- moved some more files.

src/CMakeLists.txt

@@ -704,6 +704,7 @@ file( GLOB HEADER_FILES
 	sound/timidity/*.h
 	sound/timiditypp/*.h
 	sound/wildmidi/*.h
+	rendering/*.h
 	rendering/2d/*.h
 	rendering/swrenderer/*.h
 	rendering/swrenderer/textures/*.h
@@ -971,7 +972,7 @@ set (PCH_SOURCES
 	m_cheat.cpp
 	m_joy.cpp
 	m_misc.cpp
-	p_acs.cpp
+	playsim/p_acs.cpp
 	playsim/p_actionfunctions.cpp
 	p_conversation.cpp
 	playsim/p_destructible.cpp
@@ -991,9 +992,9 @@ set (PCH_SOURCES
 	playsim/p_things.cpp
 	p_tick.cpp
 	playsim/p_user.cpp
-	r_utility.cpp
+	rendering/r_utility.cpp
-	r_sky.cpp
+	rendering/r_sky.cpp
-	r_videoscale.cpp
+	rendering/r_videoscale.cpp
 	sound/s_advsound.cpp
 	sound/s_environment.cpp
 	sound/s_sndseq.cpp
@@ -1001,9 +1002,9 @@ set (PCH_SOURCES
 	serializer.cpp
 	scriptutil.cpp
 	st_stuff.cpp
-	v_framebuffer.cpp
+	rendering/v_framebuffer.cpp
-	v_palette.cpp
+	r_data/v_palette.cpp
-	v_video.cpp
+	rendering/v_video.cpp
 	wi_stuff.cpp
 	gamedata/a_keys.cpp
 	gamedata/a_weapons.cpp
@@ -1389,6 +1390,7 @@ include_directories( .
 	gamedata/fonts
 	rendering
 	rendering/2d
+	r_data
 	sound
 	sound/music
 	sound/backend
@@ -1400,6 +1402,7 @@ include_directories( .
 	utility/nodebuilder
 	scripting
 	scripting/vm
+	rendering
 	rendering/vulkan/thirdparty
 	../libraries/gdtoa
 	../libraries/dumb/include

src/am_map.cpp

@@ -41,7 +41,6 @@
 #include "p_setup.h"
 #include "c_bind.h"
 #include "serializer.h"
-#include "r_renderer.h"
 #include "r_sky.h"
 #include "sbar.h"
 #include "d_player.h"

src/d_main.cpp

@@ -91,7 +91,6 @@
 #include "m_cheat.h"
 #include "m_joy.h"
 #include "po_man.h"
-#include "r_renderer.h"
 #include "p_local.h"
 #include "autosegs.h"
 #include "fragglescript/t_fs.h"

src/g_game.cpp

@@ -64,7 +64,6 @@
 #include "p_acs.h"
 #include "p_effect.h"
 #include "m_joy.h"
-#include "r_renderer.h"
 #include "r_utility.h"
 #include "a_morph.h"
 #include "p_spec.h"

src/g_level.cpp

@@ -71,7 +71,6 @@
 #include "d_netinf.h"
 #include "menu/menu.h"
 #include "a_sharedglobal.h"
-#include "r_renderer.h"
 #include "r_utility.h"
 #include "p_spec.h"
 #include "serializer.h"

src/gamedata/textures/texturemanager.cpp

@@ -51,7 +51,6 @@
 #include "cmdlib.h"
 #include "g_level.h"
 #include "v_video.h"
-#include "r_renderer.h"
 #include "r_sky.h"
 #include "vm.h"
 #include "image.h"

src/p_saveg.cpp

@@ -52,7 +52,6 @@
 #include "sbar.h"
 #include "r_utility.h"
 #include "r_sky.h"
-#include "r_renderer.h"
 #include "serializer.h"
 #include "g_levellocals.h"
 #include "events.h"

src/p_setup.cpp

@@ -56,7 +56,7 @@
 #include "cmdlib.h"
 #include "md5.h"
 #include "po_man.h"
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "p_blockmap.h"
 #include "r_utility.h"
 #include "p_spec.h"

src/playsim/fragglescript/t_cmd.cpp

@@ -33,7 +33,6 @@
 #include "c_dispatch.h"
 #include "sc_man.h"
 #include "g_level.h"
-#include "r_renderer.h"
 #include "d_player.h"
 #include "g_levellocals.h"
 

src/playsim/p_mobj.cpp

@@ -85,7 +85,6 @@
 #include "d_event.h"
 #include "p_enemy.h"
 #include "gstrings.h"
-#include "r_renderer.h"
 #include "po_man.h"
 #include "p_spec.h"
 #include "p_checkposition.h"

src/playsim/p_user.cpp

@@ -78,7 +78,6 @@
 #include "c_dispatch.h"
 #include "d_net.h"
 #include "serializer.h"
-#include "r_renderer.h"
 #include "d_player.h"
 #include "r_utility.h"
 #include "p_blockmap.h"

src/posix/cocoa/i_video.mm

@@ -48,7 +48,6 @@
 #include "i_system.h"
 #include "m_argv.h"
 #include "m_png.h"
-#include "r_renderer.h"
 #include "swrenderer/r_swrenderer.h"
 #include "st_console.h"
 #include "v_text.h"

src/rendering/2d/v_draw.cpp

@@ -39,7 +39,6 @@
 #include "v_video.h"
 #include "r_defs.h"
 #include "r_utility.h"
-#include "r_renderer.h"
 #include "doomstat.h"
 #include "gi.h"
 #include "g_level.h"

src/rendering/gl/renderer/gl_renderer.h

@@ -4,7 +4,7 @@
 #include "r_defs.h"
 #include "v_video.h"
 #include "vectors.h"
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "r_data/matrix.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "hwrenderer/scene/hw_portal.h"

src/rendering/r_utility.cpp

@@ -51,7 +51,7 @@
 #include "p_effect.h"
 #include "st_start.h"
 #include "v_font.h"
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "serializer.h"
 #include "r_utility.h"
 #include "d_player.h"

src/rendering/swrenderer/r_swcolormaps.cpp

@@ -54,7 +54,7 @@
 #include "v_video.h"
 #include "templates.h"
 #include "r_utility.h"
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "atterm.h"
 #include <atomic>
 

src/rendering/swrenderer/r_swrenderer.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "swrenderer/scene/r_scene.h"
 
 struct FSoftwareRenderer : public FRenderer

src/rendering/swrenderer/r_swscene.cpp

@@ -27,7 +27,7 @@
 
 #include "hwrenderer/textures/hw_ihwtexture.h"
 #include "hwrenderer/textures/hw_material.h"
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "r_swscene.h"
 #include "w_wad.h"
 #include "d_player.h"

src/rendering/v_framebuffer.cpp

@@ -44,7 +44,7 @@
 #include "sbar.h"
 #include "hardware.h"
 #include "r_utility.h"
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "vm.h"
 #include "r_videoscale.h"
 #include "i_time.h"

src/rendering/v_video.cpp

@@ -61,7 +61,7 @@
 #include "hardware.h"
 #include "m_png.h"
 #include "r_utility.h"
-#include "r_renderer.h"
+#include "swrenderer/r_renderer.h"
 #include "menu/menu.h"
 #include "vm.h"
 #include "r_videoscale.h"