zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 14:51:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Move models into r_data

Browse source
This commit is contained in:
Magnus Norddahl 2017-11-25 13:19:00 +01:00
parent 679f42db78
commit 7bb92812b8
9 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/CMakeLists.txt
View file

@ -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/.+")

2
src/gl/data/gl_vertexbuffer.h
View file

@ -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;

2
src/gl/models/gl_models.h
View file

@ -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
{

2
src/models/models.cpp → src/r_data/models/models.cpp
View file

@ -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)

0
src/models/models.h → src/r_data/models/models.h
View file

2
src/models/models_md2.cpp → src/r_data/models/models_md2.cpp
View file

@ -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

2
src/models/models_md3.cpp → src/r_data/models/models_md3.cpp
View file

@ -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

0
src/models/tab_anorms.h → src/r_data/models/tab_anorms.h
View file

0
src/models/voxels.cpp → src/r_data/models/voxels.cpp
View file