X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmatrix.h;h=6aae6df0a0e5f2a494e570932f044cb64c89d8de;hb=759612fd66034135c13134ffb8199514204b9684;hp=e32df7e3872ea6ea270ecfe0d13e8fe25db82d9c;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/matrix.h b/source/matrix.h
index e32df7e3..6aae6df0 100644
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GL_MATRIX_H_
 #define MSP_GL_MATRIX_H_
 
-#include <list>
+#include <vector>
 #include "gl.h"
 #include "vector.h"
 
@@ -81,7 +81,7 @@ public:
 
 private:
 	GLenum mode;
-	std::list<Matrix> matrices;
+	std::vector<Matrix> matrices;
 
 	static GLenum current_mode;
 
@@ -107,38 +107,6 @@ public:
 	static MatrixStack &projection();
 };
 
-
-/* The stuff below is deprecated and preserved (for now) only for compatibility
-with existing applications */
-
-enum MatrixMode
-{
-	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