Move files into additional folders

src/CMakeLists.txt

@@ -768,6 +768,9 @@ file( GLOB HEADER_FILES
 	swrenderer/*.h
 	swrenderer/drawers/*.h
 	swrenderer/scene/*.h
+	swrenderer/segments/*.h
+	swrenderer/plane/*.h
+	swrenderer/things/*.h
 	polyrenderer/*.h
 	polyrenderer/math/*.h
 	polyrenderer/drawers/*.h
@@ -819,22 +822,22 @@ set( FASTMATH_PCH_SOURCES
 	swrenderer/scene/r_plane.cpp
 	swrenderer/scene/r_segs.cpp
 	swrenderer/scene/r_things.cpp
-	swrenderer/scene/r_voxel.cpp
 	swrenderer/scene/r_walldraw.cpp
-	swrenderer/scene/r_clip_segment.cpp
-	swrenderer/scene/r_draw_segment.cpp
-	swrenderer/scene/r_portal_segment.cpp
 	swrenderer/scene/r_portal.cpp
-	swrenderer/scene/r_visible_plane.cpp
-	swrenderer/scene/r_visible_sprite.cpp
-	swrenderer/scene/r_particle.cpp
-	swrenderer/scene/r_playersprite.cpp
-	swrenderer/scene/r_wallsprite.cpp
-	swrenderer/scene/r_decal.cpp
-	swrenderer/scene/r_skyplane.cpp
-	swrenderer/scene/r_flatplane.cpp
-	swrenderer/scene/r_slopeplane.cpp
-	swrenderer/scene/r_fogboundary.cpp
+	swrenderer/segments/r_clipsegment.cpp
+	swrenderer/segments/r_drawsegment.cpp
+	swrenderer/segments/r_portalsegment.cpp
+	swrenderer/things/r_visiblesprite.cpp
+	swrenderer/things/r_voxel.cpp
+	swrenderer/things/r_particle.cpp
+	swrenderer/things/r_playersprite.cpp
+	swrenderer/things/r_wallsprite.cpp
+	swrenderer/things/r_decal.cpp
+	swrenderer/plane/r_visibleplane.cpp
+	swrenderer/plane/r_skyplane.cpp
+	swrenderer/plane/r_flatplane.cpp
+	swrenderer/plane/r_slopeplane.cpp
+	swrenderer/plane/r_fogboundary.cpp
 	polyrenderer/poly_renderer.cpp
 	polyrenderer/scene/poly_scene.cpp
 	polyrenderer/scene/poly_portal.cpp
@@ -1471,6 +1474,9 @@ source_group("OpenGL Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_S
 source_group("Software Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/.+")
 source_group("Software Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/drawers/.+")
 source_group("Software Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/scene/.+")
+source_group("Software Renderer\\Segments" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/segments/.+")
+source_group("Software Renderer\\Plane" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/plane/.+")
+source_group("Software Renderer\\Things" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/things/.+")
 source_group("Poly Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/.+")
 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/.+")

src/swrenderer/plane/r_flatplane.cpp

@@ -16,19 +16,19 @@
 #include "cmdlib.h"
 #include "d_net.h"
 #include "g_level.h"
-#include "r_bsp.h"
+#include "swrenderer/scene/r_bsp.h"
 #include "r_flatplane.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_segs.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "gl/dynlights/gl_dynlight.h"
-#include "r_walldraw.h"
-#include "r_clip_segment.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_walldraw.h"
+#include "swrenderer/segments/r_clipsegment.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
+#include "swrenderer/scene/r_plane.h"
 #include "swrenderer/r_memory.h"
 
 namespace swrenderer

src/swrenderer/plane/r_flatplane.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_visible_plane.h"
+#include "r_visibleplane.h"
 
 namespace swrenderer
 {

src/swrenderer/plane/r_fogboundary.cpp

@@ -16,19 +16,19 @@
 #include "cmdlib.h"
 #include "d_net.h"
 #include "g_level.h"
-#include "r_bsp.h"
-#include "r_fogboundary.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/plane/r_fogboundary.h"
+#include "swrenderer/scene/r_segs.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "gl/dynlights/gl_dynlight.h"
-#include "r_walldraw.h"
-#include "r_clip_segment.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_walldraw.h"
+#include "swrenderer/segments/r_clipsegment.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
+#include "swrenderer/scene/r_plane.h"
 #include "swrenderer/r_memory.h"
 
 #ifdef _MSC_VER

src/swrenderer/plane/r_fogboundary.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_visible_plane.h"
+#include "r_visibleplane.h"
 
 namespace swrenderer
 {

src/swrenderer/plane/r_skyplane.cpp

@@ -16,18 +16,18 @@
 #include "cmdlib.h"
 #include "d_net.h"
 #include "g_level.h"
-#include "r_bsp.h"
+#include "swrenderer/scene/r_bsp.h"
 #include "r_skyplane.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_segs.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "gl/dynlights/gl_dynlight.h"
-#include "r_walldraw.h"
-#include "r_clip_segment.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
+#include "swrenderer/scene/r_walldraw.h"
+#include "swrenderer/segments/r_clipsegment.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
 #include "swrenderer/r_memory.h"
 
 CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);

src/swrenderer/plane/r_skyplane.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_visible_plane.h"
+#include "r_visibleplane.h"
 
 namespace swrenderer
 {

src/swrenderer/plane/r_slopeplane.cpp

@@ -16,19 +16,19 @@
 #include "cmdlib.h"
 #include "d_net.h"
 #include "g_level.h"
-#include "r_bsp.h"
+#include "swrenderer/scene/r_bsp.h"
 #include "r_slopeplane.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_segs.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "gl/dynlights/gl_dynlight.h"
-#include "r_walldraw.h"
-#include "r_clip_segment.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_walldraw.h"
+#include "swrenderer/segments/r_clipsegment.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
+#include "swrenderer/scene/r_plane.h"
 #include "swrenderer/r_memory.h"
 
 #ifdef _MSC_VER

src/swrenderer/plane/r_slopeplane.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_visible_plane.h"
+#include "r_visibleplane.h"
 
 namespace swrenderer
 {

src/swrenderer/plane/r_visibleplane.cpp

@@ -17,8 +17,8 @@
 #include "cmdlib.h"
 #include "d_net.h"
 #include "g_level.h"
-#include "r_bsp.h"
-#include "r_visible_plane.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "r_visibleplane.h"
 
 namespace swrenderer
 {

src/swrenderer/r_main.cpp

@@ -38,11 +38,11 @@
 #include "scene/r_things.h"
 #include "drawers/r_draw.h"
 #include "scene/r_plane.h"
-#include "scene/r_flatplane.h"
+#include "plane/r_flatplane.h"
 #include "scene/r_bsp.h"
-#include "scene/r_draw_segment.h"
-#include "scene/r_portal_segment.h"
-#include "scene/r_clip_segment.h"
+#include "segments/r_drawsegment.h"
+#include "segments/r_portalsegment.h"
+#include "segments/r_clipsegment.h"
 #include "scene/r_segs.h"
 #include "scene/r_3dfloors.h"
 #include "scene/r_portal.h"

src/swrenderer/r_swrenderer.cpp

@@ -34,7 +34,7 @@
 
 
 #include "r_main.h"
-#include "swrenderer/scene/r_playersprite.h"
+#include "swrenderer/things/r_playersprite.h"
 #include "v_palette.h"
 #include "v_video.h"
 #include "m_png.h"

src/swrenderer/scene/r_bsp.cpp

@@ -36,9 +36,9 @@
 #include "r_plane.h"
 #include "swrenderer/drawers/r_draw.h"
 #include "r_things.h"
-#include "r_particle.h"
+#include "swrenderer/things/r_particle.h"
 #include "r_3dfloors.h"
-#include "r_clip_segment.h"
+#include "swrenderer/segments/r_clipsegment.h"
 #include "r_portal.h"
 #include "a_sharedglobal.h"
 #include "g_level.h"

src/swrenderer/scene/r_plane.cpp

@@ -62,12 +62,12 @@
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "gl/dynlights/gl_dynlight.h"
 #include "r_walldraw.h"
-#include "r_clip_segment.h"
-#include "r_draw_segment.h"
+#include "swrenderer/segments/r_clipsegment.h"
+#include "swrenderer/segments/r_drawsegment.h"
 #include "r_portal.h"
-#include "r_skyplane.h"
-#include "r_flatplane.h"
-#include "r_slopeplane.h"
+#include "swrenderer/plane/r_skyplane.h"
+#include "swrenderer/plane/r_flatplane.h"
+#include "swrenderer/plane/r_slopeplane.h"
 #include "swrenderer/r_memory.h"
 
 #ifdef _MSC_VER

src/swrenderer/scene/r_plane.h

@@ -23,7 +23,7 @@
 #ifndef __R_PLANE_H__
 #define __R_PLANE_H__
 
-#include "r_visible_plane.h"
+#include "swrenderer/plane/r_visibleplane.h"
 
 namespace swrenderer
 {

src/swrenderer/scene/r_portal.cpp

@@ -33,8 +33,8 @@
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "r_utility.h"
 #include "r_plane.h"
-#include "r_clip_segment.h"
-#include "r_draw_segment.h"
+#include "swrenderer/segments/r_clipsegment.h"
+#include "swrenderer/segments/r_drawsegment.h"
 #include "r_things.h"
 #include "r_3dfloors.h"
 #include "swrenderer/r_main.h"

src/swrenderer/scene/r_portal.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_portal_segment.h"
+#include "swrenderer/segments/r_portalsegment.h"
 
 namespace swrenderer
 {

src/swrenderer/scene/r_segs.cpp

@@ -43,17 +43,17 @@
 #include "g_level.h"
 #include "r_bsp.h"
 #include "r_plane.h"
-#include "r_fogboundary.h"
+#include "swrenderer/plane/r_fogboundary.h"
 #include "r_segs.h"
 #include "r_3dfloors.h"
 #include "swrenderer/drawers/r_draw.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "r_walldraw.h"
-#include "r_draw_segment.h"
+#include "swrenderer/segments/r_drawsegment.h"
 #include "r_portal.h"
-#include "r_wallsprite.h"
-#include "r_decal.h"
+#include "swrenderer/things/r_wallsprite.h"
+#include "swrenderer/things/r_decal.h"
 #include "swrenderer/r_memory.h"
 
 #define WALLYREPEAT 8

src/swrenderer/scene/r_things.cpp

@@ -67,12 +67,12 @@
 #include "r_data/voxels.h"
 #include "p_local.h"
 #include "p_maputl.h"
-#include "r_voxel.h"
-#include "r_draw_segment.h"
+#include "swrenderer/things/r_voxel.h"
+#include "swrenderer/segments/r_drawsegment.h"
 #include "r_portal.h"
-#include "r_particle.h"
-#include "r_playersprite.h"
-#include "r_wallsprite.h"
+#include "swrenderer/things/r_particle.h"
+#include "swrenderer/things/r_playersprite.h"
+#include "swrenderer/things/r_wallsprite.h"
 #include "swrenderer/r_memory.h"
 
 EXTERN_CVAR(Int, r_drawfuzz)

src/swrenderer/scene/r_things.h

@@ -23,7 +23,7 @@
 #ifndef __R_THINGS__
 #define __R_THINGS__
 
-#include "r_visible_sprite.h"
+#include "swrenderer/things/r_visiblesprite.h"
 
 struct particle_t;
 struct FVoxel;

src/swrenderer/scene/r_walldraw.cpp

@@ -45,7 +45,7 @@
 #include "gl/dynlights/gl_dynlight.h"
 #include "swrenderer/drawers/r_drawers.h"
 #include "r_walldraw.h"
-#include "r_draw_segment.h"
+#include "swrenderer/segments/r_drawsegment.h"
 
 namespace swrenderer
 {

src/swrenderer/segments/r_clipsegment.cpp

@@ -7,22 +7,22 @@
 #include "p_lnspec.h"
 #include "p_setup.h"
 #include "swrenderer/r_main.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_plane.h"
 #include "swrenderer/drawers/r_draw.h"
-#include "r_things.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_things.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "a_sharedglobal.h"
 #include "g_level.h"
 #include "p_effect.h"
 #include "doomstat.h"
 #include "r_state.h"
-#include "r_bsp.h"
-#include "r_segs.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/scene/r_segs.h"
 #include "v_palette.h"
 #include "r_sky.h"
 #include "po_man.h"
 #include "r_data/colormaps.h"
-#include "r_clip_segment.h"
+#include "swrenderer/segments/r_clipsegment.h"
 
 namespace swrenderer
 {

src/swrenderer/segments/r_drawsegment.cpp

@@ -7,22 +7,22 @@
 #include "p_lnspec.h"
 #include "p_setup.h"
 #include "swrenderer/r_main.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_plane.h"
 #include "swrenderer/drawers/r_draw.h"
-#include "r_things.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_things.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "a_sharedglobal.h"
 #include "g_level.h"
 #include "p_effect.h"
 #include "doomstat.h"
 #include "r_state.h"
-#include "r_bsp.h"
-#include "r_segs.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/scene/r_segs.h"
 #include "v_palette.h"
 #include "r_sky.h"
 #include "po_man.h"
 #include "r_data/colormaps.h"
-#include "r_draw_segment.h"
+#include "swrenderer/segments/r_drawsegment.h"
 
 namespace swrenderer
 {

src/swrenderer/segments/r_drawsegment.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_bsp.h"
+#include "swrenderer/scene/r_bsp.h"
 
 namespace swrenderer
 {

src/swrenderer/segments/r_portalsegment.cpp

@@ -7,22 +7,22 @@
 #include "p_lnspec.h"
 #include "p_setup.h"
 #include "swrenderer/r_main.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_plane.h"
 #include "swrenderer/drawers/r_draw.h"
-#include "r_things.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_things.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "a_sharedglobal.h"
 #include "g_level.h"
 #include "p_effect.h"
 #include "doomstat.h"
 #include "r_state.h"
-#include "r_bsp.h"
-#include "r_segs.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/scene/r_segs.h"
 #include "v_palette.h"
 #include "r_sky.h"
 #include "po_man.h"
 #include "r_data/colormaps.h"
-#include "r_portal_segment.h"
+#include "swrenderer/segments/r_portalsegment.h"
 
 namespace swrenderer
 {

src/swrenderer/things/r_decal.cpp

@@ -17,19 +17,18 @@
 #include "a_sharedglobal.h"
 #include "d_net.h"
 #include "g_level.h"
-#include "r_bsp.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/scene/r_plane.h"
 #include "r_decal.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "swrenderer/drawers/r_draw.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
-#include "r_walldraw.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
+#include "swrenderer/scene/r_walldraw.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
 #include "r_wallsprite.h"
-#include "r_draw_segment.h"
-#include "r_segs.h"
+#include "swrenderer/scene/r_segs.h"
 #include "swrenderer/r_memory.h"
 
 namespace swrenderer

src/swrenderer/things/r_particle.cpp

@@ -10,7 +10,7 @@
 #include "w_wad.h"
 #include "swrenderer/r_main.h"
 #include "swrenderer/scene/r_things.h"
-#include "swrenderer/scene/r_particle.h"
+#include "swrenderer/things/r_particle.h"
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -27,10 +27,10 @@
 #include "colormatcher.h"
 #include "d_netinf.h"
 #include "p_effect.h"
-#include "r_bsp.h"
-#include "r_plane.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/scene/r_plane.h"
+#include "swrenderer/scene/r_segs.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "swrenderer/drawers/r_draw_pal.h"
 #include "v_palette.h"
@@ -40,8 +40,8 @@
 #include "p_local.h"
 #include "p_maputl.h"
 #include "r_voxel.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
 #include "swrenderer/r_memory.h"
 
 namespace swrenderer

src/swrenderer/things/r_particle.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_visible_sprite.h"
+#include "r_visiblesprite.h"
 
 namespace swrenderer
 {

src/swrenderer/things/r_playersprite.cpp

@@ -10,7 +10,7 @@
 #include "w_wad.h"
 #include "swrenderer/r_main.h"
 #include "swrenderer/scene/r_things.h"
-#include "swrenderer/scene/r_playersprite.h"
+#include "swrenderer/things/r_playersprite.h"
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -27,10 +27,10 @@
 #include "colormatcher.h"
 #include "d_netinf.h"
 #include "p_effect.h"
-#include "r_bsp.h"
-#include "r_plane.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/scene/r_plane.h"
+#include "swrenderer/scene/r_segs.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "swrenderer/drawers/r_draw_pal.h"
 #include "v_palette.h"
@@ -40,8 +40,8 @@
 #include "p_local.h"
 #include "p_maputl.h"
 #include "r_voxel.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
 #include "swrenderer/r_memory.h"
 
 EXTERN_CVAR(Bool, st_scale)

src/swrenderer/things/r_playersprite.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_visible_sprite.h"
+#include "r_visiblesprite.h"
 
 namespace swrenderer
 {

src/swrenderer/things/r_visiblesprite.cpp

@@ -9,7 +9,7 @@
 #include "i_system.h"
 #include "w_wad.h"
 #include "swrenderer/r_main.h"
-#include "swrenderer/scene/r_visible_sprite.h"
+#include "swrenderer/things/r_visiblesprite.h"
 
 namespace swrenderer
 {

src/swrenderer/things/r_visiblesprite.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_bsp.h"
+#include "swrenderer/scene/r_bsp.h"
 
 struct particle_t;
 struct FVoxel;

src/swrenderer/things/r_voxel.cpp

@@ -30,7 +30,7 @@
 #include "r_data/sprites.h"
 #include "d_net.h"
 #include "po_man.h"
-#include "r_things.h"
+#include "swrenderer/scene/r_things.h"
 #include "swrenderer/drawers/r_draw.h"
 #include "swrenderer/drawers/r_thread.h"
 #include "r_utility.h"

src/swrenderer/things/r_wallsprite.cpp

@@ -10,7 +10,7 @@
 #include "w_wad.h"
 #include "swrenderer/r_main.h"
 #include "swrenderer/scene/r_things.h"
-#include "swrenderer/scene/r_wallsprite.h"
+#include "swrenderer/things/r_wallsprite.h"
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -27,10 +27,10 @@
 #include "colormatcher.h"
 #include "d_netinf.h"
 #include "p_effect.h"
-#include "r_bsp.h"
-#include "r_plane.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "swrenderer/scene/r_bsp.h"
+#include "swrenderer/scene/r_plane.h"
+#include "swrenderer/scene/r_segs.h"
+#include "swrenderer/scene/r_3dfloors.h"
 #include "swrenderer/drawers/r_draw_rgba.h"
 #include "swrenderer/drawers/r_draw_pal.h"
 #include "v_palette.h"
@@ -40,8 +40,8 @@
 #include "p_local.h"
 #include "p_maputl.h"
 #include "r_voxel.h"
-#include "r_draw_segment.h"
-#include "r_portal.h"
+#include "swrenderer/segments/r_drawsegment.h"
+#include "swrenderer/scene/r_portal.h"
 #include "swrenderer/r_memory.h"
 
 namespace swrenderer

src/swrenderer/things/r_wallsprite.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "r_visible_sprite.h"
+#include "r_visiblesprite.h"
 
 namespace swrenderer
 {