Merge remote-tracking branch 'origin/dev_cubes(code)'

This commit is contained in:
webbaer 2025-12-08 15:54:10 +01:00
commit a3849ffde9

View File

@ -21,15 +21,17 @@ 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]);
@ -44,7 +46,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;