Support scaling on the z axis with cogl_scale
This simply adds a z argument to cogl_scale and updates clutter-actor.c to pass 1.0 for the z scale.
This commit is contained in:
parent
e9a45c7744
commit
70d7d16f13
2
README
2
README
@ -251,6 +251,8 @@ Release Notes for Clutter 1.0
|
||||
* cogl_alpha_func has been removed, since this is now controlled using the
|
||||
material API via cogl_material_set_alpha_test_function ()
|
||||
|
||||
* cogl_scale now supports scaling on the z axis
|
||||
|
||||
Release Notes for Clutter 0.8
|
||||
-------------------------------
|
||||
|
||||
|
@ -1369,7 +1369,7 @@ _clutter_actor_apply_modelview_transform (ClutterActor *self)
|
||||
* entire object will move on the screen as a result of rotating it).
|
||||
*/
|
||||
if (priv->scale_x != 1.0 || priv->scale_y != 1.0)
|
||||
cogl_scale (priv->scale_x, priv->scale_y);
|
||||
cogl_scale (priv->scale_x, priv->scale_y, 1.0);
|
||||
|
||||
if (priv->rzang)
|
||||
{
|
||||
|
@ -226,12 +226,14 @@ void cogl_pop_matrix (void);
|
||||
* cogl_scale:
|
||||
* @x: Amount to scale along the x-axis
|
||||
* @y: Amount to scale along the y-axis
|
||||
* @z: Amount to scale along the z-axis
|
||||
*
|
||||
* Multiplies the current model-view matrix by one that scales the x
|
||||
* and y axes by the given values.
|
||||
* Multiplies the current model-view matrix by one that scales the x,
|
||||
* y and z axes by the given values.
|
||||
*/
|
||||
void cogl_scale (float x,
|
||||
float y);
|
||||
float y,
|
||||
float z);
|
||||
|
||||
/**
|
||||
* cogl_translate:
|
||||
|
@ -213,9 +213,9 @@ cogl_pop_matrix (void)
|
||||
}
|
||||
|
||||
void
|
||||
cogl_scale (float x, float y)
|
||||
cogl_scale (float x, float y, float z)
|
||||
{
|
||||
GE( glScalef (x, y, 1.0) );
|
||||
GE( glScalef (x, y, z) );
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -130,9 +130,9 @@ cogl_pop_matrix (void)
|
||||
}
|
||||
|
||||
void
|
||||
cogl_scale (float x, float y)
|
||||
cogl_scale (float x, float y, float z)
|
||||
{
|
||||
GE( glScalef (x, y, 1.0) );
|
||||
GE( glScalef (x, y, z) );
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user