X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmatrix.h;h=b574c7359506bf05e9cecc46fd9f4593f721bab2;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=66848b2d3f9dfe552bceb0ba4d90de758458f8fe;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3;p=libs%2Fgl.git

diff --git a/source/matrix.h b/source/matrix.h
index 66848b2d..b574c735 100644
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -1,23 +1,46 @@
+/* $Id$
+
+This file is part of libmspgl
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef MSP_GL_MATRIX_H_
 #define MSP_GL_MATRIX_H_
 
-#include <GL/gl.h>
+#include "gl.h"
 
 namespace Msp {
 namespace GL {
 
 enum MatrixMode
 {
-	MODELVIEW=GL_MODELVIEW,
-	PROJECTION=GL_PROJECTION,
-	TEXTURE=GL_TEXTURE
+	MODELVIEW = GL_MODELVIEW,
+	PROJECTION = GL_PROJECTION,
+	TEXTURE = GL_TEXTURE
 };
 
 void matrix_mode(MatrixMode);
 void load_identity();
+void load_matrix(const float *);
+void load_matrix(const double *);
+void mult_matrix(const float *);
+void mult_matrix(const double *);
 void push_matrix();
 void pop_matrix();
 
+/// RAII object - pushes matrix when constructed and pops when destroyed
+struct PushMatrix
+{
+	PushMatrix() { push_matrix(); }
+	~PushMatrix() { pop_matrix(); }
+};
+
+void translate(float, float, float);
+void rotate(float, float, float, float);
+void scale(float, float, float);
+void scale_uniform(float);
+
 } // namespace GL
 } // namespace Msp