2007-12-07 Tomas Frydrych <tf@openedhand.com>

* clutter/clutter-actor.c:
	(_clutter_actor_apply_modelview_transform):
	Moved offset translation after rotation so that rotation coords
	are also relative to the offset point.
This commit is contained in:
Tomas Frydrych 2007-12-10 08:15:10 +00:00
parent e1b1bc289c
commit 797805c6e7
2 changed files with 14 additions and 7 deletions

View File

@ -26,6 +26,13 @@
(clutter_actor_get_positionu): Add unit-based accessors to (clutter_actor_get_positionu): Add unit-based accessors to
the size and position. the size and position.
2007-12-07 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-actor.c:
(_clutter_actor_apply_modelview_transform):
Moved offset translation after rotation so that rotation coords
are also relative to the offset point.
2007-12-07 Tomas Frydrych <tf@openedhand.com> 2007-12-07 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-behaviour-ellipse.c: * clutter/clutter-behaviour-ellipse.c:

View File

@ -783,13 +783,6 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self)
cogl_scale (priv->scale_x, priv->scale_y); cogl_scale (priv->scale_x, priv->scale_y);
} }
if (parent && (priv->anchor_x || priv->anchor_y))
{
cogl_translatex (CLUTTER_UNITS_TO_FIXED (-priv->anchor_x),
CLUTTER_UNITS_TO_FIXED (-priv->anchor_y),
0);
}
if (priv->rzang) if (priv->rzang)
{ {
cogl_translatex (CLUTTER_UNITS_TO_FIXED (priv->rzx), cogl_translatex (CLUTTER_UNITS_TO_FIXED (priv->rzx),
@ -829,6 +822,13 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self)
CLUTTER_UNITS_TO_FIXED (-(priv->z + priv->rxz))); CLUTTER_UNITS_TO_FIXED (-(priv->z + priv->rxz)));
} }
if (parent && (priv->anchor_x || priv->anchor_y))
{
cogl_translatex (CLUTTER_UNITS_TO_FIXED (-priv->anchor_x),
CLUTTER_UNITS_TO_FIXED (-priv->anchor_y),
0);
}
if (priv->z) if (priv->z)
cogl_translatex (0, 0, priv->z); cogl_translatex (0, 0, priv->z);