diff --git a/zadanie-3/CMakeFiles/zadanie-3.dir/main.cpp.o b/zadanie-3/CMakeFiles/zadanie-3.dir/main.cpp.o index d99eb39..0415c93 100644 Binary files a/zadanie-3/CMakeFiles/zadanie-3.dir/main.cpp.o and b/zadanie-3/CMakeFiles/zadanie-3.dir/main.cpp.o differ diff --git a/zadanie-3/imgui.ini b/zadanie-3/imgui.ini index 2c39712..96a334d 100644 --- a/zadanie-3/imgui.ini +++ b/zadanie-3/imgui.ini @@ -28,5 +28,5 @@ Size=256,127 [Window][Track Ball] Pos=60,180 -Size=247,125 +Size=325,209 diff --git a/zadanie-3/main.cpp b/zadanie-3/main.cpp index 1711ec9..8d70275 100644 --- a/zadanie-3/main.cpp +++ b/zadanie-3/main.cpp @@ -19,6 +19,7 @@ const int ballsAmount = 2; const float initTimeStep = 0.001f; const float initCameraScale = 1.0f; +const float initSphereScale = 0.05f; bool shouldUpdate = true; bool shouldAlwaysUpdate = true; @@ -26,6 +27,7 @@ float t = 0.0f; float timeStep = initTimeStep; float cameraScale = initCameraScale; +float sphereScale = initSphereScale; int currentTrackedBall = -1; struct Ball { @@ -51,6 +53,7 @@ void imGuiTrackBallFrame(){ ImGui::Begin("Track Ball"); ImGui::SliderFloat("Camera scale", &cameraScale, 0.1f, 2.0f, "%.3f", 1.0f); + ImGui::SliderFloat("Sphere scale", &sphereScale, 0.01f, 0.1f, "%.3f", 1.0f); if(ImGui::Button("Track red ball")){ @@ -261,7 +264,7 @@ void display() { // Rysowanie kul for (const auto &ball : balls) { glm::mat4 model = glm::translate(glm::mat4(1.0f), glm::vec3(ball.position.x, ball.position.y, 0.0f)); - model = glm::scale(model, glm::vec3(0.05f, 0.05f, 1.0f)); // Skala dla małych kul + model = glm::scale(model, glm::vec3(sphereScale, sphereScale, 1.0f)); // Skala dla małych kul glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model)); glUniform3f(colorLoc, ball.color.r, ball.color.g, ball.color.b); drawSmallCircle(); // Rysujemy małe koło reprezentujące kulę diff --git a/zadanie-3/zadanie-3 b/zadanie-3/zadanie-3 index 053950d..efa5ad1 100755 Binary files a/zadanie-3/zadanie-3 and b/zadanie-3/zadanie-3 differ