From 45885850d27aede5383e4aad84690e5fb9002fa5 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Thu, 8 Apr 2010 14:37:01 +0100 Subject: [PATCH] cogl: renames cogl_multiply_matrix to cogl_transform Although cogl_multiply_matrix was consistent with OpenGL, after further consideration it was agreed that cogl_transform is a better name. Given that it's in the global cogl_ namespace cogl_transform seems more self documenting. --- clutter/cogl/cogl/cogl.c | 2 +- clutter/cogl/cogl/cogl.h | 4 ++-- doc/reference/cogl/cogl-sections.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c index fe91770..60761af 100644 --- a/clutter/cogl/cogl/cogl.c +++ b/clutter/cogl/cogl/cogl.c @@ -938,7 +938,7 @@ cogl_rotate (float angle, float x, float y, float z) } void -cogl_multiply_matrix (const CoglMatrix *matrix) +cogl_transform (const CoglMatrix *matrix) { CoglMatrixStack *modelview_stack = _cogl_framebuffer_get_modelview_stack (_cogl_get_framebuffer ()); diff --git a/clutter/cogl/cogl/cogl.h b/clutter/cogl/cogl/cogl.h index aff97dc..ff0e1f9 100644 --- a/clutter/cogl/cogl/cogl.h +++ b/clutter/cogl/cogl/cogl.h @@ -348,7 +348,7 @@ cogl_rotate (float angle, float z); /** - * cogl_multiply_matrix: + * cogl_transform: * @matrix: the matrix to multiply with the current model-view * * Multiplies the current model-view matrix by the given matrix. @@ -356,7 +356,7 @@ cogl_rotate (float angle, * Since: 1.4 */ void -cogl_multiply_matrix (const CoglMatrix *matrix); +cogl_transform (const CoglMatrix *matrix); /** * cogl_get_modelview_matrix: diff --git a/doc/reference/cogl/cogl-sections.txt b/doc/reference/cogl/cogl-sections.txt index 9a45a3d..cde92d5 100644 --- a/doc/reference/cogl/cogl-sections.txt +++ b/doc/reference/cogl/cogl-sections.txt @@ -27,6 +27,7 @@ cogl_pop_matrix cogl_scale cogl_translate cogl_rotate +cogl_transform cogl_frustum cogl_perspective cogl_ortho -- 2.7.4