diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8c1d559de..3451b000b 100644 --- a/src/CMakeLists.txt +++ b/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/.+") diff --git a/src/swrenderer/scene/r_flatplane.cpp b/src/swrenderer/plane/r_flatplane.cpp similarity index 96% rename from src/swrenderer/scene/r_flatplane.cpp rename to src/swrenderer/plane/r_flatplane.cpp index fba9cd162..51d7b88cc 100644 --- a/src/swrenderer/scene/r_flatplane.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_flatplane.h b/src/swrenderer/plane/r_flatplane.h similarity index 92% rename from src/swrenderer/scene/r_flatplane.h rename to src/swrenderer/plane/r_flatplane.h index d719c7153..7164b140c 100644 --- a/src/swrenderer/scene/r_flatplane.h +++ b/src/swrenderer/plane/r_flatplane.h @@ -1,7 +1,7 @@ #pragma once -#include "r_visible_plane.h" +#include "r_visibleplane.h" namespace swrenderer { diff --git a/src/swrenderer/scene/r_fogboundary.cpp b/src/swrenderer/plane/r_fogboundary.cpp similarity index 89% rename from src/swrenderer/scene/r_fogboundary.cpp rename to src/swrenderer/plane/r_fogboundary.cpp index b8c395aaf..5244b937f 100644 --- a/src/swrenderer/scene/r_fogboundary.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_fogboundary.h b/src/swrenderer/plane/r_fogboundary.h similarity index 85% rename from src/swrenderer/scene/r_fogboundary.h rename to src/swrenderer/plane/r_fogboundary.h index 3885bb0da..0e9af3322 100644 --- a/src/swrenderer/scene/r_fogboundary.h +++ b/src/swrenderer/plane/r_fogboundary.h @@ -1,7 +1,7 @@ #pragma once -#include "r_visible_plane.h" +#include "r_visibleplane.h" namespace swrenderer { diff --git a/src/swrenderer/scene/r_skyplane.cpp b/src/swrenderer/plane/r_skyplane.cpp similarity index 97% rename from src/swrenderer/scene/r_skyplane.cpp rename to src/swrenderer/plane/r_skyplane.cpp index 759abe2d5..e85c3d6ef 100644 --- a/src/swrenderer/scene/r_skyplane.cpp +++ b/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); diff --git a/src/swrenderer/scene/r_skyplane.h b/src/swrenderer/plane/r_skyplane.h similarity index 94% rename from src/swrenderer/scene/r_skyplane.h rename to src/swrenderer/plane/r_skyplane.h index b8df90078..0a7d55be4 100644 --- a/src/swrenderer/scene/r_skyplane.h +++ b/src/swrenderer/plane/r_skyplane.h @@ -1,7 +1,7 @@ #pragma once -#include "r_visible_plane.h" +#include "r_visibleplane.h" namespace swrenderer { diff --git a/src/swrenderer/scene/r_slopeplane.cpp b/src/swrenderer/plane/r_slopeplane.cpp similarity index 93% rename from src/swrenderer/scene/r_slopeplane.cpp rename to src/swrenderer/plane/r_slopeplane.cpp index 4810fd3d4..b2dccead8 100644 --- a/src/swrenderer/scene/r_slopeplane.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_slopeplane.h b/src/swrenderer/plane/r_slopeplane.h similarity index 87% rename from src/swrenderer/scene/r_slopeplane.h rename to src/swrenderer/plane/r_slopeplane.h index 11c4b9ac7..fc071b110 100644 --- a/src/swrenderer/scene/r_slopeplane.h +++ b/src/swrenderer/plane/r_slopeplane.h @@ -1,7 +1,7 @@ #pragma once -#include "r_visible_plane.h" +#include "r_visibleplane.h" namespace swrenderer { diff --git a/src/swrenderer/scene/r_visible_plane.cpp b/src/swrenderer/plane/r_visibleplane.cpp similarity index 97% rename from src/swrenderer/scene/r_visible_plane.cpp rename to src/swrenderer/plane/r_visibleplane.cpp index 4a9e11ce9..79f7ea2e7 100644 --- a/src/swrenderer/scene/r_visible_plane.cpp +++ b/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 { diff --git a/src/swrenderer/scene/r_visible_plane.h b/src/swrenderer/plane/r_visibleplane.h similarity index 100% rename from src/swrenderer/scene/r_visible_plane.h rename to src/swrenderer/plane/r_visibleplane.h diff --git a/src/swrenderer/r_main.cpp b/src/swrenderer/r_main.cpp index 74bbbeabd..5d672c280 100644 --- a/src/swrenderer/r_main.cpp +++ b/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" diff --git a/src/swrenderer/r_swrenderer.cpp b/src/swrenderer/r_swrenderer.cpp index 76aa2cca4..c368bf3d4 100644 --- a/src/swrenderer/r_swrenderer.cpp +++ b/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" diff --git a/src/swrenderer/scene/r_bsp.cpp b/src/swrenderer/scene/r_bsp.cpp index df9906606..ba939390f 100644 --- a/src/swrenderer/scene/r_bsp.cpp +++ b/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" diff --git a/src/swrenderer/scene/r_plane.cpp b/src/swrenderer/scene/r_plane.cpp index fff52a62b..8442532ce 100644 --- a/src/swrenderer/scene/r_plane.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_plane.h b/src/swrenderer/scene/r_plane.h index 1bc18ec45..e38d16af8 100644 --- a/src/swrenderer/scene/r_plane.h +++ b/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 { diff --git a/src/swrenderer/scene/r_portal.cpp b/src/swrenderer/scene/r_portal.cpp index 638f99a84..d2897d656 100644 --- a/src/swrenderer/scene/r_portal.cpp +++ b/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" diff --git a/src/swrenderer/scene/r_portal.h b/src/swrenderer/scene/r_portal.h index f13c760b3..32b6463ca 100644 --- a/src/swrenderer/scene/r_portal.h +++ b/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 { diff --git a/src/swrenderer/scene/r_segs.cpp b/src/swrenderer/scene/r_segs.cpp index e28c2803d..5a8fb2982 100644 --- a/src/swrenderer/scene/r_segs.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_things.cpp b/src/swrenderer/scene/r_things.cpp index b97472206..e11510f32 100644 --- a/src/swrenderer/scene/r_things.cpp +++ b/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) diff --git a/src/swrenderer/scene/r_things.h b/src/swrenderer/scene/r_things.h index d3b3d5ebd..2354f7c0f 100644 --- a/src/swrenderer/scene/r_things.h +++ b/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; diff --git a/src/swrenderer/scene/r_walldraw.cpp b/src/swrenderer/scene/r_walldraw.cpp index 83cbc96ca..bc98b50d3 100644 --- a/src/swrenderer/scene/r_walldraw.cpp +++ b/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 { diff --git a/src/swrenderer/scene/r_clip_segment.cpp b/src/swrenderer/segments/r_clipsegment.cpp similarity index 93% rename from src/swrenderer/scene/r_clip_segment.cpp rename to src/swrenderer/segments/r_clipsegment.cpp index 4db069a49..83920a137 100644 --- a/src/swrenderer/scene/r_clip_segment.cpp +++ b/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 { diff --git a/src/swrenderer/scene/r_clip_segment.h b/src/swrenderer/segments/r_clipsegment.h similarity index 100% rename from src/swrenderer/scene/r_clip_segment.h rename to src/swrenderer/segments/r_clipsegment.h diff --git a/src/swrenderer/scene/r_draw_segment.cpp b/src/swrenderer/segments/r_drawsegment.cpp similarity index 86% rename from src/swrenderer/scene/r_draw_segment.cpp rename to src/swrenderer/segments/r_drawsegment.cpp index 2200f0ea5..42af7d032 100644 --- a/src/swrenderer/scene/r_draw_segment.cpp +++ b/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 { diff --git a/src/swrenderer/scene/r_draw_segment.h b/src/swrenderer/segments/r_drawsegment.h similarity index 97% rename from src/swrenderer/scene/r_draw_segment.h rename to src/swrenderer/segments/r_drawsegment.h index df9ed80dd..7174794a3 100644 --- a/src/swrenderer/scene/r_draw_segment.h +++ b/src/swrenderer/segments/r_drawsegment.h @@ -1,7 +1,7 @@ #pragma once -#include "r_bsp.h" +#include "swrenderer/scene/r_bsp.h" namespace swrenderer { diff --git a/src/swrenderer/scene/r_portal_segment.cpp b/src/swrenderer/segments/r_portalsegment.cpp similarity index 70% rename from src/swrenderer/scene/r_portal_segment.cpp rename to src/swrenderer/segments/r_portalsegment.cpp index e81757670..db31f5edf 100644 --- a/src/swrenderer/scene/r_portal_segment.cpp +++ b/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 { diff --git a/src/swrenderer/scene/r_portal_segment.h b/src/swrenderer/segments/r_portalsegment.h similarity index 100% rename from src/swrenderer/scene/r_portal_segment.h rename to src/swrenderer/segments/r_portalsegment.h diff --git a/src/swrenderer/scene/r_decal.cpp b/src/swrenderer/things/r_decal.cpp similarity index 96% rename from src/swrenderer/scene/r_decal.cpp rename to src/swrenderer/things/r_decal.cpp index 4159595fd..a49e90cfb 100644 --- a/src/swrenderer/scene/r_decal.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_decal.h b/src/swrenderer/things/r_decal.h similarity index 100% rename from src/swrenderer/scene/r_decal.h rename to src/swrenderer/things/r_decal.h diff --git a/src/swrenderer/scene/r_particle.cpp b/src/swrenderer/things/r_particle.cpp similarity index 96% rename from src/swrenderer/scene/r_particle.cpp rename to src/swrenderer/things/r_particle.cpp index 4197c6db2..d8a32d9ad 100644 --- a/src/swrenderer/scene/r_particle.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_particle.h b/src/swrenderer/things/r_particle.h similarity index 88% rename from src/swrenderer/scene/r_particle.h rename to src/swrenderer/things/r_particle.h index 9184840d8..01db4dfa0 100644 --- a/src/swrenderer/scene/r_particle.h +++ b/src/swrenderer/things/r_particle.h @@ -1,7 +1,7 @@ #pragma once -#include "r_visible_sprite.h" +#include "r_visiblesprite.h" namespace swrenderer { diff --git a/src/swrenderer/scene/r_playersprite.cpp b/src/swrenderer/things/r_playersprite.cpp similarity index 98% rename from src/swrenderer/scene/r_playersprite.cpp rename to src/swrenderer/things/r_playersprite.cpp index ac9137c9e..13d78495f 100644 --- a/src/swrenderer/scene/r_playersprite.cpp +++ b/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) diff --git a/src/swrenderer/scene/r_playersprite.h b/src/swrenderer/things/r_playersprite.h similarity index 88% rename from src/swrenderer/scene/r_playersprite.h rename to src/swrenderer/things/r_playersprite.h index 0fff06796..21133532b 100644 --- a/src/swrenderer/scene/r_playersprite.h +++ b/src/swrenderer/things/r_playersprite.h @@ -1,7 +1,7 @@ #pragma once -#include "r_visible_sprite.h" +#include "r_visiblesprite.h" namespace swrenderer { diff --git a/src/swrenderer/scene/r_visible_sprite.cpp b/src/swrenderer/things/r_visiblesprite.cpp similarity index 96% rename from src/swrenderer/scene/r_visible_sprite.cpp rename to src/swrenderer/things/r_visiblesprite.cpp index f3cd35791..3236e9337 100644 --- a/src/swrenderer/scene/r_visible_sprite.cpp +++ b/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 { diff --git a/src/swrenderer/scene/r_visible_sprite.h b/src/swrenderer/things/r_visiblesprite.h similarity index 98% rename from src/swrenderer/scene/r_visible_sprite.h rename to src/swrenderer/things/r_visiblesprite.h index 426840fc3..01f7ab3af 100644 --- a/src/swrenderer/scene/r_visible_sprite.h +++ b/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; diff --git a/src/swrenderer/scene/r_voxel.cpp b/src/swrenderer/things/r_voxel.cpp similarity index 99% rename from src/swrenderer/scene/r_voxel.cpp rename to src/swrenderer/things/r_voxel.cpp index 22773499d..f0d29f488 100644 --- a/src/swrenderer/scene/r_voxel.cpp +++ b/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" diff --git a/src/swrenderer/scene/r_voxel.h b/src/swrenderer/things/r_voxel.h similarity index 100% rename from src/swrenderer/scene/r_voxel.h rename to src/swrenderer/things/r_voxel.h diff --git a/src/swrenderer/scene/r_wallsprite.cpp b/src/swrenderer/things/r_wallsprite.cpp similarity index 95% rename from src/swrenderer/scene/r_wallsprite.cpp rename to src/swrenderer/things/r_wallsprite.cpp index e4718bdbe..c5fb8125c 100644 --- a/src/swrenderer/scene/r_wallsprite.cpp +++ b/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 diff --git a/src/swrenderer/scene/r_wallsprite.h b/src/swrenderer/things/r_wallsprite.h similarity index 89% rename from src/swrenderer/scene/r_wallsprite.h rename to src/swrenderer/things/r_wallsprite.h index 934c7d8eb..3a731e5d0 100644 --- a/src/swrenderer/scene/r_wallsprite.h +++ b/src/swrenderer/things/r_wallsprite.h @@ -1,7 +1,7 @@ #pragma once -#include "r_visible_sprite.h" +#include "r_visiblesprite.h" namespace swrenderer {