MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-19 11:16:37 +02:00
Code Issues Projects Releases Wiki Activity

reworked the general update strategy interface

Browse Source
This commit is contained in:
Green Sky
2021-04-28 19:38:25 +02:00
parent b8a5cd7cf4
commit efad254193
53 changed files with 756 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/imgui/test/scene_tools_test.cpp
View File

@ -47,7 +47,7 @@ TEST(imgui_scene_tools, it) {
ASSERT_TRUE(engine.enableService<MM::Services::ImGuiEngineTools>());
engine.addService<MM::Services::ImGuiSceneToolsService>();
engine.getUpdateStrategy().depend("ImGuiSceneToolsService::render"_hs, "SimpleSceneService::scene_tick"_hs);
//engine.getUpdateStrategy().depend("ImGuiSceneToolsService::render"_hs, "SimpleSceneService::scene_tick"_hs);
auto& rs = engine.addService<MM::Services::OpenGLRenderer>();
ASSERT_TRUE(engine.enableService<MM::Services::OpenGLRenderer>());

18
framework/imgui/test/sound_test.cpp
View File

@ -1,3 +1,4 @@
#include "mm/services/service.hpp"
#include <gtest/gtest.h>
#include <mm/engine.hpp>
@ -45,7 +46,7 @@ class ImGuiSpeechy : public MM::Services::Service {
public:
const char* name(void) override { return "TestWindow"; }
bool enable(MM::Engine& engine) override {
bool enable(MM::Engine& engine, std::vector<MM::UpdateStrategies::TaskInfo>& task_array) override {
auto& sound = engine.getService<MM::Services::SoundService>().engine;
speech.setText("Test text. 1. 2. 3.");
@ -55,21 +56,16 @@ class ImGuiSpeechy : public MM::Services::Service {
sound.setGlobalFilter(1, &echo);
sound.setGlobalFilter(2, &freeverb);
task_array.push_back(
MM::UpdateStrategies::TaskInfo{"testwindow"}
.fn([this](MM::Engine& engine) { renderImGui(engine); })
);
return true;
}
void disable(MM::Engine&) override {}
std::vector<MM::UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override {
return {{
"testwindow"_hs,
"testwindow",
[this](MM::Engine& engine) {
renderImGui(engine);
}
}};
}
void renderImGui(MM::Engine& engine) {
auto& sound = *engine.tryService<MM::Services::SoundService>();

17
framework/imgui/test/text_edit_test.cpp
View File

@ -1,3 +1,4 @@
#include "mm/services/service.hpp"
#include <functional>
#include <gtest/gtest.h>
@ -32,16 +33,16 @@ class TemplateUpdateMainService : public MM::Services::Service {
explicit TemplateUpdateMainService(std::function<void(MM::Engine&)> fn) : _fn(fn) {}
const char* name(void) override { return "TemplateUpdateMainService"; }
bool enable(MM::Engine&) override { return true; }
void disable(MM::Engine&) override {}
std::vector<MM::UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override {
return {{
"TemplateUpdateMainService::fn"_hs,
"TemplateUpdateMainService::fn",
_fn
}};
bool enable(MM::Engine&, std::vector<MM::UpdateStrategies::TaskInfo>& task_array) override {
task_array.push_back(
MM::UpdateStrategies::TaskInfo{"TemplateUpdateMainService::fn"}
.fn(_fn)
);
return true;
}
void disable(MM::Engine&) override {}
};
TEST(imgui_text_edit, it) {

22
framework/imgui/test/widget_test.cpp
View File

@ -1,5 +1,4 @@
#include "mm/imgui/widgets/scalar_range.hpp"
#include "mm/scalar_range2.hpp"
#include "mm/services/service.hpp"
#include <gtest/gtest.h>
#include <mm/engine.hpp>
@ -17,6 +16,7 @@
#include <imgui/imgui.h>
#include <mm/imgui/widgets/knob.hpp>
#include <mm/imgui/widgets/scalar_range.hpp>
const char* argv0;
@ -44,14 +44,11 @@ TEST(imgui_widgets, basic) {
class TestWindow : public MM::Services::Service {
public:
const char* name(void) override { return "TestWindow"; }
bool enable(MM::Engine&) override { return true; }
void disable(MM::Engine&) override {}
std::vector<MM::UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override {
return {{
"testwindow"_hs,
"testwindow",
[](MM::Engine&) {
bool enable(MM::Engine&, std::vector<MM::UpdateStrategies::TaskInfo>& task_array) override {
task_array.push_back(
MM::UpdateStrategies::TaskInfo{"testwindow"}
.fn([](MM::Engine&) {
if (ImGui::Begin("test window")) {
static float knob_test = 0.f;
@ -63,9 +60,12 @@ TEST(imgui_widgets, basic) {
MM::ImGuiWidgets::DragScalarRange2("range", range);
}
ImGui::End();
}
}};
})
);
return true;
}
void disable(MM::Engine&) override {}
};
engine.addService<TestWindow>();