bhattial100541/Prog3b_651
1
2
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

Resolve merge conflict in gamematrix.cpp

Browse Source
This commit is contained in:
Aleyna Guecuek 2025-12-15 11:42:39 +01:00
parent 2fd3ee5870
commit 6a54e6d4a2
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gamematrix.cpp
View File

@ -1,9 +1,3 @@
<<<<<<< HEAD
//
=======
//
>>>>>>> 5fc4346 (funktioniert, 3 oder 6 + Timer komplett)
// Created by bakee on 03.11.2025. // Created by bakee on 03.11.2025.
// //
#include "gamematrix.h" #include "gamematrix.h"
@ -42,9 +36,9 @@ namespace Matrix3D
{ {
Mat4 result = identity(); Mat4 result = identity();
result[0][3] = pos[0]; // x result[0][3] = pos[0];
result[1][3] = pos[1]; // y result[1][3] = pos[1];
result[2][3] = pos[2]; // z result[2][3] = pos[2];
return result; return result;
} }
@ -98,9 +92,4 @@ namespace Matrix3D
return {res_hom[0], res_hom[1], res_hom[2]}; return {res_hom[0], res_hom[1], res_hom[2]};
} }
<<<<<<< HEAD
} }
=======
}
>>>>>>> 5fc4346 (funktioniert, 3 oder 6 + Timer komplett)