isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

state: Use Interval.compute() instead of compute_value()

Browse Source 
Use the newly-added compute() variant to avoid creating a GValue only
for getting it copied by g_object_set_property().
This commit is contained in:
Emmanuele Bassi 2010-05-24 15:14:09 +01:00
parent af84d97fca
commit 173e497ff4
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
clutter/clutter-state.c
View File

@ -179,7 +179,7 @@ clutter_state_key_new (State *state,
guint mode) guint mode)
{ {
ClutterStateKey *state_key; ClutterStateKey *state_key;
GValue value = {0, }; GValue value = { 0, };
state_key = g_slice_new0 (ClutterStateKey); state_key = g_slice_new0 (ClutterStateKey);
@ -363,22 +363,22 @@ clutter_state_new_frame (ClutterTimeline *timeline,
gint msecs, gint msecs,
ClutterState *state) ClutterState *state)
{ {
GList *k; ClutterStatePrivate *priv = state->priv;
gdouble progress; GList *k;
gdouble progress;
const gchar *curprop = NULL; const gchar *curprop = NULL;
GObject *curobj = NULL; GObject *curobj = NULL;
gboolean found_specific = FALSE; gboolean found_specific = FALSE;
if (state->priv->current_animator) if (priv->current_animator)
return; return;
progress = clutter_timeline_get_progress (timeline); progress = clutter_timeline_get_progress (timeline);
for (k = state->priv->target_state->keys; k; k = k->next) for (k = priv->target_state->keys; k; k = k->next)
{ {
ClutterStateKey *key = k->data; ClutterStateKey *key = k->data;
GValue value = {0,}; gdouble sub_progress;
gdouble sub_progress;
if ((curprop && !(curprop == key->property_name)) || if ((curprop && !(curprop == key->property_name)) ||
key->object != curobj) key->object != curobj)
@ -390,16 +390,17 @@ clutter_state_new_frame (ClutterTimeline *timeline,
if (!found_specific) if (!found_specific)
{ {
if (key->source_state && if (key->source_state != NULL &&
key->source_state->name && key->source_state->name != NULL &&
g_str_equal (state->priv->source_state_name, g_str_equal (priv->source_state_name, key->source_state->name))
key->source_state->name))
{ {
found_specific = TRUE; found_specific = TRUE;
} }
if (found_specific || key->source_state == NULL) if (found_specific || key->source_state == NULL)
{ {
const GValue *value;
sub_progress = (progress - key->pre_delay) / sub_progress = (progress - key->pre_delay) /
(1.0 - (key->pre_delay + key->post_delay)); (1.0 - (key->pre_delay + key->post_delay));
@ -407,18 +408,16 @@ clutter_state_new_frame (ClutterTimeline *timeline,
{ {
if (sub_progress >= 1.0) if (sub_progress >= 1.0)
sub_progress = 1.0; sub_progress = 1.0;
clutter_timeline_advance (state->priv->slave_timeline,
clutter_timeline_advance (priv->slave_timeline,
sub_progress * SLAVE_TIMELINE_LENGTH); sub_progress * SLAVE_TIMELINE_LENGTH);
sub_progress = clutter_alpha_get_alpha (key->alpha); sub_progress = clutter_alpha_get_alpha (key->alpha);
g_value_init (&value, value = clutter_interval_compute (key->interval, sub_progress);
clutter_interval_get_value_type (key->interval)); if (value != NULL)
clutter_interval_compute_value (key->interval, sub_progress, g_object_set_property (key->object, key->property_name, value);
&value);
g_object_set_property (key->object, key->property_name,
&value);
g_value_unset (&value);
} }
/* XXX: should the target value of the default destination be /* XXX: should the target value of the default destination be
* used even when found a specific source_state key? * used even when found a specific source_state key?
*/ */