MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-19 11:16: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

6
framework/imgui/src/mm/imgui/imgui_entt_entity_editor.hpp
View File

@ -94,9 +94,9 @@ public:
ComponentInfo& registerComponent(const ComponentInfo& component_info)
{
auto index = entt::type_hash<Component>::value();
auto [it, insert_result] = component_infos.insert_or_assign(index, component_info);
MM_IEEE_ASSERT(insert_result);
return std::get<ComponentInfo>(*it);
auto insert_info = component_infos.insert_or_assign(index, component_info);
MM_IEEE_ASSERT(insert_info.second);
return std::get<ComponentInfo>(*insert_info.first);
}
template <class Component>

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,

2
framework/imgui/test/scene_tools_test.cpp
View File

@ -16,6 +16,8 @@
static char* argv0;
using namespace entt::literals;
TEST(imgui_scene_tools, it) {
MM::Engine engine;

2
framework/imgui/test/sound_test.cpp
View File

@ -27,6 +27,8 @@
const char* argv0;
using namespace entt::literals;
class ImGuiSpeechy : public MM::Services::Service {
private:
SoLoud::Speech speech;

1
framework/imgui/test/text_edit_test.cpp
View File

@ -22,6 +22,7 @@
static char* argv0;
using namespace entt::literals;
class TemplateUpdateMainService : public MM::Services::Service {
std::function<void(MM::Engine&)> _fn;

2
framework/imgui/test/widget_test.cpp
View File

@ -18,6 +18,8 @@
const char* argv0;
using namespace entt::literals;
TEST(imgui_widgets, basic) {
MM::Engine engine;