From 6be996769918577c17788e71de3703a1a5cce59f Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 16 Jun 2011 08:46:16 +0000 Subject: [PATCH] evas/canvas - reverted evas_map since some texture mapping is incorrect. SVN revision: 60381 --- legacy/evas/src/lib/canvas/evas_map.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_map.c b/legacy/evas/src/lib/canvas/evas_map.c index 7899e1d01b..06cbc34944 100644 --- a/legacy/evas/src/lib/canvas/evas_map.c +++ b/legacy/evas/src/lib/canvas/evas_map.c @@ -713,10 +713,10 @@ evas_map_util_rotate(Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy) x = p->x - cx; y = p->y - cy; - xx = (x * cos(r)); - yy = (x * sin(r)); - x = xx - (y * sin(r)); - y = yy + (y * cos(r)); + xx = x * cos(r); + yy = x * sin(r); + x = xx + (y * cos(r + M_PI_2)); + y = yy + (y * sin(r + M_PI_2)); p->px = p->x = x + cx; p->py = p->y = y + cy; @@ -772,24 +772,24 @@ evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz, { xx = x * cos(rz); yy = x * sin(rz); - x = xx - (y * sin(rz)); - y = yy + (y * cos(rz)); + x = xx + (y * cos(rz + M_PI_2)); + y = yy + (y * sin(rz + M_PI_2)); } if (ry != 0.0) { xx = x * cos(ry); zz = x * sin(ry); - x = xx - (z * sin(ry)); - z = zz + (z * cos(ry)); + x = xx + (z * cos(ry + M_PI_2)); + z = zz + (z * sin(ry + M_PI_2)); } if (rx != 0.0) { zz = z * cos(rx); yy = z * sin(rx); - z = zz - (y * sin(rx)); - y = yy + (y * cos(rx)); + z = zz + (y * cos(rx + M_PI_2)); + y = yy + (y * sin(rx + M_PI_2)); } p->px = p->x = x + cx;