- moved model code to 'common'.

2020-04-27 20:50:46 +02:00 · 2020-04-27 20:50:46 +02:00 · 3ee1aa76c3
commit 3ee1aa76c3
parent d434ce32c8
36 changed files with 52 additions and 48 deletions
--- a/src/rendering/gl/renderer/gl_renderer.cpp
+++ b/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"
--- a/src/rendering/hwrenderer/models/hw_models.h
+++ b/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;
--- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp
+++ b/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"
--- a/src/rendering/hwrenderer/scene/hw_spritelight.cpp
+++ b/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)
--- a/src/rendering/hwrenderer/scene/hw_sprites.cpp
+++ b/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"
--- a/src/rendering/hwrenderer/scene/hw_weapon.cpp
+++ b/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"
--- a/src/rendering/hwrenderer/textures/hw_precache.cpp
+++ b/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)

--- a/src/rendering/polyrenderer/drawers/poly_thread.cpp
+++ b/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"
--- a/src/rendering/polyrenderer/drawers/poly_triangle.cpp
+++ b/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"
--- a/src/rendering/swrenderer/r_swrenderer.cpp
+++ b/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"
--- a/src/rendering/swrenderer/things/r_model.h
+++ b/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"

--- a/src/rendering/swrenderer/things/r_particle.cpp
+++ b/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"
--- a/src/rendering/swrenderer/things/r_playersprite.cpp
+++ b/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"
--- a/src/rendering/swrenderer/things/r_sprite.cpp
+++ b/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"
--- a/src/rendering/swrenderer/things/r_voxel.cpp
+++ b/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"
--- a/src/rendering/swrenderer/things/r_wallsprite.cpp
+++ b/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"