- moved model code to 'common'.

src/CMakeLists.txt

@@ -595,7 +595,6 @@ file( GLOB HEADER_FILES
 	sound/backend/*.h*
 	posix/*.h
 	r_data/*.h
-	r_data/models/*.h
 	common/audio/sound/thirdparty/*.h
 	common/audio/sound/*.h
 	common/audio/music/*.h*
@@ -610,6 +609,7 @@ file( GLOB HEADER_FILES
 	common/platform/posix/cocoa/*.h
 	common/platform/posix/sdl/*.h
 	common/platform/win32/*.h
+	common/models/*.h
 	common/textures/*.h
 	common/textures/hires/hqnx/*.h
 	common/textures/hires/hqnx_asm/*.h
@@ -996,19 +996,12 @@ set (PCH_SOURCES
 	r_data/r_translate.cpp
 	r_data/sprites.cpp
 	r_data/portalgroups.cpp
-	r_data/voxels.cpp
 	r_data/voxeldef.cpp
 	r_data/r_canvastexture.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
-	r_data/models/models_ue1.cpp
-	r_data/models/models_obj.cpp
-	r_data/models/models.cpp
-	r_data/models/model.cpp
+	r_data/models.cpp
 	scripting/vmiterators.cpp
 	scripting/vmthunks.cpp
 	scripting/vmthunks_actors.cpp
@@ -1076,6 +1069,13 @@ set (PCH_SOURCES
 	common/textures/formats/tgatexture.cpp
 	common/textures/formats/stbtexture.cpp
 	common/textures/hires/hqresize.cpp
+	common/models/models_md3.cpp
+	common/models/models_md2.cpp
+	common/models/models_voxel.cpp
+	common/models/models_ue1.cpp
+	common/models/models_obj.cpp
+	common/models/model.cpp
+	common/models/voxels.cpp
 	common/console/c_commandline.cpp
 	common/console/c_buttons.cpp
 	common/console/c_bind.cpp
@@ -1249,6 +1249,7 @@ include_directories( .
 	common/textures/formats
 	common/textures/hires
 	common/textures
+	common/models
 	common/filesystem
 	common/utility
 	common/console
@@ -1441,7 +1442,6 @@ source_group("Rendering\\Poly Renderer\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRE
 source_group("Rendering\\Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/drawers/.+")
 source_group("Rendering\\Poly Renderer\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/backend/.+")
 source_group("Render Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+")
-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("Platforms\\POSIX Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/.+")
 source_group("Platforms\\Win32 Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/win32/.+")
@@ -1480,6 +1480,7 @@ source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^$
 source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+")
 source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+")
 source_group("Common\\Rendering\\OpenGL Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl/.+")
+source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+")
 source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+")
 source_group("Common\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/.+")
 source_group("Common\\Textures\\Hires\\HQ Resize" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/hqnx/.+")

src/common/models/model.cpp

@@ -31,12 +31,12 @@
 #include "sc_man.h"
 #include "m_crc32.h"
 #include "printf.h"
-#include "r_data/models/models.h"
-#include "r_data/models/model_ue1.h"
-#include "r_data/models/model_obj.h"
-#include "r_data/models/model_md2.h"
-#include "r_data/models/model_md3.h"
-#include "r_data/models/model_kvx.h"
+#include "models.h"
+#include "model_ue1.h"
+#include "model_obj.h"
+#include "model_md2.h"
+#include "model_md3.h"
+#include "model_kvx.h"
 #include "i_time.h"
 #include "texturemanager.h"
 #include "modelrenderer.h"

src/common/models/model_kvx.h

@@ -1,6 +1,14 @@
 #pragma once
 
 #include "model.h"
+#include "i_modelvertexbuffer.h"
+#include "tarray.h"
+#include "xs_Float.h"
+
+struct FVoxel;
+struct kvxslab_t;
+class FModelRenderer;
+class FGameTexture;
 
 struct FVoxelVertexHash
 {

src/common/models/models_md2.cpp

@@ -27,8 +27,7 @@
 **/
 
 #include "filesystem.h"
-#include "r_data/models/models.h"
-#include "r_data/models/model_md2.h"
+#include "model_md2.h"
 #include "texturemanager.h"
 #include "modelrenderer.h"
 

src/common/models/models_md3.cpp

@@ -22,8 +22,7 @@
 
 #include "filesystem.h"
 #include "cmdlib.h"
-#include "r_data/models/models.h"
-#include "r_data/models/model_md3.h"
+#include "model_md3.h"
 #include "texturemanager.h"
 #include "modelrenderer.h"
 

src/common/models/models_obj.cpp

@@ -20,7 +20,7 @@
 //--------------------------------------------------------------------------
 
 #include "filesystem.h"
-#include "r_data/models/model_obj.h"
+#include "model_obj.h"
 #include "texturemanager.h"
 #include "modelrenderer.h"
 

src/common/models/models_ue1.cpp

@@ -22,7 +22,7 @@
 
 #include "filesystem.h"
 #include "cmdlib.h"
-#include "r_data/models/model_ue1.h"
+#include "model_ue1.h"
 #include "texturemanager.h"
 #include "modelrenderer.h"
 

src/common/models/models_voxel.cpp

@@ -27,11 +27,8 @@
 **/
 
 #include "filesystem.h"
-#include "g_level.h"
 #include "colormatcher.h"
 #include "bitmap.h"
-#include "g_levellocals.h"
-#include "models.h"
 #include "model_kvx.h"
 #include "image.h"
 #include "texturemanager.h"

src/r_data/models.cpp

@@ -38,7 +38,7 @@
 #include "d_player.h"
 #include "g_levellocals.h"
 #include "r_utility.h"
-#include "r_data/models/models.h"
+#include "models.h"
 #include "model_kvx.h"
 #include "i_time.h"
 #include "texturemanager.h"

src/r_data/models.h

@@ -28,7 +28,7 @@
 #include "m_bbox.h"
 #include "r_defs.h"
 #include "g_levellocals.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "i_modelvertexbuffer.h"
 #include "model.h"
 

src/r_data/sprites.cpp

@@ -31,7 +31,7 @@
 #include "c_dispatch.h"
 #include "v_text.h"
 #include "r_data/sprites.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "vm.h"
 #include "texturemanager.h"
 

src/rendering/gl/renderer/gl_renderer.cpp

@@ -58,7 +58,7 @@
 #include "hw_lightbuffer.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "r_videoscale.h"
-#include "r_data/models/models.h"
+#include "model.h"
 #include "gl_postprocessstate.h"
 #include "gl_buffers.h"
 #include "texturemanager.h"

src/rendering/hwrenderer/models/hw_models.h

@@ -24,11 +24,11 @@
 
 #include "tarray.h"
 #include "p_pspr.h"
-#include "r_data/voxels.h"
-#include "r_data/models/models.h"
+#include "voxels.h"
+#include "models.h"
 #include "hwrenderer/data/buffers.h"
 #include "hw_modelvertexbuffer.h"
-#include "r_data/models/modelrenderer.h"
+#include "modelrenderer.h"
 
 class HWSprite;
 struct HWDrawInfo;

src/rendering/hwrenderer/scene/hw_drawinfo.cpp

@@ -35,10 +35,10 @@
 #include "hw_renderstate.h"
 #include "hw_drawinfo.h"
 #include "po_man.h"
-#include "r_data/models/models.h"
+#include "models.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hw_cvars.h"
-#include "hwrenderer/data/hw_viewpointbuffer.h"
+#include "hw_viewpointbuffer.h"
 #include "flatvertices.h"
 #include "hw_lightbuffer.h"
 #include "hw_vrmodes.h"

src/rendering/hwrenderer/scene/hw_spritelight.cpp

@@ -36,7 +36,7 @@
 #include "hw_shadowmap.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
-#include "r_data/models/models.h"
+#include "models.h"
 
 template<class T>
 T smoothstep(const T edge0, const T edge1, const T x)

src/rendering/hwrenderer/scene/hw_sprites.cpp

@@ -39,7 +39,7 @@
 #include "actorinlines.h"
 #include "r_data/r_vanillatrans.h"
 #include "matrix.h"
-#include "r_data/models/models.h"
+#include "models.h"
 #include "vectors.h"
 #include "texturemanager.h"
 #include "basics.h"

src/rendering/hwrenderer/scene/hw_weapon.cpp

@@ -31,7 +31,7 @@
 #include "doomstat.h"
 #include "d_player.h"
 #include "g_levellocals.h"
-#include "r_data/models/models.h"
+#include "models.h"
 #include "hw_weapon.h"
 #include "hw_fakeflat.h"
 #include "texturemanager.h"

src/rendering/hwrenderer/textures/hw_precache.cpp

@@ -30,14 +30,14 @@
 #include "c_dispatch.h"
 #include "r_state.h"
 #include "actor.h"
-#include "r_data/models/models.h"
+#include "models.h"
 #include "skyboxtexture.h"
 #include "hw_material.h"
 #include "image.h"
 #include "v_video.h"
 #include "v_font.h"
 #include "texturemanager.h"
-#include "r_data/models/modelrenderer.h"
+#include "modelrenderer.h"
 
 EXTERN_CVAR(Bool, gl_precache)
 

src/rendering/polyrenderer/drawers/poly_thread.cpp

@@ -31,7 +31,7 @@
 #include "g_game.h"
 #include "g_level.h"
 #include "r_data/r_translate.h"
-#include "r_data/models/models.h"
+#include "model.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "poly_thread.h"

src/rendering/polyrenderer/drawers/poly_triangle.cpp

@@ -31,7 +31,7 @@
 #include "g_game.h"
 #include "g_level.h"
 #include "r_data/r_translate.h"
-#include "r_data/models/models.h"
+#include "model.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "poly_triangle.h"

src/rendering/swrenderer/r_swrenderer.cpp

@@ -46,7 +46,7 @@
 #include "scene/r_3dfloors.h"
 #include "scene/r_portal.h"
 #include "textures.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "drawers/r_draw_rgba.h"
 #include "p_setup.h"
 #include "g_levellocals.h"

src/rendering/swrenderer/things/r_model.h

@@ -24,7 +24,7 @@
 
 #include "polyrenderer/drawers/poly_triangle.h"
 #include "matrix.h"
-#include "r_data/models/models.h"
+#include "models.h"
 #include "swrenderer/r_renderthread.h"
 #include "swrenderer/things/r_visiblesprite.h"
 

src/rendering/swrenderer/things/r_particle.cpp

@@ -47,7 +47,7 @@
 #include "v_palette.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "p_local.h"
 #include "p_maputl.h"
 #include "r_voxel.h"

src/rendering/swrenderer/things/r_playersprite.cpp

@@ -52,7 +52,7 @@
 #include "v_palette.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "p_local.h"
 #include "p_maputl.h"
 #include "r_voxel.h"

src/rendering/swrenderer/things/r_sprite.cpp

@@ -53,7 +53,7 @@
 #include "v_palette.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "p_local.h"
 #include "r_voxel.h"
 #include "swrenderer/segments/r_drawsegment.h"

src/rendering/swrenderer/things/r_voxel.cpp

@@ -37,7 +37,7 @@
 #include "sbar.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "r_data/sprites.h"
 #include "d_net.h"
 #include "po_man.h"

src/rendering/swrenderer/things/r_wallsprite.cpp

@@ -53,7 +53,7 @@
 #include "v_palette.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
-#include "r_data/voxels.h"
+#include "voxels.h"
 #include "p_local.h"
 #include "p_maputl.h"
 #include "r_voxel.h"