aboutsummaryrefslogtreecommitdiff
path: root/src/math/mat4.h
diff options
context:
space:
mode:
authorvimene <vincent.menegaux@gmail.com>2024-12-31 03:40:14 +0100
committervimene <vincent.menegaux@gmail.com>2024-12-31 03:40:14 +0100
commitcc6fb8c33637566a7b116d46440e6063f016deea (patch)
tree5cc83f84525507994add57df7dd974e6611d675a /src/math/mat4.h
parent6b765a85cf81bf4b7162e4c9280dd4054581c611 (diff)
downloadengine-cc6fb8c33637566a7b116d46440e6063f016deea.tar.gz
various improvements
- added quaternions and rewrote all rotations to use them - added transforms to put all object transforms in a single place - added Wavefront .obj file parser - removed frame buffer's abstract class - improved vectors, matrices, triangles, vertices and vertices data by putting all code in header file - added vector's operations - changed from NULL to nullptr - miscellaneous improvements
Diffstat (limited to 'src/math/mat4.h')
-rw-r--r--src/math/mat4.h166
1 files changed, 145 insertions, 21 deletions
diff --git a/src/math/mat4.h b/src/math/mat4.h
index 35b1ad2..adb2059 100644
--- a/src/math/mat4.h
+++ b/src/math/mat4.h
@@ -2,33 +2,157 @@
#define MATH_MAT4_H
#include <array>
+#include <cmath>
#include "math/vector.h"
namespace engine::math {
-class Matrix4 {
- public:
- static Matrix4 idty();
- static Matrix4 translate(Vector3 v);
- static Matrix4 scale(float fac);
- static Matrix4 scale(Vector3 facs);
- 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;
-
- Matrix4 operator+() const;
- Matrix4 operator-() const;
- Matrix4 operator+(Matrix4 m) const;
- Matrix4 operator-(Matrix4 m) const;
- Matrix4 operator*(Matrix4 m) const;
- Vector4 operator*(Vector4 v) const;
- std::array<Vector4, 4> to_vecs() const;
+struct Matrix4 {
+ static constexpr Matrix4 idty() {
+ return {
+ 1.f, 0.f, 0.f, 0.f,
+ 0.f, 1.f, 0.f, 0.f,
+ 0.f, 0.f, 1.f, 0.f,
+ 0.f, 0.f, 0.f, 1.f,
+ };
+ }
+
+ static constexpr Matrix4 translate(const Vector3& v) {
+ return {
+ 1.f, 0.f, 0.f, v.x,
+ 0.f, 1.f, 0.f, v.y,
+ 0.f, 0.f, 1.f, v.z,
+ 0.f, 0.f, 0.f, 1.f,
+ };
+ }
+
+ static constexpr Matrix4 scale(float fac) {
+ return {
+ fac, 0.f, 0.f, 0.f,
+ 0.f, fac, 0.f, 0.f,
+ 0.f, 0.f, fac, 0.f,
+ 0.f, 0.f, 0.f, 1.f,
+ };
+ }
+
+ static constexpr Matrix4 scale(const Vector3& facs) {
+ return {
+ facs.x, 0.f, 0.f, 0.f,
+ 0.f, facs.y, 0.f, 0.f,
+ 0.f, 0.f, facs.z, 0.f,
+ 0.f, 0.f, 0.f, 1.f,
+ };
+ }
+
+ static constexpr Matrix4 rot_x(float a) {
+ float c = std::cos(a);
+ float s = std::sin(a);
+ return {
+ 1.f, 0.f, 0.f, 0.f,
+ 0.f, c, -s, 0.f,
+ 0.f, s, c, 0.f,
+ 0.f, 0.f, 0.f, 1.f,
+ };
+ }
+
+ static constexpr Matrix4 rot_y(float a) {
+ float c = std::cos(a);
+ float s = std::sin(a);
+ return {
+ c, 0.f, s, 0.f,
+ 0.f, 1.f, 0.f, 0.f,
+ -s, 0.f, c, 0.f,
+ 0.f, 0.f, 0.f, 1.f,
+ };
+ }
+
+ static constexpr Matrix4 rot_z(float a) {
+ float c = std::cos(a);
+ float s = std::sin(a);
+ return {
+ c, -s, 0.f, 0.f,
+ s, c, 0.f, 0.f,
+ 0.f, 0.f, 1.f, 0.f,
+ 0.f, 0.f, 0.f, 1.f,
+ };
+ }
+
+ static constexpr Matrix4 projection(float aspect_ratio, float min_z, float max_z) {
+ return {{
+ aspect_ratio, 0.f, 0.f, 0.f,
+ 0.f, -1.f, 0.f, 0.f,
+ 0.f, 0.f, -2.f / (max_z - min_z), -(max_z + min_z) / (max_z - min_z),
+ 0.f, 0.f, -1.f, 0.f,
+ }};
+ }
+
+ std::array<float, 4 * 4> values;
+
+ constexpr Matrix4 operator+() const & {
+ return *this;
+ }
+
+ constexpr Matrix4 operator-() const & {
+ return {
+ -values[ 0], -values[ 1], -values[ 2], -values[ 3],
+ -values[ 4], -values[ 5], -values[ 6], -values[ 7],
+ -values[ 8], -values[ 9], -values[10], -values[11],
+ -values[12], -values[13], -values[14], -values[15],
+ };
+ }
+
+ constexpr Matrix4 operator+(const Matrix4& m) const & {
+ return {
+ values[ 0] + m.values[ 0], values[ 1] + m.values[ 1], values[ 2] + m.values[ 2], values[ 3] + m.values[ 3],
+ values[ 4] + m.values[ 4], values[ 5] + m.values[ 5], values[ 6] + m.values[ 6], values[ 7] + m.values[ 7],
+ values[ 8] + m.values[ 8], values[ 9] + m.values[ 9], values[10] + m.values[10], values[11] + m.values[11],
+ values[12] + m.values[12], values[13] + m.values[13], values[14] + m.values[14], values[15] + m.values[15],
+ };
+ }
+
+ constexpr Matrix4 operator-(const Matrix4& m) const & {
+ return *this + (-m);
+ }
+
+ constexpr Matrix4 operator*(const Matrix4& m) const & {
+ Matrix4 ret;
+ for (int i = 0; i < 4; i++) {
+ for (int j = 0; j < 4; j++) {
+ ret.values[i * 4 + j] = 0.f;
+ for (int k = 0; k < 4; k++)
+ ret.values[i * 4 + j] += values[i * 4 + k] * m.values[k * 4 + j];
+ }
+ }
+ return ret;
+ }
+
+ constexpr Vector4 operator*(const Vector4& v) const & {
+ return {
+ values[ 0] * v.x + values[ 1] * v.y + values[ 2] * v.z + values[ 3] * v.w,
+ values[ 4] * v.x + values[ 5] * v.y + values[ 6] * v.z + values[ 7] * v.w,
+ values[ 8] * v.x + values[ 9] * v.y + values[10] * v.z + values[11] * v.w,
+ values[12] * v.x + values[13] * v.y + values[14] * v.z + values[15] * v.w,
+ };
+ }
+
+ constexpr std::array<Vector4, 4> to_vecs() const & {
+ return {{
+ { values[ 0], values[ 4], values[ 8], values[12] },
+ { values[ 1], values[ 5], values[ 9], values[13] },
+ { values[ 2], values[ 6], values[10], values[14] },
+ { values[ 3], values[ 7], values[11], values[15] },
+ }};
+ }
};
-Matrix4 operator*(float fac, Matrix4 m);
+constexpr Matrix4 operator*(float fac, const Matrix4& m) {
+ return {
+ fac * m.values[ 0], fac * m.values[ 1], fac * m.values[ 2], fac * m.values[ 3],
+ fac * m.values[ 4], fac * m.values[ 5], fac * m.values[ 6], fac * m.values[ 7],
+ fac * m.values[ 8], fac * m.values[ 9], fac * m.values[10], fac * m.values[11],
+ fac * m.values[12], fac * m.values[13], fac * m.values[14], fac * m.values[15],
+ };
+}
}