Merge remote-tracking branch 'origin/main'

# Conflicts:
#	CMakeLists.txt

CMakeLists.txt

@@ -19,7 +19,6 @@ set(SRC_FILES
         ${CMAKE_CURRENT_LIST_DIR}/src/main.cpp
         ${CMAKE_CURRENT_LIST_DIR}/src/gamecube.cpp
         src/gamematrix.cpp
-        docs/tests.cpp
 )
 
 ##Tom: prev: ${CMAKE_CURRENT_LIST_DIR}/linux -> now /include

includes/gamecube.h

@@ -2,6 +2,9 @@
 #include "gamematrix.h"
 #include "raylib.h"
 #include <rlgl.h>
+#include <array>
+
+using Mat4 = std::array<std::array<double, 4>, 4>;
 
 struct Vec3
 {

includes/gamematrix.h

@@ -3,6 +3,7 @@
 #include <array>
 #include <stdexcept>
 #include <cmath>
+#include "gamecube.h"
 
 class gameMatrix
 {

src/gamematrix.cpp

@@ -1,10 +1,13 @@
 #include "gamematrix.h"
 #include <cmath>
 
-namespace Matrix3D {
+// Entfernt: namespace Matrix3D { ... }   <-- GEÄNDERT
 
-    Mat4 identity() {
+// Implementierungen jetzt als Klassenmethoden von gameMatrix   <-- GEÄNDERT
-        Mat4 m{};
+
+// Optional: identity() als Hilfsmethode hinzugefügt
+static std::array<std::array<double,4>,4> identity() {   // <-- NEU
+    std::array<std::array<double,4>,4> m{};
     for(int i = 0; i < 4; i++) {
         for(int j = 0; j < 4; j++) {
             m[i][j] = (i == j) ? 1.0 : 0.0;
@@ -13,8 +16,12 @@ namespace Matrix3D {
     return m;
 }
 
-    Mat4 matmul(const Mat4& A, const Mat4& B) {
+// -------------------- matmul --------------------
-        Mat4 R{};
+std::array<std::array<double,4>,4> gameMatrix::matmul(    // <-- GEÄNDERT
+    const std::array<std::array<double,4>,4>& A,
+    const std::array<std::array<double,4>,4>& B)
+{
+    std::array<std::array<double,4>,4> R{};
     for(int i = 0; i < 4; i++) {
         for(int j = 0; j < 4; j++) {
             double sum = 0.0;
@@ -27,16 +34,22 @@ namespace Matrix3D {
     return R;
 }
 
-    Mat4 translate(const Vec3& pos) {
+// -------------------- translate --------------------
-        Mat4 t = identity();
+std::array<std::array<double,4>,4> gameMatrix::translate( // <-- GEÄNDERT
-        t[0][3] = pos.x;
+    const std::array<double,3>& pos)
-        t[1][3] = pos.y;
+{
-        t[2][3] = pos.z;
+    auto t = identity();   // <-- NEU: nutzt die Hilfsmethode
+    t[0][3] = pos[0];
+    t[1][3] = pos[1];
+    t[2][3] = pos[2];
     return t;
 }
 
-    Mat4 rot3D(double angle_deg, char axis) {
+// -------------------- rot3D --------------------
-        Mat4 r = identity();
+std::array<std::array<double,4>,4> gameMatrix::rot3D(     // <-- GEÄNDERT
+    double angle_deg, char axis)
+{
+    auto r = identity();   // <-- NEU: nutzt die Hilfsmethode
 
     double rad = angle_deg * M_PI / 180.0;
     double c = std::cos(rad);
@@ -60,17 +73,3 @@ namespace Matrix3D {
     }
     return r;
 }
-
-    Vec3 operator*(const Mat4& M, const Vec3& v) {
-        Vec3 out;
-        out.x = M[0][0]*v.x + M[0][1]*v.y + M[0][2]*v.z + M[0][3];
-        out.y = M[1][0]*v.x + M[1][1]*v.y + M[1][2]*v.z + M[1][3];
-        out.z = M[2][0]*v.x + M[2][1]*v.y + M[2][2]*v.z + M[2][3];
-        return out;
-    }
-
-    Mat4 operator*(const Mat4& A, const Mat4& B) {
-        return matmul(A, B);
-    }
-
-}