From 53d73780dd17d804e287ddeea1d8f6be652d2878 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Tue, 10 Oct 2023 22:15:00 +0200
Subject: [PATCH] Move textureid to framework

---
 CMakeLists.txt                               |  4 ++--
 src/{lightmapper => framework}/textureid.cpp |  0
 src/{lightmapper => framework}/textureid.h   |  0
 src/level/doomdata.h                         |  2 +-
 src/lightmapper/hw_levelmesh.h               | 10 +++++-----
 src/lightmapper/vk_renderdevice.h            |  2 +-
 src/models/model.h                           |  2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename src/{lightmapper => framework}/textureid.cpp (100%)
 rename src/{lightmapper => framework}/textureid.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6652614..1816c18 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/src/lightmapper/textureid.cpp b/src/framework/textureid.cpp
similarity index 100%
rename from src/lightmapper/textureid.cpp
rename to src/framework/textureid.cpp
diff --git a/src/lightmapper/textureid.h b/src/framework/textureid.h
similarity index 100%
rename from src/lightmapper/textureid.h
rename to src/framework/textureid.h
diff --git a/src/level/doomdata.h b/src/level/doomdata.h
index 4f6fa62..a4f9c18 100644
--- a/src/level/doomdata.h
+++ b/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>
diff --git a/src/lightmapper/hw_levelmesh.h b/src/lightmapper/hw_levelmesh.h
index 91a95a4..3e6a6af 100644
--- a/src/lightmapper/hw_levelmesh.h
+++ b/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>
 
diff --git a/src/lightmapper/vk_renderdevice.h b/src/lightmapper/vk_renderdevice.h
index 2a2f89c..10abf44 100644
--- a/src/lightmapper/vk_renderdevice.h
+++ b/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;
diff --git a/src/models/model.h b/src/models/model.h
index 16cd9ba..dba9588 100644
--- a/src/models/model.h
+++ b/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>