diff --git a/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp b/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp index ff13ba8..baadedd 100644 --- a/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp +++ b/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp @@ -131,6 +131,18 @@ void Rubiks::run() { ImGui::SliderFloat("cam y", &camPos.y, -10.0f, 10.0f); ImGui::SliderFloat("cam z", &camPos.z, -10.0f, 10.0f); + ImGui::Text("Rubiks Cube Properties"); + + ImGui::SliderFloat("cube pitch", &rot.x, -glm::pi(), glm::pi()); + ImGui::SliderFloat("cube yaw", &rot.y, 0, 2 * glm::pi()); + ImGui::SliderFloat("cube roll", &rot.z, -glm::pi(), glm::pi()); + + ImGui::SliderFloat("cube x", &pos.x, -10.0f, 10.0f); + ImGui::SliderFloat("cube y", &pos.y, -10.0f, 10.0f); + ImGui::SliderFloat("cube z", &pos.z, -10.0f, 10.0f); + + ImGui::SliderFloat("cube scale", &scale, 0.01f, 10.0f); + if(ImGui::Button("Reset Window Size")) { app->emitEvent(new Archimedes::ResizeWindowEvent(500, 500)); @@ -172,12 +184,6 @@ bool Rubiks::onEvent(const Archimedes::Event& e) { //camera.moveRel(glm::vec3(0.0f, 0.0f, event.dy)); - for(auto& b : rubiksCube.getBlocks()) { - b.scaleAdd(0.1f * event.dy); - std::cout << b.getScale() << std::endl; - } - - std::cout << std::endl; return true; } else if(type == app->getEventType(Archimedes::MouseMovedWindowEvent()) && !io.WantCaptureMouse) {