diff --git a/createCube.cpp b/createCube.cpp index 8f1900d..39dfa1d 100644 --- a/createCube.cpp +++ b/createCube.cpp @@ -3,12 +3,6 @@ std::vector createCubes(int pairs) { - //zwei bis zehn paare - if (pairs >10 || pairs <= 1) - { - // 6 Karten-Positionen im 3x2 Raster - return {{-2, 0, -2}, {0, 0, -2}, {2, 0, -2},{-2, 0, 0}, {0, 0, 0}, {2, 0, 0}}; // Default field - } std::vector fieldSize = calculateFieldSize(pairs); std::vector cubePositions; //std::cout<<(fieldSize[0])< calculateFieldSize(int pairs) std::vector getColors(int pairs) { - if (pairs >10) pairs = 10; std::vector returnColors; Color colors[] = { {230, 25, 75, 255}, // Red diff --git a/main.cpp b/main.cpp index 8fd4b96..75aa15a 100644 --- a/main.cpp +++ b/main.cpp @@ -24,7 +24,8 @@ int main() camera.fovy = 45.0f; camera.projection = CAMERA_PERSPECTIVE; - int cubePairs = 3; //Cube count => 2*cubePairs + int cubePairs = 7; + if (cubePairs > 10 || cubePairs <= 1) cubePairs = 3; std::vector positions =createCubes(cubePairs); // Nur 3 Farben für 3 Paare