From 6593d429fe571edd5a11c1696513aa5f5cdbdd35 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 3 Jun 2023 01:07:38 -0500
Subject: [PATCH] [nostaliga,turbine] Move rest of ImGui init to Turbine

---
 src/nostalgia/core/opengl/gfx.cpp        | 3 ---
 src/nostalgia/core/studio/CMakeLists.txt | 5 +----
 src/turbine/glfw/gfx.cpp                 | 2 ++
 src/turbine/glfw/turbine.cpp             | 2 ++
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/nostalgia/core/opengl/gfx.cpp b/src/nostalgia/core/opengl/gfx.cpp
index dd8a39c73..07b74a6f2 100644
--- a/src/nostalgia/core/opengl/gfx.cpp
+++ b/src/nostalgia/core/opengl/gfx.cpp
@@ -2,8 +2,6 @@
  * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include <imgui_impl_opengl3.h>
-
 #include <ox/std/array.hpp>
 #include <ox/std/fmt.hpp>
 #include <ox/std/vec.hpp>
@@ -324,7 +322,6 @@ ox::Error initGfx(Context *ctx, const InitParams &initParams) noexcept {
 		turbine::gl::addDrawer(*ctx->turbineCtx, &gctx->drawer);
 		initSpritesBufferset(ctx, gctx->spriteShader, &gctx->spriteBlocks);
 	}
-	ImGui_ImplOpenGL3_Init(glutils::GlslVersion);
 	return {};
 }
 
diff --git a/src/nostalgia/core/studio/CMakeLists.txt b/src/nostalgia/core/studio/CMakeLists.txt
index f66f6e47a..b9a4cc65c 100644
--- a/src/nostalgia/core/studio/CMakeLists.txt
+++ b/src/nostalgia/core/studio/CMakeLists.txt
@@ -1,9 +1,6 @@
 add_library(
 	NostalgiaCore-Studio OBJECT
-		#import_tilesheet_wizard.cpp
 		module.cpp
-		#new_tilesheet_wizard.cpp
-		#newpalettewizard.cpp
 		paletteeditor.cpp
 		paletteeditor-imgui.cpp
 		tilesheeteditor-imgui.cpp
@@ -19,7 +16,7 @@ endif()
 
 target_link_libraries(
 	NostalgiaCore-Studio PUBLIC
-		NostalgiaStudio
+		Studio
 		NostalgiaCore
 		lodepng
 )
diff --git a/src/turbine/glfw/gfx.cpp b/src/turbine/glfw/gfx.cpp
index 7e1aa149c..d0ecf204d 100644
--- a/src/turbine/glfw/gfx.cpp
+++ b/src/turbine/glfw/gfx.cpp
@@ -5,6 +5,7 @@
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
 #include <imgui_impl_glfw.h>
+#include <imgui_impl_opengl3.h>
 
 #include <ox/std/defines.hpp>
 
@@ -228,6 +229,7 @@ ox::Error initGfx(Context &ctx) noexcept {
 		io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
 		//io.MouseDrawCursor = true;
 		ImGui_ImplGlfw_InitForOpenGL(gctx.window, true);
+		ImGui_ImplOpenGL3_Init();
 		themeImgui();
 	}
 	return {};
diff --git a/src/turbine/glfw/turbine.cpp b/src/turbine/glfw/turbine.cpp
index 53e053fba..7af7434de 100644
--- a/src/turbine/glfw/turbine.cpp
+++ b/src/turbine/glfw/turbine.cpp
@@ -84,6 +84,8 @@ ox::Error run(Context &ctx) noexcept {
 void shutdown(Context &ctx) noexcept {
 	auto &gctx = static_cast<GlfwContext&>(ctx);
 	if (gctx.window) {
+		ImGui_ImplOpenGL3_Shutdown();
+		ImGui_ImplGlfw_Shutdown();
 		glfwDestroyWindow(gctx.window);
 		gctx.window = nullptr;
 	}