fixed coordinance translation in clutter_actor_get_transformed_point

diff --git a/ChangeLog b/ChangeLog
index c891e9a..9829339 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-31  Tomas Frydrych  <tf@openedhand.com>
+
+       * clutter/clutter-actor.c:
+       (clutter_actor_get_transformed_point):
+       Fixed coordinance translation.
+       
 2007-05-31  Matthew Allum  <mallum@openedhand.com>
 
        * clutter/clutter-actor.c:

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index b6627ee..4410841 100644 (file)
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -454,10 +454,8 @@ mtx_transform (ClutterFixed *m,
 }
 
 static void
-mtx_create (ClutterActor *self, ClutterFixed *mtx)
+mtx_create (ClutterActorPrivate *priv, ClutterFixed *mtx)
 {
-  ClutterActorPrivate  *priv = self->priv;
-
   /* FIXME: need to apply perspective / viewport transforms */
 
   mtx_identity (&mtx[0]);
@@ -472,7 +470,7 @@ mtx_create (ClutterActor *self, ClutterFixed *mtx)
                 CLUTTER_UNITS_TO_FIXED (priv->coords.y1), 
                 CLUTTER_INT_TO_FIXED (priv->z));
 
-  if (self->priv->rzang)
+  if (priv->rzang)
     {
       mtx_translate (&mtx[0],
                 CLUTTER_INT_TO_FIXED (priv->rzx),
@@ -487,7 +485,7 @@ mtx_create (ClutterActor *self, ClutterFixed *mtx)
                 0);
     }
 
-  if (self->priv->ryang)
+  if (priv->ryang)
     {
       mtx_translate (&mtx[0],
                 CLUTTER_INT_TO_FIXED (priv->ryx),
@@ -502,7 +500,7 @@ mtx_create (ClutterActor *self, ClutterFixed *mtx)
                 CLUTTER_INT_TO_FIXED (-(priv->z + priv->ryz)));
     }
 
-  if (self->priv->rxang)
+  if (priv->rxang)
     {
       mtx_translate (&mtx[0],
                 0,
@@ -517,10 +515,10 @@ mtx_create (ClutterActor *self, ClutterFixed *mtx)
                 CLUTTER_INT_TO_FIXED (-(priv->z - priv->rxz)));
     }
 
-  if (self->priv->z)
+  if (priv->z)
     mtx_translate (&mtx[0], 0, 0, CLUTTER_INT_TO_FIXED (priv->z));
 
-  if (self->priv->scale_x != CFX_ONE || self->priv->scale_y != CFX_ONE)
+  if (priv->scale_x != CFX_ONE || priv->scale_y != CFX_ONE)
     {
       mtx_scale (&mtx[0], priv->scale_x, priv->scale_y);
     }
@@ -549,13 +547,16 @@ clutter_actor_get_transformed_point (ClutterActor *actor,
                                     ClutterUnit  *z_return)
 {
   ClutterFixed           mtx[16];
+  ClutterActorPrivate   *priv;
   
   g_return_if_fail (CLUTTER_IS_ACTOR (actor));
 
-  mtx_create (actor, &mtx[0]);
+  priv = actor->priv;
+
+  mtx_create (priv, &mtx[0]);
 
-  *x_return = CLUTTER_UNITS_FROM_INT(x);
-  *y_return = CLUTTER_UNITS_FROM_INT(y);
+  *x_return = CLUTTER_UNITS_FROM_INT(x) - priv->coords.x1;
+  *y_return = CLUTTER_UNITS_FROM_INT(y) - priv->coords.y1;
   *z_return = 0;
 
   mtx_transform (&mtx[0], x_return, y_return, z_return);
@@ -586,7 +587,7 @@ clutter_actor_get_transformed_vertices (ClutterActor    * self,
 
   priv = self->priv;
 
-  mtx_create (self, &mtx[0]);
+  mtx_create (priv, &mtx[0]);
 
 #if 0
   g_debug ("Matrix\n"

diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 7b3f9f0..7646229 100644 (file)
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,5 +1,10 @@
 2007-05-31  Tomas Frydrych  <tf@openedhand.com>
 
+       * tmpl/clutter-behaviour-ellipse.sgml:
+       Updated template.
+       
+2007-05-31  Tomas Frydrych  <tf@openedhand.com>
+
        * clutter.types:
        Added clutter_vertices_get_type.
        

diff --git a/doc/reference/tmpl/clutter-behaviour-ellipse.sgml b/doc/reference/tmpl/clutter-behaviour-ellipse.sgml
index d7b5533..de17826 100644 (file)
--- a/doc/reference/tmpl/clutter-behaviour-ellipse.sgml
+++ b/doc/reference/tmpl/clutter-behaviour-ellipse.sgml
@@ -23,14 +23,6 @@ ClutterBehaviourEllipse
 </para>
 
 
-<!-- ##### SIGNAL ClutterBehaviourEllipse::knot-reached ##### -->
-<para>
-
-</para>
-
-@clutterbehaviourellipse: the object which received the signal.
-@arg1: 
-
 <!-- ##### ARG ClutterBehaviourEllipse:angle-begin ##### -->
 <para>