Move textureid to framework

CMakeLists.txt

@@ -26,6 +26,8 @@ set(ZDRAY_SOURCES
 	src/framework/matrix.h
 	src/framework/bounds.cpp
 	src/framework/bounds.h
+	src/framework/textureid.cpp
+	src/framework/textureid.h
 	src/blockmapbuilder/blockmapbuilder.cpp
 	src/blockmapbuilder/blockmapbuilder.h
 	src/level/level.cpp
@@ -56,8 +58,6 @@ set(ZDRAY_SOURCES
 	src/lightmapper/vk_lightmap.h
 	src/lightmapper/vk_raytrace.cpp
 	src/lightmapper/vk_raytrace.h
-	src/lightmapper/textureid.cpp
-	src/lightmapper/textureid.h
 	src/lightmapper/doom_levelmesh.cpp
 	src/lightmapper/doom_levelmesh.h
 	src/lightmapper/gpuraytracer.cpp

src/level/doomdata.h

@@ -6,7 +6,7 @@
 #include "framework/templates.h"
 #include "framework/zstring.h"
 #include "framework/vectors.h"
-#include "lightmapper/textureid.h"
+#include "framework/textureid.h"
 #include <memory>
 #include <cmath>
 #include <optional>

src/lightmapper/hw_levelmesh.h

@@ -1,14 +1,14 @@
 
 #pragma once
 
-#include "Framework/tarray.h"
-#include "Framework/vectors.h"
-#include "Framework/matrix.h"
-#include "Framework/bounds.h"
+#include "framework/tarray.h"
+#include "framework/vectors.h"
+#include "framework/matrix.h"
+#include "framework/bounds.h"
+#include "framework/textureid.h"
 #include "hw_collision.h"
 #include <memory>
 #include <cstring>
-#include "textureid.h"
 
 #include <dp_rect_pack/dp_rect_pack.h>
 

src/lightmapper/vk_renderdevice.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "framework/zstring.h"
+#include "framework/textureid.h"
 #include "zvulkan/vulkanobjects.h"
 #include "zvulkan/vulkanbuilders.h"
-#include "textureid.h"
 #include <stdexcept>
 
 class VkRaytrace;

src/models/model.h

@@ -4,7 +4,7 @@
 #include "framework/templates.h"
 #include "framework/zstring.h"
 #include "framework/vectors.h"
-#include "lightmapper/textureid.h"
+#include "framework/textureid.h"
 #include <stdint.h>
 #include <string>
 #include <memory>