From fde9172ea311bdddc893f15efafc626421e998cb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 26 Apr 2020 20:28:43 +0200 Subject: [PATCH] - moved shadowmap to 'common'. --- src/CMakeLists.txt | 4 ++-- .../rendering/hwrenderer/data}/hw_aabbtree.cpp | 0 .../rendering/hwrenderer/data}/hw_aabbtree.h | 0 .../rendering/hwrenderer/data}/hw_shadowmap.cpp | 6 +++--- .../rendering/hwrenderer/data}/hw_shadowmap.h | 0 src/rendering/gl/renderer/gl_renderer.h | 2 +- src/rendering/hwrenderer/scene/hw_spritelight.cpp | 2 +- src/rendering/v_video.h | 3 +-- 8 files changed, 8 insertions(+), 9 deletions(-) rename src/{rendering/hwrenderer/dynlights => common/rendering/hwrenderer/data}/hw_aabbtree.cpp (100%) rename src/{rendering/hwrenderer/dynlights => common/rendering/hwrenderer/data}/hw_aabbtree.h (100%) rename src/{rendering/hwrenderer/dynlights => common/rendering/hwrenderer/data}/hw_shadowmap.cpp (97%) rename src/{rendering/hwrenderer/dynlights => common/rendering/hwrenderer/data}/hw_shadowmap.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 899e45fd6..83b8618ad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -946,8 +946,6 @@ set (PCH_SOURCES rendering/hwrenderer/hw_entrypoint.cpp rendering/hwrenderer/data/hw_vertexbuilder.cpp rendering/hwrenderer/dynlights/doom_aabbtree.cpp - rendering/hwrenderer/dynlights/hw_aabbtree.cpp - rendering/hwrenderer/dynlights/hw_shadowmap.cpp rendering/hwrenderer/models/hw_models.cpp rendering/hwrenderer/scene/hw_skydome.cpp rendering/hwrenderer/scene/hw_drawlistadd.cpp @@ -1135,6 +1133,8 @@ set (PCH_SOURCES common/rendering/hwrenderer/data/hw_cvars.cpp common/rendering/hwrenderer/data/hw_vrmodes.cpp common/rendering/hwrenderer/data/hw_lightbuffer.cpp + common/rendering/hwrenderer/data/hw_aabbtree.cpp + common/rendering/hwrenderer/data/hw_shadowmap.cpp common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp common/rendering/gl_load/gl_interface.cpp diff --git a/src/rendering/hwrenderer/dynlights/hw_aabbtree.cpp b/src/common/rendering/hwrenderer/data/hw_aabbtree.cpp similarity index 100% rename from src/rendering/hwrenderer/dynlights/hw_aabbtree.cpp rename to src/common/rendering/hwrenderer/data/hw_aabbtree.cpp diff --git a/src/rendering/hwrenderer/dynlights/hw_aabbtree.h b/src/common/rendering/hwrenderer/data/hw_aabbtree.h similarity index 100% rename from src/rendering/hwrenderer/dynlights/hw_aabbtree.h rename to src/common/rendering/hwrenderer/data/hw_aabbtree.h diff --git a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp b/src/common/rendering/hwrenderer/data/hw_shadowmap.cpp similarity index 97% rename from src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp rename to src/common/rendering/hwrenderer/data/hw_shadowmap.cpp index 20b6f53a3..cb5630594 100644 --- a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp +++ b/src/common/rendering/hwrenderer/data/hw_shadowmap.cpp @@ -20,11 +20,11 @@ //-------------------------------------------------------------------------- // -#include "hwrenderer/dynlights/hw_shadowmap.h" +#include "hw_shadowmap.h" #include "hw_cvars.h" #include "hw_dynlightdata.h" -#include "hwrenderer/data/buffers.h" -#include "hwrenderer/data/shaderuniforms.h" +#include "buffers.h" +#include "shaderuniforms.h" #include "hwrenderer/postprocessing/hw_postprocess.h" /* diff --git a/src/rendering/hwrenderer/dynlights/hw_shadowmap.h b/src/common/rendering/hwrenderer/data/hw_shadowmap.h similarity index 100% rename from src/rendering/hwrenderer/dynlights/hw_shadowmap.h rename to src/common/rendering/hwrenderer/data/hw_shadowmap.h diff --git a/src/rendering/gl/renderer/gl_renderer.h b/src/rendering/gl/renderer/gl_renderer.h index ab4e36459..5831c4866 100644 --- a/src/rendering/gl/renderer/gl_renderer.h +++ b/src/rendering/gl/renderer/gl_renderer.h @@ -8,7 +8,7 @@ #include "matrix.h" #include "gl_renderbuffers.h" #include "hwrenderer/scene/hw_portal.h" -#include "hwrenderer/dynlights/hw_shadowmap.h" +#include "hw_shadowmap.h" #include #ifdef _MSC_VER diff --git a/src/rendering/hwrenderer/scene/hw_spritelight.cpp b/src/rendering/hwrenderer/scene/hw_spritelight.cpp index abbc1a64d..759f61a7d 100644 --- a/src/rendering/hwrenderer/scene/hw_spritelight.cpp +++ b/src/rendering/hwrenderer/scene/hw_spritelight.cpp @@ -33,7 +33,7 @@ #include "g_levellocals.h" #include "actorinlines.h" #include "hw_dynlightdata.h" -#include "hwrenderer/dynlights/hw_shadowmap.h" +#include "hw_shadowmap.h" #include "hwrenderer/scene/hw_drawinfo.h" #include "hwrenderer/scene/hw_drawstructs.h" #include "r_data/models/models.h" diff --git a/src/rendering/v_video.h b/src/rendering/v_video.h index ead9eb5a2..e40d919f1 100644 --- a/src/rendering/v_video.h +++ b/src/rendering/v_video.h @@ -42,8 +42,7 @@ #include "c_cvars.h" #include "v_2ddrawer.h" #include "intrect.h" - -#include "hwrenderer/dynlights/hw_shadowmap.h" +#include "hw_shadowmap.h" static const int VID_MIN_WIDTH = 320; static const int VID_MIN_HEIGHT = 200;