Merge branch 'main' into project_tester

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/vcs.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings" defaultProject="true" />
+</project>

CMakeLists.txt

@@ -17,9 +17,9 @@ set(SRC_FILES
         src/gamematrix.cpp
 )
 
-#set(INCLUDE_DIRS
-#        ${CMAKE_CURRENT_LIST_DIR}/linux
-#)
+set(INCLUDE_DIRS
+        ${CMAKE_CURRENT_LIST_DIR}/includes
+)
 
 add_executable(${EXECUTABLE_NAME} ${SRC_FILES})
 #target_include_directories(${EXECUTABLE_NAME} PRIVATE ${INCLUDE_DIRS})
@@ -42,3 +42,22 @@ if (APPLE)
         target_link_libraries(Prog3B "-framework Cocoa")
         target_link_libraries(Prog3B "-framework OpenGL")
 endif()
+
+add_executable(tests
+        ${CMAKE_CURRENT_LIST_DIR}/src/tests.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/src/gamematrix.cpp
+)
+target_include_directories(tests PRIVATE ${INCLUDE_DIRS})
+
+target_link_libraries(tests PRIVATE
+        opengl32
+        gdi32
+        winmm
+)
+
+if (APPLE)
+        target_link_libraries(Prog3B PRIVATE "-framework IOKit")
+        target_link_libraries(Prog3B PRIVATE "-framework Cocoa")
+        target_link_libraries(Prog3B PRIVATE "-framework OpenGL")
+endif()
+

docs/requirements.txt

@@ -0,0 +1,20 @@
+Projekt: .wuerfelmemory
+Datum: 03.11.2025
+
+
+Team(Rollen):Projektleiter: Alina.B
+            Architekt:     Alex.S
+            Entwickler:    Tomila.B
+            Tester:        Elisa.S
+
+1.Projektziel:
+
+| Funktion      | Eingabe                            | Ausgabe               | Kurzbeschreibung                       |
+|---------------|------------------------------------|-----------------------|----------------------------------------|
+| matmul        | 4x4 Matrix A, 4x4 Matrix B         | 4x4 Matrix            |                                        |
+| translate     | 3D Vektor                          | 4x4 Matrix            |                                        |
+| rot3D         | Winkel in °, Rotationsachse (x/y/z)| 4x4 Matrix            |                                        |
+
+
+Dokumentation:
+

src/tests.cpp

@@ -0,0 +1,99 @@
+#include <iostream>
+#include <array>
+#include <cmath>
+#include "gamematrix.h"
+
+using Matrix4 = std::array<std::array<double,4>,4>;
+using Vec3    = std::array<double,3>;
+
+bool eq(double a, double b) {
+    return std::fabs(a - b) < 0.0001;
+}
+
+Matrix4 identity() {
+    Matrix4 I{};
+    for (int i = 0; i < 4; i++) {
+        I[i][i] = 1.0;
+    }
+    return I;
+}
+
+Vec3 applyMatrix(const Matrix4& M, const Vec3& v) {
+    Vec3 r{0,0,0};
+
+    r[0] = M[0][0]*v[0] + M[0][1]*v[1] + M[0][2]*v[2] + M[0][3];
+    r[1] = M[1][0]*v[0] + M[1][1]*v[1] + M[1][2]*v[2] + M[1][3];
+    r[2] = M[2][0]*v[0] + M[2][1]*v[1] + M[2][2]*v[2] + M[2][3];
+
+    return r;
+}
+
+void testMatmulIdentity() {
+    Matrix4 A = identity();
+    Matrix4 B = identity();
+    Matrix4 C = Matrix3D::gameMatrix::matmul(A, B);
+
+    for (int i = 0; i < 4; i++) {
+        for (int j = 0; j < 4; j++) {
+            double expected = (i == j ? 1.0 : 0.0);
+            if (!eq(C[i][j], expected)) {
+                std::cout << "[FAIL] matmul Identity\n";
+                return;
+            }
+        }
+    }
+
+    std::cout << "[OK] matmul Identity\n";
+}
+
+void testTranslate() {
+    Vec3 pos{1,2,3};
+    Matrix4 T = Matrix3D::gameMatrix::translate(pos);
+
+    if (eq(T[0][3], 1) && eq(T[1][3], 2) && eq(T[2][3], 3))
+        std::cout << "[OK] translate\n";
+    else
+        std::cout << "[FAIL] translate\n";
+}
+
+void testRotZ90() {
+    Vec3 v{1,0,0};
+    Matrix4 R = Matrix3D::gameMatrix::rot3D(90, 'z');
+    Vec3 r = applyMatrix(R, v);
+
+    if (eq(r[0], 0) && eq(r[1], 1) && eq(r[2], 0))
+        std::cout << "[OK] rotZ 90°\n";
+    else
+        std::cout << "[FAIL] rotZ 90°\n";
+}
+
+void testRotX180() {
+    Vec3 v{0,1,0};
+    Matrix4 R = Matrix3D::gameMatrix::rot3D(180, 'x');
+    Vec3 r = applyMatrix(R, v);
+
+    if (eq(r[0], 0) && eq(r[1], -1) && eq(r[2], 0))
+        std::cout << "[OK] rotX 180°\n";
+    else
+        std::cout << "[FAIL] rotX 180°\n";
+}
+
+void testRotY270() {
+    Vec3 v{1,0,0};
+    Matrix4 R = Matrix3D::gameMatrix::rot3D(270, 'y');
+    Vec3 r = applyMatrix(R, v);
+
+    if (eq(r[0], 0) && eq(r[1], 0) && eq(r[2], 1))
+        std::cout << "[OK] rotY 270°\n";
+    else
+        std::cout << "[FAIL] rotY 270°\n";
+}
+
+int main() {
+    testMatmulIdentity();
+    testTranslate();
+    testRotZ90();
+    testRotX180();
+    testRotY270();
+    return 0;
+}

tests.txt

@@ -0,0 +1,36 @@
+============================================================
+Projekt: gamematrix (C++ Library)
+Rolle: Tester
+Datei: tests.txt
+============================================================
+
+# 1. Testplan Übersicht
+
+Ziel: Überprüfung der Funktionen matmul(), translate(), rot3D().
+
+---------------------------------------------------------------------------------------------------------------
+| Funktion | Testfall              | Eingabe                                      | Erwartetes Ergebnis       | Bemerkung                       |
+|---------|------------------------|----------------------------------------------|---------------------------|---------------------------------|
+| matmul  | Identity * Identity    | 4x4 Identity Matrizen                        | Identity                  | Basisfall                       |
+| translate | Verschiebung        | Vec3(1,2,3)                                  | Matrix mit Translation    | Letzte Spalte prüfen            |
+| rot3D   | Rotation Z 90°         | angle=90, axis='z', v=(1,0,0)                | (0,1,0)                   | Anwendung auf Vektor            |
+| rot3D   | Rotation X 180°        | angle=180, axis='x', v=(0,1,0)               | (0,-1,0)                  | Anwendung auf Vektor            |
+| rot3D   | Rotation Y 270°        | angle=270, axis='y', v=(1,0,0)               | (0,0,-1)                  | Anwendung auf Vektor            |
+---------------------------------------------------------------------------------------------------------------
+
+# 2. Testdaten
+
+- Matrizen für matmul: zwei Identity-Matrizen
+- Vektoren für translate: Vec3(1,2,3)
+- Vektoren für rot3D: (1,0,0), (0,1,0)
+
+# 3. Abnahmekriterien
+
+- Alle Testfälle laufen ohne Fehler durch.
+- Ergebnisse stimmen mit erwarteten Ergebnissen überein.
+- Keine unerwarteten Exceptions.
+- Tester dokumentiert Erfolg oder Fehler im Terminal.
+
+============================================================
+Hinweis: Datei wird vom Tester gepflegt.
+============================================================