shortcuts are bad
This commit is contained in:
@@ -49,6 +49,7 @@
|
|||||||
clang++ \
|
clang++ \
|
||||||
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 \
|
||||||
$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 \
|
||||||
|
|||||||
@@ -43,12 +43,12 @@ namespace Archimedes {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
bool done = false;
|
|
||||||
|
|
||||||
inline static App* instance = nullptr;
|
inline static App* instance = nullptr;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
bool done = false;
|
||||||
|
|
||||||
std::list<Module*> modules;
|
std::list<Module*> modules;
|
||||||
std::list<Module*> toClose;
|
std::list<Module*> toClose;
|
||||||
std::list<std::string> toOpen;
|
std::list<std::string> toOpen;
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
#define WINDOWMODULE_STATIC
|
#define WINDOWMODULE_STATIC
|
||||||
#include "modules/WindowModule/src/WindowModule.h"
|
#include "modules/WindowModule/src/WindowModule.h"
|
||||||
#include "modules/WindowModule/src/WindowModule.cpp"
|
|
||||||
|
|
||||||
namespace Archimedes {
|
namespace Archimedes {
|
||||||
|
|
||||||
@@ -22,8 +21,6 @@ namespace Archimedes {
|
|||||||
virtual void onLoad() = 0;
|
virtual void onLoad() = 0;
|
||||||
virtual void run() = 0;
|
virtual void run() = 0;
|
||||||
|
|
||||||
Window* getWindow() { return windowModule; }
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
WindowModule* windowModule;
|
WindowModule* windowModule;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class WindowModule : public Archimedes::Module {
|
|||||||
|
|
||||||
//interface for other modules
|
//interface for other modules
|
||||||
std::list<Archimedes::Renderer::renderCmd*>::iterator addRenderCmd(Archimedes::Renderer::renderCmd* cmd) {
|
std::list<Archimedes::Renderer::renderCmd*>::iterator addRenderCmd(Archimedes::Renderer::renderCmd* cmd) {
|
||||||
renderer->addRenderCmd(cmd);
|
return renderer->addRenderCmd(cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
void removeRenderCmd(std::list<Archimedes::Renderer::renderCmd*>::iterator cmd) {
|
void removeRenderCmd(std::list<Archimedes::Renderer::renderCmd*>::iterator cmd) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#define ENTRYPOINT
|
#define ENTRYPOINT
|
||||||
#include "Archimedes.h"
|
#include "Archimedes.h"
|
||||||
|
|
||||||
#include "modules/GUImodules/TestImgui/src/TestImgui.h"
|
#include "modules/examples/GuiModules/TestImgui/src/TestImgui.h"
|
||||||
|
|
||||||
class ImguiEmbed : public Archimedes::App {
|
class ImguiEmbed : public Archimedes::App {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user