From 92294c3166549fa2fda283aaa2e085953c79e7d3 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 22 Mar 2025 01:53:10 -0500 Subject: [PATCH] clean up debug --- modules/GUImodules/TestImgui/src/TestImgui.cpp | 14 ++++++-------- utils/Renderer/Renderer.h | 2 ++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/GUImodules/TestImgui/src/TestImgui.cpp b/modules/GUImodules/TestImgui/src/TestImgui.cpp index 035be2d..5ac500c 100644 --- a/modules/GUImodules/TestImgui/src/TestImgui.cpp +++ b/modules/GUImodules/TestImgui/src/TestImgui.cpp @@ -21,31 +21,25 @@ void TestImgui::onLoad() { createWindow(); - std::cout << "Check version" << std::endl; + window->getRenderer().init(); + IMGUI_CHECKVERSION(); - std::cout << "CreateContext" << std::endl; ImGui::CreateContext(); - std::cout << "GetIO" << std::endl; ImGuiIO& io = ImGui::GetIO(); (void)io; io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; // Enable Gamepad Controls - std::cout << "Set Style" << std::endl; // Setup Dear ImGui style ImGui::StyleColorsDark(); //ImGui::StyleColorsLight(); - std::cout << "ImGui_ImplGlfw_InitForOpenGL" << std::endl; // Setup Platform/Renderer backends ImGui_ImplGlfw_InitForOpenGL(window->getWindowImpl().getWindow(), true); - std::cout << "ImGui_ImplOpenGL3_Init" << std::endl; ImGui_ImplOpenGL3_Init("#version 130"); - std::cout << "Successful onLoad" << std::endl; } void TestImgui::run() { - ImGui_ImplOpenGL3_NewFrame(); ImGui_ImplGlfw_NewFrame(); ImGui::NewFrame(); @@ -58,4 +52,8 @@ void TestImgui::run() { ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); }); + if(window->shouldClose()) + app.end(); + window->doFrame(); + } diff --git a/utils/Renderer/Renderer.h b/utils/Renderer/Renderer.h index a3384b0..38d44aa 100644 --- a/utils/Renderer/Renderer.h +++ b/utils/Renderer/Renderer.h @@ -13,6 +13,8 @@ namespace Archimedes { ~Renderer() {} + void init() { r.init(); } + void render(); void addRenderCmd(renderCmd* cmd) { rc.push_back(cmd); }