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

matrix-stack: Make header style consistent

Browse Source 
Cogl doesn't follow the Clutter/GTK+ columnized function prototype style
so this updates cogl-matrix-stack.h to match the other Cogl headers.
This commit is contained in:
Robert Bragg 2010-12-10 11:34:02 +00:00 committed by Neil Roberts
parent 104961de6a
commit d678125dd4
2 changed files with 76 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-matrix-stack.c
View File

@ -3,7 +3,7 @@
* *
* An object oriented GL/GLES Abstraction/Utility Layer * An object oriented GL/GLES Abstraction/Utility Layer
* *
* Copyright (C) 2009 Intel Corporation. * Copyright (C) 2009,2010 Intel Corporation.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public

66
cogl/cogl-matrix-stack.h
View File

@ -3,7 +3,7 @@
* *
* An object oriented GL/GLES Abstraction/Utility Layer * An object oriented GL/GLES Abstraction/Utility Layer
* *
* Copyright (C) 2009 Intel Corporation. * Copyright (C) 2009,2010 Intel Corporation.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -16,12 +16,14 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
* *
* *
* *
* Authors: * Authors:
* Havoc Pennington <hp@pobox.com> for litl * Havoc Pennington <hp@pobox.com> for litl
* Robert Bragg <robert@linux.intel.com>
*/ */
#ifndef __COGL_MATRIX_STACK_H #ifndef __COGL_MATRIX_STACK_H
@ -37,56 +39,78 @@ typedef enum {
COGL_MATRIX_TEXTURE COGL_MATRIX_TEXTURE
} CoglMatrixMode; } CoglMatrixMode;
CoglMatrixStack* _cogl_matrix_stack_new (void); CoglMatrixStack *
void _cogl_matrix_stack_destroy (CoglMatrixStack *stack); _cogl_matrix_stack_new (void);
void _cogl_matrix_stack_push (CoglMatrixStack *stack);
void _cogl_matrix_stack_pop (CoglMatrixStack *stack); void
void _cogl_matrix_stack_load_identity (CoglMatrixStack *stack); _cogl_matrix_stack_destroy (CoglMatrixStack *stack);
void _cogl_matrix_stack_scale (CoglMatrixStack *stack,
void
_cogl_matrix_stack_push (CoglMatrixStack *stack);
void
_cogl_matrix_stack_pop (CoglMatrixStack *stack);
void
_cogl_matrix_stack_load_identity (CoglMatrixStack *stack);
void
_cogl_matrix_stack_scale (CoglMatrixStack *stack,
float x, float x,
float y, float y,
float z); float z);
void _cogl_matrix_stack_translate (CoglMatrixStack *stack, void
_cogl_matrix_stack_translate (CoglMatrixStack *stack,
float x, float x,
float y, float y,
float z); float z);
void _cogl_matrix_stack_rotate (CoglMatrixStack *stack, void
_cogl_matrix_stack_rotate (CoglMatrixStack *stack,
float angle, float angle,
float x, float x,
float y, float y,
float z); float z);
void _cogl_matrix_stack_multiply (CoglMatrixStack *stack, void
_cogl_matrix_stack_multiply (CoglMatrixStack *stack,
const CoglMatrix *matrix); const CoglMatrix *matrix);
void _cogl_matrix_stack_frustum (CoglMatrixStack *stack, void
_cogl_matrix_stack_frustum (CoglMatrixStack *stack,
float left, float left,
float right, float right,
float bottom, float bottom,
float top, float top,
float z_near, float z_near,
float z_far); float z_far);
void _cogl_matrix_stack_perspective (CoglMatrixStack *stack, void
_cogl_matrix_stack_perspective (CoglMatrixStack *stack,
float fov_y, float fov_y,
float aspect, float aspect,
float z_near, float z_near,
float z_far); float z_far);
void _cogl_matrix_stack_ortho (CoglMatrixStack *stack, void
_cogl_matrix_stack_ortho (CoglMatrixStack *stack,
float left, float left,
float right, float right,
float bottom, float bottom,
float top, float top,
float z_near, float z_near,
float z_far); float z_far);
gboolean
gboolean _cogl_matrix_stack_get_inverse (CoglMatrixStack *stack, _cogl_matrix_stack_get_inverse (CoglMatrixStack *stack,
CoglMatrix *inverse); CoglMatrix *inverse);
void _cogl_matrix_stack_get (CoglMatrixStack *stack, void
_cogl_matrix_stack_get (CoglMatrixStack *stack,
CoglMatrix *matrix); CoglMatrix *matrix);
void _cogl_matrix_stack_set (CoglMatrixStack *stack, void
_cogl_matrix_stack_set (CoglMatrixStack *stack,
const CoglMatrix *matrix); const CoglMatrix *matrix);
void _cogl_matrix_stack_flush_to_gl (CoglMatrixStack *stack, void
_cogl_matrix_stack_flush_to_gl (CoglMatrixStack *stack,
CoglMatrixMode mode); CoglMatrixMode mode);
void _cogl_matrix_stack_dirty (CoglMatrixStack *stack); void
_cogl_matrix_stack_dirty (CoglMatrixStack *stack);
unsigned int _cogl_matrix_stack_get_age (CoglMatrixStack *stack); unsigned int
_cogl_matrix_stack_get_age (CoglMatrixStack *stack);
#endif /* __COGL_MATRIX_STACK_H */ #endif /* __COGL_MATRIX_STACK_H */