From 9661c3b53c3c01f905a8a6fadb7182954b2216a0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 7 Nov 2018 00:53:44 +0100 Subject: [PATCH] - moved hw_Sections to r_data, because this is an essential component of the dynamic light system now so it is needed for all renderers. --- src/CMakeLists.txt | 2 +- src/g_levellocals.h | 2 +- src/{hwrenderer/data/hw_sections.cpp => r_data/r_sections.cpp} | 3 +-- src/{hwrenderer/data/hw_sections.h => r_data/r_sections.h} | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename src/{hwrenderer/data/hw_sections.cpp => r_data/r_sections.cpp} (99%) rename src/{hwrenderer/data/hw_sections.h => r_data/r_sections.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index da9b92dda1..ffc8aa4415 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1050,7 +1050,6 @@ set (PCH_SOURCES gl/textures/gl_hwtexture.cpp gl/textures/gl_samplers.cpp hwrenderer/data/hw_vertexbuilder.cpp - hwrenderer/data/hw_sections.cpp hwrenderer/data/flatvertices.cpp hwrenderer/data/hw_viewpointbuffer.cpp hwrenderer/dynlights/hw_aabbtree.cpp @@ -1143,6 +1142,7 @@ set (PCH_SOURCES r_data/renderstyle.cpp r_data/r_interpolate.cpp r_data/r_vanillatrans.cpp + r_data/r_sections.cpp r_data/models/models_md3.cpp r_data/models/models_md2.cpp r_data/models/models_voxel.cpp diff --git a/src/g_levellocals.h b/src/g_levellocals.h index 6a42c12c5d..1e3aed96f7 100644 --- a/src/g_levellocals.h +++ b/src/g_levellocals.h @@ -42,7 +42,7 @@ #include "p_blockmap.h" #include "p_local.h" #include "p_destructible.h" -#include "hwrenderer/data/hw_sections.h" +#include "r_data/r_sections.h" struct FLevelLocals { diff --git a/src/hwrenderer/data/hw_sections.cpp b/src/r_data/r_sections.cpp similarity index 99% rename from src/hwrenderer/data/hw_sections.cpp rename to src/r_data/r_sections.cpp index c37b37395c..fcc273d337 100644 --- a/src/hwrenderer/data/hw_sections.cpp +++ b/src/r_data/r_sections.cpp @@ -28,13 +28,12 @@ #include "c_dispatch.h" #include "r_defs.h" #include "g_levellocals.h" -#include "hw_sections.h" +#include "r_sections.h" #include "earcut.hpp" #include "stats.h" #include "p_setup.h" #include "c_dispatch.h" #include "memarena.h" -#include "flatvertices.h" using DoublePoint = std::pair; diff --git a/src/hwrenderer/data/hw_sections.h b/src/r_data/r_sections.h similarity index 100% rename from src/hwrenderer/data/hw_sections.h rename to src/r_data/r_sections.h