zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2024-11-25 13:21:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move textureid to framework

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-10 22:15:00 +02:00
parent 2c6d4f6f22
commit 53d73780dd
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

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

0
src/lightmapper/textureid.cpp → src/framework/textureid.cpp
View file

0
src/lightmapper/textureid.h → src/framework/textureid.h
View file

2
src/level/doomdata.h
View file

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

10
src/lightmapper/hw_levelmesh.h
View file

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

2
src/lightmapper/vk_renderdevice.h
View file

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

2
src/models/model.h
View file

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