diff --git a/Editor/src/Windows/EditorInterface.cpp b/Editor/src/Windows/EditorInterface.cpp index abba4092..1395f23f 100644 --- a/Editor/src/Windows/EditorInterface.cpp +++ b/Editor/src/Windows/EditorInterface.cpp @@ -250,8 +250,7 @@ namespace Nuake { JobSystem::Get().Dispatch([]() { Nuake::ScriptingEngineNet::Get().BuildProjectAssembly(Engine::GetProject()); - }, - []() {} + }, []() {} ); } @@ -1884,17 +1883,17 @@ namespace Nuake { if (ImGui::Begin("Example: Simple overlay", &m_ShowOverlay, window_flags)) { ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 100); - if (ImGui::Button(ICON_FA_ARROWS_ALT) || Input::IsKeyPressed(GLFW_KEY_W)) + if (ImGui::Button(ICON_FA_ARROWS_ALT) || Input::IsKeyDown(GLFW_KEY_W)) { CurrentOperation = ImGuizmo::OPERATION::TRANSLATE; } ImGui::SameLine(); - if (ImGui::Button(ICON_FA_SYNC_ALT) || Input::IsKeyPressed(GLFW_KEY_E)) + if (ImGui::Button(ICON_FA_SYNC_ALT) || Input::IsKeyDown(GLFW_KEY_E)) { CurrentOperation = ImGuizmo::OPERATION::ROTATE; } ImGui::SameLine(); - if (ImGui::Button(ICON_FA_EXPAND_ALT) || Input::IsKeyPressed(GLFW_KEY_R)) + if (ImGui::Button(ICON_FA_EXPAND_ALT) || Input::IsKeyDown(GLFW_KEY_R)) { CurrentOperation = ImGuizmo::OPERATION::SCALE; } @@ -1915,7 +1914,7 @@ namespace Nuake { ImGui::SetNextWindowViewport(viewport->ID); ImGui::SetNextWindowBgAlpha(0.35f); // Transparent background ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 32.0f); - ImGui::SetNextWindowSize(ImVec2(25, ImGui::GetContentRegionAvail().y - DISTANCE * 2.0 - 30.0)); + ImGui::SetNextWindowSize(ImVec2(16, ImGui::GetContentRegionAvail().y - DISTANCE * 2.0 - 30.0)); if (ImGui::Begin("Controls", &m_ShowOverlay, window_flags)) { const auto& editorCam = Engine::GetCurrentScene()->m_EditorCamera; @@ -1923,13 +1922,13 @@ namespace Nuake { const float maxSpeed = 50.0f; const float minSpeed = 0.1f; - const float normalizedSpeed = camSpeed / maxSpeed; + const float normalizedSpeed = glm::clamp(camSpeed / maxSpeed, 0.0f, 1.0f); - ImVec2 start = ImGui::GetWindowPos() - ImVec2(0.0, 15.0) ; - ImVec2 end = start + ImGui::GetWindowSize() - ImVec2(0, 10.0); - ImVec2 startOffset = ImVec2(start.x , end.y - (normalizedSpeed * (ImGui::GetWindowHeight() -10.0))); + ImVec2 start = ImGui::GetWindowPos() - ImVec2(0.0, 4.0) ; + ImVec2 end = start + ImGui::GetWindowSize() - ImVec2(0, 16.0); + ImVec2 startOffset = ImVec2(start.x , end.y - (normalizedSpeed * (ImGui::GetWindowHeight() - 15.0))); - ImGui::GetWindowDrawList()->AddRectFilled(startOffset + ImVec2(0, 10.0), end + ImVec2(0.0, 15.0), IM_COL32(255, 255, 255, 180), 32.0f); + ImGui::GetWindowDrawList()->AddRectFilled(startOffset + ImVec2(0, 10.0), end + ImVec2(0.0, 15.0), IM_COL32(255, 255, 255, 180), 8.0f, ImDrawFlags_RoundCornersAll); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 100); ImGui::PopStyleVar(); }