2007-11-27 Tomas Frydrych <tf@openedhand.com>
authorTomas Frydrych <tf@openedhand.com>
Tue, 27 Nov 2007 12:34:28 +0000 (12:34 +0000)
committerTomas Frydrych <tf@openedhand.com>
Tue, 27 Nov 2007 12:34:28 +0000 (12:34 +0000)
        * clutter/clutter-behaviour-ellipse.c:
        * clutter/clutter-behaviour-ellipse.h:
(clutter_behaviour_ellipse_get_angle_startx):
(clutter_behaviour_ellipse_set_angle_startx):
(clutter_behaviour_ellipse_get_angle_endx):
(clutter_behaviour_ellipse_set_angle_endx):
(clutter_behaviour_ellipse_get_angle_tiltx):
(clutter_behaviour_ellipse_set_angle_tiltx):
Changed to take and return angles in degrees represented as
ClutterFixed.

ChangeLog
clutter/clutter-behaviour-ellipse.c
clutter/clutter-behaviour-ellipse.h

index fe5b2c5..a8123e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-27  Tomas Frydrych  <tf@openedhand.com>
+        * clutter/clutter-behaviour-ellipse.c:
+        * clutter/clutter-behaviour-ellipse.h:
+       (clutter_behaviour_ellipse_get_angle_startx):
+       (clutter_behaviour_ellipse_set_angle_startx):
+       (clutter_behaviour_ellipse_get_angle_endx):
+       (clutter_behaviour_ellipse_set_angle_endx):
+       (clutter_behaviour_ellipse_get_angle_tiltx):
+       (clutter_behaviour_ellipse_set_angle_tiltx):
+       Changed to take and return angles in degrees represented as
+       ClutterFixed.
+
 2007-11-27  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter/clutter-actor.c (clutter_actor_destroy): Remove the
@@ -18,7 +30,7 @@
        if it is a top-level one (like ClutterStage); the backends are
        responsible for setting that flag, as it might be the result of an
        asynchronous operation (e.g. on X11).
-       
+
        * clutter/eglnative/clutter-stage-egl.c:
        (clutter_stage_egl_show),
        (clutter_stage_egl_hide): Set/unset the CLUTTER_ACTOR_MAPPED flag
@@ -61,7 +73,7 @@
        every class overriding ClutterActor::request_coords() *must* chain
        up to the parent class method or the bounding box will not be
        saved inside the ClutterActor structure.
-       
+
        * clutter/clutter-entry.c:
        * clutter/clutter-group.c:
        * clutter/clutter-hbox.c:
        glFog() functions and enabling the GL_FOG flag.
 
        * clutter/cogl/gl/cogl.c: Add GL implementation of cogl_fog_set().
-       
+
        * clutter/cogl/gles/cogl.c: Add GL/ES implementation of
        cogl_fog_set().
 
 
        (clutter_label_class_init),
        (clutter_label_init): Set the :wrap property default to FALSE.
-       
+
        * clutter/clutter-units.h: Add ClutterUnit-to-PangoUnit conversion
        macro.
 
        (clutter_get_motion_events_frequency),
        (clutter_set_motion_events_frequency): Add accessors for the default
        motion events deliver frequency.
-       
+
        (clutter_do_event): Throttle down motion events delivery using the
        motion events frequency setting, to avoid excessive redraws. (#608)
 
 
        Updated use of clutter_actor_set_rotation? in the following files:
 
-       * clutter/clutter-behaviour-rotate.c: 
-       * clutter/clutter-effect.c: 
-       * tests/test-actors.c: 
+       * clutter/clutter-behaviour-rotate.c:
+       * clutter/clutter-effect.c:
+       * tests/test-actors.c:
        * tests/test-project.c:
 
 2007-11-19  Emmanuele Bassi  <ebassi@openedhand.com>
        * clutter/clutter-group.c:
        * clutter/clutter-main.c:
        * clutter/clutter-stage.c:
-       * tests/test-events.c: 
+       * tests/test-events.c:
        Parent Actors no longer need to be set reactive for reactive
-       children to get events. Also makes groups now pickable. 
-       (#597, #423)    
+       children to get events. Also makes groups now pickable.
+       (#597, #423)
 
        * clutter/clutter-texture.c:
        Handle case when 1x1 tiled texture is created,
-       falling 'back' to being non tiled. (#596) 
+       falling 'back' to being non tiled. (#596)
 
        * clutter/eglx/clutter-backend-egl.c:
        Call EglTerminate on backend shutdown.
 2007-11-15  Neil J. Patel  <njp@o-hand.com>
 
        * clutter/Makefile.am:
-       * clutter/clutter-model.c: 
+       * clutter/clutter-model.c:
        * clutter/clutter-model.h:
        * clutter/clutter.h:
        * tests/Makefile.am:
        * tests/test-model.c:
-       Merged ClutterModel, which closes #443.         
+       Merged ClutterModel, which closes #443.
 
 2007-11-14  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter/clutter-behaviour-depth.h:
        * clutter/clutter-behaviour-ellipse.c:
        * clutter/clutter-behaviour-ellipse.h:
-       * clutter/clutter-behaviour-path.c: 
+       * clutter/clutter-behaviour-path.c:
        * clutter/clutter-behaviour-rotate.c:
        * clutter/clutter-behaviour-rotate.h:
        * clutter/clutter-behaviour-scale.c:
        * clutter/clutter-behaviour-scale.h:
-       * clutter/clutter-effect.c: 
+       * clutter/clutter-effect.c:
        * clutter/clutter-effect.h:
        * clutter/clutter-script.c:
-       * tests/test-depth.c: 
+       * tests/test-depth.c:
        * tests/test-script.c:
 
 2007-11-06  Øyvind Kolås  <pippin@o-hand.com>
        the any event.
        (clutter_event_free): removed unused variable.
        * clutter/clutter-main.c: (deliver_event), (clutter_do_event): reduced
-       amount of code. As well as deliver button-release events to the stage. 
+       amount of code. As well as deliver button-release events to the stage.
 
 2007-11-08  Rob Bradford  <rob@openedhand.com>
 
index 63b9458..e14970b 100644 (file)
@@ -207,7 +207,7 @@ clutter_behaviour_ellipse_alpha_notify (ClutterBehaviour *behave,
       ClutterAngle diff;
       ClutterAngle angle_start = priv->angle_start + 256;
       ClutterAngle angle_end   = priv->angle_end + 256;
-      
+
       /* Work out the angular length of the arch represented by the
        * end angle in CCW direction
        */
@@ -223,7 +223,7 @@ clutter_behaviour_ellipse_alpha_notify (ClutterBehaviour *behave,
         {
           diff = 1024 - angle_end + angle_start;
         }
-      
+
       angle = priv->angle_start - (diff * alpha / CLUTTER_ALPHA_MAX_ALPHA);
     }
   else if (priv->angle_end < priv->angle_start &&
@@ -251,7 +251,7 @@ clutter_behaviour_ellipse_alpha_notify (ClutterBehaviour *behave,
 
       angle = priv->angle_start + (diff * alpha / CLUTTER_ALPHA_MAX_ALPHA);
     }
-  
+
   clutter_behaviour_ellipse_advance (self, angle, &knot);
 
   knot.x += priv->center.x;
@@ -805,7 +805,7 @@ clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
 /**
  * clutter_behaviour_ellipse_set_angle_startx
  * @self: a #ClutterBehaviourEllipse
- * @angle_start: #ClutterAngle at which movement starts
+ * @angle_start: An angle, as #ClutterFixed, at which movement starts, in degrees.
  *
  * Sets the angle at which movement starts.
  *
@@ -813,14 +813,13 @@ clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
  */
 void
 clutter_behaviour_ellipse_set_angle_startx (ClutterBehaviourEllipse *self,
-                                            ClutterAngle             angle_start)
+                                            ClutterFixed             angle_start)
 {
   ClutterBehaviourEllipsePrivate *priv;
   ClutterAngle new_angle;
-
   g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
 
-  new_angle = angle_start - 256;
+  new_angle = CLUTTER_ANGLE_FROM_DEGX (angle_start) - 256;
 
   priv = self->priv;
   if (priv->angle_start != new_angle)
@@ -854,16 +853,16 @@ clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self)
  *
  * Gets the angle at which movements starts.
  *
- * Return value: a #ClutterAngle
+ * Return value: angle, as #ClutterFixed, in degrees.
  *
  * Since: 0.6
  */
-ClutterAngle
+ClutterFixed
 clutter_behaviour_ellipse_get_angle_startx (ClutterBehaviourEllipse *self)
 {
   g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0);
 
-  return self->priv->angle_start;
+  return CLUTTER_ANGLE_TO_DEGX (self->priv->angle_start);
 }
 
 /**
@@ -888,7 +887,7 @@ clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self,
 /**
  * clutter_behaviour_ellipse_set_angle_endx
  * @self: a #ClutterBehaviourEllipse
- * @angle_end: #ClutterAngle at which movement ends
+ * @angle_end: angle, as #ClutterFixed, at which movement ends, in degrees.
  *
  * Sets the angle at which movement ends.
  *
@@ -896,14 +895,14 @@ clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self,
  */
 void
 clutter_behaviour_ellipse_set_angle_endx (ClutterBehaviourEllipse *self,
-                                          ClutterAngle             angle_end)
+                                          ClutterFixed             angle_end)
 {
   ClutterBehaviourEllipsePrivate *priv;
   ClutterAngle new_angle;
 
   g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
 
-  new_angle = angle_end - 256;
+  new_angle = CLUTTER_ANGLE_FROM_DEGX (angle_end) - 256;
 
   priv = self->priv;
 
@@ -939,16 +938,16 @@ clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self)
  *
  * Gets the angle at which movements ends.
  *
- * Return value: a #ClutterAngle
+ * Return value: angle, as #ClutterFixed, in degrees
  *
  * Since: 0.4
  */
-ClutterAngle
+ClutterFixed
 clutter_behaviour_ellipse_get_angle_endx (ClutterBehaviourEllipse *self)
 {
   g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0);
 
-  return self->priv->angle_end;
+  return CLUTTER_ANGLE_TO_DEGX (self->priv->angle_end);
 }
 
 /**
@@ -978,8 +977,8 @@ clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
  * clutter_behaviour_ellipse_set_angle_tiltx
  * @self: a #ClutterBehaviourEllipse
  * @axis: a #ClutterRoateAxis
- * @angle_tilt: #ClutterAngle tilt of the elipse around the center in the given
- * axis
+ * @angle_tilt: tilt, as #ClutterFixed, of the elipse around the center in the given
+ * axis in degrees.
  *
  * Sets the angle at which the ellipse should be tilted around it's center.
  *
@@ -988,14 +987,14 @@ clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
 void
 clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
                                            ClutterRotateAxis        axis,
-                                           ClutterAngle             angle_tilt)
+                                           ClutterFixed             angle_tilt)
 {
   ClutterBehaviourEllipsePrivate *priv;
   ClutterAngle new_angle;
 
   g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
 
-  new_angle = angle_tilt - 256;
+  new_angle = CLUTTER_ANGLE_FROM_DEGX (angle_tilt) - 256;
 
   priv = self->priv;
 
@@ -1058,11 +1057,11 @@ clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
  *
  * Gets the tilt of the ellipse around the center in the given axis.
  *
- * Return value: a #ClutterAngle
+ * Return value: angle, as #ClutterFixed, in degrees
  *
  * Since: 0.4
  */
-ClutterAngle
+ClutterFixed
 clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
                                            ClutterRotateAxis        axis)
 {
@@ -1071,11 +1070,11 @@ clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
   switch (axis)
     {
     case CLUTTER_X_AXIS:
-      return self->priv->angle_tilt_x + 256;
+      return CLUTTER_ANGLE_TO_DEGX (self->priv->angle_tilt_x + 256);
     case CLUTTER_Y_AXIS:
-      return self->priv->angle_tilt_y + 256;
+      return CLUTTER_ANGLE_TO_DEGX (self->priv->angle_tilt_y + 256);
     case CLUTTER_Z_AXIS:
-      return self->priv->angle_tilt_z + 256;
+      return CLUTTER_ANGLE_TO_DEGX (self->priv->angle_tilt_z + 256);
     default:
       break;
     }
@@ -1111,9 +1110,9 @@ clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
 /**
  * clutter_behaviour_ellipse_set_tiltx
  * @self: a #ClutterBehaviourEllipse
- * @angle_tilt_x: #ClutterAngle tilt of the elipse around the center in X axis
- * @angle_tilt_y: #ClutterAngle tilt of the elipse around the center in Y axis
- * @angle_tilt_z: #ClutterAngle tilt of the elipse around the center in Z axis
+ * @angle_tilt_x: tilt of the elipse in degrees, as #ClutterFixed, around the center in X axis
+ * @angle_tilt_y: tilt of the elipse in degrees, as #ClutterFixed, around the center in Y axis
+ * @angle_tilt_z: tilt of the elipse in degrees, as #ClutterFixed, around the center in Z axis
  *
  * Sets the angle at which the ellipse should be tilted around it's center.
  *
@@ -1121,18 +1120,18 @@ clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
  */
 void
 clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self,
-                                     ClutterAngle             angle_tilt_x,
-                                     ClutterAngle             angle_tilt_y,
-                                     ClutterAngle             angle_tilt_z)
+                                     ClutterFixed             angle_tilt_x,
+                                     ClutterFixed             angle_tilt_y,
+                                     ClutterFixed             angle_tilt_z)
 {
   ClutterBehaviourEllipsePrivate *priv;
   ClutterAngle new_angle_x, new_angle_y, new_angle_z;
 
   g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
 
-  new_angle_x = angle_tilt_x - 256;
-  new_angle_y = angle_tilt_y - 256;
-  new_angle_z = angle_tilt_z - 256;
+  new_angle_x = CLUTTER_ANGLE_FROM_DEGX (angle_tilt_x) - 256;
+  new_angle_y = CLUTTER_ANGLE_FROM_DEGX (angle_tilt_y) - 256;
+  new_angle_z = CLUTTER_ANGLE_FROM_DEGX (angle_tilt_z) - 256;
 
   priv = self->priv;
 
@@ -1158,7 +1157,7 @@ clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self,
 
       g_object_notify (G_OBJECT (self), "angle-tilt-z");
     }
-  
+
   g_object_thaw_notify (G_OBJECT (self));
 }
 
@@ -1202,12 +1201,12 @@ clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self,
 /**
  * clutter_behaviour_ellipse_get_tiltx
  * @self: a #ClutterBehaviourEllipse
- * @angle_tilt_x: #ClutterAngle location for tilt of the elipse around the
- * center in X axis, or NULL.
- * @angle_tilt_y: #ClutterAngle location for tilt of the elipse around the
- * center in Y axis, or NULL.
- * @angle_tilt_z: #ClutterAngle location for tilt of the elipse around the
- * center in Z axis, or NULL.
+ * @angle_tilt_x: location for tilt of the elipse, as #ClutterFixed, around the
+ * center in X axis in degrees, or NULL.
+ * @angle_tilt_y: location for tilt of the elipse, as #ClutterFixed, around the
+ * center in Y axis in degress, or NULL.
+ * @angle_tilt_z: location for tilt of the elipse, as #ClutterFixed, around the
+ * center in Z axis in degrees, or NULL.
  *
  * Gets the tilt of the ellipse around the center in Y axis.
  *
@@ -1215,9 +1214,9 @@ clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self,
  */
 void
 clutter_behaviour_ellipse_get_tiltx (ClutterBehaviourEllipse *self,
-                                     ClutterAngle            *angle_tilt_x,
-                                     ClutterAngle            *angle_tilt_y,
-                                     ClutterAngle            *angle_tilt_z)
+                                     ClutterFixed            *angle_tilt_x,
+                                     ClutterFixed            *angle_tilt_y,
+                                     ClutterFixed            *angle_tilt_z)
 {
   ClutterBehaviourEllipsePrivate *priv;
 
@@ -1226,13 +1225,13 @@ clutter_behaviour_ellipse_get_tiltx (ClutterBehaviourEllipse *self,
   priv = self->priv;
 
   if (angle_tilt_x)
-    *angle_tilt_x = priv->angle_tilt_x + 256;
+    *angle_tilt_x = CLUTTER_ANGLE_TO_DEGX (priv->angle_tilt_x + 256);
 
   if (angle_tilt_y)
-    *angle_tilt_y = priv->angle_tilt_y + 256;
+    *angle_tilt_y = CLUTTER_ANGLE_TO_DEGX (priv->angle_tilt_y + 256);
 
   if (angle_tilt_z)
-    *angle_tilt_z = priv->angle_tilt_z + 256;
+    *angle_tilt_z = CLUTTER_ANGLE_TO_DEGX (priv->angle_tilt_z + 256);
 }
 
 /**
index bd36979..b53f232 100644 (file)
@@ -134,31 +134,31 @@ void                   clutter_behaviour_ellipse_set_angle_start    (ClutterBeha
                                                                     gdouble                     angle_start);
 
 void                   clutter_behaviour_ellipse_set_angle_startx   (ClutterBehaviourEllipse    *self,
-                                                                    ClutterAngle                angle_start);
+                                                                    ClutterFixed                angle_start);
 
-ClutterAngle           clutter_behaviour_ellipse_get_angle_startx   (ClutterBehaviourEllipse    *self);
+ClutterFixed           clutter_behaviour_ellipse_get_angle_startx   (ClutterBehaviourEllipse    *self);
 
 gdouble                clutter_behaviour_ellipse_get_angle_start    (ClutterBehaviourEllipse    *self);
 
 void                   clutter_behaviour_ellipse_set_angle_endx     (ClutterBehaviourEllipse    *self,
-                                                                    ClutterAngle                angle_end);
+                                                                    ClutterFixed                angle_end);
 
 void                   clutter_behaviour_ellipse_set_angle_end      (ClutterBehaviourEllipse    *self,
                                                                     gdouble                     angle_end);
 
-ClutterAngle           clutter_behaviour_ellipse_get_angle_endx     (ClutterBehaviourEllipse    *self);
+ClutterFixed           clutter_behaviour_ellipse_get_angle_endx     (ClutterBehaviourEllipse    *self);
 
 gdouble                clutter_behaviour_ellipse_get_angle_end      (ClutterBehaviourEllipse    *self);
 
 void                   clutter_behaviour_ellipse_set_angle_tiltx    (ClutterBehaviourEllipse    *self,
                                                                     ClutterRotateAxis           axis,
-                                                                    ClutterAngle                angle_tilt);
+                                                                    ClutterFixed                angle_tilt);
 
 void                   clutter_behaviour_ellipse_set_angle_tilt     (ClutterBehaviourEllipse    *self,
                                                                     ClutterRotateAxis           axis,
                                                                     gdouble                     angle_tilt);
 
-ClutterAngle           clutter_behaviour_ellipse_get_angle_tiltx    (ClutterBehaviourEllipse    *self,
+ClutterFixed           clutter_behaviour_ellipse_get_angle_tiltx    (ClutterBehaviourEllipse    *self,
                                                                     ClutterRotateAxis           axis);
 
 gdouble                clutter_behaviour_ellipse_get_angle_tilt     (ClutterBehaviourEllipse    *self,
@@ -170,9 +170,9 @@ void                   clutter_behaviour_ellipse_set_tilt           (ClutterBeha
                                                                     gdouble                     angle_tilt_z);
 
 void                   clutter_behaviour_ellipse_set_tiltx          (ClutterBehaviourEllipse    *self,
-                                                                    ClutterAngle                angle_tilt_x,
-                                                                    ClutterAngle                angle_tilt_y,
-                                                                    ClutterAngle                angle_tilt_z);
+                                                                    ClutterFixed                angle_tilt_x,
+                                                                    ClutterFixed                angle_tilt_y,
+                                                                    ClutterFixed                angle_tilt_z);
 
 void                   clutter_behaviour_ellipse_get_tilt           (ClutterBehaviourEllipse    *self,
                                                                     gdouble                    *angle_tilt_x,
@@ -180,9 +180,9 @@ void                   clutter_behaviour_ellipse_get_tilt           (ClutterBeha
                                                                     gdouble                    *angle_tilt_z);
 
 void                   clutter_behaviour_ellipse_get_tiltx          (ClutterBehaviourEllipse    *self,
-                                                                    ClutterAngle               *angle_tilt_x,
-                                                                    ClutterAngle               *angle_tilt_y,
-                                                                    ClutterAngle               *angle_tilt_z);
+                                                                    ClutterFixed               *angle_tilt_x,
+                                                                    ClutterFixed               *angle_tilt_y,
+                                                                    ClutterFixed               *angle_tilt_z);
 
 ClutterRotateDirection clutter_behaviour_ellipse_get_direction      (ClutterBehaviourEllipse    *self);