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

added fixed version of clutter_actor_rotate_*() functions and accessors for rotation angles

Browse Source
This commit is contained in:
Tomas Frydrych 2007-06-26 11:35:33 +00:00
parent 62d716b1cb
commit f4029ab77c
3 changed files with 135 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-26 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-actor.h:
* clutter/clutter-actor.c:
Added fixed point version of clutter_actor_rotate_*() functions
and accessors for rotation angles.
2007-06-25 Matthew Allum <mallum@openedhand.com> 2007-06-25 Matthew Allum <mallum@openedhand.com>
* README: * README:

118
clutter/clutter-actor.c
View File

@ -1990,7 +1990,6 @@ clutter_actor_rotate_z (ClutterActor *self,
gint x, gint x,
gint y) gint y)
{ {
/* FIXME: FIXED VERSION */
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
self->priv->rzang = CLUTTER_FLOAT_TO_FIXED (angle); self->priv->rzang = CLUTTER_FLOAT_TO_FIXED (angle);
@ -2018,8 +2017,6 @@ clutter_actor_rotate_x (ClutterActor *self,
{ {
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
/* FIXME: FIXED API Version */
self->priv->rxang = CLUTTER_FLOAT_TO_FIXED(angle); self->priv->rxang = CLUTTER_FLOAT_TO_FIXED(angle);
self->priv->rxy = y; self->priv->rxy = y;
self->priv->rxz = z; self->priv->rxz = z;
@ -2045,8 +2042,6 @@ clutter_actor_rotate_y (ClutterActor *self,
{ {
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
/* FIXME: FIXED API VERSION */
self->priv->ryang = CLUTTER_FLOAT_TO_FIXED(angle); self->priv->ryang = CLUTTER_FLOAT_TO_FIXED(angle);
self->priv->ryx = x; self->priv->ryx = x;
@ -2056,6 +2051,119 @@ clutter_actor_rotate_y (ClutterActor *self,
clutter_actor_queue_redraw (self); clutter_actor_queue_redraw (self);
} }
/**
* clutter_actor_rotate_zx:
* @self: A #ClutterActor
* @angle: Angle of rotation
* @x: X co-ord to rotate actor around ( relative to actor position )
* @y: Y co-ord to rotate actor around ( relative to actor position )
*
* Rotates actor around the Z axis.
*/
void
clutter_actor_rotate_zx (ClutterActor *self,
ClutterFixed angle,
gint x,
gint y)
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
self->priv->rzang = angle;
self->priv->rzx = x;
self->priv->rzy = y;
if (CLUTTER_ACTOR_IS_VISIBLE (self))
clutter_actor_queue_redraw (self);
}
/**
* clutter_actor_rotate_xx:
* @self: A #ClutterActor
* @angle: Angle of rotation
* @y: Y co-ord to rotate actor around ( relative to actor position )
* @z: Z co-ord to rotate actor around ( relative to actor position )
*
* Rotates actor around the X axis.
*/
void
clutter_actor_rotate_xx (ClutterActor *self,
ClutterFixed angle,
gint y,
gint z)
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
self->priv->rxang = angle;
self->priv->rxy = y;
self->priv->rxz = z;
if (CLUTTER_ACTOR_IS_VISIBLE (self))
clutter_actor_queue_redraw (self);
}
/**
* clutter_actor_rotate_yx:
* @self: A #ClutterActor
* @angle: Angle of rotation
* @x: X co-ord to rotate actor around ( relative to actor position )
* @z: Z co-ord to rotate actor around ( relative to actor position )
*
* Rotates actor around the X axis.
*/
void
clutter_actor_rotate_yx (ClutterActor *self,
ClutterFixed angle,
gint x,
gint z)
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
self->priv->ryang = angle;
self->priv->ryx = x;
self->priv->ryz = z;
if (CLUTTER_ACTOR_IS_VISIBLE (self))
clutter_actor_queue_redraw (self);
}
/**
* clutter_actor_get_rxangx:
* @self: A #ClutterActor
*
* Gets the angle of rotation around x axis in degrees.
*/
ClutterFixed
clutter_actor_get_rxangx (ClutterActor *self)
{
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), 0);
return self->priv->rxang;
}
/**
* clutter_actor_get_ryangx:
* @self: A #ClutterActor
*
* Gets the angle of rotation around y axis in degrees.
*/
ClutterFixed
clutter_actor_get_ryangx (ClutterActor *self)
{
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), 0);
return self->priv->ryang;
}
/**
* clutter_actor_get_rzangx:
* @self: A #ClutterActor
*
* Gets the angle of rotation around x axis in degrees.
*/
ClutterFixed
clutter_actor_get_rzangx (ClutterActor *self)
{
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), 0);
return self->priv->rzang;
}
/** /**
* clutter_actor_set_clip: * clutter_actor_set_clip:

15
clutter/clutter-actor.h
View File

@ -217,6 +217,21 @@ void clutter_actor_rotate_z (ClutterActor *sel
gfloat angle, gfloat angle,
gint x, gint x,
gint y); gint y);
void clutter_actor_rotate_xx (ClutterActor *self,
ClutterFixed angle,
gint y,
gint z);
void clutter_actor_rotate_yx (ClutterActor *self,
ClutterFixed angle,
gint x,
gint z);
void clutter_actor_rotate_zx (ClutterActor *self,
ClutterFixed angle,
gint x,
gint y);
ClutterFixed clutter_actor_get_rxangx (ClutterActor *self);
ClutterFixed clutter_actor_get_ryangx (ClutterActor *self);
ClutterFixed clutter_actor_get_rzangx (ClutterActor *self);
void clutter_actor_set_opacity (ClutterActor *self, void clutter_actor_set_opacity (ClutterActor *self,
guint8 opacity); guint8 opacity);
guint8 clutter_actor_get_opacity (ClutterActor *self); guint8 clutter_actor_get_opacity (ClutterActor *self);