Use libmspmath to provide vector and matrix operations

[libs/gl.git] / source / matrix.h

diff --git a/source/matrix.h b/source/matrix.h
index 6aae6df0a0e5f2a494e570932f044cb64c89d8de..5c20d60c7d333b2a4c468bf9c7fcd250dc1ee312 100644 (file)
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -2,60 +2,56 @@
 #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
+class Matrix: public LinAl::SquareMatrix<double, 4>
 {
 private:
-       enum Flags
-       {
-               IDENTITY  = 0,
-               TRANSLATE = 1,
-               ROTATE    = 2,
-               SCALE     = 4,
-               ARBITARY  = 8
-       };
-
-       double matrix[16];
-       unsigned flags;
+       typedef LinAl::SquareMatrix<double, 4> Base;
+       typedef Geometry::Angle<double> Angle;
 
 public:
        Matrix();
        Matrix(const float *);
        Matrix(const double *);
-private:
-       void check_flags();
+       Matrix(const LinAl::Matrix<double, 4, 4> &);
 
-public:
-       const double *data() const { return matrix; }
+       const double *data() const { return &Base::operator()(0, 0); }
 
        void multiply(const Matrix &);
-       void translate(double, double, double);
-       void translate(const Vector3 &t) { translate(t.x, t.y, t.z); }
-       void rotate(double, double, double, double);
-       void rotate(double a, const Vector3 &x) { rotate(a, x.x, x.y, x.z); }
-       void rotate_deg(double, double, double, double);
-       void rotate_deg(double a, const Vector3 & x) { rotate_deg(a, x.x, x.y, x.z); }
-       void scale(double);
-       void scale(double, double, double);
+       void translate(double x, double y, double z) { translate(Vector3(x, y, z)); }
+       void translate(const Vector3 &);
+       void rotate(const Angle &, const Vector3 &);
+       void rotate(double a, double x, double y, double z) { rotate(Angle::from_radians(a), Vector3(x, y, z)); }
+       void rotate(double a, const Vector3 &x) { rotate(Angle::from_radians(a), x); }
+       void rotate_deg(double a, double x, double y, double z) { rotate(Angle::from_degrees(a), Vector3(x, y, z)); }
+       void rotate_deg(double a, const Vector3 & x) { rotate(Angle::from_degrees(a), x); }
+       void scale(double s) { scale(Vector3(s, s, s)); }
+       void scale(double x, double y, double z) { scale(Vector3(x, y, z)); }
+       void scale(const Vector3 &);
 
        Matrix operator*(const Matrix &) const;
        Matrix &operator*=(const Matrix &);
        Vector4 operator*(const Vector4 &) const;
+       Vector3 operator*(const Vector3 &) const;
        double operator[](unsigned) const;
 
-       static Matrix translation(double, double, double);
-       static Matrix translation(const Vector3 &t) { return translation(t.x, t.y, t.z); }
-       static Matrix rotation(double, double, double, double);
-       static Matrix rotation(double a, const Vector3 &x) { return rotation(a, x.x, x.y, x.z); }
-       static Matrix rotation_deg(double, double, double, double);
-       static Matrix rotation_deg(double a, const Vector3 &x) { return rotation_deg(a, x.x, x.y, x.z); }
-       static Matrix scaling(double);
-       static Matrix scaling(double, double, double);
+       static Matrix translation(double x, double y, double z) { return translation(Vector3(x, y, z)); }
+       static Matrix translation(const Vector3 &);
+       static Matrix rotation(const Angle &a, const Vector3 &);
+       static Matrix rotation(double a, double x, double y, double z) { return rotation(Angle::from_radians(a), Vector3(x, y, z)); }
+       static Matrix rotation(double a, const Vector3 &x) { return rotation(Angle::from_radians(a), x); }
+       static Matrix rotation_deg(double a, double x, double y, double z) { return rotation(Angle::from_degrees(a), Vector3(x, y, z)); }
+       static Matrix rotation_deg(double a, const Vector3 &x) { return rotation(Angle::from_degrees(a), x); }
+       static Matrix scaling(double s) { return scaling(Vector3(s, s, s)); }
+       static Matrix scaling(double x, double y, double z) { return scaling(Vector3(x, y, z)); }
+       static Matrix scaling(const Vector3 &);
 
        static Matrix ortho(double, double, double, double, double, double);
        static Matrix ortho_centered(double, double);