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

cleanup includes, primarily artifacts of the updatestrat refactor

Browse Source
This commit is contained in:
Green Sky
2021-05-17 01:35:35 +02:00
parent efad254193
commit 1248957a18
29 changed files with 28 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/imgui/src/mm/imgui/widgets/components/transform2d.cpp
View File

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

1
framework/imgui/src/mm/services/engine_tools.cpp
View File

@ -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")
);

4
framework/imgui/src/mm/services/imgui_menu_bar.cpp
View File

@ -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;

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

@ -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

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

@ -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")
);

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

@ -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>

7
framework/imgui/src/mm/services/sound_tools.cpp
View File

@ -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")
);

1
framework/imgui/src/mm/services/sound_tools.hpp
View File

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