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

actor: review use of _apply_modelview_transform_recursive

Browse Source 
On reviewing the clutter-actor.c code using
_apply_modelview_transform_recursive I noticed various comments stating
that it will never call the stage's ->apply_transform vfunc to transform
into eye coordinates, but actually looking at the implementation that's
not true. The comments probably got out of sync with an earlier
implementation that had that constraint. This removes the miss-leading
comments and also updates various uses of the api where we were manually
applying the stage->apply_transform.
This commit is contained in:
Robert Bragg
2011-06-17 17:44:16 +01:00
parent ddc9eb5fa5
commit 1720b77d29
3 changed files with 7 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
clutter/clutter-paint-volume.c
View File

@ -1004,21 +1004,12 @@ _clutter_paint_volume_get_stage_paint_box (ClutterPaintVolume *pv,
_clutter_paint_volume_copy_static (pv, &projected_pv);
/* NB: _clutter_actor_apply_modelview_transform_recursive will never
* include the transformation between stage coordinates and OpenGL
* eye coordinates, we have to explicitly use the
* stage->apply_transform to get that... */
cogl_matrix_init_identity (&modelview);
/* If the paint volume isn't already in eye coordinates... */
if (pv->actor)
{
ClutterActor *stage_actor = CLUTTER_ACTOR (stage);
_clutter_actor_apply_modelview_transform (stage_actor, &modelview);
_clutter_actor_apply_modelview_transform_recursive (pv->actor,
stage_actor,
&modelview);
}
_clutter_actor_apply_modelview_transform_recursive (pv->actor, NULL,
&modelview);
_clutter_stage_get_projection_matrix (stage, &projection);
_clutter_stage_get_viewport (stage,
@ -1052,25 +1043,6 @@ _clutter_paint_volume_transform_relative (ClutterPaintVolume *pv,
_clutter_paint_volume_set_reference_actor (pv, relative_to_ancestor);
cogl_matrix_init_identity (&matrix);
if (relative_to_ancestor == NULL)
{
/* NB: _clutter_actor_apply_modelview_transform_recursive will never
* include the transformation between stage coordinates and OpenGL
* eye coordinates, we have to explicitly use the
* stage->apply_transform to get that... */
ClutterActor *stage = _clutter_actor_get_stage_internal (actor);
/* We really can't do anything meaningful in this case so don't try
* to do any transform */
if (G_UNLIKELY (stage == NULL))
return;
_clutter_actor_apply_modelview_transform (stage, &matrix);
relative_to_ancestor = stage;
}
_clutter_actor_apply_modelview_transform_recursive (actor,
relative_to_ancestor,
&matrix);