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

Compare commits

base: 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
..
compare: 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

No commits in common. "87e190dfd6c9f7d40ae7ba7f7da546277320ac5b" and "8eda1730bf50c9d81dd3acb57b0cb32702b8835e" have entirely different histories.
87e190dfd6 ... 8eda1730bf

1 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

10
src/main.cpp
View File

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