MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-20 19:56:37 +02:00
Code Issues Projects Releases Wiki Activity

fix entt update

Browse Source
This commit is contained in:
Green Sky
2020-12-12 18:21:45 +01:00
parent f62ed43209
commit 1d59003858
26 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
framework/imgui/src/mm/services/imgui_s.cpp
View File

@ -65,44 +65,9 @@ bool ImGuiService::enable(Engine& engine) {
#endif
}
// TODO: register event handle
_event_handle = sdl_ss.addEventHandler([](const SDL_Event& e) {
if (!ImGui_ImplSDL2_ProcessEvent(&e)) {
return false; // if the event was not relevant to imgui anyway
}
auto& io = ImGui::GetIO();
// keyboard
if ((
e.type == SDL_KEYDOWN ||
e.type == SDL_KEYUP ||
e.type == SDL_TEXTEDITING ||
e.type == SDL_TEXTINPUT
)
&& io.WantCaptureKeyboard) {
return true;
}
// mouse
if ((
e.type == SDL_MOUSEMOTION ||
e.type == SDL_MOUSEBUTTONUP ||
e.type == SDL_MOUSEBUTTONDOWN ||
e.type == SDL_MOUSEWHEEL // ????
)
&& io.WantCaptureMouse) {
return true;
}
//// controller ???
//if ((
//e.type == SDL_CONTROLLERBUTTONUP ||
//e.type == SDL_CONTROLLERBUTTONDOWN
//)[>
//&& io.WantCaptureKeyboard*/) {
//return false;
//}
return false;
});
_event_handle = sdl_ss.addEventHandler(
[this](const SDL_Event& e) { return handle_sdl_event(e); }
);
return true;
}
@ -121,6 +86,7 @@ void ImGuiService::disable(Engine& engine) {
}
std::vector<UpdateStrategies::UpdateCreationInfo> ImGuiService::registerUpdates(void) {
using namespace entt::literals;
return {
{
"ImGuiService::new_frame"_hs,
@ -144,5 +110,43 @@ void ImGuiService::imgui_new_frame(Engine& engine) {
ImGui::NewFrame();
}
bool ImGuiService::handle_sdl_event(const SDL_Event& e) {
if (!ImGui_ImplSDL2_ProcessEvent(&e)) {
return false; // if the event was not relevant to imgui anyway
}
auto& io = ImGui::GetIO();
// keyboard
if ((
e.type == SDL_KEYDOWN ||
e.type == SDL_KEYUP ||
e.type == SDL_TEXTEDITING ||
e.type == SDL_TEXTINPUT
)
&& io.WantCaptureKeyboard) {
return true;
}
// mouse
if ((
e.type == SDL_MOUSEMOTION ||
e.type == SDL_MOUSEBUTTONUP ||
e.type == SDL_MOUSEBUTTONDOWN ||
e.type == SDL_MOUSEWHEEL // ????
)
&& io.WantCaptureMouse) {
return true;
}
//// controller ???
//if ((
//e.type == SDL_CONTROLLERBUTTONUP ||
//e.type == SDL_CONTROLLERBUTTONDOWN
//)[>
//&& io.WantCaptureKeyboard*/) {
//return false;
//}
return false;
}
} // namespace MM::Services

2
framework/imgui/src/mm/services/imgui_s.hpp
View File

@ -23,6 +23,8 @@ namespace MM::Services {
private:
void imgui_new_frame(Engine& engine);
bool handle_sdl_event(const SDL_Event& e);
};
} // namespace MM::Services

1
framework/imgui/src/mm/services/scene_tools.cpp
View File

@ -203,6 +203,7 @@ namespace MM::Services {
}
std::vector<UpdateStrategies::UpdateCreationInfo> ImGuiSceneToolsService::registerUpdates(void) {
using namespace entt::literals;
return {
{
"ImGuiSceneToolsService::render"_hs,