adopt engine stuff to new update strategy

framework/input/src/mm/services/input_service.cpp

@@ -1,5 +1,7 @@
 #include "./input_service.hpp"
 
+#include <entt/core/hashed_string.hpp>
+
 #include <glm/common.hpp>
 #include <glm/geometric.hpp>
 #include <glm/trigonometric.hpp>
@@ -88,24 +90,6 @@ bool InputService::enable(Engine& engine) {
 		return false;
 	}
 
-	_update_handle = engine.addFixedUpdate([this](MM::Engine&) {
-		for (size_t i = 0; i < 4; i++) {
-			if (!_player_active[i])
-				continue;
-
-			auto& p = _player[i];
-			if (p.is_controller) {
-			} else {
-				updateKPlayerDirs(p);
-			}
-		}
-	});
-	if (_update_handle.expired()) {
-		LOG_ERROR("couldnt register update handler!");
-		return false;
-	}
-	_update_handle.lock()->priority = 1; // scene is 0
-
 	return true;
 }
 
@@ -119,12 +103,27 @@ void InputService::disable(Engine& engine) {
 
 		sdl_ss->removeEventHandler(_event_handle);
 	}
+}
 
-	if (!_update_handle.expired()) {
-		engine.removeFixedUpdate(_update_handle);
-		_update_handle.reset();
-	}
+std::vector<UpdateStrategies::UpdateCreationInfo> InputService::registerUpdates(void) {
+	return {
+		{
+			"InputService::update"_hs,
+			"InputService::update",
+			[this](MM::Engine&) {
+				for (size_t i = 0; i < 4; i++) {
+					if (!_player_active[i])
+						continue;
 
+					auto& p = _player[i];
+					if (p.is_controller) {
+					} else {
+						updateKPlayerDirs(p);
+					}
+				}
+			}
+		}
+	};
 }
 
 bool InputService::handleSDL_Event(const SDL_Event& e, MM::Engine& engine) {

framework/input/src/mm/services/input_service.hpp

@@ -16,7 +16,7 @@ namespace MM::Services {
 
 	class InputService : public Service {
 		public:
-			// TDO: rework
+			// TODO: rework
 			enum input_action_t {
 				SPELL_WEAPON,
 				SPELL_1,
@@ -106,8 +106,6 @@ namespace MM::Services {
 
 		private:
 			SDLService::EventHandlerHandle _event_handle = nullptr;
-			MM::Engine::FunctionDataHandle _update_handle;
-
 
 		public:
 			bool enable(Engine& engine) override;
@@ -115,6 +113,10 @@ namespace MM::Services {
 
 			const char* name(void) override { return "InputService"; }
 
+			// you will likely want to make the scene depend on this
+			std::vector<UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override;
+
+		public:
 			// returns true if event was relevant
 			bool handleSDL_Event(const SDL_Event& e, MM::Engine& engine);
 

framework/input/test/input_visualizer.cpp

@@ -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();
 }