triangle?

modules/Archimedes-Modules/TestTriangle/TestTriangle.cpp

@@ -24,6 +24,8 @@ TestTriangle::~TestTriangle() {
 #endif
 */
         wm->releaseWindow(window);
+
+        delete rt;
     }   
 }
 
@@ -32,12 +34,14 @@ void TestTriangle::onLoad() {
     WindowModule* wm; { wm = (WindowModule*) moduleInstances[WindowModule()]; }
     
     if(!wm) {
-        std::cout << "No WindowModule for ImguiModule!\n";
+        std::cout << "No WindowModule TestTriangle!\n";
         std::abort();
     }
 
     window = wm->aquireWindow();
 
+    window->getRenderer()->clearColor = { 0.2, 0.2, 0.4, 0.7 };
+
     rt = window->getRenderer()->createRenderTarget(
             vertices, 
             9 * sizeof(float), 
@@ -53,7 +57,10 @@ void TestTriangle::onLoad() {
 
 void TestTriangle::run() {
 
-    window->getRenderer()->draw(*rt);
+    window->getRenderer()->render();
+    window->getRenderer()->draw(rt);
+    window->swapBuffers();
+    window->pollEvents();
 
 } 
 

modules/Archimedes-Modules/TestTriangle/TestTriangle.h

@@ -51,10 +51,12 @@ class TestTriangle : public Archimedes::Module {
         }; 
 
         unsigned int indices[3] = {
-            1, // left  
-            2, // right 
-            3  // top   
+            0, // left  
+            1, // right 
+            2  // top   
         }; 
+                
+        unsigned int vao, vbo, ibo, shaderProgram;
 };
 
 #ifdef TESTTRIANGLE_DYNAMIC

modules/ImguiModule/ImguiModule.cpp

@@ -15,7 +15,7 @@ ImguiModule::~ImguiModule() {
     if(app) {
         WindowModule* wm; { wm = (WindowModule*) moduleInstances[WindowModule()]; }
 
-#if WINDOW == 2
+#ifdef WINDOW_SDL3
         wm->removeEventFn(ecmd_it);
 #endif
 
@@ -38,8 +38,8 @@ void ImguiModule::onLoad() {
 
     window = wm->aquireWindow();
 
-#if RENDERER == 2
-    renderer = window->getRenderer()->getRendererImpl().renderer;
+#ifdef RENDERER_SDL3
+    renderer = window->getRenderer()->getRendererImpl()->renderer;
 #endif
     
     IMGUI_CHECKVERSION();
@@ -105,7 +105,7 @@ void ImguiModule::run() {
         ImGui::UpdatePlatformWindows();
         ImGui::RenderPlatformWindowsDefault();
 
-        window->getWindowImpl().restoreContext();
+        window->getWindowImpl()->restoreContext();
     }
 };
 

modules/ImguiModule/ImguiModule.h

@@ -6,22 +6,24 @@
 
 #include "modules/WindowModule/WindowModule.h"
 
-#if RENDERER == 1
+#ifdef RENDERER_OPENGL
 
 #include "backends/imgui_impl_opengl3.h"
 
-#elif RENDERER == 2
+#endif
+#ifdef RENDERER_SDL3
 
 #include "backends/imgui_impl_sdlrenderer3.h"
 
 #endif
 
-#if WINDOW == 1
+#ifdef WINDOW_GLFW
 
 #include "backends/imgui_impl_glfw.h"
 #include <GLFW/glfw3.h>
 
-#elif WINDOW == 2
+#endif
+#ifdef WINDOW_SDL3
 
 #include "backends/imgui_impl_sdl3.h"
 #include <SDL3/SDL.h>
@@ -68,14 +70,14 @@ class ImguiModule : public Archimedes::Module {
         
         std::list<std::function<void(Archimedes::Event*)>>::iterator ecmd_it;
 
-#if RENDERER == 1
+#ifdef RENDERER_OPENGL
         auto rendererInit() { return ImGui_ImplOpenGL3_Init("#version 330"); }
         void rendererShutdown() { ImGui_ImplOpenGL3_Shutdown(); }
 
         void rendererNewFrame() { ImGui_ImplOpenGL3_NewFrame(); }
         void rendererRenderDrawData() { ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); }
-
-#elif RENDERER == 2
+#endif
+#ifdef RENDERER_SDL3
         SDL_Renderer* renderer;
         auto rendererInit() { return ImGui_ImplSDLRenderer3_Init(renderer); }
         void rendererShutdown() { ImGui_ImplSDLRenderer3_Shutdown(); }

modules/WindowModule/WindowModule.cpp

@@ -42,10 +42,11 @@ void WindowModule::onLoad() {
 
 void WindowModule::run() {
 
-    if(window)
-        window->doFrame();
-    else
+    if(window) {
+        //window->doFrame();
+    } else {
         app->emitEvent(new Archimedes::DoUnloadModuleEvent(name));
+    }
 }
         
 bool WindowModule::onEvent(const Archimedes::Event& e) {