cleanup includes, primarily artifacts of the updatestrat refactor

framework/imgui/src/mm/imgui/widgets/components/transform2d.cpp

@@ -1,5 +1,4 @@
 #include "./transform2d.hpp"
-#include "mm/components/transform2d.hpp"
 
 #include <imgui/imgui.h>
 

framework/imgui/src/mm/services/engine_tools.cpp

@@ -184,6 +184,7 @@ bool ImGuiEngineTools::enable(Engine& engine, std::vector<UpdateStrategies::Task
 	task_array.push_back(
 		UpdateStrategies::TaskInfo{"ImGuiEngineTools::render"}
 		.fn([this](Engine& e){ renderImGui(e); })
+		.phase(UpdateStrategies::update_phase_t::PRE)
 		.succeed("ImGuiMenuBar::render")
 	);
 

framework/imgui/src/mm/services/imgui_menu_bar.cpp

@@ -1,8 +1,6 @@
 #include "./imgui_menu_bar.hpp"
-#include "mm/services/service.hpp"
 
 #include <mm/engine.hpp>
-#include <entt/core/hashed_string.hpp>
 
 #include <imgui/imgui.h>
 
@@ -37,6 +35,8 @@ namespace MM::Services {
 		task_array.push_back(
 			UpdateStrategies::TaskInfo{"ImGuiMenuBar::render"}
 			.fn([this](Engine& e){ renderImGui(e); })
+			.phase(UpdateStrategies::update_phase_t::PRE)
+			.succeed("ImGuiService::new_frame")
 		);
 
 		return true;

framework/imgui/src/mm/services/imgui_s.cpp

@@ -1,12 +1,8 @@
 #include "./imgui_s.hpp"
-#include "mm/services/service.hpp"
-#include "mm/update_strategies/update_strategy.hpp"
 
 #include <imgui/imgui.h>
 #include <imgui/backends/imgui_impl_sdl.h>
 
-#include <entt/core/hashed_string.hpp>
-
 #ifdef MM_OPENGL_3
 #include <imgui/backends/imgui_impl_opengl3.h>
 #endif

framework/imgui/src/mm/services/scene_tools.cpp

@@ -5,15 +5,15 @@
 //#include <mm/resource_manager.hpp>
 
 #include <mm/engine.hpp>
-#include "./imgui_menu_bar.hpp"
-#include "mm/components/time_delta.hpp"
-#include "mm/services/service.hpp"
+
+#include <mm/services/imgui_menu_bar.hpp>
 
 #include <imgui/imgui.h>
 
 #include <mm/components/name.hpp>
 #include <mm/components/transform2d.hpp>
 #include <mm/components/velocity2d.hpp>
+#include <mm/components/time_delta.hpp>
 
 //#include <mm/imgui/widgets/texture_resource_manager.hpp>
 #include <mm/imgui/widgets/entity.hpp>
@@ -87,6 +87,7 @@ namespace MM::Services {
 		task_array.push_back(
 			UpdateStrategies::TaskInfo{"ImGuiSceneToolsService::render"}
 			.fn([this](Engine& e){ renderImGui(e); })
+			.phase(UpdateStrategies::update_phase_t::PRE)
 			.succeed("ImGuiMenuBar::render")
 		);
 

framework/imgui/src/mm/services/scene_tools.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "mm/services/service.hpp"
+#include <mm/services/service.hpp>
+
 #define MM_IEEE_ENTITY_WIDGET ::MM::ImGuiWidgets::Entity // evil
 #define MM_IEEE_ASSERT(x)
 #include <mm/imgui/widgets/entity.hpp>

framework/imgui/src/mm/services/sound_tools.cpp

@@ -1,13 +1,11 @@
 #include "./sound_tools.hpp"
-#include <mm/imgui/sound_info.hpp>
 
 #include <mm/engine.hpp>
-#include <entt/core/hashed_string.hpp>
+#include <mm/services/sound_service.hpp>
+#include <mm/imgui/sound_info.hpp>
 
 #include <imgui/imgui.h>
 
-#include <mm/services/sound_service.hpp>
-
 #include <mm/logger.hpp>
 #define LOGIGS(x) LOG("ImGuiSceneToolsService", x)
 
@@ -39,6 +37,7 @@ namespace MM::Services {
 		task_array.push_back(
 			UpdateStrategies::TaskInfo{"ImGuiSoundTools::render"}
 			.fn([this](Engine& e){ renderImGui(e); })
+			.phase(UpdateStrategies::update_phase_t::PRE)
 			.succeed("ImGuiMenuBar::render")
 		);
 

framework/imgui/src/mm/services/sound_tools.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "./imgui_menu_bar.hpp"
-#include "mm/services/service.hpp"
 
 namespace MM::Services {
 

framework/imgui/test/engine_tools_test.cpp

@@ -1,4 +1,3 @@
-#include "mm/services/imgui_menu_bar.hpp"
 #include <gtest/gtest.h>
 
 #include <mm/engine.hpp>
@@ -6,12 +5,12 @@
 #include <mm/services/sdl_service.hpp>
 #include <mm/services/filesystem.hpp>
 #include <mm/services/imgui_s.hpp>
+#include <mm/services/imgui_menu_bar.hpp>
+#include <mm/services/engine_tools.hpp>
 
 #include <mm/services/opengl_renderer.hpp>
 #include <mm/opengl/render_tasks/imgui.hpp>
 
-#include <mm/services/engine_tools.hpp>
-
 static char* argv0;
 
 TEST(imgui_scene_tools, it) {

framework/imgui/test/sound_test.cpp

@@ -1,10 +1,7 @@
-#include "mm/services/service.hpp"
 #include <gtest/gtest.h>
 
 #include <mm/engine.hpp>
 
-#include <entt/core/hashed_string.hpp>
-
 // services
 #include <mm/services/sdl_service.hpp>
 #include <mm/services/filesystem.hpp>

framework/imgui/test/text_edit_test.cpp

@@ -1,4 +1,3 @@
-#include "mm/services/service.hpp"
 #include <functional>
 #include <gtest/gtest.h>
 

framework/imgui/test/widget_test.cpp

@@ -1,10 +1,7 @@
-#include "mm/services/service.hpp"
 #include <gtest/gtest.h>
 
 #include <mm/engine.hpp>
 
-#include <entt/core/hashed_string.hpp>
-
 // services
 #include <mm/services/sdl_service.hpp>
 #include <mm/services/filesystem.hpp>