diff options
| author | David Robillard <d@drobilla.net> | 2013-12-21 00:02:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-12-21 00:02:50 +0000 |
| commit | 5b15633236f029ff376e9fcaf943353b00f888b8 (patch) | |
| tree | 606b26e16968a184934426dadf72a536a2be2cbb /src | |
| parent | 10de1f9ec25507b5d67fb89d460aa65815e4fe19 (diff) | |
| download | ganv-5b15633236f029ff376e9fcaf943353b00f888b8.tar.gz ganv-5b15633236f029ff376e9fcaf943353b00f888b8.tar.bz2 ganv-5b15633236f029ff376e9fcaf943353b00f888b8.zip | |
FDGL: Make layout converge and stop chewing CPU when done again.
git-svn-id: http://svn.drobilla.net/lad/trunk/ganv@5191 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Canvas.cpp | 17 | ||||
| -rw-r--r-- | src/canvas-base.c | 10 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/Canvas.cpp b/src/Canvas.cpp index 65f2b16..593fe07 100644 --- a/src/Canvas.cpp +++ b/src/Canvas.cpp @@ -799,10 +799,10 @@ GanvCanvasImpl::layout_iteration() on a flowing river surface. This prevents disconnected components from being ejected, since at some point the tide force will be greater than distant repelling charges. */ - const Vector mouth = { -10000.0, -10000.0 }; + const Vector mouth = { -100000.0, -100000.0 }; node->impl->force = vec_add( node->impl->force, - tide_force(mouth, reg.pos, 4000000000000.0)); + tide_force(mouth, reg.pos, 10000000000000.0)); FOREACH_ITEM(_items, j) { if (i == j || (!GANV_IS_MODULE(*i) && !GANV_IS_CIRCLE(*i))) { @@ -827,8 +827,8 @@ GanvCanvasImpl::layout_iteration() GanvNode* const node = GANV_NODE(*i); - static const float dur = 0.1; // Time duration - static const float damp = 0.5; // Velocity damping + static const float dur = 0.1; // Time duration + static const float damp = 0.3; // Velocity damping const bool has_edges = (node->impl->has_in_edges || node->impl->has_out_edges); @@ -836,13 +836,13 @@ GanvCanvasImpl::layout_iteration() node->impl->vel.x = 0.0; node->impl->vel.y = 0.0; } else { - node->impl->vel = vec_mult(node->impl->vel, damp); node->impl->vel = vec_add(node->impl->vel, vec_mult(node->impl->force, dur)); + node->impl->vel = vec_mult(node->impl->vel, damp); // Clamp velocity const double vel_mag = vec_mag(node->impl->vel); - static const double MAX_VEL = 4000.0; + static const double MAX_VEL = 2000.0; if (vel_mag > MAX_VEL) { node->impl->vel = vec_mult( vec_mult(node->impl->vel, 1.0 / vel_mag), @@ -851,8 +851,7 @@ GanvCanvasImpl::layout_iteration() // Update position const Vector dpos = vec_mult(node->impl->vel, dur); - if (fabs(dpos.x) >= 1.0 || fabs(dpos.y) >= 1.0) { - ganv_item_move(GANV_ITEM(node), dpos.x, dpos.y); + if (ganv_item_move(GANV_ITEM(node), dpos.x, dpos.y)) { ++n_moved; } } @@ -1663,7 +1662,7 @@ GanvCanvasImpl::contents_changed() if (!_layout_idle_id) { _layout_idle_id = g_timeout_add_full( G_PRIORITY_DEFAULT_IDLE, - 40, + 66, on_layout_timeout, this, on_layout_done); diff --git a/src/canvas-base.c b/src/canvas-base.c index b437581..544b558 100644 --- a/src/canvas-base.c +++ b/src/canvas-base.c @@ -421,11 +421,12 @@ ganv_item_lower(GanvItem* item) * @dx: Horizontal offset. * @dy: Vertical offset. **/ -void +gboolean ganv_item_move(GanvItem* item, double dx, double dy) { - g_return_if_fail(item != NULL); - g_return_if_fail(GANV_IS_ITEM(item)); + if (item == NULL || !GANV_IS_ITEM(item)) { + return FALSE; + } const double old_x = item->x; const double old_y = item->y; @@ -445,7 +446,10 @@ ganv_item_move(GanvItem* item, double dx, double dy) lrint(old_y) != lrint(item->y)) { ganv_item_request_update(item); item->canvas->need_repick = TRUE; + return TRUE; } + + return FALSE; } /** |