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

pruned ClutterBehaviourEllipse api

Browse Source
This commit is contained in:
Tomas Frydrych 2007-07-27 13:44:42 +00:00
parent e17173edb4
commit aed6a0cbe2
4 changed files with 92 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-07-27 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-behaviour-ellipse.h:
* clutter/clutter-behaviour-ellipse.c:
* tests/test-behave.c:
(clutter_behaviour_ellipse_get_angle_tilt):
(clutter_behaviour_ellipse_set_angle_tilt):
Pruned ClutterBehaviourEllipse api.
2007-07-27 Tomas Frydrych <tf@openedhand.com> 2007-07-27 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-behaviour-ellipse.h: * clutter/clutter-behaviour-ellipse.h:

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

@ -890,258 +890,135 @@ clutter_behaviour_ellipse_get_angle_endx (ClutterBehaviourEllipse *self)
} }
/** /**
* clutter_behaviour_ellipse_set_angle_tilt_z * clutter_behaviour_ellipse_set_angle_tilt
* @self: a #ClutterBehaviourEllipse * @self: a #ClutterBehaviourEllipse
* @angle_tilt_z: tilt of the elipse around the center in Z axis in degrees. * @axis: a #ClutterRotateAxis
* @angle_tilt: tilt 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. * Sets the angle at which the ellipse should be tilted around it's center.
* *
* Since: 0.4 * Since: 0.4
*/ */
void void
clutter_behaviour_ellipse_set_angle_tilt_z (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
gdouble angle_tilt_z) ClutterRotateAxis axis,
gdouble angle_tilt)
{ {
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self)); g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
clutter_behaviour_ellipse_set_angle_tilt_zx (self, clutter_behaviour_ellipse_set_angle_tiltx (self,
CLUTTER_ANGLE_FROM_DEG (angle_tilt_z)); axis,
CLUTTER_ANGLE_FROM_DEG (angle_tilt));
} }
/** /**
* clutter_behaviour_ellipse_set_angle_tilt_zx * clutter_behaviour_ellipse_set_angle_tiltx
* @self: a #ClutterBehaviourEllipse * @self: a #ClutterBehaviourEllipse
* @angle_tilt_z: #ClutterAngle tilt of the elipse around the center in z axis * @axis: a #ClutterRoateAxis
* @angle_tilt: #ClutterAngle tilt of the elipse around the center in the given
* 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.
* *
* Since: 0.4 * Since: 0.4
*/ */
void void
clutter_behaviour_ellipse_set_angle_tilt_zx (ClutterBehaviourEllipse *self, clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_z) ClutterRotateAxis axis,
ClutterAngle 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_z - 256; new_angle = angle_tilt - 256;
priv = self->priv; priv = self->priv;
if (priv->angle_tilt_z != new_angle) switch (axis)
{ {
priv->angle_tilt_z = new_angle; case CLUTTER_X_AXIS:
g_object_notify (G_OBJECT (self), "angle-tilt-z");
}
}
/**
* clutter_behaviour_ellipse_get_angle_tilt_z
* @self: a #ClutterBehaviourEllipse
*
* Gets the tilt of the ellipse around the center in Z axis.
*
* Return value: angle in degrees.
*
* Since: 0.4
*/
gdouble
clutter_behaviour_ellipse_get_angle_tilt_z (ClutterBehaviourEllipse *self)
{
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0.0);
return CLUTTER_ANGLE_TO_DEG (self->priv->angle_tilt_z + 256);
}
/**
* clutter_behaviour_ellipse_get_angle_tilt_zx
* @self: a #ClutterBehaviourEllipse
*
* Gets the tilt of the ellipse around the center in Z axis.
*
* Return value: a #ClutterAngle
*
* Since: 0.4
*/
ClutterAngle
clutter_behaviour_ellipse_get_angle_tilt_zx (ClutterBehaviourEllipse *self)
{
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0);
return self->priv->angle_tilt_z + 256;
}
/**
* clutter_behaviour_ellipse_set_angle_tilt_x
* @self: a #ClutterBehaviourEllipse
* @angle_tilt_x: tilt of the elipse around the center in X axis in degrees.
*
* Sets the angle at which the ellipse should be tilted around it's center.
*
* Since: 0.4
*/
void
clutter_behaviour_ellipse_set_angle_tilt_x (ClutterBehaviourEllipse *self,
gdouble angle_tilt_x)
{
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
clutter_behaviour_ellipse_set_angle_tilt_xx (self,
CLUTTER_ANGLE_FROM_DEG (angle_tilt_x));
}
/**
* clutter_behaviour_ellipse_set_angle_tilt_xx
* @self: a #ClutterBehaviourEllipse
* @angle_tilt_x: #ClutterAngle tilt of the elipse around the center in X axis
*
* Sets the angle at which the ellipse should be tilted around it's center.
*
* Since: 0.4
*/
void
clutter_behaviour_ellipse_set_angle_tilt_xx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_x)
{
ClutterBehaviourEllipsePrivate *priv;
ClutterAngle new_angle;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
new_angle = angle_tilt_x - 256;
priv = self->priv;
if (priv->angle_tilt_x != new_angle) if (priv->angle_tilt_x != new_angle)
{ {
priv->angle_tilt_x = new_angle; priv->angle_tilt_x = new_angle;
g_object_notify (G_OBJECT (self), "angle-tilt-x"); g_object_notify (G_OBJECT (self), "angle-tilt-x");
} }
} break;
case CLUTTER_Y_AXIS:
/**
* clutter_behaviour_ellipse_get_angle_tilt_x
* @self: a #ClutterBehaviourEllipse
*
* Gets the tilt of the ellipse around the center in X axis.
*
* Return value: angle in degrees.
*
* Since: 0.4
*/
gdouble
clutter_behaviour_ellipse_get_angle_tilt_x (ClutterBehaviourEllipse *self)
{
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0.0);
return CLUTTER_ANGLE_TO_DEG (self->priv->angle_tilt_x + 256);
}
/**
* clutter_behaviour_ellipse_get_angle_tilt_xx
* @self: a #ClutterBehaviourEllipse
*
* Gets the tilt of the ellipse around the center in X axis.
*
* Return value: a #ClutterAngle
*
* Since: 0.4
*/
ClutterAngle
clutter_behaviour_ellipse_get_angle_tilt_xx (ClutterBehaviourEllipse *self)
{
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0);
return self->priv->angle_tilt_x + 256;
}
/**
* clutter_behaviour_ellipse_set_angle_tilt_y
* @self: a #ClutterBehaviourEllipse
* @angle_tilt_y: tilt of the elipse around the center in Y axis in degrees.
*
* Sets the angle at which the ellipse should be tilted around it's center.
*
* Since: 0.4
*/
void
clutter_behaviour_ellipse_set_angle_tilt_y (ClutterBehaviourEllipse *self,
gdouble angle_tilt_y)
{
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
clutter_behaviour_ellipse_set_angle_tilt_yx (self,
CLUTTER_ANGLE_FROM_DEG (angle_tilt_y));
}
/**
* clutter_behaviour_ellipse_set_angle_tilt_yx
* @self: a #ClutterBehaviourEllipse
* @angle_tilt_y: #ClutterAngle tilt of the elipse around the center in Y axis
*
* Sets the angle at which the ellipse should be tilted around it's center.
*
* Since: 0.4
*/
void
clutter_behaviour_ellipse_set_angle_tilt_yx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_y)
{
ClutterBehaviourEllipsePrivate *priv;
ClutterAngle new_angle;
g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self));
new_angle = angle_tilt_y - 256;
priv = self->priv;
if (priv->angle_tilt_y != new_angle) if (priv->angle_tilt_y != new_angle)
{ {
priv->angle_tilt_y = new_angle; priv->angle_tilt_y = new_angle;
g_object_notify (G_OBJECT (self), "angle-tilt-y"); g_object_notify (G_OBJECT (self), "angle-tilt-y");
} }
break;
case CLUTTER_Z_AXIS:
if (priv->angle_tilt_z != new_angle)
{
priv->angle_tilt_z = new_angle;
g_object_notify (G_OBJECT (self), "angle-tilt-z");
}
break;
default:
break;
}
} }
/** /**
* clutter_behaviour_ellipse_get_angle_tilt_y * clutter_behaviour_ellipse_get_angle_tilt
* @self: a #ClutterBehaviourEllipse * @self: a #ClutterBehaviourEllipse
* @axis: a #ClutterRotateAxis
* *
* Gets the tilt of the ellipse around the center in Y axis. * Gets the tilt of the ellipse around the center in the given axis.
* *
* Return value: angle in degrees. * Return value: angle in degrees.
* *
* Since: 0.4 * Since: 0.4
*/ */
gdouble gdouble
clutter_behaviour_ellipse_get_angle_tilt_y (ClutterBehaviourEllipse *self) clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis)
{ {
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0.0); g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0.0);
return CLUTTER_ANGLE_TO_DEG (self->priv->angle_tilt_y + 256); return CLUTTER_ANGLE_TO_DEG (clutter_behaviour_ellipse_get_angle_tilt (self,
axis));
} }
/** /**
* clutter_behaviour_ellipse_get_angle_tilt_yx * clutter_behaviour_ellipse_get_angle_tiltx
* @self: a #ClutterBehaviourEllipse * @self: a #ClutterBehaviourEllipse
* @self: a #ClutterRotateAxis
* *
* Gets the tilt of the ellipse around the center in Y axis. * Gets the tilt of the ellipse around the center in the given axis.
* *
* Return value: a #ClutterAngle * Return value: a #ClutterAngle
* *
* Since: 0.4 * Since: 0.4
*/ */
ClutterAngle ClutterAngle
clutter_behaviour_ellipse_get_angle_tilt_yx (ClutterBehaviourEllipse *self) clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis axis)
{ {
g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0); g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ELLIPSE (self), 0);
switch (axis)
{
case CLUTTER_X_AXIS:
return self->priv->angle_tilt_x + 256;
case CLUTTER_Y_AXIS:
return self->priv->angle_tilt_y + 256; return self->priv->angle_tilt_y + 256;
case CLUTTER_Z_AXIS:
return self->priv->angle_tilt_z + 256;
default:
break;
}
return 0;
} }
/** /**

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

@ -134,35 +134,19 @@ ClutterAngle clutter_behaviour_ellipse_get_angle_endx (ClutterBeha
gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self); gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self);
void clutter_behaviour_ellipse_set_angle_tilt_zx (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_z); ClutterRotateAxis,
ClutterAngle angle_tilt);
void clutter_behaviour_ellipse_set_angle_tilt_z (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
gdouble angle_tilt_z); ClutterRotateAxis,
gdouble angle_tilt);
ClutterAngle clutter_behaviour_ellipse_get_angle_tilt_zx (ClutterBehaviourEllipse *self); ClutterAngle clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis);
gdouble clutter_behaviour_ellipse_get_angle_tilt_z (ClutterBehaviourEllipse *self); gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
ClutterRotateAxis);
void clutter_behaviour_ellipse_set_angle_tilt_xx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_x);
void clutter_behaviour_ellipse_set_angle_tilt_x (ClutterBehaviourEllipse *self,
gdouble angle_tilt_x);
ClutterAngle clutter_behaviour_ellipse_get_angle_tilt_xx (ClutterBehaviourEllipse *self);
gdouble clutter_behaviour_ellipse_get_angle_tilt_x (ClutterBehaviourEllipse *self);
void clutter_behaviour_ellipse_set_angle_tilt_yx (ClutterBehaviourEllipse *self,
ClutterAngle angle_tilt_y);
void clutter_behaviour_ellipse_set_angle_tilt_y (ClutterBehaviourEllipse *self,
gdouble angle_tilt_y);
ClutterAngle clutter_behaviour_ellipse_get_angle_tilt_yx (ClutterBehaviourEllipse *self);
gdouble clutter_behaviour_ellipse_get_angle_tilt_y (ClutterBehaviourEllipse *self);
void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self, void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
gdouble angle_tilt_x, gdouble angle_tilt_x,

8
tests/test-behave.c
View File

@ -173,8 +173,12 @@ main (int argc, char *argv[])
clutter_behaviour_ellipse_new (alpha, 200, 200, 400, 300, clutter_behaviour_ellipse_new (alpha, 200, 200, 400, 300,
0.0, 360.0); 0.0, 360.0);
clutter_behaviour_ellipse_set_angle_tilt_x (p_behave, 45.0); clutter_behaviour_ellipse_set_angle_tilt (CLUTTER_BEHAVIOUR_ELLIPSE (p_behave),
clutter_behaviour_ellipse_set_angle_tilt_z (p_behave, 45.0); CLUTTER_X_AXIS,
45.0);
clutter_behaviour_ellipse_set_angle_tilt (CLUTTER_BEHAVIOUR_ELLIPSE (p_behave),
CLUTTER_Z_AXIS,
45.0);
break; break;
case PATH_BSPLINE: case PATH_BSPLINE: