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

diff --git a/source/matrix.h b/source/matrix.h
index 95932bc6..cb61e292 100644
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -23,7 +23,7 @@ public:
 
 	const float *data() const { return &Base::operator()(0, 0); }
 
-	Matrix &multiply(const Matrix &);
+	Matrix &multiply(const Matrix &m) { return operator*=(m); }
 	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)); }
@@ -36,10 +36,12 @@ public:
 	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;
+	Matrix operator*(const Matrix &m) const { return static_cast<const Base &>(*this)*static_cast<const Base &>(m); }
+	Matrix &operator*=(const Matrix &m) { Base::operator*=(m); return *this; }
+	Matrix operator*(float s) const { return static_cast<const Base &>(*this)*s; }
+	Matrix &operator*=(float s) { Base::operator*=(s); return *this; }
+	Vector4 operator*(const Vector4 &v) const { return static_cast<const Base &>(*this)*v; }
+	Vector3 operator*(const Vector3 &v) const { return ((*this)*compose(v, 1.0f)).slice<3>(0); }
 	float operator[](unsigned) const;
 
 	static Matrix translation(float x, float y, float z) { return translation(Vector3(x, y, z)); }
@@ -63,47 +65,6 @@ public:
 	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