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

2007-01-31 Tomas Frydrych <tf@openedhand.com>

Browse Source 
* clutter/clutter-actor.c:
	(clutter_actor_transform_vertices):
	Call clutter_actor_query_coords() instead of accessing the actor
	box, so that actors that calculate their bounding box on the fly
	(like ClutterGroup) work.

	* (_clutter_actor_apply_modelview_transform_recursive):
	Made to work for parentless actors.
This commit is contained in:
Tomas Frydrych 2008-01-31 17:30:46 +00:00
parent 1c05c60e99
commit 81612d44e7
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2007-01-31 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-actor.c:
(clutter_actor_transform_vertices):
Call clutter_actor_query_coords() instead of accessing the actor
box, so that actors that calculate their bounding box on the fly
(like ClutterGroup) work.
* (_clutter_actor_apply_modelview_transform_recursive):
Made to work for parentless actors.
2008-01-31 Øyvind Kolås <pippin@o-hand.com> 2008-01-31 Øyvind Kolås <pippin@o-hand.com>
* tests/test-depth.c: added a box of cloned hands to further expand * tests/test-depth.c: added a box of cloned hands to further expand

18
clutter/clutter-actor.c
View File

@ -647,11 +647,15 @@ clutter_actor_transform_vertices (ClutterActor * self,
{ {
ClutterFixed mtx[16]; ClutterFixed mtx[16];
ClutterFixed _x, _y, _z, _w; ClutterFixed _x, _y, _z, _w;
ClutterActorPrivate *priv; ClutterActorBox coords;
/*
* Need to query coords here, so that we get coorect values for actors that
* do not modify priv->coords.
*/
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
priv = self->priv; clutter_actor_query_coords (self, &coords);
cogl_push_matrix(); cogl_push_matrix();
_clutter_actor_apply_modelview_transform_recursive (self); _clutter_actor_apply_modelview_transform_recursive (self);
@ -670,7 +674,7 @@ clutter_actor_transform_vertices (ClutterActor * self,
verts[0].z = _z; verts[0].z = _z;
w[0] = _w; w[0] = _w;
_x = priv->coords.x2 - priv->coords.x1; _x = coords.x2 - coords.x1;
_y = 0; _y = 0;
_z = 0; _z = 0;
_w = CFX_ONE; _w = CFX_ONE;
@ -683,7 +687,7 @@ clutter_actor_transform_vertices (ClutterActor * self,
w[1] = _w; w[1] = _w;
_x = 0; _x = 0;
_y = priv->coords.y2 - priv->coords.y1; _y = coords.y2 - coords.y1;
_z = 0; _z = 0;
_w = CFX_ONE; _w = CFX_ONE;
@ -694,8 +698,8 @@ clutter_actor_transform_vertices (ClutterActor * self,
verts[2].z = _z; verts[2].z = _z;
w[2] = _w; w[2] = _w;
_x = priv->coords.x2 - priv->coords.x1; _x = coords.x2 - coords.x1;
_y = priv->coords.y2 - priv->coords.y1; _y = coords.y2 - coords.y1;
_z = 0; _z = 0;
_w = CFX_ONE; _w = CFX_ONE;
@ -889,6 +893,8 @@ _clutter_actor_apply_modelview_transform_recursive (ClutterActor * self)
if (parent) if (parent)
_clutter_actor_apply_modelview_transform_recursive (parent); _clutter_actor_apply_modelview_transform_recursive (parent);
else if (self != clutter_stage_get_default ())
_clutter_actor_apply_modelview_transform (clutter_stage_get_default());
_clutter_actor_apply_modelview_transform (self); _clutter_actor_apply_modelview_transform (self);
} }