From 1248957a18805f6dffdb2a97ed04f02f693bfb53 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Mon, 17 May 2021 01:35:35 +0200 Subject: [PATCH] cleanup includes, primarily artifacts of the updatestrat refactor --- .../filesystem/src/mm/services/filesystem.hpp | 7 ++----- .../mm/imgui/widgets/components/transform2d.cpp | 1 - framework/imgui/src/mm/services/engine_tools.cpp | 1 + .../imgui/src/mm/services/imgui_menu_bar.cpp | 4 ++-- framework/imgui/src/mm/services/imgui_s.cpp | 4 ---- framework/imgui/src/mm/services/scene_tools.cpp | 7 ++++--- framework/imgui/src/mm/services/scene_tools.hpp | 3 ++- framework/imgui/src/mm/services/sound_tools.cpp | 7 +++---- framework/imgui/src/mm/services/sound_tools.hpp | 1 - framework/imgui/test/engine_tools_test.cpp | 5 ++--- framework/imgui/test/sound_test.cpp | 3 --- framework/imgui/test/text_edit_test.cpp | 1 - framework/imgui/test/widget_test.cpp | 3 --- framework/input/src/mm/services/input_service.cpp | 2 -- framework/input/src/mm/services/input_service.hpp | 1 - framework/input/test/input_visualizer.cpp | 3 --- .../src/mm/services/opengl_renderer.cpp | 1 - .../src/mm/services/opengl_renderer_tools.cpp | 15 ++++++++------- .../test/blur_render_task_test.cpp | 4 ++-- .../test/fast_sky_render_task_test.cpp | 3 ++- .../test/imgui_render_task_test.cpp | 3 --- .../src/mm/services/organizer_scene.hpp | 2 -- framework/screen_director/CMakeLists.txt | 3 --- .../src/mm/services/screen_director.cpp | 4 ---- .../sdl_service/src/mm/services/sdl_service.cpp | 4 ---- .../simple_scene/src/mm/services/simple_scene.cpp | 2 -- .../simple_scene/src/mm/services/simple_scene.hpp | 1 - .../src/mm/services/simple_sdl_renderer.cpp | 3 --- .../src/mm/services/simple_sdl_renderer.hpp | 1 - 29 files changed, 28 insertions(+), 71 deletions(-) diff --git a/framework/filesystem/src/mm/services/filesystem.hpp b/framework/filesystem/src/mm/services/filesystem.hpp index f53ffc6..cf55652 100644 --- a/framework/filesystem/src/mm/services/filesystem.hpp +++ b/framework/filesystem/src/mm/services/filesystem.hpp @@ -1,10 +1,5 @@ #pragma once -#include "mm/services/service.hpp" -#include "mm/update_strategies/update_strategy.hpp" -#include -#include - //#include //fwd typedef struct PHYSFS_File PHYSFS_File; @@ -14,6 +9,8 @@ typedef struct PHYSFS_Stat PHYSFS_Stat; #include +#include + namespace MM::Services { class FilesystemService : public Service { diff --git a/framework/imgui/src/mm/imgui/widgets/components/transform2d.cpp b/framework/imgui/src/mm/imgui/widgets/components/transform2d.cpp index 64decc2..0904be9 100644 --- a/framework/imgui/src/mm/imgui/widgets/components/transform2d.cpp +++ b/framework/imgui/src/mm/imgui/widgets/components/transform2d.cpp @@ -1,5 +1,4 @@ #include "./transform2d.hpp" -#include "mm/components/transform2d.hpp" #include diff --git a/framework/imgui/src/mm/services/engine_tools.cpp b/framework/imgui/src/mm/services/engine_tools.cpp index 08b5805..91a0128 100644 --- a/framework/imgui/src/mm/services/engine_tools.cpp +++ b/framework/imgui/src/mm/services/engine_tools.cpp @@ -184,6 +184,7 @@ bool ImGuiEngineTools::enable(Engine& engine, std::vector -#include #include @@ -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; diff --git a/framework/imgui/src/mm/services/imgui_s.cpp b/framework/imgui/src/mm/services/imgui_s.cpp index 0fbd5a4..eb503b6 100644 --- a/framework/imgui/src/mm/services/imgui_s.cpp +++ b/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 #include -#include - #ifdef MM_OPENGL_3 #include #endif diff --git a/framework/imgui/src/mm/services/scene_tools.cpp b/framework/imgui/src/mm/services/scene_tools.cpp index a20e278..2a06e1d 100644 --- a/framework/imgui/src/mm/services/scene_tools.cpp +++ b/framework/imgui/src/mm/services/scene_tools.cpp @@ -5,15 +5,15 @@ //#include #include -#include "./imgui_menu_bar.hpp" -#include "mm/components/time_delta.hpp" -#include "mm/services/service.hpp" + +#include #include #include #include #include +#include //#include #include @@ -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") ); diff --git a/framework/imgui/src/mm/services/scene_tools.hpp b/framework/imgui/src/mm/services/scene_tools.hpp index 0a22f26..76462e7 100644 --- a/framework/imgui/src/mm/services/scene_tools.hpp +++ b/framework/imgui/src/mm/services/scene_tools.hpp @@ -1,6 +1,7 @@ #pragma once -#include "mm/services/service.hpp" +#include + #define MM_IEEE_ENTITY_WIDGET ::MM::ImGuiWidgets::Entity // evil #define MM_IEEE_ASSERT(x) #include diff --git a/framework/imgui/src/mm/services/sound_tools.cpp b/framework/imgui/src/mm/services/sound_tools.cpp index 7e6dfd8..69b8ca7 100644 --- a/framework/imgui/src/mm/services/sound_tools.cpp +++ b/framework/imgui/src/mm/services/sound_tools.cpp @@ -1,13 +1,11 @@ #include "./sound_tools.hpp" -#include #include -#include +#include +#include #include -#include - #include #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") ); diff --git a/framework/imgui/src/mm/services/sound_tools.hpp b/framework/imgui/src/mm/services/sound_tools.hpp index f158332..a343ed0 100644 --- a/framework/imgui/src/mm/services/sound_tools.hpp +++ b/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 { diff --git a/framework/imgui/test/engine_tools_test.cpp b/framework/imgui/test/engine_tools_test.cpp index 9ea00c5..56ccd1b 100644 --- a/framework/imgui/test/engine_tools_test.cpp +++ b/framework/imgui/test/engine_tools_test.cpp @@ -1,4 +1,3 @@ -#include "mm/services/imgui_menu_bar.hpp" #include #include @@ -6,12 +5,12 @@ #include #include #include +#include +#include #include #include -#include - static char* argv0; TEST(imgui_scene_tools, it) { diff --git a/framework/imgui/test/sound_test.cpp b/framework/imgui/test/sound_test.cpp index 3e029d6..34ae058 100644 --- a/framework/imgui/test/sound_test.cpp +++ b/framework/imgui/test/sound_test.cpp @@ -1,10 +1,7 @@ -#include "mm/services/service.hpp" #include #include -#include - // services #include #include diff --git a/framework/imgui/test/text_edit_test.cpp b/framework/imgui/test/text_edit_test.cpp index 03360bd..8607aeb 100644 --- a/framework/imgui/test/text_edit_test.cpp +++ b/framework/imgui/test/text_edit_test.cpp @@ -1,4 +1,3 @@ -#include "mm/services/service.hpp" #include #include diff --git a/framework/imgui/test/widget_test.cpp b/framework/imgui/test/widget_test.cpp index 0ff2a48..1559fe3 100644 --- a/framework/imgui/test/widget_test.cpp +++ b/framework/imgui/test/widget_test.cpp @@ -1,10 +1,7 @@ -#include "mm/services/service.hpp" #include #include -#include - // services #include #include diff --git a/framework/input/src/mm/services/input_service.cpp b/framework/input/src/mm/services/input_service.cpp index bf337ff..020d840 100644 --- a/framework/input/src/mm/services/input_service.cpp +++ b/framework/input/src/mm/services/input_service.cpp @@ -1,7 +1,5 @@ #include "./input_service.hpp" -#include - #include #include #include diff --git a/framework/input/src/mm/services/input_service.hpp b/framework/input/src/mm/services/input_service.hpp index 40db405..4534ef3 100644 --- a/framework/input/src/mm/services/input_service.hpp +++ b/framework/input/src/mm/services/input_service.hpp @@ -1,6 +1,5 @@ #pragma once -#include "mm/services/service.hpp" #include #include diff --git a/framework/input/test/input_visualizer.cpp b/framework/input/test/input_visualizer.cpp index 12c7a72..d457a7a 100644 --- a/framework/input/test/input_visualizer.cpp +++ b/framework/input/test/input_visualizer.cpp @@ -1,4 +1,3 @@ -#include "mm/services/service.hpp" #include #include @@ -9,8 +8,6 @@ #include -#include - #include class InputVisualizer : public MM::Services::Service { diff --git a/framework/opengl_renderer/src/mm/services/opengl_renderer.cpp b/framework/opengl_renderer/src/mm/services/opengl_renderer.cpp index f838000..43b4167 100644 --- a/framework/opengl_renderer/src/mm/services/opengl_renderer.cpp +++ b/framework/opengl_renderer/src/mm/services/opengl_renderer.cpp @@ -10,7 +10,6 @@ #include #include "../opengl/res/default_texture.h" // data #include "../opengl/res/errig_texture.h" // data -#include "mm/update_strategies/update_strategy.hpp" #include #ifndef MM_OPENGL_3_GLES diff --git a/framework/opengl_renderer/src/mm/services/opengl_renderer_tools.cpp b/framework/opengl_renderer/src/mm/services/opengl_renderer_tools.cpp index 5c34a03..1456ae8 100644 --- a/framework/opengl_renderer/src/mm/services/opengl_renderer_tools.cpp +++ b/framework/opengl_renderer/src/mm/services/opengl_renderer_tools.cpp @@ -11,20 +11,21 @@ namespace MM::Services { bool ImGuiOpenGLRendererTools::enable(Engine& engine, std::vector& task_array) { - auto& menu_bar = engine.getService(); + auto& menu_bar = engine.getService(); menu_bar.menu_tree["OpenGL"]["RenderTasks"] = [this](Engine&) { - ImGui::MenuItem("Render Tasks", NULL, &_show_render_tasks); - }; + ImGui::MenuItem("Render Tasks", NULL, &_show_render_tasks); + }; menu_bar.menu_tree["OpenGL"]["TextureCacheLegacy"] = [this](Engine&) { - ImGui::MenuItem("Texture Cache (legacy)", NULL, &_show_texture_cache_legacy); - }; + ImGui::MenuItem("Texture Cache (legacy)", NULL, &_show_texture_cache_legacy); + }; // add task task_array.push_back( UpdateStrategies::TaskInfo{"ImGuiOpenGLRendererTools::render"} .fn([this](Engine& e) { renderImGui(e); }) + .phase(UpdateStrategies::update_phase_t::PRE) .succeed("ImGuiMenuBar::render") ); @@ -34,8 +35,8 @@ bool ImGuiOpenGLRendererTools::enable(Engine& engine, std::vector(); - menu_bar.menu_tree["OpenGL"].erase("RenderTasks"); - menu_bar.menu_tree["OpenGL"].erase("TextureCacheLegacy"); + menu_bar.menu_tree["OpenGL"].erase("RenderTasks"); + menu_bar.menu_tree["OpenGL"].erase("TextureCacheLegacy"); } void ImGuiOpenGLRendererTools::renderImGui(Engine& engine) { diff --git a/framework/opengl_renderer/test/blur_render_task_test.cpp b/framework/opengl_renderer/test/blur_render_task_test.cpp index 05422ad..a6bfe7f 100644 --- a/framework/opengl_renderer/test/blur_render_task_test.cpp +++ b/framework/opengl_renderer/test/blur_render_task_test.cpp @@ -1,5 +1,3 @@ -#include "mm/opengl/render_tasks/clear.hpp" -#include "mm/opengl/render_tasks/copy_to_fb.hpp" #include #include @@ -12,6 +10,8 @@ #include +#include +#include #include #include #include diff --git a/framework/opengl_renderer/test/fast_sky_render_task_test.cpp b/framework/opengl_renderer/test/fast_sky_render_task_test.cpp index 9c1fcaa..6d6d016 100644 --- a/framework/opengl_renderer/test/fast_sky_render_task_test.cpp +++ b/framework/opengl_renderer/test/fast_sky_render_task_test.cpp @@ -1,4 +1,3 @@ -#include "mm/opengl/camera_3d.hpp" #include #include @@ -13,6 +12,8 @@ #include #include +#include + const char* argv0; TEST(fast_sky_render_task, it) { diff --git a/framework/opengl_renderer/test/imgui_render_task_test.cpp b/framework/opengl_renderer/test/imgui_render_task_test.cpp index 74170d7..5cca2e8 100644 --- a/framework/opengl_renderer/test/imgui_render_task_test.cpp +++ b/framework/opengl_renderer/test/imgui_render_task_test.cpp @@ -1,4 +1,3 @@ -#include "mm/services/service.hpp" #include #include @@ -8,8 +7,6 @@ #include #include -#include - #include using namespace entt::literals; diff --git a/framework/organizer_scene/src/mm/services/organizer_scene.hpp b/framework/organizer_scene/src/mm/services/organizer_scene.hpp index f54a211..6099789 100644 --- a/framework/organizer_scene/src/mm/services/organizer_scene.hpp +++ b/framework/organizer_scene/src/mm/services/organizer_scene.hpp @@ -1,8 +1,6 @@ #pragma once -#include "mm/services/service.hpp" #include -#include #include diff --git a/framework/screen_director/CMakeLists.txt b/framework/screen_director/CMakeLists.txt index 302bb69..c3a20b7 100644 --- a/framework/screen_director/CMakeLists.txt +++ b/framework/screen_director/CMakeLists.txt @@ -14,9 +14,6 @@ target_link_libraries(screen_director entt ) -message("screen_director_simple ALIAS TODO: remove!!") -add_library(screen_director_simple ALIAS screen_director) - if (BUILD_TESTING) add_subdirectory(test) endif() diff --git a/framework/screen_director/src/mm/services/screen_director.cpp b/framework/screen_director/src/mm/services/screen_director.cpp index 0bb0d65..e4906f6 100644 --- a/framework/screen_director/src/mm/services/screen_director.cpp +++ b/framework/screen_director/src/mm/services/screen_director.cpp @@ -1,8 +1,4 @@ #include "./screen_director.hpp" -#include "mm/services/service.hpp" -#include "mm/update_strategies/update_strategy.hpp" - -#include #include diff --git a/framework/sdl_service/src/mm/services/sdl_service.cpp b/framework/sdl_service/src/mm/services/sdl_service.cpp index 3a4d696..1f18aa6 100644 --- a/framework/sdl_service/src/mm/services/sdl_service.cpp +++ b/framework/sdl_service/src/mm/services/sdl_service.cpp @@ -1,8 +1,4 @@ #include "./sdl_service.hpp" -#include "mm/services/service.hpp" -#include "mm/update_strategies/update_strategy.hpp" - -#include #include diff --git a/framework/simple_scene/src/mm/services/simple_scene.cpp b/framework/simple_scene/src/mm/services/simple_scene.cpp index 5009ace..01c0d6f 100644 --- a/framework/simple_scene/src/mm/services/simple_scene.cpp +++ b/framework/simple_scene/src/mm/services/simple_scene.cpp @@ -1,11 +1,9 @@ #include "./simple_scene.hpp" -#include "mm/services/service.hpp" #include #include - #include #include diff --git a/framework/simple_scene/src/mm/services/simple_scene.hpp b/framework/simple_scene/src/mm/services/simple_scene.hpp index 063fcb3..3a5cbe0 100644 --- a/framework/simple_scene/src/mm/services/simple_scene.hpp +++ b/framework/simple_scene/src/mm/services/simple_scene.hpp @@ -1,6 +1,5 @@ #pragma once -#include "mm/services/service.hpp" #include #include diff --git a/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.cpp b/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.cpp index f0cf943..4ea0d0d 100644 --- a/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.cpp +++ b/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.cpp @@ -1,7 +1,4 @@ #include "simple_sdl_renderer.hpp" -#include "mm/update_strategies/update_strategy.hpp" - -#include #include #define LOG_CRIT(...) __LOG_CRIT( "SimpleSDLRenderer", __VA_ARGS__) diff --git a/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.hpp b/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.hpp index 8b3b125..6c8914e 100644 --- a/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.hpp +++ b/framework/simple_sdl_renderer/src/mm/services/simple_sdl_renderer.hpp @@ -1,6 +1,5 @@ #pragma once -#include "mm/services/service.hpp" #include #include