[nostalgia] Move GlUtils out of Nostalgia

2023-06-01 23:58:39 -05:00
parent 5c8242490e
commit 8cd2ef2d8b
18 changed files with 45 additions and 38 deletions
@@ -7,5 +7,5 @@ target_link_libraries(
 	NostalgiaCore PUBLIC
 		glad
 		imgui
-		NostalgiaGlUtils
+		GlUtils
 )
@@ -6,7 +6,7 @@

 #include <ox/std/types.hpp>

-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>

 #include "gfx.hpp"

@@ -10,7 +10,7 @@

 #include <keel/media.hpp>

-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>

 #include <nostalgia/core/context.hpp>
 #include <nostalgia/core/gfx.hpp>
@@ -8,7 +8,7 @@

 #include <turbine/gfx.hpp>

-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>

 namespace nostalgia::core::renderer {

@@ -21,7 +21,6 @@ target_link_libraries(
 	NostalgiaCore-Studio PUBLIC
 		NostalgiaStudio
 		NostalgiaCore
-		NostalgiaGlUtils
 		lodepng
 )

@@ -4,10 +4,12 @@

 #include <imgui.h>

-#include <nostalgia/core/gfx.hpp>
-#include <keel/media.hpp>
 #include <ox/std/memory.hpp>

+#include <keel/media.hpp>
+
+#include <nostalgia/core/gfx.hpp>
+
 #include "paletteeditor.hpp"
 #include "paletteeditor-imgui.hpp"

@@ -7,7 +7,8 @@
 #include <ox/model/def.hpp>
 #include <ox/std/vec.hpp>

-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>
+
 #include <nostalgia/studio/studio.hpp>

 #include "tilesheetpixelgrid.hpp"
@@ -7,8 +7,9 @@
 #include <ox/std/vec.hpp>
 #include <ox/model/def.hpp>

+#include <glutils/glutils.hpp>
+
 #include <nostalgia/core/gfx.hpp>
-#include <nostalgia/glutils/glutils.hpp>
 #include <nostalgia/studio/studio.hpp>

 #include "tilesheeteditormodel.hpp"
@@ -4,8 +4,9 @@

 #pragma once

+#include <glutils/glutils.hpp>
+
 #include <nostalgia/core/gfx.hpp>
-#include <nostalgia/glutils/glutils.hpp>
 #include <nostalgia/studio/studio.hpp>

 namespace nostalgia::core {
@@ -6,8 +6,9 @@

 #include <ox/std/vec.hpp>

+#include <glutils/glutils.hpp>
+
 #include <nostalgia/core/gfx.hpp>
-#include <nostalgia/glutils/glutils.hpp>
 #include <nostalgia/studio/studio.hpp>

 namespace nostalgia::core {