fix ImguiEmbed
This commit is contained in:
@@ -50,6 +50,7 @@
|
|||||||
src/example_apps/ImguiEmbed/*.cpp \
|
src/example_apps/ImguiEmbed/*.cpp \
|
||||||
modules/examples/GuiModules/TestImgui/src/*.cpp \
|
modules/examples/GuiModules/TestImgui/src/*.cpp \
|
||||||
modules/WindowModule/src/*.cpp \
|
modules/WindowModule/src/*.cpp \
|
||||||
|
modules/ImguiModule/src/*.cpp \
|
||||||
$imgui/backends/imgui_impl_glfw.cpp \
|
$imgui/backends/imgui_impl_glfw.cpp \
|
||||||
$imgui/backends/imgui_impl_opengl3.cpp \
|
$imgui/backends/imgui_impl_opengl3.cpp \
|
||||||
$imgui/*.cpp \
|
$imgui/*.cpp \
|
||||||
|
|||||||
@@ -17,8 +17,12 @@ void ImguiEmbed::run() {
|
|||||||
}
|
}
|
||||||
toClose.clear();
|
toClose.clear();
|
||||||
|
|
||||||
for(std::string m : toOpen) {
|
for(auto m : toOpen) {
|
||||||
load(m);
|
if(std::holds_alternative<std::string>(m.second)) {
|
||||||
|
load(std::get<std::string>(m.second))->onLoad();
|
||||||
|
} else {
|
||||||
|
load(std::get<Archimedes::Module*>(m.second))->onLoad();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
toOpen.clear();
|
toOpen.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class ImguiEmbed : public Archimedes::App {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
ImguiEmbed() {
|
ImguiEmbed() {
|
||||||
Archimedes::Module* m = (Archimedes::Module*) new TestImgui(nullptr, Get());
|
Archimedes::Module* m = (Archimedes::Module*) new TestImgui(Get(), nullptr);
|
||||||
|
|
||||||
load(m);
|
load(m);
|
||||||
};
|
};
|
||||||
@@ -21,10 +21,6 @@ class ImguiEmbed : public Archimedes::App {
|
|||||||
|
|
||||||
void run();
|
void run();
|
||||||
|
|
||||||
//void stopModule(std::list<Archimedes::Module*>::iterator);
|
|
||||||
|
|
||||||
//void startModule(std::string);
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define APP_TYPE ImguiEmbed
|
#define APP_TYPE ImguiEmbed
|
||||||
|
|||||||
Reference in New Issue
Block a user