shortcuts are bad
This commit is contained in:
@@ -49,6 +49,7 @@
|
||||
clang++ \
|
||||
src/example_apps/ImguiEmbed/*.cpp \
|
||||
modules/examples/GuiModules/TestImgui/src/*.cpp \
|
||||
modules/WindowModule/src/*.cpp \
|
||||
$imgui/backends/imgui_impl_glfw.cpp \
|
||||
$imgui/backends/imgui_impl_opengl3.cpp \
|
||||
$imgui/*.cpp \
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
glfw
|
||||
glew
|
||||
glew
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
@@ -50,9 +50,9 @@
|
||||
-lGL -lglfw -lGLEW \
|
||||
-Wall \
|
||||
-o $name
|
||||
'';
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp $name $out/bin
|
||||
'';
|
||||
|
||||
@@ -43,11 +43,11 @@ namespace Archimedes {
|
||||
|
||||
private:
|
||||
|
||||
bool done = false;
|
||||
|
||||
inline static App* instance = nullptr;
|
||||
|
||||
protected:
|
||||
|
||||
bool done = false;
|
||||
|
||||
std::list<Module*> modules;
|
||||
std::list<Module*> toClose;
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
#define WINDOWMODULE_STATIC
|
||||
#include "modules/WindowModule/src/WindowModule.h"
|
||||
#include "modules/WindowModule/src/WindowModule.cpp"
|
||||
|
||||
namespace Archimedes {
|
||||
|
||||
@@ -22,8 +21,6 @@ namespace Archimedes {
|
||||
virtual void onLoad() = 0;
|
||||
virtual void run() = 0;
|
||||
|
||||
Window* getWindow() { return windowModule; }
|
||||
|
||||
protected:
|
||||
WindowModule* windowModule;
|
||||
};
|
||||
|
||||
@@ -18,7 +18,7 @@ class WindowModule : public Archimedes::Module {
|
||||
|
||||
//interface for other modules
|
||||
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) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#define ENTRYPOINT
|
||||
#include "Archimedes.h"
|
||||
|
||||
#include "modules/GUImodules/TestImgui/src/TestImgui.h"
|
||||
#include "modules/examples/GuiModules/TestImgui/src/TestImgui.h"
|
||||
|
||||
class ImguiEmbed : public Archimedes::App {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user