From 445f07a74a340715e850441017845001ce38a878 Mon Sep 17 00:00:00 2001 From: cedric Date: Wed, 7 Mar 2012 18:21:28 +0000 Subject: [PATCH] edje: fix rotation with fixed point. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@69011 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 2 ++ NEWS | 1 + src/lib/edje_calc.c | 8 ++++---- src/lib/edje_private.h | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4f53e1..64b6a99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -386,3 +386,5 @@ 2012-03-07 Cedric Bail * Correctly count and propagate preload signal with GROUP. + * Fix rotation with fixed point. + diff --git a/NEWS b/NEWS index 01b7676..2f00d0a 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,7 @@ Improvements: Fixes: * Correctly count and propagate preload signal with GROUP. + * Fix rotation with fixed point. Changes since Edje 1.0.0: ------------------------- diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c index 0484b67..2738cb5 100644 --- a/src/lib/edje_calc.c +++ b/src/lib/edje_calc.c @@ -1809,9 +1809,9 @@ _edje_part_recalc_single_map(Edje *ed, } params->map.center.z = 0; - params->map.rotation.x = TO_DOUBLE(desc->map.rot.x); - params->map.rotation.y = TO_DOUBLE(desc->map.rot.y); - params->map.rotation.z = TO_DOUBLE(desc->map.rot.z); + params->map.rotation.x = desc->map.rot.x; + params->map.rotation.y = desc->map.rot.y; + params->map.rotation.z = desc->map.rot.z; if (light) { @@ -2831,7 +2831,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta } evas_map_util_3d_rotate(map, - pf->map.rotation.x, pf->map.rotation.y, pf->map.rotation.z, + TO_DOUBLE(pf->map.rotation.x), TO_DOUBLE(pf->map.rotation.y), TO_DOUBLE(pf->map.rotation.z), pf->map.center.x, pf->map.center.y, pf->map.center.z); // calculate light color & position etc. if there is one diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h index 9636129..8fbc4af 100644 --- a/src/lib/edje_private.h +++ b/src/lib/edje_private.h @@ -1202,7 +1202,7 @@ struct _Edje_Calc_Params int x, y, z; } center; // 12 struct { - double x, y, z; + FLOAT_T x, y, z; } rotation; // 24 struct { int x, y, z; -- 2.7.4