MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-18 18:56: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/opengl_renderer/src/mm/services/opengl_renderer.cpp
View File

@ -10,7 +10,6 @@
#include <mm/opengl/texture_loader.hpp>
#include "../opengl/res/default_texture.h" // data
#include "../opengl/res/errig_texture.h" // data
#include "mm/update_strategies/update_strategy.hpp"
#include <tracy/Tracy.hpp>
#ifndef MM_OPENGL_3_GLES

15
framework/opengl_renderer/src/mm/services/opengl_renderer_tools.cpp
View File

@ -11,20 +11,21 @@
namespace MM::Services {
bool ImGuiOpenGLRendererTools::enable(Engine& engine, std::vector<UpdateStrategies::TaskInfo>& task_array) {
auto& menu_bar = engine.getService<MM::Services::ImGuiMenuBar>();
auto& menu_bar = engine.getService<MM::Services::ImGuiMenuBar>();
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<UpdateStrategi
void ImGuiOpenGLRendererTools::disable(Engine& engine) {
auto& menu_bar = engine.getService<MM::Services::ImGuiMenuBar>();
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) {

4
framework/opengl_renderer/test/blur_render_task_test.cpp
View File

@ -1,5 +1,3 @@
#include "mm/opengl/render_tasks/clear.hpp"
#include "mm/opengl/render_tasks/copy_to_fb.hpp"
#include <gtest/gtest.h>
#include <mm/engine.hpp>
@ -12,6 +10,8 @@
#include <entt/entity/registry.hpp>
#include <mm/opengl/render_tasks/clear.hpp>
#include <mm/opengl/render_tasks/copy_to_fb.hpp>
#include <mm/opengl/render_tasks/simple_rect.hpp>
#include <mm/opengl/render_tasks/blur.hpp>
#include <mm/opengl/render_tasks/imgui.hpp>

3
framework/opengl_renderer/test/fast_sky_render_task_test.cpp
View File

@ -1,4 +1,3 @@
#include "mm/opengl/camera_3d.hpp"
#include <gtest/gtest.h>
#include <mm/engine.hpp>
@ -13,6 +12,8 @@
#include <mm/opengl/render_tasks/fast_sky_render_task.hpp>
#include <mm/systems/fast_sky_sun_system.hpp>
#include <mm/opengl/camera_3d.hpp>
const char* argv0;
TEST(fast_sky_render_task, it) {

3
framework/opengl_renderer/test/imgui_render_task_test.cpp
View File

@ -1,4 +1,3 @@
#include "mm/services/service.hpp"
#include <gtest/gtest.h>
#include <mm/engine.hpp>
@ -8,8 +7,6 @@
#include <mm/services/imgui_s.hpp>
#include <mm/opengl/render_tasks/imgui.hpp>
#include <entt/core/hashed_string.hpp>
#include <imgui/imgui.h>
using namespace entt::literals;