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

when calculating vertices, apply perspective before all other tranforms

Browse Source
This commit is contained in:
Tomas Frydrych 2007-06-01 11:43:53 +00:00
parent 79d618e13a
commit d53497d92f
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -11,6 +11,12 @@
of entry-related keyboard keys. However modifiers still need to be of entry-related keyboard keys. However modifiers still need to be
implemented. implemented.
2007-06-01 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-actor.c:
(mtx_create):
Apply perspective transform before all other transforms.
2007-06-01 Tomas Frydrych <tf@openedhand.com> 2007-06-01 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-stage.c: * clutter/clutter-stage.c:

31
clutter/clutter-actor.c
View File

@ -586,6 +586,35 @@ mtx_create (ClutterActorPrivate *priv,
/* FIXME: need to apply perspective / viewport transforms */ /* FIXME: need to apply perspective / viewport transforms */
mtx_identity (mtx); mtx_identity (mtx);
mtx_mul (mtx, mtx_p);
#if 0
g_debug ("Perspective Matrix\n"
" %f, %f, %f, %f\n"
" %f, %f, %f, %f\n"
" %f, %f, %f, %f\n"
" %f, %f, %f, %f",
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,0,0)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,0,1)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,0,2)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,0,3)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,1,0)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,1,1)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,1,2)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,1,3)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,2,0)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,2,1)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,2,2)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,2,3)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,3,0)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,3,1)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,3,2)),
CLUTTER_FIXED_TO_FLOAT (M(mtx_p,3,3)));
#endif
/* /*
* All the rotation ops are relative to the actor, not the overall * All the rotation ops are relative to the actor, not the overall
* coordiante system; so first of all, we carry out a translation from * coordiante system; so first of all, we carry out a translation from
@ -648,8 +677,6 @@ mtx_create (ClutterActorPrivate *priv,
{ {
mtx_scale (mtx, priv->scale_x, priv->scale_y); mtx_scale (mtx, priv->scale_x, priv->scale_y);
} }
mtx_mul (mtx, mtx_p);
} }
/** /**