X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Faffinetransformation.h;h=e311b885f2111a4d777d7a5c775a780cbc9468a3;hb=60caa19c84877c89d750140a90e5d891bce30ee7;hp=15bd92675405a36a4b4205326400256ee3187934;hpb=4bb4d03d5a6a0252083d6bc45b8a50fe7b504c51;p=libs%2Fmath.git

diff --git a/source/geometry/affinetransformation.h b/source/geometry/affinetransformation.h
index 15bd926..e311b88 100644
--- a/source/geometry/affinetransformation.h
+++ b/source/geometry/affinetransformation.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GEOMETRY_AFFINETRANSFORMATION_H_
 #define MSP_GEOMETRY_AFFINETRANSFORMATION_H_
 
-#include <msp/linal/squarematrix.h>
+#include <msp/linal/matrix.h>
 #include "angle.h"
 #include "boundingbox.h"
 #include "ray.h"
@@ -55,7 +55,7 @@ class AffineTransformation: public AffineTransformationOps<T, D>
 	friend class AffineTransformationOps<T, D>;
 
 private:
-	LinAl::SquareMatrix<T, D+1> matrix;
+	LinAl::Matrix<T, D+1, D+1> matrix;
 
 public:
 	AffineTransformation();
@@ -67,8 +67,8 @@ public:
 	AffineTransformation &operator*=(const AffineTransformation &);
 	AffineTransformation &invert();
 
-	const LinAl::SquareMatrix<T, D+1> &get_matrix() const { return matrix; }
-	operator const LinAl::SquareMatrix<T, D+1> &() const { return matrix; }
+	const LinAl::Matrix<T, D+1, D+1> &get_matrix() const { return matrix; }
+	operator const LinAl::Matrix<T, D+1, D+1> &() const { return matrix; }
 
 	LinAl::Vector<T, D> transform(const LinAl::Vector<T, D> &) const;
 	LinAl::Vector<T, D> transform_linear(const LinAl::Vector<T, D> &) const;
@@ -79,7 +79,7 @@ public:
 template<typename T, unsigned D>
 inline AffineTransformation<T, D>::AffineTransformation()
 {
-	this->matrix = LinAl::SquareMatrix<T, D+1>::identity();
+	this->matrix = LinAl::Matrix<T, D+1, D+1>::identity();
 }
 
 
@@ -175,13 +175,13 @@ inline AffineTransformation<T, D> invert(const AffineTransformation<T, D> &at)
 template<typename T, unsigned D>
 inline LinAl::Vector<T, D> AffineTransformation<T, D>::transform(const LinAl::Vector<T, D> &v) const
 {
-	return LinAl::Vector<T, D>(matrix*LinAl::Vector<T, D+1>(v, T(1)));
+	return (matrix*compose(v, T(1))).template slice<D>(0);
 }
 
 template<typename T, unsigned D>
 inline LinAl::Vector<T, D> AffineTransformation<T, D>::transform_linear(const LinAl::Vector<T, D> &v) const
 {
-	return LinAl::Vector<T, D>(matrix*LinAl::Vector<T, D+1>(v, T(0)));
+	return (matrix*compose(v, T(0))).template slice<D>(0);
 }
 
 template<typename T, unsigned D>