X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmatrix.cpp;h=ddc0cdf58c8ac64c72e1d830e6226f0edc2dcfa7;hb=574abfb;hp=4bf550aa090ffc44c2734992cd064e578ebb460a;hpb=fa5b232a16e11d7950e80764497f0167ec9e3b41;p=libs%2Fgl.git

diff --git a/source/matrix.cpp b/source/matrix.cpp
index 4bf550aa..ddc0cdf5 100644
--- a/source/matrix.cpp
+++ b/source/matrix.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <cmath>
 #include <msp/geometry/affinetransformation.h>
+#include <msp/gl/extensions/msp_legacy_features.h>
 #include "error.h"
 #include "matrix.h"
 
@@ -21,24 +22,25 @@ Matrix::Matrix(const LinAl::Matrix<float, 4, 4> &other):
 	Base(other)
 { }
 
-void Matrix::multiply(const Matrix &other)
+Matrix &Matrix::multiply(const Matrix &other)
 {
 	*this = *this*other;
+	return *this;
 }
 
-void Matrix::translate(const Vector3 &t)
+Matrix &Matrix::translate(const Vector3 &t)
 {
-	multiply(translation(t));
+	return multiply(translation(t));
 }
 
-void Matrix::rotate(const Angle &a, const Vector3 &x)
+Matrix &Matrix::rotate(const Angle &a, const Vector3 &x)
 {
-	multiply(rotation(a, x));
+	return multiply(rotation(a, x));
 }
 
-void Matrix::scale(const Vector3 &s)
+Matrix &Matrix::scale(const Vector3 &s)
 {
-	multiply(scaling(s));
+	return multiply(scaling(s));
 }
 
 Matrix Matrix::operator*(const Matrix &other) const
@@ -48,8 +50,7 @@ Matrix Matrix::operator*(const Matrix &other) const
 
 Matrix &Matrix::operator*=(const Matrix &other)
 {
-	multiply(other);
-	return *this;
+	return multiply(other);
 }
 
 Vector4 Matrix::operator*(const Vector4 &vec) const
@@ -59,7 +60,7 @@ Vector4 Matrix::operator*(const Vector4 &vec) const
 
 Vector3 Matrix::operator*(const Vector3 &vec) const
 {
-	return Vector3((*this)*Vector4(vec, 1.0f));
+	return ((*this)*compose(vec, 1.0f)).slice<3>(0);
 }
 
 float Matrix::operator[](unsigned i) const
@@ -195,6 +196,8 @@ void MatrixStack::update()
 	if(!mode)
 		return;
 
+	static Require _req(MSP_legacy_features);
+
 	if(mode!=current_mode)
 	{
 		glMatrixMode(mode);