Explicitly make the modelview-matrix current in cogl_{rotate,transform,etc}
Its not intended that users should use these with any other matrix mode, and internally we now have the _cogl_current_matrix API if we need to play with other modes.
This commit is contained in:
parent
c43ebcd7ff
commit
81eadde16c
@ -307,30 +307,35 @@ _cogl_current_matrix_state_flush (void)
|
|||||||
void
|
void
|
||||||
cogl_push_matrix (void)
|
cogl_push_matrix (void)
|
||||||
{
|
{
|
||||||
|
_cogl_set_current_matrix (GL_MODELVIEW);
|
||||||
_cogl_current_matrix_push ();
|
_cogl_current_matrix_push ();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cogl_pop_matrix (void)
|
cogl_pop_matrix (void)
|
||||||
{
|
{
|
||||||
|
_cogl_set_current_matrix (GL_MODELVIEW);
|
||||||
_cogl_current_matrix_pop ();
|
_cogl_current_matrix_pop ();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cogl_scale (float x, float y, float z)
|
cogl_scale (float x, float y, float z)
|
||||||
{
|
{
|
||||||
|
_cogl_set_current_matrix (GL_MODELVIEW);
|
||||||
_cogl_current_matrix_scale (x, y, z);
|
_cogl_current_matrix_scale (x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cogl_translate (float x, float y, float z)
|
cogl_translate (float x, float y, float z)
|
||||||
{
|
{
|
||||||
|
_cogl_set_current_matrix (GL_MODELVIEW);
|
||||||
_cogl_current_matrix_translate (x, y, z);
|
_cogl_current_matrix_translate (x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cogl_rotate (float angle, float x, float y, float z)
|
cogl_rotate (float angle, float x, float y, float z)
|
||||||
{
|
{
|
||||||
|
_cogl_set_current_matrix (GL_MODELVIEW);
|
||||||
_cogl_current_matrix_rotate (angle, x, y, z);
|
_cogl_current_matrix_rotate (angle, x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user