work on WindowSDL3
This commit is contained in:
@@ -1,10 +1,52 @@
|
||||
#include "ImguiModule.h"
|
||||
|
||||
#include "backends/imgui_impl_glfw.h"
|
||||
#define RENDERER_OPENGL
|
||||
#define WINDOW_GLFW
|
||||
|
||||
#ifdef RENDERER_OPENGL
|
||||
|
||||
#include "backends/imgui_impl_opengl3.h"
|
||||
|
||||
#define RENDERER_INIT() ImGui_ImplOpenGL3_Init("#version 330")
|
||||
#define RENDERER_SHUTDOWN() ImGui_ImplOpenGL3_Shutdown()
|
||||
|
||||
#define RENDERER_NEWFRAME() ImGui_ImplOpenGL3_NewFrame()
|
||||
#define RENDERER_RENDERDRAWDATA(x) ImGui_ImplOpenGL3_RenderDrawData(x)
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef WINDOW_GLFW
|
||||
|
||||
#include "backends/imgui_impl_glfw.h"
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#ifdef RENDERER_OPENGL
|
||||
#define WINDOW_INIT() ImGui_ImplGlfw_InitForOpenGL(window->getWindowImpl().getWindow(), true)
|
||||
#endif
|
||||
|
||||
#define WINDOW_SHUTDOWN() ImGui_ImplGlfw_Shutdown()
|
||||
|
||||
#define WINDOW_NEWFRAME() ImGui_ImplGlfw_NewFrame()
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef WINDOW_SDL3
|
||||
|
||||
#include "backends/imgui_impl_sdl3.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#ifdef RENDERER_OPENGL
|
||||
#define WINDOW_INIT() ImGui_ImplSDL3_InitForOpenGL(window->getWindowImpl().getWindow(), window->getWindowImpl().getContext())
|
||||
#endif
|
||||
|
||||
#define WINDOW_SHUTDOWN() ImGui_ImplSDL3_Shutdown()
|
||||
|
||||
#define WINDOW_NEWFRAME() ImGui_ImplSDL3_NewFrame()
|
||||
|
||||
#define WINDOW_PROCESSEVENT() ImGui_ImplSDL3_ProcessEvent(&e)
|
||||
|
||||
#endif
|
||||
|
||||
#include "pch.hpp"
|
||||
|
||||
ImguiModule::ImguiModule(Archimedes::App* a, void* h = nullptr) : Archimedes::Module(a, h) {
|
||||
@@ -22,8 +64,8 @@ ImguiModule::~ImguiModule() {
|
||||
|
||||
wm->getRenderer()->getCmdList().erase(rcmd_it);
|
||||
|
||||
ImGui_ImplOpenGL3_Shutdown();
|
||||
ImGui_ImplGlfw_Shutdown();
|
||||
RENDERER_SHUTDOWN();
|
||||
WINDOW_SHUTDOWN();
|
||||
ImGui::DestroyContext();
|
||||
|
||||
wm->releaseWindow(window);
|
||||
@@ -58,28 +100,28 @@ void ImguiModule::onLoad() {
|
||||
//ImGui::StyleColorsLight();
|
||||
|
||||
// Setup Platform/Renderer backends
|
||||
if(!ImGui_ImplGlfw_InitForOpenGL(window->getWindowImpl().getWindow(), true))
|
||||
std::cout << "GLFWImpl failed\n";
|
||||
if(!WINDOW_INIT())
|
||||
std::cout << "WINDOW_INIT failed\n";
|
||||
|
||||
if(!ImGui_ImplOpenGL3_Init("#version 330")) {
|
||||
std::cout << "ImGui_ImplOpenGL3_Init failed!\n" << std::endl;
|
||||
if(!RENDERER_INIT()) {
|
||||
std::cout << "RENDERER_INIT failed!\n" << std::endl;
|
||||
}
|
||||
|
||||
wm->getRenderer()->getCmdList().push_back([](){
|
||||
ImGui::Render();
|
||||
|
||||
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
|
||||
RENDERER_RENDERDRAWDATA(ImGui::GetDrawData());
|
||||
|
||||
ImGui_ImplOpenGL3_NewFrame();
|
||||
ImGui_ImplGlfw_NewFrame();
|
||||
RENDERER_NEWFRAME();
|
||||
WINDOW_NEWFRAME();
|
||||
ImGui::NewFrame();
|
||||
});
|
||||
|
||||
rcmd_it = --wm->getRenderer()->getCmdList().end()++;
|
||||
|
||||
//Compute first frame ahead of first WindowModule->run()
|
||||
ImGui_ImplOpenGL3_NewFrame();
|
||||
ImGui_ImplGlfw_NewFrame();
|
||||
RENDERER_NEWFRAME();
|
||||
WINDOW_NEWFRAME();
|
||||
ImGui::NewFrame();
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user