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

diff --git a/source/matrix.h b/source/matrix.h
index b4cc339c..b574c735 100644
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -8,25 +8,39 @@ 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