brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-11-27 Tomas Frydrych <tf@openedhand.com>

Browse Source 
* 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.
This commit is contained in:
Tomas Frydrych 2007-11-27 12:34:28 +00:00
parent ceecc23a02
commit 55d53acc8f
3 changed files with 88 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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> 2007-11-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.c (clutter_actor_destroy): Remove the * clutter/clutter-actor.c (clutter_actor_destroy): Remove the

85
clutter/clutter-behaviour-ellipse.c
View File

@ -805,7 +805,7 @@ clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
/** /**
* clutter_behaviour_ellipse_set_angle_startx * clutter_behaviour_ellipse_set_angle_startx
* @self: a #ClutterBehaviourEllipse * @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. * Sets the angle at which movement starts.
* *
@ -813,14 +813,13 @@ clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
*/ */
void void
clutter_behaviour_ellipse_set_angle_startx (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_set_angle_startx (ClutterBehaviourEllipse *self,
ClutterAngle angle_start) ClutterFixed angle_start)
{ {
ClutterBehaviourEllipsePrivate *priv; ClutterBehaviourEllipsePrivate *priv;
ClutterAngle new_angle; ClutterAngle new_angle;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self)); 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; priv = self->priv;
if (priv->angle_start != new_angle) 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. * Gets the angle at which movements starts.
* *
* Return value: a #ClutterAngle * Return value: angle, as #ClutterFixed, in degrees.
* *
* Since: 0.6 * Since: 0.6
*/ */
ClutterAngle ClutterFixed
clutter_behaviour_ellipse_get_angle_startx (ClutterBehaviourEllipse *self) clutter_behaviour_ellipse_get_angle_startx (ClutterBehaviourEllipse *self)
{ {
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0); 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 * clutter_behaviour_ellipse_set_angle_endx
* @self: a #ClutterBehaviourEllipse * @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. * Sets the angle at which movement ends.
* *
@ -896,14 +895,14 @@ clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self,
*/ */
void void
clutter_behaviour_ellipse_set_angle_endx (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_set_angle_endx (ClutterBehaviourEllipse *self,
ClutterAngle angle_end) ClutterFixed angle_end)
{ {
ClutterBehaviourEllipsePrivate *priv; ClutterBehaviourEllipsePrivate *priv;
ClutterAngle new_angle; ClutterAngle new_angle;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self)); 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; priv = self->priv;
@ -939,16 +938,16 @@ clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self)
* *
* Gets the angle at which movements ends. * Gets the angle at which movements ends.
* *
* Return value: a #ClutterAngle * Return value: angle, as #ClutterFixed, in degrees
* *
* Since: 0.4 * Since: 0.4
*/ */
ClutterAngle ClutterFixed
clutter_behaviour_ellipse_get_angle_endx (ClutterBehaviourEllipse *self) clutter_behaviour_ellipse_get_angle_endx (ClutterBehaviourEllipse *self)
{ {
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0); 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 * clutter_behaviour_ellipse_set_angle_tiltx
* @self: a #ClutterBehaviourEllipse * @self: a #ClutterBehaviourEllipse
* @axis: a #ClutterRoateAxis * @axis: a #ClutterRoateAxis
* @angle_tilt: #ClutterAngle tilt of the elipse around the center in the given * @angle_tilt: tilt, as #ClutterFixed, of the elipse around the center in the given
* axis * axis in degrees.
* *
* Sets the angle at which the ellipse should be tilted around it's center. * 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 void
clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis, ClutterRotateAxis axis,
ClutterAngle angle_tilt) ClutterFixed angle_tilt)
{ {
ClutterBehaviourEllipsePrivate *priv; ClutterBehaviourEllipsePrivate *priv;
ClutterAngle new_angle; ClutterAngle new_angle;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self)); 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; 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. * 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 * Since: 0.4
*/ */
ClutterAngle ClutterFixed
clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis) ClutterRotateAxis axis)
{ {
@ -1071,11 +1070,11 @@ clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
switch (axis) switch (axis)
{ {
case CLUTTER_X_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: 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: case CLUTTER_Z_AXIS:
return self->priv->angle_tilt_z + 256; return CLUTTER_ANGLE_TO_DEGX (self->priv->angle_tilt_z + 256);
default: default:
break; break;
} }
@ -1111,9 +1110,9 @@ clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
/** /**
* clutter_behaviour_ellipse_set_tiltx * clutter_behaviour_ellipse_set_tiltx
* @self: a #ClutterBehaviourEllipse * @self: a #ClutterBehaviourEllipse
* @angle_tilt_x: #ClutterAngle tilt of the elipse around the center in X axis * @angle_tilt_x: tilt of the elipse in degrees, as #ClutterFixed, around the center in X axis
* @angle_tilt_y: #ClutterAngle tilt of the elipse around the center in Y axis * @angle_tilt_y: tilt of the elipse in degrees, as #ClutterFixed, around the center in Y axis
* @angle_tilt_z: #ClutterAngle tilt of the elipse around the center in Z 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. * 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 void
clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_x, ClutterFixed angle_tilt_x,
ClutterAngle angle_tilt_y, ClutterFixed angle_tilt_y,
ClutterAngle angle_tilt_z) ClutterFixed angle_tilt_z)
{ {
ClutterBehaviourEllipsePrivate *priv; ClutterBehaviourEllipsePrivate *priv;
ClutterAngle new_angle_x, new_angle_y, new_angle_z; ClutterAngle new_angle_x, new_angle_y, new_angle_z;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self)); g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
new_angle_x = angle_tilt_x - 256; new_angle_x = CLUTTER_ANGLE_FROM_DEGX (angle_tilt_x) - 256;
new_angle_y = angle_tilt_y - 256; new_angle_y = CLUTTER_ANGLE_FROM_DEGX (angle_tilt_y) - 256;
new_angle_z = angle_tilt_z - 256; new_angle_z = CLUTTER_ANGLE_FROM_DEGX (angle_tilt_z) - 256;
priv = self->priv; priv = self->priv;
@ -1202,12 +1201,12 @@ clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self,
/** /**
* clutter_behaviour_ellipse_get_tiltx * clutter_behaviour_ellipse_get_tiltx
* @self: a #ClutterBehaviourEllipse * @self: a #ClutterBehaviourEllipse
* @angle_tilt_x: #ClutterAngle location for tilt of the elipse around the * @angle_tilt_x: location for tilt of the elipse, as #ClutterFixed, around the
* center in X axis, or NULL. * center in X axis in degrees, or NULL.
* @angle_tilt_y: #ClutterAngle location for tilt of the elipse around the * @angle_tilt_y: location for tilt of the elipse, as #ClutterFixed, around the
* center in Y axis, or NULL. * center in Y axis in degress, or NULL.
* @angle_tilt_z: #ClutterAngle location for tilt of the elipse around the * @angle_tilt_z: location for tilt of the elipse, as #ClutterFixed, around the
* center in Z axis, or NULL. * center in Z axis in degrees, or NULL.
* *
* Gets the tilt of the ellipse around the center in Y axis. * Gets the tilt of the ellipse around the center in Y axis.
* *
@ -1215,9 +1214,9 @@ clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self,
*/ */
void void
clutter_behaviour_ellipse_get_tiltx (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_get_tiltx (ClutterBehaviourEllipse *self,
ClutterAngle *angle_tilt_x, ClutterFixed *angle_tilt_x,
ClutterAngle *angle_tilt_y, ClutterFixed *angle_tilt_y,
ClutterAngle *angle_tilt_z) ClutterFixed *angle_tilt_z)
{ {
ClutterBehaviourEllipsePrivate *priv; ClutterBehaviourEllipsePrivate *priv;
@ -1226,13 +1225,13 @@ clutter_behaviour_ellipse_get_tiltx (ClutterBehaviourEllipse *self,
priv = self->priv; priv = self->priv;
if (angle_tilt_x) 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) 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) if (angle_tilt_z)
*angle_tilt_z = priv->angle_tilt_z + 256; *angle_tilt_z = CLUTTER_ANGLE_TO_DEGX (priv->angle_tilt_z + 256);
} }
/** /**

24
clutter/clutter-behaviour-ellipse.h
View File

@ -134,31 +134,31 @@ void clutter_behaviour_ellipse_set_angle_start (ClutterBeha
gdouble angle_start); gdouble angle_start);
void clutter_behaviour_ellipse_set_angle_startx (ClutterBehaviourEllipse *self, 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); gdouble clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self);
void clutter_behaviour_ellipse_set_angle_endx (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, void clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self,
gdouble angle_end); 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); gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self);
void clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis, ClutterRotateAxis axis,
ClutterAngle angle_tilt); ClutterFixed angle_tilt);
void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis, ClutterRotateAxis axis,
gdouble angle_tilt); gdouble angle_tilt);
ClutterAngle clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self, ClutterFixed clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis); ClutterRotateAxis axis);
gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self, gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
@ -170,9 +170,9 @@ void clutter_behaviour_ellipse_set_tilt (ClutterBeha
gdouble angle_tilt_z); gdouble angle_tilt_z);
void clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_x, ClutterFixed angle_tilt_x,
ClutterAngle angle_tilt_y, ClutterFixed angle_tilt_y,
ClutterAngle angle_tilt_z); ClutterFixed angle_tilt_z);
void clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self,
gdouble *angle_tilt_x, gdouble *angle_tilt_x,
@ -180,9 +180,9 @@ void clutter_behaviour_ellipse_get_tilt (ClutterBeha
gdouble *angle_tilt_z); gdouble *angle_tilt_z);
void clutter_behaviour_ellipse_get_tiltx (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_get_tiltx (ClutterBehaviourEllipse *self,
ClutterAngle *angle_tilt_x, ClutterFixed *angle_tilt_x,
ClutterAngle *angle_tilt_y, ClutterFixed *angle_tilt_y,
ClutterAngle *angle_tilt_z); ClutterFixed *angle_tilt_z);
ClutterRotateDirection clutter_behaviour_ellipse_get_direction (ClutterBehaviourEllipse *self); ClutterRotateDirection clutter_behaviour_ellipse_get_direction (ClutterBehaviourEllipse *self);