diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
index 6d99e339b..bc6410633 100644
--- a/cogl/cogl-framebuffer.c
+++ b/cogl/cogl-framebuffer.c
@@ -40,6 +40,7 @@
#include "cogl-journal-private.h"
#include "cogl-winsys-private.h"
#include "cogl-pipeline-state-private.h"
+#include "cogl-matrix-private.h"
#ifndef GL_FRAMEBUFFER
#define GL_FRAMEBUFFER 0x8D40
@@ -1779,3 +1780,175 @@ cogl_framebuffer_finish (CoglFramebuffer *framebuffer)
_cogl_framebuffer_flush_journal (framebuffer);
GE (framebuffer->context, glFinish ());
}
+
+void
+cogl_framebuffer_push_matrix (CoglFramebuffer *framebuffer)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_push (modelview_stack);
+}
+
+void
+cogl_framebuffer_pop_matrix (CoglFramebuffer *framebuffer)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_pop (modelview_stack);
+}
+
+void
+cogl_framebuffer_scale (CoglFramebuffer *framebuffer,
+ float x,
+ float y,
+ float z)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_scale (modelview_stack, x, y, z);
+}
+
+void
+cogl_framebuffer_translate (CoglFramebuffer *framebuffer,
+ float x,
+ float y,
+ float z)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_translate (modelview_stack, x, y, z);
+}
+
+void
+cogl_framebuffer_rotate (CoglFramebuffer *framebuffer,
+ float angle,
+ float x,
+ float y,
+ float z)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_rotate (modelview_stack, angle, x, y, z);
+}
+
+void
+cogl_framebuffer_transform (CoglFramebuffer *framebuffer,
+ const CoglMatrix *matrix)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_multiply (modelview_stack, matrix);
+}
+
+void
+cogl_framebuffer_perspective (CoglFramebuffer *framebuffer,
+ float fov_y,
+ float aspect,
+ float z_near,
+ float z_far)
+{
+ float ymax = z_near * tanf (fov_y * G_PI / 360.0);
+
+ cogl_framebuffer_frustum (framebuffer,
+ -ymax * aspect, /* left */
+ ymax * aspect, /* right */
+ -ymax, /* bottom */
+ ymax, /* top */
+ z_near,
+ z_far);
+}
+
+void
+cogl_framebuffer_frustum (CoglFramebuffer *framebuffer,
+ float left,
+ float right,
+ float bottom,
+ float top,
+ float z_near,
+ float z_far)
+{
+ CoglMatrixStack *projection_stack =
+ _cogl_framebuffer_get_projection_stack (framebuffer);
+
+ /* XXX: The projection matrix isn't currently tracked in the journal
+ * so we need to flush all journaled primitives first... */
+ _cogl_framebuffer_flush_journal (framebuffer);
+
+ _cogl_matrix_stack_load_identity (projection_stack);
+
+ _cogl_matrix_stack_frustum (projection_stack,
+ left,
+ right,
+ bottom,
+ top,
+ z_near,
+ z_far);
+}
+
+void
+cogl_framebuffer_orthographic (CoglFramebuffer *framebuffer,
+ float x_1,
+ float y_1,
+ float x_2,
+ float y_2,
+ float near,
+ float far)
+{
+ CoglMatrix ortho;
+ CoglMatrixStack *projection_stack =
+ _cogl_framebuffer_get_projection_stack (framebuffer);
+
+ /* XXX: The projection matrix isn't currently tracked in the journal
+ * so we need to flush all journaled primitives first... */
+ _cogl_framebuffer_flush_journal (framebuffer);
+
+ cogl_matrix_init_identity (&ortho);
+ cogl_matrix_orthographic (&ortho, x_1, y_1, x_2, y_2, near, far);
+ _cogl_matrix_stack_set (projection_stack, &ortho);
+}
+
+void
+cogl_framebuffer_get_modelview_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_get (modelview_stack, matrix);
+ _COGL_MATRIX_DEBUG_PRINT (matrix);
+}
+
+void
+cogl_framebuffer_set_modelview_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix)
+{
+ CoglMatrixStack *modelview_stack =
+ _cogl_framebuffer_get_modelview_stack (framebuffer);
+ _cogl_matrix_stack_set (modelview_stack, matrix);
+ _COGL_MATRIX_DEBUG_PRINT (matrix);
+}
+
+void
+cogl_framebuffer_get_projection_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix)
+{
+ CoglMatrixStack *projection_stack =
+ _cogl_framebuffer_get_projection_stack (framebuffer);
+ _cogl_matrix_stack_get (projection_stack, matrix);
+ _COGL_MATRIX_DEBUG_PRINT (matrix);
+}
+
+void
+cogl_framebuffer_set_projection_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix)
+{
+ CoglMatrixStack *projection_stack =
+ _cogl_framebuffer_get_projection_stack (framebuffer);
+
+ /* XXX: The projection matrix isn't currently tracked in the journal
+ * so we need to flush all journaled primitives first... */
+ _cogl_framebuffer_flush_journal (framebuffer);
+
+ _cogl_matrix_stack_set (projection_stack, matrix);
+
+ _COGL_MATRIX_DEBUG_PRINT (matrix);
+}
diff --git a/cogl/cogl-framebuffer.h b/cogl/cogl-framebuffer.h
index 1234b36a4..b86d273c1 100644
--- a/cogl/cogl-framebuffer.h
+++ b/cogl/cogl-framebuffer.h
@@ -127,6 +127,249 @@ void
cogl_framebuffer_get_viewport4fv (CoglFramebuffer *framebuffer,
float *viewport);
+#define cogl_framebuffer_push_matrix cogl_framebuffer_push_matrix_EXP
+/**
+ * cogl_framebuffer_push_matrix:
+ * @framebuffer: A #CoglFramebuffer pointer
+ *
+ * Copies the current model-view matrix onto the matrix stack. The matrix
+ * can later be restored with cogl_framebuffer_pop_matrix().
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_push_matrix (CoglFramebuffer *framebuffer);
+
+#define cogl_framebuffer_pop_matrix cogl_framebuffer_pop_matrix_EXP
+/**
+ * cogl_framebuffer_pop_matrix:
+ * @framebuffer: A #CoglFramebuffer pointer
+ *
+ * Restores the model-view matrix on the top of the matrix stack.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_pop_matrix (CoglFramebuffer *framebuffer);
+
+#define cogl_framebuffer_scale cogl_framebuffer_scale_EXP
+/**
+ * cogl_framebuffer_scale:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @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,
+ * y and z axes by the given values.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_scale (CoglFramebuffer *framebuffer,
+ float x,
+ float y,
+ float z);
+
+#define cogl_framebuffer_translate cogl_framebuffer_translate_EXP
+/**
+ * cogl_framebuffer_translate:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @x: Distance to translate along the x-axis
+ * @y: Distance to translate along the y-axis
+ * @z: Distance to translate along the z-axis
+ *
+ * Multiplies the current model-view matrix by one that translates the
+ * model along all three axes according to the given values.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_translate (CoglFramebuffer *framebuffer,
+ float x,
+ float y,
+ float z);
+
+#define cogl_framebuffer_rotate cogl_framebuffer_rotate_EXP
+/**
+ * cogl_framebuffer_rotate:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @angle: Angle in degrees to rotate.
+ * @x: X-component of vertex to rotate around.
+ * @y: Y-component of vertex to rotate around.
+ * @z: Z-component of vertex to rotate around.
+ *
+ * Multiplies the current model-view matrix by one that rotates the
+ * model around the vertex specified by @x, @y and @z. The rotation
+ * follows the right-hand thumb rule so for example rotating by 10
+ * degrees about the vertex (0, 0, 1) causes a small counter-clockwise
+ * rotation.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_rotate (CoglFramebuffer *framebuffer,
+ float angle,
+ float x,
+ float y,
+ float z);
+
+#define cogl_framebuffer_transform cogl_framebuffer_transform_EXP
+/**
+ * cogl_framebuffer_transform:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @matrix: the matrix to multiply with the current model-view
+ *
+ * Multiplies the current model-view matrix by the given matrix.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_transform (CoglFramebuffer *framebuffer,
+ const CoglMatrix *matrix);
+
+#define cogl_framebuffer_get_modelview_matrix \
+ cogl_framebuffer_get_modelview_matrix_EXP
+/**
+ * cogl_framebuffer_get_modelview_matrix:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @matrix: (out): return location for the model-view matrix
+ *
+ * Stores the current model-view matrix in @matrix.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_get_modelview_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix);
+
+#define cogl_framebuffer_set_modelview_matrix \
+ cogl_framebuffer_set_modelview_matrix_EXP
+/**
+ * cogl_framebuffer_set_modelview_matrix:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @matrix: the new model-view matrix
+ *
+ * Sets @matrix as the new model-view matrix.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_set_modelview_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix);
+
+#define cogl_framebuffer_perspective cogl_framebuffer_perspective_EXP
+/**
+ * cogl_framebuffer_perspective:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @fovy: Vertical field of view angle in degrees.
+ * @aspect: The (width over height) aspect ratio for display
+ * @z_near: The distance to the near clipping plane (Must be positive,
+ * and must not be 0)
+ * @z_far: The distance to the far clipping plane (Must be positive)
+ *
+ * Replaces the current projection matrix with a perspective matrix
+ * based on the provided values.
+ *
+ * You should be careful not to have to great a @z_far / @z_near
+ * ratio since that will reduce the effectiveness of depth testing
+ * since there wont be enough precision to identify the depth of
+ * objects near to each other.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_perspective (CoglFramebuffer *framebuffer,
+ float fov_y,
+ float aspect,
+ float z_near,
+ float z_far);
+
+#define cogl_framebuffer_frustum cogl_framebuffer_frustum_EXP
+/**
+ * cogl_framebuffer_frustum:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @left: X position of the left clipping plane where it
+ * intersects the near clipping plane
+ * @right: X position of the right clipping plane where it
+ * intersects the near clipping plane
+ * @bottom: Y position of the bottom clipping plane where it
+ * intersects the near clipping plane
+ * @top: Y position of the top clipping plane where it intersects
+ * the near clipping plane
+ * @z_near: The distance to the near clipping plane (Must be positive)
+ * @z_far: The distance to the far clipping plane (Must be positive)
+ *
+ * Replaces the current projection matrix with a perspective matrix
+ * for a given viewing frustum defined by 4 side clip planes that
+ * all cross through the origin and 2 near and far clip planes.
+ *
+ * Since: 1.10
+ */
+void
+cogl_framebuffer_frustum (CoglFramebuffer *framebuffer,
+ float left,
+ float right,
+ float bottom,
+ float top,
+ float z_near,
+ float z_far);
+
+#define cogl_framebuffer_orthographic cogl_framebuffer_orthographic_EXP
+/**
+ * cogl_framebuffer_orthographic:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @x_1: The x coordinate for the first vertical clipping plane
+ * @y_1: The y coordinate for the first horizontal clipping plane
+ * @x_2: The x coordinate for the second vertical clipping plane
+ * @y_2: The y coordinate for the second horizontal clipping plane
+ * @near: The distance to the near clipping
+ * plane (will be negative if the plane is
+ * behind the viewer)
+ * @far: The distance to the far clipping
+ * plane (will be negative if the plane is
+ * behind the viewer)
+ *
+ * Replaces the current projection matrix with an orthographic projection
+ * matrix.
+ *
+ * Since: 1.0
+ */
+void
+cogl_framebuffer_orthographic (CoglFramebuffer *framebuffer,
+ float x_1,
+ float y_1,
+ float x_2,
+ float y_2,
+ float near,
+ float far);
+
+#define cogl_framebuffer_get_projection_matrix \
+ cogl_framebuffer_get_projection_matrix
+/**
+ * cogl_framebuffer_get_projection_matrix:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @matrix: (out): return location for the projection matrix
+ *
+ * Stores the current projection matrix in @matrix.
+ */
+void
+cogl_framebuffer_get_projection_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix);
+
+#define cogl_framebuffer_set_projection_matrix \
+ cogl_framebuffer_set_projection_matrix
+/**
+ * cogl_set_projection_matrix:
+ * @framebuffer: A #CoglFramebuffer pointer
+ * @matrix: the new projection matrix
+ *
+ * Sets @matrix as the new projection matrix.
+ */
+void
+cogl_framebuffer_set_projection_matrix (CoglFramebuffer *framebuffer,
+ CoglMatrix *matrix);
+
/**
* cogl_framebuffer_get_red_bits:
* @framebuffer: a pointer to a #CoglFramebuffer
diff --git a/cogl/cogl.c b/cogl/cogl.c
index e5a10a2ff..d29885f79 100644
--- a/cogl/cogl.c
+++ b/cogl/cogl.c
@@ -722,49 +722,37 @@ cogl_end_gl (void)
void
cogl_push_matrix (void)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_push (modelview_stack);
+ cogl_framebuffer_push_matrix (cogl_get_draw_framebuffer ());
}
void
cogl_pop_matrix (void)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_pop (modelview_stack);
+ cogl_framebuffer_pop_matrix (cogl_get_draw_framebuffer ());
}
void
cogl_scale (float x, float y, float z)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_scale (modelview_stack, x, y, z);
+ cogl_framebuffer_scale (cogl_get_draw_framebuffer (), x, y, z);
}
void
cogl_translate (float x, float y, float z)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_translate (modelview_stack, x, y, z);
+ cogl_framebuffer_translate (cogl_get_draw_framebuffer (), x, y, z);
}
void
cogl_rotate (float angle, float x, float y, float z)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_rotate (modelview_stack, angle, x, y, z);
+ cogl_framebuffer_rotate (cogl_get_draw_framebuffer (), angle, x, y, z);
}
void
cogl_transform (const CoglMatrix *matrix)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_multiply (modelview_stack, matrix);
+ cogl_framebuffer_transform (cogl_get_draw_framebuffer (), matrix);
}
void
@@ -773,14 +761,8 @@ cogl_perspective (float fov_y,
float z_near,
float z_far)
{
- float ymax = z_near * tanf (fov_y * G_PI / 360.0);
-
- cogl_frustum (-ymax * aspect, /* left */
- ymax * aspect, /* right */
- -ymax, /* bottom */
- ymax, /* top */
- z_near,
- z_far);
+ cogl_framebuffer_perspective (cogl_get_draw_framebuffer (),
+ fov_y, aspect, z_near, z_far);
}
void
@@ -791,24 +773,8 @@ cogl_frustum (float left,
float z_near,
float z_far)
{
- CoglMatrixStack *projection_stack =
- _cogl_framebuffer_get_projection_stack (cogl_get_draw_framebuffer ());
-
- _COGL_GET_CONTEXT (ctx, NO_RETVAL);
-
- /* XXX: The projection matrix isn't currently tracked in the journal
- * so we need to flush all journaled primitives first... */
- cogl_flush ();
-
- _cogl_matrix_stack_load_identity (projection_stack);
-
- _cogl_matrix_stack_frustum (projection_stack,
- left,
- right,
- bottom,
- top,
- z_near,
- z_far);
+ cogl_framebuffer_frustum (cogl_get_draw_framebuffer (),
+ left, right, bottom, top, z_near, z_far);
}
void
@@ -816,64 +782,35 @@ cogl_ortho (float left,
float right,
float bottom,
float top,
- float z_near,
- float z_far)
+ float near,
+ float far)
{
- CoglMatrix ortho;
- CoglMatrixStack *projection_stack =
- _cogl_framebuffer_get_projection_stack (cogl_get_draw_framebuffer ());
-
- _COGL_GET_CONTEXT (ctx, NO_RETVAL);
-
- /* XXX: The projection matrix isn't currently tracked in the journal
- * so we need to flush all journaled primitives first... */
- cogl_flush ();
-
- cogl_matrix_init_identity (&ortho);
- cogl_matrix_ortho (&ortho, left, right, bottom, top, z_near, z_far);
- _cogl_matrix_stack_set (projection_stack, &ortho);
+ cogl_framebuffer_orthographic (cogl_get_draw_framebuffer (),
+ left, top, right, bottom, near, far);
}
void
cogl_get_modelview_matrix (CoglMatrix *matrix)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_get (modelview_stack, matrix);
- _COGL_MATRIX_DEBUG_PRINT (matrix);
+ cogl_framebuffer_get_modelview_matrix (cogl_get_draw_framebuffer (), matrix);
}
void
cogl_set_modelview_matrix (CoglMatrix *matrix)
{
- CoglMatrixStack *modelview_stack =
- _cogl_framebuffer_get_modelview_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_set (modelview_stack, matrix);
- _COGL_MATRIX_DEBUG_PRINT (matrix);
+ cogl_framebuffer_set_modelview_matrix (cogl_get_draw_framebuffer (), matrix);
}
void
cogl_get_projection_matrix (CoglMatrix *matrix)
{
- CoglMatrixStack *projection_stack =
- _cogl_framebuffer_get_projection_stack (cogl_get_draw_framebuffer ());
- _cogl_matrix_stack_get (projection_stack, matrix);
- _COGL_MATRIX_DEBUG_PRINT (matrix);
+ cogl_framebuffer_get_projection_matrix (cogl_get_draw_framebuffer (), matrix);
}
void
cogl_set_projection_matrix (CoglMatrix *matrix)
{
- CoglMatrixStack *projection_stack =
- _cogl_framebuffer_get_projection_stack (cogl_get_draw_framebuffer ());
-
- /* XXX: The projection matrix isn't currently tracked in the journal
- * so we need to flush all journaled primitives first... */
- cogl_flush ();
-
- _cogl_matrix_stack_set (projection_stack, matrix);
-
- _COGL_MATRIX_DEBUG_PRINT (matrix);
+ cogl_framebuffer_set_projection_matrix (cogl_get_draw_framebuffer (), matrix);
}
CoglClipState *