From 7bb92812b8db10b82170bc460e420b53a9844a4f Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 25 Nov 2017 13:19:00 +0100 Subject: [PATCH] - Move models into r_data --- src/CMakeLists.txt | 15 +++++++-------- src/gl/data/gl_vertexbuffer.h | 2 +- src/gl/models/gl_models.h | 2 +- src/{ => r_data}/models/models.cpp | 2 +- src/{ => r_data}/models/models.h | 0 src/{ => r_data}/models/models_md2.cpp | 2 +- src/{ => r_data}/models/models_md3.cpp | 2 +- src/{ => r_data}/models/tab_anorms.h | 0 src/{ => r_data}/models/voxels.cpp | 0 9 files changed, 12 insertions(+), 13 deletions(-) rename src/{ => r_data}/models/models.cpp (99%) rename src/{ => r_data}/models/models.h (100%) rename src/{ => r_data}/models/models_md2.cpp (99%) rename src/{ => r_data}/models/models_md3.cpp (99%) rename src/{ => r_data}/models/tab_anorms.h (100%) rename src/{ => r_data}/models/voxels.cpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c54372e0ea..15504c65d9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -645,13 +645,13 @@ file( GLOB HEADER_FILES g_inventory/*.h intermission/*.h menu/*.h - models/*.h sound/oplsynth/*.h sound/oplsynth/dosbox/*.h posix/*.h posix/cocoa/*.h posix/sdl/*.h r_data/*.h + r_data/models/*.h rapidjson/*.h resourcefiles/*.h sfmt/*.h @@ -825,7 +825,7 @@ set( FASTMATH_SOURCES gl/dynlights/gl_dynlight1.cpp gl/system/gl_load.c gl/models/gl_models.cpp - models/models.cpp + r_data/models/models.cpp ) set (PCH_SOURCES @@ -1083,9 +1083,6 @@ set (PCH_SOURCES textures/tgatexture.cpp textures/warptexture.cpp textures/skyboxtexture.cpp - models/models_md3.cpp - models/models_md2.cpp - models/voxels.cpp xlat/parse_xlat.cpp fragglescript/t_func.cpp fragglescript/t_load.cpp @@ -1105,6 +1102,9 @@ set (PCH_SOURCES r_data/renderstyle.cpp r_data/r_interpolate.cpp r_data/r_vanillatrans.cpp + r_data/models/models_md3.cpp + r_data/models/models_md2.cpp + r_data/models/voxels.cpp scripting/symbols.cpp scripting/types.cpp scripting/thingdef.cpp @@ -1333,7 +1333,6 @@ source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fr source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+") source_group("Inventory" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_inventory/.+") source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+") -source_group("Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/models/.+") source_group("OpenGL Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/.+") source_group("OpenGL Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/data/.+") source_group("OpenGL Renderer\\Dynamic Lights" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/dynlights/.+") @@ -1360,9 +1359,9 @@ source_group("Poly Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/po source_group("Poly Renderer\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/math/.+") source_group("Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/drawers/.+") source_group("Poly Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/scene/.+") -source_group("Render Data\\Resource Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+\\.h$") -source_group("Render Data\\Resource Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+\\.cpp$") +source_group("Render Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+") source_group("Render Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/.+") +source_group("Render Data\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/models/.+") source_group("Render Interface" FILES r_defs.h r_renderer.h r_sky.cpp r_sky.h r_state.h r_utility.cpp r_utility.h) source_group("Resource Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/resourcefiles/.+") source_group("Platforms\\POSIX Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/.+") diff --git a/src/gl/data/gl_vertexbuffer.h b/src/gl/data/gl_vertexbuffer.h index 2fab5b8fcf..ea4c3481fa 100644 --- a/src/gl/data/gl_vertexbuffer.h +++ b/src/gl/data/gl_vertexbuffer.h @@ -26,7 +26,7 @@ #include "tarray.h" #include "gl/utility/gl_clock.h" #include "gl/system/gl_interface.h" -#include "models/models.h" +#include "r_data/models/models.h" struct vertex_t; struct secplane_t; diff --git a/src/gl/models/gl_models.h b/src/gl/models/gl_models.h index fc22644f6a..b60fabea66 100644 --- a/src/gl/models/gl_models.h +++ b/src/gl/models/gl_models.h @@ -27,7 +27,7 @@ #include "gl/data/gl_vertexbuffer.h" #include "p_pspr.h" #include "r_data/voxels.h" -#include "models/models.h" +#include "r_data/models/models.h" class FGLModelRenderer : public FModelRenderer { diff --git a/src/models/models.cpp b/src/r_data/models/models.cpp similarity index 99% rename from src/models/models.cpp rename to src/r_data/models/models.cpp index 30e194e741..46db0deeb7 100644 --- a/src/models/models.cpp +++ b/src/r_data/models/models.cpp @@ -40,7 +40,7 @@ #include "g_levellocals.h" #include "r_utility.h" #include "i_time.h" -#include "models/models.h" +#include "r_data/models/models.h" CVAR(Bool, gl_interpolate_model_frames, true, CVAR_ARCHIVE) EXTERN_CVAR(Bool, r_drawvoxels) diff --git a/src/models/models.h b/src/r_data/models/models.h similarity index 100% rename from src/models/models.h rename to src/r_data/models/models.h diff --git a/src/models/models_md2.cpp b/src/r_data/models/models_md2.cpp similarity index 99% rename from src/models/models_md2.cpp rename to src/r_data/models/models_md2.cpp index d43a0826b4..11cc8783d9 100644 --- a/src/models/models_md2.cpp +++ b/src/r_data/models/models_md2.cpp @@ -30,7 +30,7 @@ #include "cmdlib.h" #include "sc_man.h" #include "m_crc32.h" -#include "models/models.h" +#include "r_data/models/models.h" #ifdef _MSC_VER #pragma warning(disable:4244) // warning C4244: conversion from 'double' to 'float', possible loss of data diff --git a/src/models/models_md3.cpp b/src/r_data/models/models_md3.cpp similarity index 99% rename from src/models/models_md3.cpp rename to src/r_data/models/models_md3.cpp index 5c4bf045a3..e504b252af 100644 --- a/src/models/models_md3.cpp +++ b/src/r_data/models/models_md3.cpp @@ -24,7 +24,7 @@ #include "cmdlib.h" #include "sc_man.h" #include "m_crc32.h" -#include "models/models.h" +#include "r_data/models/models.h" #define MAX_QPATH 64 diff --git a/src/models/tab_anorms.h b/src/r_data/models/tab_anorms.h similarity index 100% rename from src/models/tab_anorms.h rename to src/r_data/models/tab_anorms.h diff --git a/src/models/voxels.cpp b/src/r_data/models/voxels.cpp similarity index 100% rename from src/models/voxels.cpp rename to src/r_data/models/voxels.cpp