shehibr98345/PROG_3B
1
0
Fork 0
Code Issues 3 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: shehibr98345:8eda1730bf50c9d81dd3acb57b0cb32702b8835e
Branches Tags
shehibr98345:master
shehibr98345:gamestate
shehibr98345:count
shehibr98345:menu
shehibr98345:game_timer
shehibr98345:dev_cubes(code)
shehibr98345:test
shehibr98345:project_leader
shehibr98345:architect
shehibr98345:project_developer
shehibr98345:cmake-update
...
compare: shehibr98345:87e190dfd6c9f7d40ae7ba7f7da546277320ac5b
Branches Tags
shehibr98345:master
shehibr98345:gamestate
shehibr98345:count
shehibr98345:menu
shehibr98345:game_timer
shehibr98345:dev_cubes(code)
shehibr98345:test
shehibr98345:project_leader
shehibr98345:architect
shehibr98345:project_developer
shehibr98345:cmake-update

3 Commits
8eda1730bf ... 87e190dfd6

Author SHA1 Message Date
webbaer
87e190dfd6 Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/shehibr98345/PROG_3B 2025-12-08 16:32:20 +01:00
webbaer
a3849ffde9 Merge remote-tracking branch 'origin/dev_cubes(code)' 2025-12-08 15:54:10 +01:00
webbaer
9ce6f05ba7 fixed version von main.cpp und gamematrix.cpp 2025-11-24 17:12:30 +01:00
1 changed files with 6 additions and 4 deletions
Show Stats Expand all files Collapse all files

10
src/main.cpp
View File

@ -26,16 +26,18 @@ int main()
camera.fovy = 45.0f;
camera.projection = CAMERA_PERSPECTIVE;
// cubePairs = {};
// Nur 3 Farben für 3 Paare
Color colors[] = { RED, GREEN, BLUE };
Color colors[] = { RED, GREEN, BLUE, YELLOW, PINK };
// 6 Karten-Positionen im 3x2 Raster
std::vector<Vec3> positions = {{-2, 0, -2}, {0, 0, -2}, {2, 0, -2},{-2, 0, 0}, {0, 0, 0}, {2, 0, 0}};
std::vector<Vec3> positions = {{-2, 0, -2}, {0, 0, -2}, {2, 0, -2},{-2, 0, 0}, {0, 0, 0},
{2, 0, 0},{2,0,-4},{0,0,-4},{-2,0,-4},{-4,0,-2}};
// Farben doppelt in einen Pool legen und mischen
std::vector<Color> colorPool;
for (int i = 0; i < 3; i++)
for (int i = 0; i <5; i++)
{
colorPool.push_back(colors[i]);
colorPool.push_back(colors[i]);
@ -50,7 +52,7 @@ int main()
// Karten/Würfel erstellen
std::vector<gamecube> cubes;
for (int i = 0; i < 6; i++)
for (int i = 0; i < 10; i++)
cubes.emplace_back(positions[i], colorPool[i]);
gamecube* first = nullptr;