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

adopt engine stuff to new update strategy

Browse Source
This commit is contained in:
Green Sky
2020-12-26 19:29:39 +01:00
parent c1ae30c89c
commit 840b663d5e
28 changed files with 351 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,8 @@
#include <imgui/imgui.h>
#include <imgui_impl_sdl.h>
#include <entt/core/hashed_string.hpp>
#ifdef MM_OPENGL_3
#include <imgui_impl_opengl3.h>
#endif
@ -102,12 +104,6 @@ bool ImGuiService::enable(Engine& engine) {
return false;
});
_new_frame_handle = engine.addUpdate([this](Engine& e) { this->imgui_new_frame(e); });
assert(!_new_frame_handle.expired());
auto tmp_lock = _new_frame_handle.lock();
tmp_lock->priority = 90; // after sdl events (100)
tmp_lock->name = "imgui new frame";
return true;
}
@ -115,8 +111,6 @@ void ImGuiService::disable(Engine& engine) {
auto& sdl_ss = engine.getService<MM::Services::SDLService>();
sdl_ss.removeEventHandler(_event_handle);
engine.removeUpdate(_new_frame_handle);
ImGui::EndFrame(); // making sure, does not work????
#ifdef MM_OPENGL_3
@ -126,6 +120,19 @@ void ImGuiService::disable(Engine& engine) {
ImGui::DestroyContext();
}
std::vector<UpdateStrategies::UpdateCreationInfo> ImGuiService::registerUpdates(void) {
return {
{
"ImGuiService::new_frame"_hs,
"ImGuiService::new_frame",
[this](Engine& e) { this->imgui_new_frame(e); },
UpdateStrategies::update_phase_t::PRE,
true,
{"SDLService::events"_hs}
}
};
}
void ImGuiService::imgui_new_frame(Engine& engine) {
ZoneScopedN("MM::Services::ImGuiService::imgui_new_frame");

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

@ -12,7 +12,6 @@ namespace MM::Services {
MM::Services::SDLService::EventHandlerHandle _event_handle = nullptr;
// new frame needs to start AFTER the events have been processed (and obv bf rendt)
MM::Engine::FunctionDataHandle _new_frame_handle;
public:
bool enable(Engine& engine) override;
@ -20,6 +19,8 @@ namespace MM::Services {
const char* name(void) override { return "ImGuiService"; }
std::vector<UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override;
private:
void imgui_new_frame(Engine& engine);
};

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

@ -179,8 +179,6 @@ namespace MM::Services {
_entity_editor.registerComponent<MM::Components::OpenGL::Texture>("Texture");
}
_render_handle = engine.addUpdate([this](Engine& e){ this->renderImGui(e); });
auto* sdl_ss = engine.tryService<MM::Services::SDLService>();
if (sdl_ss) {
_event_handle = sdl_ss->addEventHandler([this](const SDL_Event& e) -> bool {
@ -197,11 +195,6 @@ namespace MM::Services {
}
void ImGuiSceneToolsService::disable(Engine& engine) {
if (!_render_handle.expired()) {
engine.removeUpdate(_render_handle);
_render_handle.reset();
}
if (_event_handle) {
auto* sdl_ss = engine.tryService<MM::Services::SDLService>();
sdl_ss->removeEventHandler(_event_handle);
@ -209,5 +202,14 @@ namespace MM::Services {
}
}
std::vector<UpdateStrategies::UpdateCreationInfo> ImGuiSceneToolsService::registerUpdates(void) {
return {
{
"ImGuiSceneToolsService::render"_hs,
"ImGuiSceneToolsService::render",
[this](Engine& e){ renderImGui(e); }
}
};
}
} // namespace MM::Services

4
framework/imgui/src/mm/services/scene_tools.hpp
View File

@ -32,7 +32,6 @@ namespace MM::Services {
std::vector<MM::FileTextEditor> _text_editor_list;
Engine::FunctionDataHandle _render_handle;
MM::Services::SDLService::EventHandlerHandle _event_handle = nullptr;
private:
@ -47,6 +46,9 @@ namespace MM::Services {
void disable(Engine& engine) override;
const char* name(void) override { return "ImGuiSceneToolsService"; }
std::vector<UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override;
};
} // namespace MM::Services