From defeb0347f7ddef5ccb679c42b3f15543d591896 Mon Sep 17 00:00:00 2001 From: Simon Tippe Date: Thu, 15 Feb 2024 23:45:04 +0100 Subject: [PATCH] Smaller improvements --- src/editor/ui/windows/SceneWindow.cpp | 4 +++- src/engine/input/Keyboard.cpp | 14 ++++++++++---- src/engine/input/Keyboard.h | 1 + src/engine/physics/Player.h | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/editor/ui/windows/SceneWindow.cpp b/src/editor/ui/windows/SceneWindow.cpp index caea6a02f..b315cbbd4 100644 --- a/src/editor/ui/windows/SceneWindow.cpp +++ b/src/editor/ui/windows/SceneWindow.cpp @@ -69,9 +69,11 @@ namespace Atlas::Editor::UI { return; ImGuiID dsID = ImGui::GetID(dockSpaceNameID.c_str()); - auto viewport = ImGui::GetWindowViewport(); if (!ImGui::DockBuilderGetNode(dsID) || resetDockingLayout) { + ImGui::SetWindowSize(ImVec2(640, 480), ImGuiCond_FirstUseEver); + + auto viewport = ImGui::GetWindowViewport(); ImGui::DockBuilderRemoveNode(dsID); ImGui::DockBuilderAddNode(dsID, ImGuiDockNodeFlags_DockSpace); diff --git a/src/engine/input/Keyboard.cpp b/src/engine/input/Keyboard.cpp index 115f4142d..0f9ad59b9 100644 --- a/src/engine/input/Keyboard.cpp +++ b/src/engine/input/Keyboard.cpp @@ -76,10 +76,8 @@ namespace Atlas { interpolatedLinearVelocity = glm::mix(interpolatedLinearVelocity, linearVelocity, progress); - auto velocity = interpolatedLinearVelocity * player.slowVelocity; - - if (glm::length(velocity) > 0.0f) - Log::Warning("Velocity greater zero: " + std::to_string(glm::length(velocity))); + auto velocity = fast ? interpolatedLinearVelocity * player.fastVelocity : + interpolatedLinearVelocity * player.slowVelocity; player.SetInputVelocity(velocity); if (jump) @@ -153,6 +151,14 @@ namespace Atlas { if (event.keyCode == AE_KEY_SPACE && event.state == AE_BUTTON_RELEASED) { jump = false; } + + if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_PRESSED) { + fast = true; + } + + if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_RELEASED) { + fast = false; + } } diff --git a/src/engine/input/Keyboard.h b/src/engine/input/Keyboard.h index b9d647cb6..2136cb7a5 100644 --- a/src/engine/input/Keyboard.h +++ b/src/engine/input/Keyboard.h @@ -41,6 +41,7 @@ namespace Atlas { vec3 movement = vec3(0.0f); bool jump = false; + bool fast = false; int32_t eventHandle = -1; diff --git a/src/engine/physics/Player.h b/src/engine/physics/Player.h index 4813a6ad7..4906c370c 100644 --- a/src/engine/physics/Player.h +++ b/src/engine/physics/Player.h @@ -18,7 +18,7 @@ namespace Atlas::Physics { float mass = 75.0f; float maxStrength = 100.0f; - float predictiveContactDistance = 0.01f; + float predictiveContactDistance = 0.1f; float shapePadding = 0.02f; vec3 shapeOffset;