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

42
framework/input/test/input_visualizer.cpp
View File

@ -1,7 +1,4 @@
#include <gtest/gtest.h>
#include <mm/engine.hpp>
#include <mm/services/input_service.hpp>
#include <mm/services/sdl_service.hpp>
#include <mm/services/filesystem.hpp>
@ -10,7 +7,7 @@
#include <mm/opengl/render_tasks/imgui.hpp>
#include <mm/imgui/fps_overlay.hpp>
#include <entt/core/hashed_string.hpp>
#include <imgui/imgui.h>
@ -18,10 +15,11 @@
class InputVisualizer : public MM::Services::Service {
private:
MM::Input::PlayerID _player_id;
MM::Engine::FunctionDataHandle _render_handle;
MM::Services::SDLService::EventHandlerHandle _event_handle = nullptr;
public:
const char* name(void) override { return "InputVisualizer"; }
bool enable(MM::Engine& engine) override {
_player_id = UINT16_MAX;
@ -42,19 +40,26 @@ class InputVisualizer : public MM::Services::Service {
}
}
_render_handle = engine.addUpdate([this](MM::Engine& e){ this->renderImGui(e); });
return true;
}
void disable(MM::Engine& engine) override {
if (!_render_handle.expired()) {
engine.removeUpdate(_render_handle);
_render_handle.reset();
}
void disable(MM::Engine&) override {
}
std::vector<MM::UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override {
return {
{
"InputVisualizer::render"_hs,
"InputVisualizer::render",
[this](MM::Engine& e){ this->renderImGui(e); },
MM::UpdateStrategies::update_phase_t::MAIN,
true,
{ "InputService::update"_hs }
}
};
}
private:
void renderImGui(MM::Engine& engine) {
ImGui::Begin("InputVisualizer", NULL, ImGuiWindowFlags_AlwaysAutoResize);
@ -146,16 +151,7 @@ TEST(input_service, input_visualizer) {
rs.addRenderTask<MM::OpenGL::RenderTasks::ImGuiRT>(engine);
{
MM::ImGuiSimpleFPSOverlay fps_overlay;
engine.addUpdate([&](MM::Engine&) {
fps_overlay.renderImGui();
}
);
engine.run();
}
engine.run();
sdl_ss.destroyWindow();
}