diff options
| author | David Robillard <d@drobilla.net> | 2011-12-12 19:50:16 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-12-12 19:50:16 +0000 |
| commit | afa75c916926e61755eb5400623faeeb0bd4ae48 (patch) | |
| tree | 8aff6cdefc51da6f1204e9d12bbbd2e9d9431d3a | |
| parent | 2df06ae2839206a2005e926d7674a8d519b91012 (diff) | |
| download | ganv-afa75c916926e61755eb5400623faeeb0bd4ae48.tar.gz ganv-afa75c916926e61755eb5400623faeeb0bd4ae48.tar.bz2 ganv-afa75c916926e61755eb5400623faeeb0bd4ae48.zip | |
Remove HACKISH_AFFINE gunk.
git-svn-id: http://svn.drobilla.net/lad/trunk/ganv@3861 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/canvas-base.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/canvas-base.c b/src/canvas-base.c index 61839e3..ec55d99 100644 --- a/src/canvas-base.c +++ b/src/canvas-base.c @@ -312,8 +312,6 @@ ganv_item_update(GanvItem* item, double* affine, int flags) GTK_OBJECT_UNSET_FLAGS(item, GANV_ITEM_NEED_VIS); } -#define noHACKISH_AFFINE - /* * This routine invokes the update method of the item * Please notice, that we take parent to canvas pixel matrix as argument @@ -333,10 +331,6 @@ ganv_item_invoke_update(GanvItem* item, double* p2cpx, int flags) int child_flags; gdouble i2cpx[6]; -#ifdef HACKISH_AFFINE - double i2w[6], w2c[6], i2c[6]; -#endif - child_flags = flags; if (!(item->object.flags & GANV_ITEM_VISIBLE)) { child_flags &= ~GANV_CANVAS_BASE_UPDATE_IS_VISIBLE; @@ -359,14 +353,6 @@ ganv_item_invoke_update(GanvItem* item, double* p2cpx, int flags) memcpy(i2cpx, p2cpx, 6 * sizeof(gdouble)); } -#ifdef HACKISH_AFFINE - ganv_item_i2w_affine(item, i2w); - ganv_canvas_base_w2c_affine(item->canvas, w2c); - art_affine_multiply(i2c, i2w, w2c); - /* invariant (doesn't hold now): child_affine == i2c */ - child_affine = i2c; -#endif - /* apply object flags to child flags */ child_flags &= ~GANV_CANVAS_BASE_UPDATE_REQUESTED; @@ -422,23 +408,6 @@ ganv_item_invoke_point(GanvItem* item, double x, double y, int cx, int cy, } } -#ifdef HACKISH_AFFINE - double i2w[6], w2c[6], i2c[6], c2i[6]; - ArtPoint c, i; -#endif - -#ifdef HACKISH_AFFINE - ganv_item_i2w_affine(item, i2w); - ganv_canvas_base_w2c_affine(item->canvas, w2c); - art_affine_multiply(i2c, i2w, w2c); - art_affine_invert(c2i, i2c); - c.x = cx; - c.y = cy; - art_affine_point(&i, &c, c2i); - x = i.x; - y = i.y; -#endif - if (GANV_ITEM_GET_CLASS(item)->point) { return GANV_ITEM_GET_CLASS(item)->point(item, x, y, cx, cy, actual_item); } |