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

2007-07-29 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-behaviour-ellipse.c: Documentation
	fixes; kill some indirections; freeze the notification
	queue when (potentially) emitting multiple notify
	signals.

	* clutter/clutter-alpha.h: Remove the unused macro
	CLUTTER_TYPE_SMOOTHSTEP.
This commit is contained in:
Emmanuele Bassi 2007-07-29 08:54:24 +00:00
parent ad64200aa7
commit 0d287fc4d4
4 changed files with 26 additions and 19 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-29 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-behaviour-ellipse.c: Documentation
fixes; kill some indirections; freeze the notification
queue when (potentially) emitting multiple notify
signals.
* clutter/clutter-alpha.h: Remove the unused macro
CLUTTER_TYPE_SMOOTHSTEP.
2007-07-28 Emmanuele Bassi <ebassi@openedhand.com> 2007-07-28 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.[ch]: Use GInitiallyUnowned * clutter/clutter-actor.[ch]: Use GInitiallyUnowned

2
clutter/clutter-alpha.h
View File

@ -115,8 +115,6 @@ ClutterTimeline *clutter_alpha_get_timeline (ClutterAlpha *alpha);
#define CLUTTER_ALPHA_EXP_INC clutter_exp_inc_func #define CLUTTER_ALPHA_EXP_INC clutter_exp_inc_func
#define CLUTTER_ALPHA_EXP_DEC clutter_exp_dec_func #define CLUTTER_ALPHA_EXP_DEC clutter_exp_dec_func
#define CLUTTER_TYPE_SMOOTHSTEP (clutter_smoothstep_get_type ())
guint32 clutter_ramp_inc_func (ClutterAlpha *alpha, guint32 clutter_ramp_inc_func (ClutterAlpha *alpha,
gpointer dummy); gpointer dummy);
guint32 clutter_ramp_dec_func (ClutterAlpha *alpha, guint32 clutter_ramp_dec_func (ClutterAlpha *alpha,

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

@ -109,7 +109,7 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
y = CLUTTER_FIXED_INT (priv->b * clutter_sini (angle)); y = CLUTTER_FIXED_INT (priv->b * clutter_sini (angle));
z = 0; z = 0;
if (e->priv->angle_tilt_z) if (priv->angle_tilt_z)
{ {
/* /*
* x2 = r * cos (angle + tilt_z) * x2 = r * cos (angle + tilt_z)
@ -131,7 +131,7 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
y = CLUTTER_FIXED_INT (y2); y = CLUTTER_FIXED_INT (y2);
} }
if (e->priv->angle_tilt_x) if (priv->angle_tilt_x)
{ {
ClutterFixed z2, y2; ClutterFixed z2, y2;
@ -143,7 +143,7 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
y = CLUTTER_FIXED_INT (y2); y = CLUTTER_FIXED_INT (y2);
} }
if (e->priv->angle_tilt_y) if (priv->angle_tilt_y)
{ {
ClutterFixed x2, z2; ClutterFixed x2, z2;
@ -492,11 +492,12 @@ clutter_behaviour_ellipse_init (ClutterBehaviourEllipse * self)
* @end: angle in degrees at which movement ends * @end: angle in degrees at which movement ends
* *
* Creates a behaviour that drives actors along an elliptical path with * Creates a behaviour that drives actors along an elliptical path with
* given center, width and height; the movement begins at angle_begin (with 0 * given center, width and height; the movement begins at @angle_begin
* corresponding to 12 o'clock) and ends at angle_end; if angle_end > angle_begin, * degrees (with 0 corresponding to 12 o'clock) and ends at @angle_end degrees;
* the movement is in clockwise direction, counter-clockwise otherwise. * if @angle_end is greater than @angle_begin, the movement is in clockwise
* direction, counter-clockwise otherwise.
* *
* Return value: a #ClutterBehaviour * Return value: the newly created #ClutterBehaviourEllipse
* *
* Since: 0.4 * Since: 0.4
*/ */
@ -536,12 +537,10 @@ clutter_behaviour_ellipse_new (ClutterAlpha *alpha,
* @begin: #ClutterFixed angle in degrees at which movement begins * @begin: #ClutterFixed angle in degrees at which movement begins
* @end: #ClutterFixed angle in degrees at which movement ends * @end: #ClutterFixed angle in degrees at which movement ends
* *
* Creates a behaviour that drives actors along an elliptical path with * Creates a behaviour that drives actors along an elliptical path. This
* given center, width and height; the movement begins at angle_begin (with 0 * is the fixed point variant of clutter_behaviour_ellipse_new().
* corresponding to 12 o'clock) and ends at angle_end; if angle_end > angle_begin,
* the movement is in clockwise direction, counter-clockwise otherwise.
* *
* Return value: a #ClutterBehaviour * Return value: the newly created #ClutterBehaviourEllipse
* *
* Since: 0.4 * Since: 0.4
*/ */
@ -1074,6 +1073,8 @@ clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self,
priv = self->priv; priv = self->priv;
g_object_freeze_notify (G_OBJECT (self));
if (priv->angle_tilt_x != new_angle_x) if (priv->angle_tilt_x != new_angle_x)
{ {
priv->angle_tilt_x = new_angle_x; priv->angle_tilt_x = new_angle_x;
@ -1094,6 +1095,8 @@ clutter_behaviour_ellipse_set_tiltx (ClutterBehaviourEllipse *self,
g_object_notify (G_OBJECT (self), "angle-tilt-z"); g_object_notify (G_OBJECT (self), "angle-tilt-z");
} }
g_object_thaw_notify (G_OBJECT (self));
} }
/** /**
@ -1211,11 +1214,8 @@ clutter_behaviour_ellipse_set_direction (ClutterBehaviourEllipse *self,
if (priv->direction != direction) if (priv->direction != direction)
{ {
g_object_ref (self);
priv->direction = direction; priv->direction = direction;
g_object_notify (G_OBJECT (self), "direction"); g_object_notify (G_OBJECT (self), "direction");
g_object_unref (self);
} }
} }

1
doc/reference/clutter-sections.txt
View File

@ -152,7 +152,6 @@ CLUTTER_TYPE_ALPHA
CLUTTER_ALPHA_CLASS CLUTTER_ALPHA_CLASS
CLUTTER_IS_ALPHA_CLASS CLUTTER_IS_ALPHA_CLASS
CLUTTER_ALPHA_GET_CLASS CLUTTER_ALPHA_GET_CLASS
CLUTTER_TYPE_SMOOTHSTEP
<SUBSECTION Private> <SUBSECTION Private>
ClutterAlphaPrivate ClutterAlphaPrivate
clutter_alpha_get_type clutter_alpha_get_type