Split r_main into r_viewport, r_scene and r_light

src/polyrenderer/drawers/poly_draw_args.cpp

@@ -34,7 +34,7 @@
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "poly_draw_args.h"
-#include "swrenderer/r_main.h"
+#include "swrenderer/scene/r_viewport.h"
 
 void PolyDrawArgs::SetClipPlane(float a, float b, float c, float d)
 {

src/polyrenderer/drawers/poly_triangle.cpp

@@ -35,7 +35,6 @@
 #include "r_data/colormaps.h"
 #include "poly_triangle.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
-#include "swrenderer/r_main.h"
 #include "screen_triangle.h"
 
 CVAR(Bool, r_debug_trisetup, false, 0);

src/polyrenderer/drawers/screen_triangle.cpp

@@ -35,7 +35,6 @@
 #include "r_data/colormaps.h"
 #include "poly_triangle.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
-#include "swrenderer/r_main.h"
 #include "screen_triangle.h"
 
 void ScreenTriangle::SetupNormal(const TriDrawTriangleArgs *args, WorkerThreadData *thread)

src/polyrenderer/math/tri_matrix.cpp

@@ -33,10 +33,11 @@
 #include "r_data/r_translate.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
+#include "r_utility.h"
 #include "tri_matrix.h"
 #include "polyrenderer/drawers/poly_triangle.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
-#include "swrenderer/r_main.h"
+#include "swrenderer/scene/r_viewport.h"
 
 TriMatrix TriMatrix::null()
 {

src/polyrenderer/poly_renderer.cpp

@@ -30,6 +30,8 @@
 #include "gl/data/gl_data.h"
 #include "d_net.h"
 #include "po_man.h"
+#include "swrenderer/scene/r_scene.h"
+#include "swrenderer/scene/r_viewport.h"
 
 EXTERN_CVAR(Int, screenblocks)
 void InitGLRMapinfoData();

src/polyrenderer/poly_renderer.h

@@ -28,7 +28,6 @@
 #include <functional>
 #include "doomdata.h"
 #include "r_utility.h"
-#include "swrenderer/r_main.h"
 #include "scene/poly_portal.h"
 #include "scene/poly_playersprite.h"
 #include "scene/poly_sky.h"

src/polyrenderer/scene/poly_decal.cpp

@@ -28,6 +28,8 @@
 #include "poly_decal.h"
 #include "polyrenderer/poly_renderer.h"
 #include "a_sharedglobal.h"
+#include "swrenderer/scene/r_scene.h"
+#include "swrenderer/scene/r_light.h"
 
 void RenderPolyDecal::RenderWallDecals(const TriMatrix &worldToClip, const Vec4f &clipPlane, const seg_t *line, uint32_t subsectorDepth, uint32_t stencilValue)
 {

src/polyrenderer/scene/poly_particle.cpp

@@ -27,6 +27,7 @@
 #include "r_data/r_translate.h"
 #include "poly_particle.h"
 #include "polyrenderer/poly_renderer.h"
+#include "swrenderer/scene/r_light.h"
 
 void RenderPolyParticle::Render(const TriMatrix &worldToClip, const Vec4f &clipPlane, particle_t *particle, subsector_t *sub, uint32_t subsectorDepth, uint32_t stencilValue)
 {

src/polyrenderer/scene/poly_plane.cpp

@@ -29,6 +29,7 @@
 #include "poly_portal.h"
 #include "polyrenderer/poly_renderer.h"
 #include "r_sky.h"
+#include "swrenderer/scene/r_light.h"
 
 EXTERN_CVAR(Int, r_3dfloors)
 

src/polyrenderer/scene/poly_playersprite.cpp

@@ -27,6 +27,9 @@
 #include "r_data/r_translate.h"
 #include "poly_playersprite.h"
 #include "polyrenderer/poly_renderer.h"
+#include "d_player.h"
+#include "swrenderer/scene/r_viewport.h"
+#include "swrenderer/scene/r_light.h"
 
 EXTERN_CVAR(Bool, r_drawplayersprites)
 EXTERN_CVAR(Bool, r_deathcamera)

src/polyrenderer/scene/poly_portal.cpp

@@ -28,6 +28,7 @@
 #include "r_data/r_translate.h"
 #include "poly_portal.h"
 #include "polyrenderer/poly_renderer.h"
+#include "swrenderer/scene/r_light.h"
 #include "gl/data/gl_data.h"
 
 extern bool r_showviewer;

src/polyrenderer/scene/poly_scene.h

@@ -28,7 +28,6 @@
 #include <functional>
 #include "doomdata.h"
 #include "r_utility.h"
-#include "swrenderer/r_main.h"
 #include "polyrenderer/drawers/poly_triangle.h"
 #include "polyrenderer/math/poly_intersection.h"
 #include "poly_wall.h"

src/polyrenderer/scene/poly_sky.cpp

@@ -28,6 +28,7 @@
 #include "poly_portal.h"
 #include "r_sky.h" // for skyflatnum
 #include "g_levellocals.h"
+#include "swrenderer/scene/r_light.h"
 
 PolySkyDome::PolySkyDome()
 {

src/polyrenderer/scene/poly_sprite.cpp

@@ -28,6 +28,7 @@
 #include "poly_sprite.h"
 #include "polyrenderer/poly_renderer.h"
 #include "polyrenderer/math/poly_intersection.h"
+#include "swrenderer/scene/r_light.h"
 
 EXTERN_CVAR(Float, transsouls)
 EXTERN_CVAR(Int, r_drawfuzz)

src/polyrenderer/scene/poly_wall.cpp

@@ -32,6 +32,7 @@
 #include "poly_decal.h"
 #include "polyrenderer/poly_renderer.h"
 #include "r_sky.h"
+#include "swrenderer/scene/r_light.h"
 
 EXTERN_CVAR(Bool, r_drawmirrors)