Remove SquareMatrix and instead use static_assert to check squareness

[libs/math.git] / source / geometry / affinetransformation.h

diff --git a/source/geometry/affinetransformation.h b/source/geometry/affinetransformation.h
index 15bd92675405a36a4b4205326400256ee3187934..e311b885f2111a4d777d7a5c775a780cbc9468a3 100644 (file)
--- 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>