diff options
Diffstat (limited to 'src/math/mat4.h')
-rw-r--r-- | src/math/mat4.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/math/mat4.h b/src/math/mat4.h index d8b66c4..66d6cd2 100644 --- a/src/math/mat4.h +++ b/src/math/mat4.h @@ -2,32 +2,32 @@ #define MATH_MAT4_H #include <array> -#include "math/math_vector.h" +#include "math/vector.h" namespace engine::math { -class Mat4 { +class Matrix4 { public: - static Mat4 idty(); - static Mat4 translate(MathVector3 v); - static Mat4 scale(float fac); - static Mat4 rot_x(float a); - static Mat4 rot_y(float a); - static Mat4 rot_z(float a); - static Mat4 projection(float aspect_ratio, float min_z, float max_z); + static Matrix4 idty(); + static Matrix4 translate(Vector3 v); + static Matrix4 scale(float fac); + static Matrix4 rot_x(float a); + static Matrix4 rot_y(float a); + static Matrix4 rot_z(float a); + static Matrix4 projection(float aspect_ratio, float min_z, float max_z); std::array<float, 16> values; - Mat4 operator+(); - Mat4 operator-(); - Mat4 operator+(Mat4 m); - Mat4 operator-(Mat4 m); - Mat4 operator*(Mat4 m); - MathVector4 operator*(MathVector4 v); - std::array<MathVector4, 4> to_vecs(); + Matrix4 operator+(); + Matrix4 operator-(); + Matrix4 operator+(Matrix4 m); + Matrix4 operator-(Matrix4 m); + Matrix4 operator*(Matrix4 m); + Vector4 operator*(Vector4 v); + std::array<Vector4, 4> to_vecs(); }; -Mat4 operator*(float fac, Mat4 m); +Matrix4 operator*(float fac, Matrix4 m); } |