zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 15:22:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move files into additional folders

Browse source
This commit is contained in:
Magnus Norddahl 2016-12-31 12:45:07 +01:00
parent 2f96dcc1a8
commit ad15d56a81
40 changed files with 138 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/CMakeLists.txt
View file

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

16
src/swrenderer/scene/r_flatplane.cpp → src/swrenderer/plane/r_flatplane.cpp
View file

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

2
src/swrenderer/scene/r_flatplane.h → src/swrenderer/plane/r_flatplane.h
View file

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

18
src/swrenderer/scene/r_fogboundary.cpp → src/swrenderer/plane/r_fogboundary.cpp
View file

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

2
src/swrenderer/scene/r_fogboundary.h → src/swrenderer/plane/r_fogboundary.h
View file

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

14
src/swrenderer/scene/r_skyplane.cpp → src/swrenderer/plane/r_skyplane.cpp
View file

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

2
src/swrenderer/scene/r_skyplane.h → src/swrenderer/plane/r_skyplane.h
View file

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

16
src/swrenderer/scene/r_slopeplane.cpp → src/swrenderer/plane/r_slopeplane.cpp
View file

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

2
src/swrenderer/scene/r_slopeplane.h → src/swrenderer/plane/r_slopeplane.h
View file

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

4
src/swrenderer/scene/r_visible_plane.cpp → src/swrenderer/plane/r_visibleplane.cpp
View file

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

0
src/swrenderer/scene/r_visible_plane.h → src/swrenderer/plane/r_visibleplane.h
View file

8
src/swrenderer/r_main.cpp
View file

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

2
src/swrenderer/r_swrenderer.cpp
View file

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

4
src/swrenderer/scene/r_bsp.cpp
View file

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

10
src/swrenderer/scene/r_plane.cpp
View file

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

2
src/swrenderer/scene/r_plane.h
View file

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

4
src/swrenderer/scene/r_portal.cpp
View file

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

2
src/swrenderer/scene/r_portal.h
View file

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

8
src/swrenderer/scene/r_segs.cpp
View file

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

10
src/swrenderer/scene/r_things.cpp
View file

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

2
src/swrenderer/scene/r_things.h
View file

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

2
src/swrenderer/scene/r_walldraw.cpp
View file

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

12
src/swrenderer/scene/r_clip_segment.cpp → src/swrenderer/segments/r_clipsegment.cpp
View file

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

0
src/swrenderer/scene/r_clip_segment.h → src/swrenderer/segments/r_clipsegment.h
View file

12
src/swrenderer/scene/r_draw_segment.cpp → src/swrenderer/segments/r_drawsegment.cpp
View file

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

2
src/swrenderer/scene/r_draw_segment.h → src/swrenderer/segments/r_drawsegment.h
View file

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

12
src/swrenderer/scene/r_portal_segment.cpp → src/swrenderer/segments/r_portalsegment.cpp
View file

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

0
src/swrenderer/scene/r_portal_segment.h → src/swrenderer/segments/r_portalsegment.h
View file

15
src/swrenderer/scene/r_decal.cpp → src/swrenderer/things/r_decal.cpp
View file

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

0
src/swrenderer/scene/r_decal.h → src/swrenderer/things/r_decal.h
View file

14
src/swrenderer/scene/r_particle.cpp → src/swrenderer/things/r_particle.cpp
View file

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

2
src/swrenderer/scene/r_particle.h → src/swrenderer/things/r_particle.h
View file

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

14
src/swrenderer/scene/r_playersprite.cpp → src/swrenderer/things/r_playersprite.cpp
View file

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

2
src/swrenderer/scene/r_playersprite.h → src/swrenderer/things/r_playersprite.h
View file

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

2
src/swrenderer/scene/r_visible_sprite.cpp → src/swrenderer/things/r_visiblesprite.cpp
View file

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

2
src/swrenderer/scene/r_visible_sprite.h → src/swrenderer/things/r_visiblesprite.h
View file

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

2
src/swrenderer/scene/r_voxel.cpp → src/swrenderer/things/r_voxel.cpp
View file

@ -30,7 +30,7 @@
#include "r_data/sprites.h" #include "r_data/sprites.h"
#include "d_net.h" #include "d_net.h"
#include "po_man.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_draw.h"
#include "swrenderer/drawers/r_thread.h" #include "swrenderer/drawers/r_thread.h"
#include "r_utility.h" #include "r_utility.h"

0
src/swrenderer/scene/r_voxel.h → src/swrenderer/things/r_voxel.h
View file

14
src/swrenderer/scene/r_wallsprite.cpp → src/swrenderer/things/r_wallsprite.cpp
View file

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

2
src/swrenderer/scene/r_wallsprite.h → src/swrenderer/things/r_wallsprite.h
View file

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