inverse and bed
Brett
parent
133728b641
commit
0a04408e70
|
|
@ -1,7 +1,7 @@
|
||||||
cmake_minimum_required(VERSION 3.20)
|
cmake_minimum_required(VERSION 3.20)
|
||||||
include(cmake/color.cmake)
|
include(cmake/color.cmake)
|
||||||
|
|
||||||
set(BLT_VERSION 0.16.15)
|
set(BLT_VERSION 0.16.16)
|
||||||
set(BLT_TEST_VERSION 0.0.1)
|
set(BLT_TEST_VERSION 0.0.1)
|
||||||
|
|
||||||
set(BLT_TARGET BLT)
|
set(BLT_TARGET BLT)
|
||||||
|
|
|
||||||
|
|
@ -46,10 +46,10 @@ namespace blt
|
||||||
template<typename Writer = std::ostream>
|
template<typename Writer = std::ostream>
|
||||||
inline Writer& operator<<(Writer& out, const mat4x4& v)
|
inline Writer& operator<<(Writer& out, const mat4x4& v)
|
||||||
{
|
{
|
||||||
out << "Mat4x4(\n";
|
out << "Mat4x4(";
|
||||||
out << "\t{" << v.m00() << ", " << v.m01() << ", " << v.m02() << ", " << v.m03() << "},\n";
|
out << "{" << v.m00() << ", " << v.m01() << ", " << v.m02() << ", " << v.m03() << "},";
|
||||||
out << "\t{" << v.m10() << ", " << v.m11() << ", " << v.m12() << ", " << v.m13() << "},\n";
|
out << "\t{" << v.m10() << ", " << v.m11() << ", " << v.m12() << ", " << v.m13() << "},";
|
||||||
out << "\t{" << v.m20() << ", " << v.m21() << ", " << v.m22() << ", " << v.m23() << "},\n";
|
out << "\t{" << v.m20() << ", " << v.m21() << ", " << v.m22() << ", " << v.m23() << "},";
|
||||||
out << "\t{" << v.m30() << ", " << v.m31() << ", " << v.m32() << ", " << v.m33() << "})";
|
out << "\t{" << v.m30() << ", " << v.m31() << ", " << v.m32() << ", " << v.m33() << "})";
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,18 +8,22 @@
|
||||||
#define BLT_TESTS_MATRIX_H
|
#define BLT_TESTS_MATRIX_H
|
||||||
|
|
||||||
#include <blt/math/vectors.h>
|
#include <blt/math/vectors.h>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
#ifndef M_PI
|
#ifndef M_PI
|
||||||
// MSVC does not have M_PI
|
// MSVC does not have M_PI
|
||||||
# define M_PI 3.14159265358979323846
|
# define M_PI 3.14159265358979323846
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace blt {
|
namespace blt
|
||||||
|
{
|
||||||
|
|
||||||
class mat4x4 {
|
class mat4x4
|
||||||
|
{
|
||||||
protected:
|
protected:
|
||||||
// 4x4 = 16
|
// 4x4 = 16
|
||||||
union dataType {
|
union dataType
|
||||||
|
{
|
||||||
float single[16];
|
float single[16];
|
||||||
float dim[4][4];
|
float dim[4][4];
|
||||||
};
|
};
|
||||||
|
|
@ -40,7 +44,8 @@ namespace blt {
|
||||||
friend mat4x4 operator/(float c, const mat4x4& v);
|
friend mat4x4 operator/(float c, const mat4x4& v);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
mat4x4() {
|
mat4x4()
|
||||||
|
{
|
||||||
for (float& i : data.single)
|
for (float& i : data.single)
|
||||||
i = 0;
|
i = 0;
|
||||||
// set identity matrix default
|
// set identity matrix default
|
||||||
|
|
@ -50,29 +55,45 @@ namespace blt {
|
||||||
m33(1);
|
m33(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
mat4x4(const mat4x4& mat) {
|
mat4x4(const blt::vec4& c1, const blt::vec4& c2, const blt::vec4& c3, const blt::vec4& c4)
|
||||||
for (int i = 0; i < 16; i++) {
|
{
|
||||||
|
// dangerous?
|
||||||
|
std::memcpy(data.dim[0], c1.data(), 4 * sizeof(float));
|
||||||
|
std::memcpy(data.dim[1], c2.data(), 4 * sizeof(float));
|
||||||
|
std::memcpy(data.dim[2], c3.data(), 4 * sizeof(float));
|
||||||
|
std::memcpy(data.dim[3], c4.data(), 4 * sizeof(float));
|
||||||
|
}
|
||||||
|
|
||||||
|
mat4x4(const mat4x4& mat)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < 16; i++)
|
||||||
|
{
|
||||||
data.single[i] = mat.data.single[i];
|
data.single[i] = mat.data.single[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mat4x4& operator=(const mat4x4& copy){
|
mat4x4& operator=(const mat4x4& copy)
|
||||||
|
{
|
||||||
if (© == this)
|
if (© == this)
|
||||||
return *this;
|
return *this;
|
||||||
for (int i = 0; i < 16; i++) {
|
for (int i = 0; i < 16; i++)
|
||||||
|
{
|
||||||
data.single[i] = copy.data.single[i];
|
data.single[i] = copy.data.single[i];
|
||||||
}
|
}
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
explicit mat4x4(const float dat[16]) {
|
explicit mat4x4(const float dat[16])
|
||||||
for (int i = 0; i < 16; i++) {
|
{
|
||||||
|
for (int i = 0; i < 16; i++)
|
||||||
|
{
|
||||||
data.single[i] = dat[i];
|
data.single[i] = dat[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline mat4x4& translate(float x, float y, float z) {
|
inline mat4x4& translate(float x, float y, float z)
|
||||||
mat4x4 translation_mat {};
|
{
|
||||||
|
mat4x4 translation_mat{};
|
||||||
/**
|
/**
|
||||||
* 9.005 Are OpenGL matrices column-major or row-major?
|
* 9.005 Are OpenGL matrices column-major or row-major?
|
||||||
* For programming purposes, OpenGL matrices are 16-value arrays with base vectors laid out contiguously in memory.
|
* For programming purposes, OpenGL matrices are 16-value arrays with base vectors laid out contiguously in memory.
|
||||||
|
|
@ -88,11 +109,15 @@ namespace blt {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline mat4x4& translate(const vec4& vec) { return translate(vec[0], vec[1], vec[2]); }
|
inline mat4x4& translate(const vec4& vec)
|
||||||
inline mat4x4& translate(const vec3& vec) { return translate(vec[0], vec[1], vec[2]); }
|
{ return translate(vec[0], vec[1], vec[2]); }
|
||||||
|
|
||||||
inline mat4x4& scale(float x, float y, float z) {
|
inline mat4x4& translate(const vec3& vec)
|
||||||
mat4x4 scale_mat {};
|
{ return translate(vec[0], vec[1], vec[2]); }
|
||||||
|
|
||||||
|
inline mat4x4& scale(float x, float y, float z)
|
||||||
|
{
|
||||||
|
mat4x4 scale_mat{};
|
||||||
|
|
||||||
m00(m00() * x);
|
m00(m00() * x);
|
||||||
m11(m11() * y);
|
m11(m11() * y);
|
||||||
|
|
@ -103,12 +128,16 @@ namespace blt {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline mat4x4& scale(const vec4& vec) { return scale(vec[0], vec[1], vec[2]); }
|
inline mat4x4& scale(const vec4& vec)
|
||||||
inline mat4x4& scale(const vec3& vec) { return scale(vec[0], vec[1], vec[2]); }
|
{ return scale(vec[0], vec[1], vec[2]); }
|
||||||
|
|
||||||
|
inline mat4x4& scale(const vec3& vec)
|
||||||
|
{ return scale(vec[0], vec[1], vec[2]); }
|
||||||
|
|
||||||
// angle in radians
|
// angle in radians
|
||||||
inline mat4x4& rotateX(float angle){
|
inline mat4x4& rotateX(float angle)
|
||||||
mat4x4 rotationMatrix {};
|
{
|
||||||
|
mat4x4 rotationMatrix{};
|
||||||
rotationMatrix.m(1, 1, std::cos(angle));
|
rotationMatrix.m(1, 1, std::cos(angle));
|
||||||
rotationMatrix.m(1, 2, -std::sin(angle));
|
rotationMatrix.m(1, 2, -std::sin(angle));
|
||||||
rotationMatrix.m(2, 1, std::sin(angle));
|
rotationMatrix.m(2, 1, std::sin(angle));
|
||||||
|
|
@ -119,8 +148,9 @@ namespace blt {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline mat4x4& rotateY(float angle){
|
inline mat4x4& rotateY(float angle)
|
||||||
mat4x4 rotationMatrix {};
|
{
|
||||||
|
mat4x4 rotationMatrix{};
|
||||||
rotationMatrix.m(0, 0, std::cos(angle));
|
rotationMatrix.m(0, 0, std::cos(angle));
|
||||||
rotationMatrix.m(0, 2, std::sin(angle));
|
rotationMatrix.m(0, 2, std::sin(angle));
|
||||||
rotationMatrix.m(2, 0, -std::sin(angle));
|
rotationMatrix.m(2, 0, -std::sin(angle));
|
||||||
|
|
@ -131,8 +161,9 @@ namespace blt {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline mat4x4& rotateZ(float angle){
|
inline mat4x4& rotateZ(float angle)
|
||||||
mat4x4 rotationMatrix {};
|
{
|
||||||
|
mat4x4 rotationMatrix{};
|
||||||
rotationMatrix.m(0, 0, std::cos(angle));
|
rotationMatrix.m(0, 0, std::cos(angle));
|
||||||
rotationMatrix.m(0, 1, -std::sin(angle));
|
rotationMatrix.m(0, 1, -std::sin(angle));
|
||||||
rotationMatrix.m(1, 0, std::sin(angle));
|
rotationMatrix.m(1, 0, std::sin(angle));
|
||||||
|
|
@ -143,11 +174,14 @@ namespace blt {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] mat4x4 transpose() const {
|
[[nodiscard]] mat4x4 transpose() const
|
||||||
|
{
|
||||||
mat4x4 copy{*this};
|
mat4x4 copy{*this};
|
||||||
|
|
||||||
for (int i = 0; i < 4; i++){
|
for (int i = 0; i < 4; i++)
|
||||||
for (int j = 0; j < 4; j++) {
|
{
|
||||||
|
for (int j = 0; j < 4; j++)
|
||||||
|
{
|
||||||
copy.m(j, i, m(i, j));
|
copy.m(j, i, m(i, j));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -155,75 +189,8 @@ namespace blt {
|
||||||
return copy;
|
return copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] inline float m(int row, int column) const { return data.single[row + column * 4]; };
|
[[nodiscard]] float determinant() const
|
||||||
|
{
|
||||||
[[nodiscard]] inline float m00() const { return m(0, 0); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m10() const { return m(1, 0); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m20() const { return m(2, 0); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m30() const { return m(3, 0); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m01() const { return m(0, 1); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m11() const { return m(1, 1); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m21() const { return m(2, 1); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m31() const { return m(3, 1); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m02() const { return m(0, 2); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m12() const { return m(1, 2); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m22() const { return m(2, 2); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m32() const { return m(3, 2); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m03() const { return m(0, 3); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m13() const { return m(1, 3); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m23() const { return m(2, 3); }
|
|
||||||
|
|
||||||
[[nodiscard]] inline float m33() const { return m(3, 3); }
|
|
||||||
|
|
||||||
inline float m(int row, int column, float value) { return data.single[row + column * 4] = value; };
|
|
||||||
|
|
||||||
inline float m00(float d) { return m(0, 0, d); }
|
|
||||||
|
|
||||||
inline float m10(float d) { return m(1, 0, d); }
|
|
||||||
|
|
||||||
inline float m20(float d) { return m(2, 0, d); }
|
|
||||||
|
|
||||||
inline float m30(float d) { return m(3, 0, d); }
|
|
||||||
|
|
||||||
inline float m01(float d) { return m(0, 1, d); }
|
|
||||||
|
|
||||||
inline float m11(float d) { return m(1, 1, d); }
|
|
||||||
|
|
||||||
inline float m21(float d) { return m(2, 1, d); }
|
|
||||||
|
|
||||||
inline float m31(float d) { return m(3, 1, d); }
|
|
||||||
|
|
||||||
inline float m02(float d) { return m(0, 2, d); }
|
|
||||||
|
|
||||||
inline float m12(float d) { return m(1, 2, d); }
|
|
||||||
|
|
||||||
inline float m22(float d) { return m(2, 2, d); }
|
|
||||||
|
|
||||||
inline float m32(float d) { return m(3, 2, d); }
|
|
||||||
|
|
||||||
inline float m03(float d) { return m(0, 3, d); }
|
|
||||||
|
|
||||||
inline float m13(float d) { return m(1, 3, d); }
|
|
||||||
|
|
||||||
inline float m23(float d) { return m(2, 3, d); }
|
|
||||||
|
|
||||||
inline float m33(float d) { return m(3, 3, d); }
|
|
||||||
|
|
||||||
[[nodiscard]] float determinant() const {
|
|
||||||
return m00() * (m11() * m22() * m33() + m12() * m23() * m31() + m13() * m21() * m32()
|
return m00() * (m11() * m22() * m33() + m12() * m23() * m31() + m13() * m21() * m32()
|
||||||
- m31() * m22() * m13() - m32() * m23() * m11() - m33() * m21() * m12())
|
- m31() * m22() * m13() - m32() * m23() * m11() - m33() * m21() * m12())
|
||||||
- m10() * (m01() * m22() * m33() + m02() * m23() * m31() + m03() * m21() * m32()
|
- m10() * (m01() * m22() * m33() + m02() * m23() * m31() + m03() * m21() * m32()
|
||||||
|
|
@ -234,11 +201,274 @@ namespace blt {
|
||||||
- m21() * m12() * m03() - m22() * m13() * m01() - m23() * m11() * m02());
|
- m21() * m12() * m03() - m22() * m13() * m01() - m23() * m11() * m02());
|
||||||
}
|
}
|
||||||
|
|
||||||
inline float* ptr() { return data.single; }
|
[[nodiscard]] mat4x4 adjugate() const
|
||||||
|
{
|
||||||
|
mat4x4 ad;
|
||||||
|
ad.w11(w22() * w33() * w44() + w23() * w34() * w42() + w24() * w32() * w43()
|
||||||
|
- w24() * w33() * w42() - w23() * w32() * w44() - w22() * w34() * w43());
|
||||||
|
ad.w12(w21() * w33() * w44() + w23() * w34() * w41() + w24() * w31() * w43()
|
||||||
|
- w24() * w33() * w41() - w23() * w31() * w44() - w21() * w34() * w43());
|
||||||
|
ad.w13(w21() * w32() * w44() + w22() * w34() * w41() + w24() * w31() * w42()
|
||||||
|
- w24() * w32() * w41() - w22() * w31() * w44() - w21() * w34() * w42());
|
||||||
|
ad.w14(w21() * w32() * w43() + w22() * w33() * w41() + w23() * w31() * w42()
|
||||||
|
- w23() * w32() * w41() - w22() * w31() * w43() - w21() * w33() * w42());
|
||||||
|
|
||||||
|
ad.w21(w12() * w33() * w44() + w13() * w34() * w42() + w14() * w32() * w43()
|
||||||
|
- w14() * w33() * w42() - w13() * w32() * w44() - w12() * w34() * w43());
|
||||||
|
ad.w22(w11() * w33() * w44() + w13() * w34() * w41() + w14() * w31() * w43()
|
||||||
|
- w14() * w33() * w41() - w13() * w31() * w44() - w11() * w34() * w43());
|
||||||
|
ad.w23(w11() * w32() * w44() + w12() * w34() * w41() + w14() * w31() * w42()
|
||||||
|
- w14() * w32() * w41() - w12() * w31() * w44() - w11() * w34() * w42());
|
||||||
|
ad.w24(w11() * w32() * w43() + w12() * w33() * w41() + w13() * w31() * w42()
|
||||||
|
- w13() * w32() * w41() - w12() * w31() * w43() - w11() * w33() * w42());
|
||||||
|
|
||||||
|
ad.w31(w12() * w23() * w44() + w13() * w24() * w42() + w14() * w22() * w43()
|
||||||
|
- w14() * w23() * w42() - w13() * w22() * w44() - w12() * w24() * w43());
|
||||||
|
ad.w32(w11() * w23() * w44() + w13() * w24() * w41() + w14() * w21() * w43()
|
||||||
|
- w14() * w23() * w41() - w13() * w21() * w44() - w11() * w24() * w43());
|
||||||
|
ad.w33(w11() * w22() * w44() + w12() * w24() * w41() + w14() * w21() * w42()
|
||||||
|
- w14() * w22() * w41() - w12() * w21() * w44() - w11() * w24() * w42());
|
||||||
|
ad.w34(w11() * w22() * w43() + w12() * w23() * w41() + w13() * w21() * w42()
|
||||||
|
- w13() * w22() * w41() - w12() * w21() * w43() - w11() * w23() * w42());
|
||||||
|
|
||||||
|
ad.w41(w12() * w23() * w34() + w13() * w24() * w32() + w14() * w22() * w33()
|
||||||
|
- w14() * w23() * w32() - w13() * w22() * w34() - w12() * w24() * w33());
|
||||||
|
ad.w42(w11() * w23() * w34() + w13() * w24() * w31() + w14() * w21() * w33()
|
||||||
|
- w14() * w23() * w31() - w13() * w21() * w34() - w11() * w24() * w33());
|
||||||
|
ad.w43(w11() * w22() * w34() + w12() * w24() * w31() + w14() * w21() * w32()
|
||||||
|
- w14() * w22() * w31() - w12() * w21() * w34() - w11() * w24() * w32());
|
||||||
|
ad.w44(w11() * w22() * w33() + w12() * w23() * w31() + w13() * w21() * w32()
|
||||||
|
- w13() * w22() * w31() - w12() * w21() * w33() - w11() * w23() * w32());
|
||||||
|
|
||||||
|
for (int i = 1; i <= 4; i++)
|
||||||
|
{
|
||||||
|
for (int j = 1; j <= 4; j++)
|
||||||
|
{
|
||||||
|
auto v = static_cast<float>(std::pow(-1, j + i));
|
||||||
|
ad.w(j, i, v * ad.w(j, i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ad;
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]] mat4x4 inverse() const
|
||||||
|
{
|
||||||
|
auto ad = adjugate();
|
||||||
|
auto d = 1 / determinant();
|
||||||
|
return d * ad;
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m(int row, int column) const
|
||||||
|
{ return data.single[row + column * 4]; };
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m00() const
|
||||||
|
{ return m(0, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m10() const
|
||||||
|
{ return m(1, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m20() const
|
||||||
|
{ return m(2, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m30() const
|
||||||
|
{ return m(3, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m01() const
|
||||||
|
{ return m(0, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m11() const
|
||||||
|
{ return m(1, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m21() const
|
||||||
|
{ return m(2, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m31() const
|
||||||
|
{ return m(3, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m02() const
|
||||||
|
{ return m(0, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m12() const
|
||||||
|
{ return m(1, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m22() const
|
||||||
|
{ return m(2, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m32() const
|
||||||
|
{ return m(3, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m03() const
|
||||||
|
{ return m(0, 3); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m13() const
|
||||||
|
{ return m(1, 3); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m23() const
|
||||||
|
{ return m(2, 3); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float m33() const
|
||||||
|
{ return m(3, 3); }
|
||||||
|
|
||||||
|
inline float m(int row, int column, float value)
|
||||||
|
{ return data.single[row + column * 4] = value; };
|
||||||
|
|
||||||
|
inline float m00(float d)
|
||||||
|
{ return m(0, 0, d); }
|
||||||
|
|
||||||
|
inline float m10(float d)
|
||||||
|
{ return m(1, 0, d); }
|
||||||
|
|
||||||
|
inline float m20(float d)
|
||||||
|
{ return m(2, 0, d); }
|
||||||
|
|
||||||
|
inline float m30(float d)
|
||||||
|
{ return m(3, 0, d); }
|
||||||
|
|
||||||
|
inline float m01(float d)
|
||||||
|
{ return m(0, 1, d); }
|
||||||
|
|
||||||
|
inline float m11(float d)
|
||||||
|
{ return m(1, 1, d); }
|
||||||
|
|
||||||
|
inline float m21(float d)
|
||||||
|
{ return m(2, 1, d); }
|
||||||
|
|
||||||
|
inline float m31(float d)
|
||||||
|
{ return m(3, 1, d); }
|
||||||
|
|
||||||
|
inline float m02(float d)
|
||||||
|
{ return m(0, 2, d); }
|
||||||
|
|
||||||
|
inline float m12(float d)
|
||||||
|
{ return m(1, 2, d); }
|
||||||
|
|
||||||
|
inline float m22(float d)
|
||||||
|
{ return m(2, 2, d); }
|
||||||
|
|
||||||
|
inline float m32(float d)
|
||||||
|
{ return m(3, 2, d); }
|
||||||
|
|
||||||
|
inline float m03(float d)
|
||||||
|
{ return m(0, 3, d); }
|
||||||
|
|
||||||
|
inline float m13(float d)
|
||||||
|
{ return m(1, 3, d); }
|
||||||
|
|
||||||
|
inline float m23(float d)
|
||||||
|
{ return m(2, 3, d); }
|
||||||
|
|
||||||
|
inline float m33(float d)
|
||||||
|
{ return m(3, 3, d); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w(int row, int column) const
|
||||||
|
{ return data.single[(row - 1) + (column - 1) * 4]; };
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w11() const
|
||||||
|
{ return m(0, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w21() const
|
||||||
|
{ return m(1, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w31() const
|
||||||
|
{ return m(2, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w41() const
|
||||||
|
{ return m(3, 0); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w12() const
|
||||||
|
{ return m(0, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w22() const
|
||||||
|
{ return m(1, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w32() const
|
||||||
|
{ return m(2, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w42() const
|
||||||
|
{ return m(3, 1); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w13() const
|
||||||
|
{ return m(0, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w23() const
|
||||||
|
{ return m(1, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w33() const
|
||||||
|
{ return m(2, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w43() const
|
||||||
|
{ return m(3, 2); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w14() const
|
||||||
|
{ return m(0, 3); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w24() const
|
||||||
|
{ return m(1, 3); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w34() const
|
||||||
|
{ return m(2, 3); }
|
||||||
|
|
||||||
|
[[nodiscard]] inline float w44() const
|
||||||
|
{ return m(3, 3); }
|
||||||
|
|
||||||
|
inline float w(int row, int column, float value)
|
||||||
|
{ return data.single[(row - 1) + (column - 1) * 4] = value; };
|
||||||
|
|
||||||
|
inline float w11(float d)
|
||||||
|
{ return m(0, 0, d); }
|
||||||
|
|
||||||
|
inline float w21(float d)
|
||||||
|
{ return m(1, 0, d); }
|
||||||
|
|
||||||
|
inline float w31(float d)
|
||||||
|
{ return m(2, 0, d); }
|
||||||
|
|
||||||
|
inline float w41(float d)
|
||||||
|
{ return m(3, 0, d); }
|
||||||
|
|
||||||
|
inline float w12(float d)
|
||||||
|
{ return m(0, 1, d); }
|
||||||
|
|
||||||
|
inline float w22(float d)
|
||||||
|
{ return m(1, 1, d); }
|
||||||
|
|
||||||
|
inline float w32(float d)
|
||||||
|
{ return m(2, 1, d); }
|
||||||
|
|
||||||
|
inline float w42(float d)
|
||||||
|
{ return m(3, 1, d); }
|
||||||
|
|
||||||
|
inline float w13(float d)
|
||||||
|
{ return m(0, 2, d); }
|
||||||
|
|
||||||
|
inline float w23(float d)
|
||||||
|
{ return m(1, 2, d); }
|
||||||
|
|
||||||
|
inline float w33(float d)
|
||||||
|
{ return m(2, 2, d); }
|
||||||
|
|
||||||
|
inline float w43(float d)
|
||||||
|
{ return m(3, 2, d); }
|
||||||
|
|
||||||
|
inline float w14(float d)
|
||||||
|
{ return m(0, 3, d); }
|
||||||
|
|
||||||
|
inline float w24(float d)
|
||||||
|
{ return m(1, 3, d); }
|
||||||
|
|
||||||
|
inline float w34(float d)
|
||||||
|
{ return m(2, 3, d); }
|
||||||
|
|
||||||
|
inline float w44(float d)
|
||||||
|
{ return m(3, 3, d); }
|
||||||
|
|
||||||
|
inline float* ptr()
|
||||||
|
{ return data.single; }
|
||||||
};
|
};
|
||||||
|
|
||||||
// adds the two mat4x4 left and right
|
// adds the two mat4x4 left and right
|
||||||
inline mat4x4 operator+(const mat4x4& left, const mat4x4& right) {
|
inline mat4x4 operator+(const mat4x4& left, const mat4x4& right)
|
||||||
|
{
|
||||||
float data[16];
|
float data[16];
|
||||||
for (int i = 0; i < 16; i++)
|
for (int i = 0; i < 16; i++)
|
||||||
data[i] = left.data.single[i] + right.data.single[i];
|
data[i] = left.data.single[i] + right.data.single[i];
|
||||||
|
|
@ -246,7 +476,8 @@ namespace blt {
|
||||||
}
|
}
|
||||||
|
|
||||||
// subtracts the right mat4x4 from the left.
|
// subtracts the right mat4x4 from the left.
|
||||||
inline mat4x4 operator-(const mat4x4& left, const mat4x4& right) {
|
inline mat4x4 operator-(const mat4x4& left, const mat4x4& right)
|
||||||
|
{
|
||||||
float data[16];
|
float data[16];
|
||||||
for (int i = 0; i < 16; i++)
|
for (int i = 0; i < 16; i++)
|
||||||
data[i] = left.data.single[i] - right.data.single[i];
|
data[i] = left.data.single[i] - right.data.single[i];
|
||||||
|
|
@ -261,13 +492,17 @@ namespace blt {
|
||||||
0, 0, 0, 0};
|
0, 0, 0, 0};
|
||||||
|
|
||||||
// multiples the left with the right
|
// multiples the left with the right
|
||||||
inline mat4x4 operator*(const mat4x4& left, const mat4x4& right) {
|
inline mat4x4 operator*(const mat4x4& left, const mat4x4& right)
|
||||||
|
{
|
||||||
mat4x4 mat{emptyMatrix};
|
mat4x4 mat{emptyMatrix};
|
||||||
|
|
||||||
// TODO: check avx with this??
|
// TODO: check avx with this??
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++)
|
||||||
for (int j = 0; j < 4; j++) {
|
{
|
||||||
for (int k = 0; k < 4; k++) {
|
for (int j = 0; j < 4; j++)
|
||||||
|
{
|
||||||
|
for (int k = 0; k < 4; k++)
|
||||||
|
{
|
||||||
mat.m(i, j, mat.m(i, j) + left.m(i, k) * right.m(k, j));
|
mat.m(i, j, mat.m(i, j) + left.m(i, k) * right.m(k, j));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -276,11 +511,14 @@ namespace blt {
|
||||||
return mat;
|
return mat;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline vec4 operator*(const mat4x4& left, const vec4& right){
|
inline vec4 operator*(const mat4x4& left, const vec4& right)
|
||||||
vec4 ret{0,0,0,0};
|
{
|
||||||
|
vec4 ret{0, 0, 0, 0};
|
||||||
|
|
||||||
for (int m = 0; m < 4; m++) {
|
for (int m = 0; m < 4; m++)
|
||||||
for (int n = 0; n < 4; n++) {
|
{
|
||||||
|
for (int n = 0; n < 4; n++)
|
||||||
|
{
|
||||||
ret[m] = ret[m] + left.m(m, n) * right[n];
|
ret[m] = ret[m] + left.m(m, n) * right[n];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -289,20 +527,23 @@ namespace blt {
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, unsigned long size>
|
template<typename T, unsigned long size>
|
||||||
inline vec4 operator*(const mat4x4& left, const vec<T, size>& right){
|
inline vec4 operator*(const mat4x4& left, const vec<T, size>& right)
|
||||||
vec4 ret{0,0,0,0};
|
{
|
||||||
|
vec4 ret{0, 0, 0, 0};
|
||||||
|
|
||||||
for (int i = 0; i < size; i++)
|
for (int i = 0; i < size; i++)
|
||||||
ret[i] = (float)right[i];
|
ret[i] = (float) right[i];
|
||||||
|
|
||||||
return left * ret;
|
return left * ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
// multiplies the const c with each element in the mat4x4 v
|
// multiplies the const c with each element in the mat4x4 v
|
||||||
inline mat4x4 operator*(float c, const mat4x4& v) {
|
inline mat4x4 operator*(float c, const mat4x4& v)
|
||||||
|
{
|
||||||
mat4x4 mat{};
|
mat4x4 mat{};
|
||||||
|
|
||||||
for (int i = 0; i < 16; i++) {
|
for (int i = 0; i < 16; i++)
|
||||||
|
{
|
||||||
mat.data.single[i] = c * v.data.single[i];
|
mat.data.single[i] = c * v.data.single[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -310,10 +551,12 @@ namespace blt {
|
||||||
}
|
}
|
||||||
|
|
||||||
// same as above but for right sided constants
|
// same as above but for right sided constants
|
||||||
inline mat4x4 operator*(const mat4x4& v, float c) {
|
inline mat4x4 operator*(const mat4x4& v, float c)
|
||||||
|
{
|
||||||
mat4x4 mat{};
|
mat4x4 mat{};
|
||||||
|
|
||||||
for (int i = 0; i < 16; i++) {
|
for (int i = 0; i < 16; i++)
|
||||||
|
{
|
||||||
mat.data.single[i] = v.data.single[i] * c;
|
mat.data.single[i] = v.data.single[i] * c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -321,10 +564,12 @@ namespace blt {
|
||||||
}
|
}
|
||||||
|
|
||||||
// divides the mat4x4 by the constant c
|
// divides the mat4x4 by the constant c
|
||||||
inline mat4x4 operator/(const mat4x4& v, float c) {
|
inline mat4x4 operator/(const mat4x4& v, float c)
|
||||||
|
{
|
||||||
mat4x4 mat{};
|
mat4x4 mat{};
|
||||||
|
|
||||||
for (int i = 0; i < 16; i++) {
|
for (int i = 0; i < 16; i++)
|
||||||
|
{
|
||||||
mat.data.single[i] = v.data.single[i] / c;
|
mat.data.single[i] = v.data.single[i] / c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -332,10 +577,12 @@ namespace blt {
|
||||||
}
|
}
|
||||||
|
|
||||||
// divides each element in the mat4x4 by over the constant
|
// divides each element in the mat4x4 by over the constant
|
||||||
inline mat4x4 operator/(float c, const mat4x4& v) {
|
inline mat4x4 operator/(float c, const mat4x4& v)
|
||||||
|
{
|
||||||
mat4x4 mat{};
|
mat4x4 mat{};
|
||||||
|
|
||||||
for (int i = 0; i < 16; i++) {
|
for (int i = 0; i < 16; i++)
|
||||||
|
{
|
||||||
mat.data.single[i] = c / v.data.single[i];
|
mat.data.single[i] = c / v.data.single[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -345,10 +592,11 @@ namespace blt {
|
||||||
// https://www.scratchapixel.com/lessons/3d-basic-rendering/perspective-and-orthographic-projection-matrix/building-basic-perspective-projection-matrix.html
|
// https://www.scratchapixel.com/lessons/3d-basic-rendering/perspective-and-orthographic-projection-matrix/building-basic-perspective-projection-matrix.html
|
||||||
// https://ogldev.org/www/tutorial12/tutorial12.html
|
// https://ogldev.org/www/tutorial12/tutorial12.html
|
||||||
// http://www.songho.ca/opengl/gl_projectionmatrix.html
|
// http://www.songho.ca/opengl/gl_projectionmatrix.html
|
||||||
static inline mat4x4 perspective(float fov, float aspect_ratio, float near, float far){
|
static inline mat4x4 perspective(float fov, float aspect_ratio, float near, float far)
|
||||||
mat4x4 perspectiveMat4x4 {emptyMatrix};
|
{
|
||||||
|
mat4x4 perspectiveMat4x4{emptyMatrix};
|
||||||
|
|
||||||
float halfTan = tanf(fov * 0.5f * (float)M_PI / 180.0f);
|
float halfTan = tanf(fov * 0.5f * (float) M_PI / 180.0f);
|
||||||
perspectiveMat4x4.m00(float(1.0 / (aspect_ratio * halfTan)));
|
perspectiveMat4x4.m00(float(1.0 / (aspect_ratio * halfTan)));
|
||||||
perspectiveMat4x4.m11(float(1.0 / halfTan));
|
perspectiveMat4x4.m11(float(1.0 / halfTan));
|
||||||
perspectiveMat4x4.m22(float(-((far + near) / (far - near))));
|
perspectiveMat4x4.m22(float(-((far + near) / (far - near))));
|
||||||
|
|
@ -358,12 +606,13 @@ namespace blt {
|
||||||
return perspectiveMat4x4;
|
return perspectiveMat4x4;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline mat4x4 ortho(float left, float right, float top, float bottom, float near, float far){
|
static inline mat4x4 ortho(float left, float right, float top, float bottom, float near, float far)
|
||||||
mat4x4 perspectiveMat4x4 {emptyMatrix};
|
{
|
||||||
|
mat4x4 perspectiveMat4x4{emptyMatrix};
|
||||||
|
|
||||||
perspectiveMat4x4.m00(2/(right - left));
|
perspectiveMat4x4.m00(2 / (right - left));
|
||||||
perspectiveMat4x4.m11(2/(top-bottom));
|
perspectiveMat4x4.m11(2 / (top - bottom));
|
||||||
perspectiveMat4x4.m22(2/(far-near));
|
perspectiveMat4x4.m22(2 / (far - near));
|
||||||
perspectiveMat4x4.m33(1);
|
perspectiveMat4x4.m33(1);
|
||||||
perspectiveMat4x4.m03(-(right + left) / (right - left));
|
perspectiveMat4x4.m03(-(right + left) / (right - left));
|
||||||
perspectiveMat4x4.m13(-(top + bottom) / (top - bottom));
|
perspectiveMat4x4.m13(-(top + bottom) / (top - bottom));
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ void run_logging() {
|
||||||
// blt::logging::trace << "Seeee\n Super\n";
|
// blt::logging::trace << "Seeee\n Super\n";
|
||||||
|
|
||||||
std::string hello = "superSexyMax";
|
std::string hello = "superSexyMax";
|
||||||
std::cout << "String starts with: " << blt::string::contains(hello, "superSexyMaxE") << "\n";
|
std::cout << "String starts with: " << blt::string::contains(main_graph, "superSexyMaxE") << "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //BLT_TESTS_LOGGING_H
|
#endif //BLT_TESTS_LOGGING_H
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue