X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmatrix.h;h=2e1096f5f4586d7f6c05ea0620f59a5425b4b450;hb=refs%2Fheads%2Fmaster;hp=95932bc65b104e3f10839703ad6a20e446be47c9;hpb=d8234c16eea3631c1b6e2c10f391ec86d9b97bfa;p=libs%2Fgl.git

diff --git a/source/matrix.h b/source/matrix.h
deleted file mode 100644
index 95932bc6..00000000
--- a/source/matrix.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef MSP_GL_MATRIX_H_
-#define MSP_GL_MATRIX_H_
-
-#include <vector>
-#include <msp/geometry/angle.h>
-#include <msp/linal/squarematrix.h>
-#include "gl.h"
-#include "vector.h"
-
-namespace Msp {
-namespace GL {
-
-class Matrix: public LinAl::SquareMatrix<float, 4>
-{
-private:
-	typedef LinAl::SquareMatrix<float, 4> Base;
-	typedef Geometry::Angle<float> Angle;
-
-public:
-	Matrix();
-	Matrix(const float *);
-	Matrix(const LinAl::Matrix<float, 4, 4> &);
-
-	const float *data() const { return &Base::operator()(0, 0); }
-
-	Matrix &multiply(const Matrix &);
-	Matrix &translate(float x, float y, float z) { return translate(Vector3(x, y, z)); }
-	Matrix &translate(const Vector3 &);
-	Matrix &rotate(const Angle &a, float x, float y, float z) { return rotate(a, Vector3(x, y, z)); }
-	Matrix &rotate(const Angle &, const Vector3 &);
-	Matrix &rotate(float a, float x, float y, float z) { return rotate(Angle::from_radians(a), Vector3(x, y, z)); }
-	Matrix &rotate(float a, const Vector3 &x) { return rotate(Angle::from_radians(a), x); }
-	Matrix &rotate_deg(float a, float x, float y, float z) { return rotate(Angle::from_degrees(a), Vector3(x, y, z)); }
-	Matrix &rotate_deg(float a, const Vector3 & x) { return rotate(Angle::from_degrees(a), x); }
-	Matrix &scale(float s) { return scale(Vector3(s, s, s)); }
-	Matrix &scale(float x, float y, float z) { return scale(Vector3(x, y, z)); }
-	Matrix &scale(const Vector3 &);
-
-	Matrix operator*(const Matrix &) const;
-	Matrix &operator*=(const Matrix &);
-	Vector4 operator*(const Vector4 &) const;
-	Vector3 operator*(const Vector3 &) const;
-	float operator[](unsigned) const;
-
-	static Matrix translation(float x, float y, float z) { return translation(Vector3(x, y, z)); }
-	static Matrix translation(const Vector3 &);
-	static Matrix rotation(const Angle &a, float x, float y, float z) { return rotation(a, Vector3(x, y, z)); }
-	static Matrix rotation(const Angle &, const Vector3 &);
-	static Matrix rotation(float a, float x, float y, float z) { return rotation(Angle::from_radians(a), Vector3(x, y, z)); }
-	static Matrix rotation(float a, const Vector3 &x) { return rotation(Angle::from_radians(a), x); }
-	static Matrix rotation_deg(float a, float x, float y, float z) { return rotation(Angle::from_degrees(a), Vector3(x, y, z)); }
-	static Matrix rotation_deg(float a, const Vector3 &x) { return rotation(Angle::from_degrees(a), x); }
-	static Matrix scaling(float s) { return scaling(Vector3(s, s, s)); }
-	static Matrix scaling(float x, float y, float z) { return scaling(Vector3(x, y, z)); }
-	static Matrix scaling(const Vector3 &);
-
-	static Matrix ortho(float, float, float, float, float, float);
-	static Matrix ortho_centered(float, float);
-	static Matrix ortho_bottomleft(float, float);
-	static Matrix ortho_topleft(float, float);
-	static Matrix frustum(float, float, float, float, float, float);
-	static Matrix frustum_centered(float, float, float, float);
-	static Matrix perspective(const Angle &, float, float, float);
-};
-
-class MatrixStack
-{
-public:
-	class Push
-	{
-	private:
-		MatrixStack &stack;
-
-	public:
-		Push(MatrixStack &s): stack(s) { stack.push(); }
-		~Push() { stack.pop(); }
-	};
-
-private:
-	GLenum mode;
-	std::vector<Matrix> matrices;
-
-	static GLenum current_mode;
-
-	MatrixStack(const MatrixStack &);
-	MatrixStack &operator=(const MatrixStack &);
-	MatrixStack(GLenum);
-public:
-	MatrixStack();
-
-	const Matrix &top() const;
-	void load(const Matrix &);
-	void multiply(const Matrix &);
-	void push();
-	void pop();
-private:
-	virtual void update();
-
-public:
-	MatrixStack &operator=(const Matrix &);
-	MatrixStack &operator*=(const Matrix &);
-
-	static MatrixStack &modelview();
-	static MatrixStack &projection();
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif