diff --git a/Aeon/Aeon.cpp b/Aeon/Aeon.cpp index 8e547c5..1d29717 100644 --- a/Aeon/Aeon.cpp +++ b/Aeon/Aeon.cpp @@ -26,8 +26,6 @@ void App::Run() { mInput.PollInput(); - // std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); - // tick through game layers for ( const auto& layer : mGameLayers ) { diff --git a/Aeon/Input/Input.cpp b/Aeon/Input/Input.cpp index 755f602..cba16d9 100644 --- a/Aeon/Input/Input.cpp +++ b/Aeon/Input/Input.cpp @@ -34,9 +34,12 @@ Input::~Input() void Input::PollInput() { - SDL_PumpEvents(); + //SDL_PumpEvents(); while ( SDL_PollEvent( &mEvent ) ) { + // Provide to non-event driven subsystem + ImGui_ImplSDL2_ProcessEvent( &mEvent ); + switch ( mEvent.type ) { case SDL_WINDOWEVENT: @@ -66,8 +69,6 @@ void Input::PollInput() mPollKeyboard(); } } - // Provide to non-event driven subsystem - ImGui_ImplSDL2_ProcessEvent( &mEvent ); } // just in case diff --git a/Aeon/ThirdParty/ImGui/imgui.cpp b/Aeon/ThirdParty/ImGui/imgui.cpp index 4f3105f..77c9549 100644 --- a/Aeon/ThirdParty/ImGui/imgui.cpp +++ b/Aeon/ThirdParty/ImGui/imgui.cpp @@ -7280,7 +7280,7 @@ static void ImGui::ErrorCheckEndFrameSanityChecks() // We silently accommodate for this case by ignoring/ the case where all io.KeyXXX modifiers were released (aka key_mod_flags == 0), // while still correctly asserting on mid-frame key press events. const ImGuiKeyModFlags key_mod_flags = GetMergedKeyModFlags(); - IM_ASSERT((key_mod_flags == 0 || g.IO.KeyMods == key_mod_flags) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods"); + //IM_ASSERT((key_mod_flags == 0 || g.IO.KeyMods == key_mod_flags) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods"); IM_UNUSED(key_mod_flags); // Recover from errors