diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2fb046924b..2eb5ba784b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -765,6 +765,13 @@ file( GLOB HEADER_FILES scripting/zscript/*.h scripting/vm/*.h xlat/*.h + swrenderer/*.h + swrenderer/drawers/*.h + swrenderer/scene/*.h + polyrenderer/*.h + polyrenderer/math/*.h + polyrenderer/drawers/*.h + polyrenderer/scene/*.h gl/*.h gl/api/*.h gl/data/*.h @@ -799,35 +806,35 @@ set( NOT_COMPILED_SOURCE_FILES ) set( FASTMATH_PCH_SOURCES - r_swrenderer.cpp - r_poly.cpp - r_poly_scene.cpp - r_poly_portal.cpp - r_poly_cull.cpp - r_poly_decal.cpp - r_poly_particle.cpp - r_poly_plane.cpp - r_poly_playersprite.cpp - r_poly_wall.cpp - r_poly_wallsprite.cpp - r_poly_sprite.cpp - r_poly_sky.cpp - r_poly_triangle.cpp - r_poly_intersection.cpp - r_3dfloors.cpp - r_bsp.cpp - r_draw.cpp - r_draw_pal.cpp - r_draw_rgba.cpp - r_drawers.cpp - r_thread.cpp - r_main.cpp - r_plane.cpp - r_segs.cpp + swrenderer/r_swrenderer.cpp + swrenderer/r_main.cpp + swrenderer/drawers/r_draw.cpp + swrenderer/drawers/r_draw_pal.cpp + swrenderer/drawers/r_draw_rgba.cpp + swrenderer/drawers/r_drawers.cpp + swrenderer/drawers/r_thread.cpp + swrenderer/scene/r_3dfloors.cpp + swrenderer/scene/r_bsp.cpp + 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 + polyrenderer/poly_renderer.cpp + polyrenderer/scene/poly_scene.cpp + polyrenderer/scene/poly_portal.cpp + polyrenderer/scene/poly_cull.cpp + polyrenderer/scene/poly_decal.cpp + polyrenderer/scene/poly_particle.cpp + polyrenderer/scene/poly_plane.cpp + polyrenderer/scene/poly_playersprite.cpp + polyrenderer/scene/poly_wall.cpp + polyrenderer/scene/poly_wallsprite.cpp + polyrenderer/scene/poly_sprite.cpp + polyrenderer/scene/poly_sky.cpp + polyrenderer/drawers/poly_triangle.cpp + polyrenderer/math/poly_intersection.cpp r_sky.cpp - r_things.cpp - r_voxel.cpp - r_walldraw.cpp s_advsound.cpp s_environment.cpp s_playlist.cpp @@ -1441,8 +1448,13 @@ source_group("OpenGL Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOU source_group("OpenGL Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/system/.+") source_group("OpenGL Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/textures/.+") source_group("OpenGL Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/utility/.+") -source_group("Render Core\\Render Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.h$") -source_group("Render Core\\Render Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.cpp$") +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("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/.+") +source_group("Poly Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/scene/.+") source_group("Render Data\\Resource Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+\\.h$") source_group("Render Data\\Resource Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+\\.cpp$") source_group("Render Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/.+") diff --git a/src/gl/system/gl_swframebuffer.cpp b/src/gl/system/gl_swframebuffer.cpp index 5f142d30c7..0d9cdfce9d 100644 --- a/src/gl/system/gl_swframebuffer.cpp +++ b/src/gl/system/gl_swframebuffer.cpp @@ -57,7 +57,7 @@ #include "v_pfx.h" #include "stats.h" #include "doomerrors.h" -#include "r_main.h" +#include "swrenderer/r_main.h" #include "r_data/r_translate.h" #include "f_wipe.h" #include "sbar.h" diff --git a/src/gl/system/gl_swwipe.cpp b/src/gl/system/gl_swwipe.cpp index 44c2203b49..2f51ae5a4f 100644 --- a/src/gl/system/gl_swwipe.cpp +++ b/src/gl/system/gl_swwipe.cpp @@ -53,7 +53,7 @@ #include "v_pfx.h" #include "stats.h" #include "doomerrors.h" -#include "r_main.h" +#include "swrenderer/r_main.h" #include "r_data/r_translate.h" #include "f_wipe.h" #include "sbar.h" diff --git a/src/r_poly_triangle.cpp b/src/polyrenderer/drawers/poly_triangle.cpp similarity index 99% rename from src/r_poly_triangle.cpp rename to src/polyrenderer/drawers/poly_triangle.cpp index 5da23297b6..76e349af74 100644 --- a/src/r_poly_triangle.cpp +++ b/src/polyrenderer/drawers/poly_triangle.cpp @@ -25,7 +25,6 @@ #include "doomdef.h" #include "i_system.h" #include "w_wad.h" -#include "r_local.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" @@ -34,8 +33,9 @@ #include "r_data/r_translate.h" #include "v_palette.h" #include "r_data/colormaps.h" -#include "r_poly_triangle.h" -#include "r_draw_rgba.h" +#include "poly_triangle.h" +#include "swrenderer/drawers/r_draw_rgba.h" +#include "swrenderer/r_main.h" CVAR(Bool, r_debug_trisetup, false, 0); diff --git a/src/r_poly_triangle.h b/src/polyrenderer/drawers/poly_triangle.h similarity index 98% rename from src/r_poly_triangle.h rename to src/polyrenderer/drawers/poly_triangle.h index 5b66e80e2b..9d8e0e44b0 100644 --- a/src/r_poly_triangle.h +++ b/src/polyrenderer/drawers/poly_triangle.h @@ -22,9 +22,9 @@ #pragma once -#include "r_draw.h" -#include "r_thread.h" -#include "r_drawers.h" +#include "swrenderer/drawers/r_draw.h" +#include "swrenderer/drawers/r_thread.h" +#include "swrenderer/drawers/r_drawers.h" #include "r_data/r_translate.h" #include "r_data/colormaps.h" diff --git a/src/r_poly_intersection.cpp b/src/polyrenderer/math/poly_intersection.cpp similarity index 99% rename from src/r_poly_intersection.cpp rename to src/polyrenderer/math/poly_intersection.cpp index 5e7ad374b7..ed5e8ef438 100644 --- a/src/r_poly_intersection.cpp +++ b/src/polyrenderer/math/poly_intersection.cpp @@ -23,7 +23,7 @@ #include #include "templates.h" #include "doomdef.h" -#include "r_poly_intersection.h" +#include "poly_intersection.h" IntersectionTest::Result IntersectionTest::plane_aabb(const Vec4f &plane, const AxisAlignedBoundingBox &aabb) { diff --git a/src/r_poly_intersection.h b/src/polyrenderer/math/poly_intersection.h similarity index 99% rename from src/r_poly_intersection.h rename to src/polyrenderer/math/poly_intersection.h index 2ce164e5e7..438146fce3 100644 --- a/src/r_poly_intersection.h +++ b/src/polyrenderer/math/poly_intersection.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" #include #include diff --git a/src/r_poly.cpp b/src/polyrenderer/poly_renderer.cpp similarity index 99% rename from src/r_poly.cpp rename to src/polyrenderer/poly_renderer.cpp index f7fa339795..031dff683d 100644 --- a/src/r_poly.cpp +++ b/src/polyrenderer/poly_renderer.cpp @@ -26,7 +26,7 @@ #include "sbar.h" #include "r_data/r_translate.h" #include "r_data/r_interpolate.h" -#include "r_poly.h" +#include "poly_renderer.h" #include "gl/data/gl_data.h" #include "d_net.h" #include "po_man.h" diff --git a/src/r_poly.h b/src/polyrenderer/poly_renderer.h similarity index 93% rename from src/r_poly.h rename to src/polyrenderer/poly_renderer.h index 10d2e92aa9..c7de1b1cc8 100644 --- a/src/r_poly.h +++ b/src/polyrenderer/poly_renderer.h @@ -28,10 +28,10 @@ #include #include "doomdata.h" #include "r_utility.h" -#include "r_main.h" -#include "r_poly_portal.h" -#include "r_poly_playersprite.h" -#include "r_poly_sky.h" +#include "swrenderer/r_main.h" +#include "scene/poly_portal.h" +#include "scene/poly_playersprite.h" +#include "scene/poly_sky.h" class AActor; class DCanvas; diff --git a/src/r_poly_cull.cpp b/src/polyrenderer/scene/poly_cull.cpp similarity index 99% rename from src/r_poly_cull.cpp rename to src/polyrenderer/scene/poly_cull.cpp index 02a0f2fc51..38f1502225 100644 --- a/src/r_poly_cull.cpp +++ b/src/polyrenderer/scene/poly_cull.cpp @@ -25,8 +25,8 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_cull.h" -#include "r_poly.h" +#include "poly_cull.h" +#include "polyrenderer/poly_renderer.h" void PolyCull::CullScene(const TriMatrix &worldToClip, const Vec4f &portalClipPlane) { diff --git a/src/r_poly_cull.h b/src/polyrenderer/scene/poly_cull.h similarity index 95% rename from src/r_poly_cull.h rename to src/polyrenderer/scene/poly_cull.h index 4c0cfe314b..faa8a0740c 100644 --- a/src/r_poly_cull.h +++ b/src/polyrenderer/scene/poly_cull.h @@ -22,8 +22,8 @@ #pragma once -#include "r_poly_triangle.h" -#include "r_poly_intersection.h" +#include "polyrenderer/drawers/poly_triangle.h" +#include "polyrenderer/math/poly_intersection.h" enum class LineSegmentRange { diff --git a/src/r_poly_decal.cpp b/src/polyrenderer/scene/poly_decal.cpp similarity index 98% rename from src/r_poly_decal.cpp rename to src/polyrenderer/scene/poly_decal.cpp index 7718d422e1..fbc95a15c3 100644 --- a/src/r_poly_decal.cpp +++ b/src/polyrenderer/scene/poly_decal.cpp @@ -25,8 +25,8 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_decal.h" -#include "r_poly.h" +#include "poly_decal.h" +#include "polyrenderer/poly_renderer.h" #include "a_sharedglobal.h" void RenderPolyDecal::RenderWallDecals(const TriMatrix &worldToClip, const Vec4f &clipPlane, const seg_t *line, uint32_t subsectorDepth, uint32_t stencilValue) diff --git a/src/r_poly_decal.h b/src/polyrenderer/scene/poly_decal.h similarity index 96% rename from src/r_poly_decal.h rename to src/polyrenderer/scene/poly_decal.h index 068887d90c..48907780a8 100644 --- a/src/r_poly_decal.h +++ b/src/polyrenderer/scene/poly_decal.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" class Vec4f; diff --git a/src/r_poly_particle.cpp b/src/polyrenderer/scene/poly_particle.cpp similarity index 98% rename from src/r_poly_particle.cpp rename to src/polyrenderer/scene/poly_particle.cpp index 27888e77b0..3d1142b85b 100644 --- a/src/r_poly_particle.cpp +++ b/src/polyrenderer/scene/poly_particle.cpp @@ -25,8 +25,8 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_particle.h" -#include "r_poly.h" +#include "poly_particle.h" +#include "polyrenderer/poly_renderer.h" void RenderPolyParticle::Render(const TriMatrix &worldToClip, const Vec4f &clipPlane, particle_t *particle, subsector_t *sub, uint32_t subsectorDepth, uint32_t stencilValue) { diff --git a/src/r_poly_particle.h b/src/polyrenderer/scene/poly_particle.h similarity index 96% rename from src/r_poly_particle.h rename to src/polyrenderer/scene/poly_particle.h index fd581fa83c..b3b25b996d 100644 --- a/src/r_poly_particle.h +++ b/src/polyrenderer/scene/poly_particle.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" #include "p_effect.h" class Vec4f; diff --git a/src/r_poly_plane.cpp b/src/polyrenderer/scene/poly_plane.cpp similarity index 99% rename from src/r_poly_plane.cpp rename to src/polyrenderer/scene/poly_plane.cpp index e21868dc2f..5a8396c616 100644 --- a/src/r_poly_plane.cpp +++ b/src/polyrenderer/scene/poly_plane.cpp @@ -25,9 +25,9 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_plane.h" -#include "r_poly_portal.h" -#include "r_poly.h" +#include "poly_plane.h" +#include "poly_portal.h" +#include "polyrenderer/poly_renderer.h" #include "r_sky.h" EXTERN_CVAR(Int, r_3dfloors) diff --git a/src/r_poly_plane.h b/src/polyrenderer/scene/poly_plane.h similarity index 97% rename from src/r_poly_plane.h rename to src/polyrenderer/scene/poly_plane.h index be307b4e23..bf844dcc27 100644 --- a/src/r_poly_plane.h +++ b/src/polyrenderer/scene/poly_plane.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" class PolyDrawSectorPortal; class PolyCull; diff --git a/src/r_poly_playersprite.cpp b/src/polyrenderer/scene/poly_playersprite.cpp similarity index 99% rename from src/r_poly_playersprite.cpp rename to src/polyrenderer/scene/poly_playersprite.cpp index cd9584b681..ded5a55b30 100644 --- a/src/r_poly_playersprite.cpp +++ b/src/polyrenderer/scene/poly_playersprite.cpp @@ -25,9 +25,9 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_playersprite.h" -#include "r_poly.h" -#include "r_things.h" // for pspritexscale +#include "poly_playersprite.h" +#include "polyrenderer/poly_renderer.h" +#include "swrenderer/scene/r_things.h" // for pspritexscale EXTERN_CVAR(Bool, r_drawplayersprites) EXTERN_CVAR(Bool, r_deathcamera) diff --git a/src/r_poly_playersprite.h b/src/polyrenderer/scene/poly_playersprite.h similarity index 100% rename from src/r_poly_playersprite.h rename to src/polyrenderer/scene/poly_playersprite.h diff --git a/src/r_poly_portal.cpp b/src/polyrenderer/scene/poly_portal.cpp similarity index 99% rename from src/r_poly_portal.cpp rename to src/polyrenderer/scene/poly_portal.cpp index 580622c1fb..58bb5b0496 100644 --- a/src/r_poly_portal.cpp +++ b/src/polyrenderer/scene/poly_portal.cpp @@ -26,8 +26,8 @@ #include "p_maputl.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_portal.h" -#include "r_poly.h" +#include "poly_portal.h" +#include "polyrenderer/poly_renderer.h" #include "gl/data/gl_data.h" extern bool r_showviewer; diff --git a/src/r_poly_portal.h b/src/polyrenderer/scene/poly_portal.h similarity index 99% rename from src/r_poly_portal.h rename to src/polyrenderer/scene/poly_portal.h index 4f23567610..24a812a4f5 100644 --- a/src/r_poly_portal.h +++ b/src/polyrenderer/scene/poly_portal.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_scene.h" +#include "poly_scene.h" struct PolyPortalVertexRange { diff --git a/src/r_poly_scene.cpp b/src/polyrenderer/scene/poly_scene.cpp similarity index 99% rename from src/r_poly_scene.cpp rename to src/polyrenderer/scene/poly_scene.cpp index 8bf6d1ce99..51ce53a26f 100644 --- a/src/r_poly_scene.cpp +++ b/src/polyrenderer/scene/poly_scene.cpp @@ -26,8 +26,8 @@ #include "p_maputl.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_scene.h" -#include "r_poly.h" +#include "polyrenderer/scene/poly_scene.h" +#include "polyrenderer/poly_renderer.h" #include "gl/data/gl_data.h" CVAR(Bool, r_debug_cull, 0, 0) diff --git a/src/r_poly_scene.h b/src/polyrenderer/scene/poly_scene.h similarity index 91% rename from src/r_poly_scene.h rename to src/polyrenderer/scene/poly_scene.h index 00502e53ee..fbc878fc7c 100644 --- a/src/r_poly_scene.h +++ b/src/polyrenderer/scene/poly_scene.h @@ -28,16 +28,16 @@ #include #include "doomdata.h" #include "r_utility.h" -#include "r_main.h" -#include "r_poly_triangle.h" -#include "r_poly_intersection.h" -#include "r_poly_wall.h" -#include "r_poly_sprite.h" -#include "r_poly_wallsprite.h" -#include "r_poly_playersprite.h" -#include "r_poly_particle.h" -#include "r_poly_plane.h" -#include "r_poly_cull.h" +#include "swrenderer/r_main.h" +#include "polyrenderer/drawers/poly_triangle.h" +#include "polyrenderer/math/poly_intersection.h" +#include "poly_wall.h" +#include "poly_sprite.h" +#include "poly_wallsprite.h" +#include "poly_playersprite.h" +#include "poly_particle.h" +#include "poly_plane.h" +#include "poly_cull.h" #include #include diff --git a/src/r_poly_sky.cpp b/src/polyrenderer/scene/poly_sky.cpp similarity index 98% rename from src/r_poly_sky.cpp rename to src/polyrenderer/scene/poly_sky.cpp index d2ea632b85..8c84901b86 100644 --- a/src/r_poly_sky.cpp +++ b/src/polyrenderer/scene/poly_sky.cpp @@ -24,8 +24,8 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_sky.h" -#include "r_poly_portal.h" +#include "poly_sky.h" +#include "poly_portal.h" #include "r_sky.h" // for skyflatnum PolySkyDome::PolySkyDome() diff --git a/src/r_poly_sky.h b/src/polyrenderer/scene/poly_sky.h similarity index 96% rename from src/r_poly_sky.h rename to src/polyrenderer/scene/poly_sky.h index 1f5a655b9b..1a8cd8ef21 100644 --- a/src/r_poly_sky.h +++ b/src/polyrenderer/scene/poly_sky.h @@ -21,7 +21,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" class PolySkyDome { diff --git a/src/r_poly_sprite.cpp b/src/polyrenderer/scene/poly_sprite.cpp similarity index 99% rename from src/r_poly_sprite.cpp rename to src/polyrenderer/scene/poly_sprite.cpp index 1821357535..d344ae78b9 100644 --- a/src/r_poly_sprite.cpp +++ b/src/polyrenderer/scene/poly_sprite.cpp @@ -25,9 +25,9 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_sprite.h" -#include "r_poly.h" -#include "r_poly_intersection.h" +#include "poly_sprite.h" +#include "polyrenderer/poly_renderer.h" +#include "polyrenderer/math/poly_intersection.h" EXTERN_CVAR(Float, transsouls) EXTERN_CVAR(Int, r_drawfuzz) diff --git a/src/r_poly_sprite.h b/src/polyrenderer/scene/poly_sprite.h similarity index 96% rename from src/r_poly_sprite.h rename to src/polyrenderer/scene/poly_sprite.h index 085845e506..fe38dad22e 100644 --- a/src/r_poly_sprite.h +++ b/src/polyrenderer/scene/poly_sprite.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" class Vec4f; diff --git a/src/r_poly_wall.cpp b/src/polyrenderer/scene/poly_wall.cpp similarity index 99% rename from src/r_poly_wall.cpp rename to src/polyrenderer/scene/poly_wall.cpp index f9d409b604..5c912dec08 100644 --- a/src/r_poly_wall.cpp +++ b/src/polyrenderer/scene/poly_wall.cpp @@ -28,9 +28,9 @@ #include "p_lnspec.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_wall.h" -#include "r_poly_decal.h" -#include "r_poly.h" +#include "poly_wall.h" +#include "poly_decal.h" +#include "polyrenderer/poly_renderer.h" #include "r_sky.h" EXTERN_CVAR(Bool, r_drawmirrors) diff --git a/src/r_poly_wall.h b/src/polyrenderer/scene/poly_wall.h similarity index 98% rename from src/r_poly_wall.h rename to src/polyrenderer/scene/poly_wall.h index 8443a174ad..014110a400 100644 --- a/src/r_poly_wall.h +++ b/src/polyrenderer/scene/poly_wall.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" class PolyTranslucentObject; class PolyDrawLinePortal; diff --git a/src/r_poly_wallsprite.cpp b/src/polyrenderer/scene/poly_wallsprite.cpp similarity index 98% rename from src/r_poly_wallsprite.cpp rename to src/polyrenderer/scene/poly_wallsprite.cpp index fe12b271db..197f528ed1 100644 --- a/src/r_poly_wallsprite.cpp +++ b/src/polyrenderer/scene/poly_wallsprite.cpp @@ -25,8 +25,8 @@ #include "doomdef.h" #include "sbar.h" #include "r_data/r_translate.h" -#include "r_poly_wallsprite.h" -#include "r_poly.h" +#include "poly_wallsprite.h" +#include "polyrenderer/poly_renderer.h" void RenderPolyWallSprite::Render(const TriMatrix &worldToClip, const Vec4f &clipPlane, AActor *thing, subsector_t *sub, uint32_t subsectorDepth, uint32_t stencilValue) { diff --git a/src/r_poly_wallsprite.h b/src/polyrenderer/scene/poly_wallsprite.h similarity index 96% rename from src/r_poly_wallsprite.h rename to src/polyrenderer/scene/poly_wallsprite.h index 51cf28de6d..75a550748e 100644 --- a/src/r_poly_wallsprite.h +++ b/src/polyrenderer/scene/poly_wallsprite.h @@ -22,7 +22,7 @@ #pragma once -#include "r_poly_triangle.h" +#include "polyrenderer/drawers/poly_triangle.h" class Vec4f; diff --git a/src/portal.cpp b/src/portal.cpp index 121b05e19f..0a21f19149 100644 --- a/src/portal.cpp +++ b/src/portal.cpp @@ -40,8 +40,6 @@ #include "p_local.h" #include "p_blockmap.h" #include "p_lnspec.h" -#include "r_bsp.h" -#include "r_segs.h" #include "c_cvars.h" #include "m_bbox.h" #include "p_tags.h" diff --git a/src/r_draw.cpp b/src/swrenderer/drawers/r_draw.cpp similarity index 99% rename from src/r_draw.cpp rename to src/swrenderer/drawers/r_draw.cpp index 3e31c7e048..6260982459 100644 --- a/src/r_draw.cpp +++ b/src/swrenderer/drawers/r_draw.cpp @@ -38,7 +38,7 @@ #include "doomdef.h" #include "i_system.h" #include "w_wad.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" @@ -47,7 +47,7 @@ #include "r_data/r_translate.h" #include "v_palette.h" #include "r_data/colormaps.h" -#include "r_plane.h" +#include "swrenderer/scene/r_plane.h" #include "r_draw.h" #include "r_draw_rgba.h" #include "r_draw_pal.h" diff --git a/src/r_draw.h b/src/swrenderer/drawers/r_draw.h similarity index 100% rename from src/r_draw.h rename to src/swrenderer/drawers/r_draw.h diff --git a/src/r_draw_pal.cpp b/src/swrenderer/drawers/r_draw_pal.cpp similarity index 99% rename from src/r_draw_pal.cpp rename to src/swrenderer/drawers/r_draw_pal.cpp index fbe372fb8b..c8adf39656 100644 --- a/src/r_draw_pal.cpp +++ b/src/swrenderer/drawers/r_draw_pal.cpp @@ -39,8 +39,8 @@ #include "doomdef.h" #include "r_defs.h" #include "r_draw.h" -#include "r_main.h" -#include "r_things.h" +#include "swrenderer/r_main.h" +#include "swrenderer/scene/r_things.h" #include "v_video.h" #include "r_draw_pal.h" diff --git a/src/r_draw_pal.h b/src/swrenderer/drawers/r_draw_pal.h similarity index 100% rename from src/r_draw_pal.h rename to src/swrenderer/drawers/r_draw_pal.h diff --git a/src/r_draw_rgba.cpp b/src/swrenderer/drawers/r_draw_rgba.cpp similarity index 99% rename from src/r_draw_rgba.cpp rename to src/swrenderer/drawers/r_draw_rgba.cpp index 4b56856081..b3e970a6a1 100644 --- a/src/r_draw_rgba.cpp +++ b/src/swrenderer/drawers/r_draw_rgba.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "i_system.h" #include "w_wad.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" @@ -36,7 +36,7 @@ #include "r_data/r_translate.h" #include "v_palette.h" #include "r_data/colormaps.h" -#include "r_plane.h" +#include "swrenderer/scene/r_plane.h" #include "r_draw_rgba.h" #include "r_drawers.h" #include "gl/data/gl_matrix.h" diff --git a/src/r_draw_rgba.h b/src/swrenderer/drawers/r_draw_rgba.h similarity index 100% rename from src/r_draw_rgba.h rename to src/swrenderer/drawers/r_draw_rgba.h diff --git a/src/r_drawers.cpp b/src/swrenderer/drawers/r_drawers.cpp similarity index 100% rename from src/r_drawers.cpp rename to src/swrenderer/drawers/r_drawers.cpp diff --git a/src/r_drawers.h b/src/swrenderer/drawers/r_drawers.h similarity index 100% rename from src/r_drawers.h rename to src/swrenderer/drawers/r_drawers.h diff --git a/src/r_thread.cpp b/src/swrenderer/drawers/r_thread.cpp similarity index 99% rename from src/r_thread.cpp rename to src/swrenderer/drawers/r_thread.cpp index bbb3faf3f9..15eeee4250 100644 --- a/src/r_thread.cpp +++ b/src/swrenderer/drawers/r_thread.cpp @@ -25,7 +25,7 @@ #include "doomdef.h" #include "i_system.h" #include "w_wad.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" diff --git a/src/r_thread.h b/src/swrenderer/drawers/r_thread.h similarity index 100% rename from src/r_thread.h rename to src/swrenderer/drawers/r_thread.h diff --git a/src/r_local.h b/src/swrenderer/r_local.h similarity index 94% rename from src/r_local.h rename to src/swrenderer/r_local.h index b0ba8841ee..92fb717abd 100644 --- a/src/r_local.h +++ b/src/swrenderer/r_local.h @@ -34,7 +34,7 @@ // Separate header file for each module. // #include "r_main.h" -#include "r_things.h" -#include "r_draw.h" +#include "scene/r_things.h" +#include "drawers/r_draw.h" #endif // __R_LOCAL_H__ diff --git a/src/r_main.cpp b/src/swrenderer/r_main.cpp similarity index 99% rename from src/r_main.cpp rename to src/swrenderer/r_main.cpp index a83b2f190a..ea5bb64e5b 100644 --- a/src/r_main.cpp +++ b/src/swrenderer/r_main.cpp @@ -35,12 +35,12 @@ #include "m_random.h" #include "m_bbox.h" #include "r_local.h" -#include "r_plane.h" -#include "r_bsp.h" -#include "r_segs.h" -#include "r_3dfloors.h" +#include "scene/r_plane.h" +#include "scene/r_bsp.h" +#include "scene/r_segs.h" +#include "scene/r_3dfloors.h" #include "r_sky.h" -#include "r_draw_rgba.h" +#include "drawers/r_draw_rgba.h" #include "st_stuff.h" #include "c_cvars.h" #include "c_dispatch.h" diff --git a/src/r_main.h b/src/swrenderer/r_main.h similarity index 100% rename from src/r_main.h rename to src/swrenderer/r_main.h diff --git a/src/r_swrenderer.cpp b/src/swrenderer/r_swrenderer.cpp similarity index 98% rename from src/r_swrenderer.cpp rename to src/swrenderer/r_swrenderer.cpp index 77cbb28eb7..5b0d3b4dd3 100644 --- a/src/r_swrenderer.cpp +++ b/src/swrenderer/r_swrenderer.cpp @@ -37,14 +37,14 @@ #include "v_palette.h" #include "v_video.h" #include "m_png.h" -#include "r_bsp.h" +#include "scene/r_bsp.h" #include "r_swrenderer.h" -#include "r_3dfloors.h" +#include "scene/r_3dfloors.h" #include "textures/textures.h" #include "r_data/voxels.h" -#include "r_draw_rgba.h" -#include "r_drawers.h" -#include "r_poly.h" +#include "drawers/r_draw_rgba.h" +#include "drawers/r_drawers.h" +#include "polyrenderer/poly_renderer.h" #include "p_setup.h" void gl_ParseDefs(); diff --git a/src/r_swrenderer.h b/src/swrenderer/r_swrenderer.h similarity index 100% rename from src/r_swrenderer.h rename to src/swrenderer/r_swrenderer.h diff --git a/src/r_3dfloors.cpp b/src/swrenderer/scene/r_3dfloors.cpp similarity index 99% rename from src/r_3dfloors.cpp rename to src/swrenderer/scene/r_3dfloors.cpp index 87c8af618e..bbd50331c6 100644 --- a/src/r_3dfloors.cpp +++ b/src/swrenderer/scene/r_3dfloors.cpp @@ -9,7 +9,7 @@ #include "doomdef.h" #include "p_local.h" #include "c_dispatch.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "r_bsp.h" #include "r_plane.h" #include "c_cvars.h" diff --git a/src/r_3dfloors.h b/src/swrenderer/scene/r_3dfloors.h similarity index 100% rename from src/r_3dfloors.h rename to src/swrenderer/scene/r_3dfloors.h diff --git a/src/r_bsp.cpp b/src/swrenderer/scene/r_bsp.cpp similarity index 99% rename from src/r_bsp.cpp rename to src/swrenderer/scene/r_bsp.cpp index d8a6c2c01a..36984743b1 100644 --- a/src/r_bsp.cpp +++ b/src/swrenderer/scene/r_bsp.cpp @@ -32,10 +32,10 @@ #include "p_lnspec.h" #include "p_setup.h" -#include "r_local.h" -#include "r_main.h" +#include "swrenderer/r_local.h" +#include "swrenderer/r_main.h" #include "r_plane.h" -#include "r_draw.h" +#include "swrenderer/drawers/r_draw.h" #include "r_things.h" #include "r_3dfloors.h" #include "a_sharedglobal.h" diff --git a/src/r_bsp.h b/src/swrenderer/scene/r_bsp.h similarity index 100% rename from src/r_bsp.h rename to src/swrenderer/scene/r_bsp.h diff --git a/src/r_plane.cpp b/src/swrenderer/scene/r_plane.cpp similarity index 99% rename from src/r_plane.cpp rename to src/swrenderer/scene/r_plane.cpp index fce565922b..bcd0d5e5f3 100644 --- a/src/r_plane.cpp +++ b/src/swrenderer/scene/r_plane.cpp @@ -42,7 +42,7 @@ #include "doomdef.h" #include "doomstat.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "r_sky.h" #include "stats.h" @@ -58,7 +58,7 @@ #include "r_3dfloors.h" #include "v_palette.h" #include "r_data/colormaps.h" -#include "r_draw_rgba.h" +#include "swrenderer/drawers/r_draw_rgba.h" #include "gl/dynlights/gl_dynlight.h" #ifdef _MSC_VER diff --git a/src/r_plane.h b/src/swrenderer/scene/r_plane.h similarity index 100% rename from src/r_plane.h rename to src/swrenderer/scene/r_plane.h diff --git a/src/r_segs.cpp b/src/swrenderer/scene/r_segs.cpp similarity index 99% rename from src/r_segs.cpp rename to src/swrenderer/scene/r_segs.cpp index eff303acb6..0348ba26c9 100644 --- a/src/r_segs.cpp +++ b/src/swrenderer/scene/r_segs.cpp @@ -30,7 +30,7 @@ #include "doomdata.h" #include "p_lnspec.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "r_sky.h" #include "v_video.h" @@ -44,7 +44,7 @@ #include "r_plane.h" #include "r_segs.h" #include "r_3dfloors.h" -#include "r_draw.h" +#include "swrenderer/drawers/r_draw.h" #include "v_palette.h" #include "r_data/colormaps.h" diff --git a/src/r_segs.h b/src/swrenderer/scene/r_segs.h similarity index 100% rename from src/r_segs.h rename to src/swrenderer/scene/r_segs.h diff --git a/src/r_things.cpp b/src/swrenderer/scene/r_things.cpp similarity index 99% rename from src/r_things.cpp rename to src/swrenderer/scene/r_things.cpp index 8d8ae3eefc..f0365819e6 100644 --- a/src/r_things.cpp +++ b/src/swrenderer/scene/r_things.cpp @@ -37,7 +37,7 @@ #include "m_swap.h" #include "i_system.h" #include "w_wad.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "c_console.h" #include "c_cvars.h" #include "c_dispatch.h" @@ -58,8 +58,8 @@ #include "r_plane.h" #include "r_segs.h" #include "r_3dfloors.h" -#include "r_draw_rgba.h" -#include "r_draw_pal.h" +#include "swrenderer/drawers/r_draw_rgba.h" +#include "swrenderer/drawers/r_draw_pal.h" #include "v_palette.h" #include "r_data/r_translate.h" #include "r_data/colormaps.h" diff --git a/src/r_things.h b/src/swrenderer/scene/r_things.h similarity index 100% rename from src/r_things.h rename to src/swrenderer/scene/r_things.h diff --git a/src/r_voxel.cpp b/src/swrenderer/scene/r_voxel.cpp similarity index 98% rename from src/r_voxel.cpp rename to src/swrenderer/scene/r_voxel.cpp index 42973ce9ea..4645982420 100644 --- a/src/r_voxel.cpp +++ b/src/swrenderer/scene/r_voxel.cpp @@ -31,10 +31,10 @@ #include "d_net.h" #include "po_man.h" #include "r_things.h" -#include "r_draw.h" -#include "r_thread.h" +#include "swrenderer/drawers/r_draw.h" +#include "swrenderer/drawers/r_thread.h" #include "r_utility.h" -#include "r_main.h" +#include "swrenderer/r_main.h" #include "r_voxel.h" namespace swrenderer diff --git a/src/r_voxel.h b/src/swrenderer/scene/r_voxel.h similarity index 100% rename from src/r_voxel.h rename to src/swrenderer/scene/r_voxel.h diff --git a/src/r_walldraw.cpp b/src/swrenderer/scene/r_walldraw.cpp similarity index 99% rename from src/r_walldraw.cpp rename to src/swrenderer/scene/r_walldraw.cpp index 7e4f3f5151..41e27d40e9 100644 --- a/src/r_walldraw.cpp +++ b/src/swrenderer/scene/r_walldraw.cpp @@ -27,7 +27,7 @@ #include "doomstat.h" #include "doomdata.h" -#include "r_local.h" +#include "swrenderer/r_local.h" #include "r_sky.h" #include "v_video.h" @@ -35,7 +35,7 @@ #include "a_sharedglobal.h" #include "d_net.h" #include "g_level.h" -#include "r_draw.h" +#include "swrenderer/drawers/r_draw.h" #include "r_bsp.h" #include "r_plane.h" #include "r_segs.h" @@ -43,7 +43,7 @@ #include "v_palette.h" #include "r_data/colormaps.h" #include "gl/dynlights/gl_dynlight.h" -#include "r_drawers.h" +#include "swrenderer/drawers/r_drawers.h" namespace swrenderer { diff --git a/src/v_draw.cpp b/src/v_draw.cpp index 1b23d55668..1af386d603 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -43,10 +43,10 @@ #include "r_defs.h" #include "r_utility.h" #ifndef NO_SWRENDER -#include "r_draw.h" -#include "r_draw_rgba.h" -#include "r_main.h" -#include "r_things.h" +#include "swrenderer/drawers/r_draw.h" +#include "swrenderer/drawers/r_draw_rgba.h" +#include "swrenderer/r_main.h" +#include "swrenderer/scene/r_things.h" #endif #include "r_data/r_translate.h" #include "doomstat.h" diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index f3a4e426e2..cf627f4d7f 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -63,7 +63,7 @@ #include "v_pfx.h" #include "stats.h" #include "doomerrors.h" -#include "r_main.h" +#include "swrenderer/r_main.h" #include "r_data/r_translate.h" #include "f_wipe.h" #include "sbar.h" diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp index 609f56647d..70898ebe5a 100644 --- a/src/win32/hardware.cpp +++ b/src/win32/hardware.cpp @@ -47,7 +47,7 @@ #include "doomstat.h" #include "m_argv.h" #include "version.h" -#include "r_swrenderer.h" +#include "swrenderer/r_swrenderer.h" EXTERN_CVAR (Bool, ticker) EXTERN_CVAR (Bool, fullscreen) diff --git a/src/win32/win32video.cpp b/src/win32/win32video.cpp index e07ca36609..e6c8075365 100644 --- a/src/win32/win32video.cpp +++ b/src/win32/win32video.cpp @@ -69,7 +69,7 @@ #include "m_argv.h" #include "r_defs.h" #include "v_text.h" -#include "r_swrenderer.h" +#include "swrenderer/r_swrenderer.h" #include "version.h" #include "win32iface.h" diff --git a/tools/drawergen/precomp.h b/tools/drawergen/precomp.h index ea5a5e6df5..f2bf67b70a 100644 --- a/tools/drawergen/precomp.h +++ b/tools/drawergen/precomp.h @@ -2,4 +2,4 @@ #pragma once #include "llvm_include.h" -#include "../../src/r_drawers.h" +#include "../../src/swrenderer/drawers/r_drawers.h"