BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made debug camera detect UI focus properly

Browse Source
This commit is contained in:
sippeangelo
2015-12-13 23:39:59 +01:00
parent 7bc492134d
commit b8620eac26
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/DebugCameraInputController.h
+4 -2
View File
@@ -14,9 +14,11 @@ public:
virtual bool OnCommand(const Events::InputCommand& e) override virtual bool OnCommand(const Events::InputCommand& e) override
{ {
ImGuiIO& io = ImGui::GetIO();
if (e.Command == "PrimaryFire") { if (e.Command == "PrimaryFire") {
if (e.Value > 0) { if (e.Value > 0) {
if (!ImGui::IsMouseHoveringAnyWindow()) { if (!io.WantCaptureMouse) {
LockMouse(); LockMouse();
} }
} else { } else {
@@ -25,7 +27,7 @@ public:
return false; return false;
} }
if (m_MouseLocked || e.Value == 0) { if (!io.WantCaptureKeyboard) {
if (e.Command == "Right") { if (e.Command == "Right") {
float value = std::max(-1.f, std::min(e.Value, 1.f)); float value = std::max(-1.f, std::min(e.Value, 1.f));
m_Velocity.x = value; m_Velocity.x = value;