X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmatrix.h;h=a2194916e52d80a8e7cd322b1af93e0b3871d223;hb=a9e9bb12274c4b00eabdc00d14c61f0df18956b5;hp=13de6c8f4542030eb22e35647c443e6e473640fb;hpb=2316272b57cf9bea26d2c35b9451910c169efafa;p=libs%2Fgl.git

diff --git a/source/matrix.h b/source/matrix.h
index 13de6c8f..a2194916 100644
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -8,20 +8,119 @@ Distributed under the LGPL
 #ifndef MSP_GL_MATRIX_H_
 #define MSP_GL_MATRIX_H_
 
+#include <list>
 #include "gl.h"
 
 namespace Msp {
 namespace GL {
 
+class Matrix
+{
+private:
+	enum Flags
+	{
+		IDENTITY  = 0,
+		TRANSLATE = 1,
+		ROTATE    = 2,
+		SCALE     = 4,
+		ARBITARY  = 8
+	};
+
+	double matrix[16];
+	unsigned flags;
+
+public:
+	Matrix();
+	Matrix(const float *);
+	Matrix(const double *);
+private:
+	void check_flags();
+
+public:
+	const double *data() const { return matrix; }
+
+	void multiply(const Matrix &);
+	void translate(double, double, double);
+	void rotate(double, double, double, double);
+	void rotate_deg(double, double, double, double);
+	void scale(double);
+	void scale(double, double, double);
+
+	Matrix operator*(const Matrix &) const;
+	Matrix &operator*=(const Matrix &);
+	double operator[](unsigned) const;
+
+	static Matrix translation(double, double, double);
+	static Matrix rotation(double, double, double, double);
+	static Matrix rotation_deg(double, double, double, double);
+	static Matrix scaling(double);
+	static Matrix scaling(double, double, double);
+
+	static Matrix ortho(double, double, double, double, double, double);
+	static Matrix ortho_centered(double, double);
+	static Matrix ortho_bottomleft(double, double);
+	static Matrix ortho_topleft(double, double);
+	static Matrix frustum(double, double, double, double, double, double);
+	static Matrix frustum_centered(double, double, double, double);
+	static Matrix perspective(double, double, double, double);
+};
+
+class MatrixStack
+{
+public:
+	class Push
+	{
+	private:
+		MatrixStack &stack;
+
+	public:
+		Push(MatrixStack &s): stack(s) { stack.push(); }
+		~Push() { stack.pop(); }
+	};
+
+private:
+	GLenum mode;
+	std::list<Matrix> matrices;
+
+	static GLenum current_mode;
+
+	MatrixStack(const MatrixStack &);
+	MatrixStack &operator=(const MatrixStack &);
+	MatrixStack(GLenum);
+public:
+	MatrixStack();
+
+	const Matrix &top();
+	void load(const Matrix &);
+	void multiply(const Matrix &);
+	void push();
+	void pop();
+private:
+	void update();
+
+public:
+	MatrixStack &operator=(const Matrix &);
+	MatrixStack &operator*=(const Matrix &);
+
+	static MatrixStack &modelview();
+	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
+	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();