From 93ea5ae8d1a2cb50b6f0e82431a5f04159c742f6 Mon Sep 17 00:00:00 2001 From: Alina Bhatti Date: Mon, 3 Nov 2025 11:59:18 +0000 Subject: [PATCH 1/5] Add requirements.txt --- requirements.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..f05079a --- /dev/null +++ b/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: + From a2d77869a16977932cda834a548f3dbb96a013f6 Mon Sep 17 00:00:00 2001 From: bhattial100541 Date: Mon, 3 Nov 2025 13:03:48 +0100 Subject: [PATCH 2/5] adding requirements --- requirements.txt | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index f05079a..0000000 --- a/requirements.txt +++ /dev/null @@ -1,20 +0,0 @@ -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: - From 21700018752d7b19e3c2642707b1c1b06e2f3d84 Mon Sep 17 00:00:00 2001 From: bhattial100541 Date: Mon, 3 Nov 2025 13:04:14 +0100 Subject: [PATCH 3/5] adding requirements --- docs/requirements.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docs/requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..f05079a --- /dev/null +++ b/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: + From e72d51f3b22ebea2e2efe8fcb4f7e4774a0b4abe Mon Sep 17 00:00:00 2001 From: bhattial100541 Date: Thu, 13 Nov 2025 12:37:45 +0100 Subject: [PATCH 4/5] hi --- .DS_Store | Bin 0 -> 6148 bytes .idea/.gitignore | 8 ++++++++ .idea/vcs.xml | 4 ++++ Prog3b_651 | 1 + 4 files changed, 13 insertions(+) create mode 100644 .DS_Store create mode 100644 .idea/.gitignore create mode 100644 .idea/vcs.xml create mode 160000 Prog3b_651 diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a9921da2bb36b884333134329ddda31ade067b0a GIT binary patch literal 6148 zcmeHKF^|(Q6n?%7oO=gS2M~-Ftkuz8RZfT{^m+qALWm$30F|bxdJ$<{H7OaYibywc z6EizMfB~`Gz{bRe_%jUfp6!ZM&B4ZapIw!f%>ZLsy zr@b&9OcWsu1{m_}Nf-w*Ys+aIB#P^42e0r-w|ZqZYc?A-(Q3_WVs>k%UK6`J_4&NQ zFJHfL`(gKGG>YXLHF;pTO)9%+Z~;fyD3v2f`jL-QC1Pnnan0C=uis9JE3V(`dx!6? z>Gdleb0mMS<=&iZU#`NX$eC18zNXA3-FGQeNYp17xSqHv#dQ-5OtpZkoGpYdX z4+0CJYcSWSwhpY+6#&t}Ze`e}W1Bd_pldMKh#oYisfe1&%oT%aI`#__=Nim4YC14; z`Cuk9GdC2bvg7zdg#&Xn+S)2$6Sd^hpPy^95m}|ryH2Wi + + + \ No newline at end of file diff --git a/Prog3b_651 b/Prog3b_651 new file mode 160000 index 0000000..2170001 --- /dev/null +++ b/Prog3b_651 @@ -0,0 +1 @@ +Subproject commit 21700018752d7b19e3c2642707b1c1b06e2f3d84 From 54a44f9e531f1e37ba5fd724142179e35795127a Mon Sep 17 00:00:00 2001 From: Tomila Bakeeva Date: Mon, 17 Nov 2025 12:08:36 +0100 Subject: [PATCH 5/5] fehlerkorrektur (namespace, gamecube) --- src/gamecube.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gamecube.cpp b/src/gamecube.cpp index 6848d50..274e6d5 100644 --- a/src/gamecube.cpp +++ b/src/gamecube.cpp @@ -39,11 +39,11 @@ void gamecube::Draw() const rlPushMatrix(); // Matrizen für Rotation und Translation erzeugen - auto matrix_a = gameMatrix::translate({ position.x, position.y, position.z}); - auto matrix_b = gameMatrix::rot3D(rotation, 'y'); + auto matrix_a = Matrix3D::gameMatrix::translate({ position.x, position.y, position.z}); + auto matrix_b = Matrix3D::gameMatrix::rot3D(rotation, 'y'); // Matrizen multiplizieren (Translation * Rotation) - auto model = gameMatrix::matmul(matrix_a, matrix_b); + auto model = Matrix3D::gameMatrix::matmul(matrix_a, matrix_b); // transform for raylib matrix float f[16];