Move transform functions to matrix.h

[libs/gl.git] / source / matrix.h

diff --git a/source/matrix.h b/source/matrix.h
index b4cc339ceccd3a46601e3529c4e21bcd563150b0..13de6c8f4542030eb22e35647c443e6e473640fb 100644 (file)
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -8,7 +8,7 @@ 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 {
@@ -27,6 +27,18 @@ 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