zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-12 07:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move floorclip, ceilingclip, floorplane and ceilingplane closer to their location

Browse source
This commit is contained in:
Magnus Norddahl 2016-12-31 14:00:12 +01:00
parent 165134f1a7
commit 0884a09b38
6 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/swrenderer/scene/r_3dfloors.cpp
View file

@ -12,6 +12,7 @@
#include "swrenderer/r_main.h" #include "swrenderer/r_main.h"
#include "r_bsp.h" #include "r_bsp.h"
#include "r_plane.h" #include "r_plane.h"
#include "r_segs.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "r_3dfloors.h" #include "r_3dfloors.h"

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

@ -82,8 +82,6 @@ namespace swrenderer
extern subsector_t *InSubsector; extern subsector_t *InSubsector;
visplane_t *floorplane;
visplane_t *ceilingplane;
// These are copies of the main parameters used when drawing stacked sectors. // These are copies of the main parameters used when drawing stacked sectors.
// When you change the main parameters, you should copy them here too *unless* // When you change the main parameters, you should copy them here too *unless*
@ -94,14 +92,6 @@ double stacked_visibility;
DVector3 stacked_viewpos; DVector3 stacked_viewpos;
DAngle stacked_angle; DAngle stacked_angle;
//
// Clip values are the solid pixel bounding the range.
// floorclip starts out SCREENHEIGHT and is just outside the range
// ceilingclip starts out 0 and is just inside the range
//
short floorclip[MAXWIDTH];
short ceilingclip[MAXWIDTH];
// //
// texture mapping // texture mapping
// //

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

@ -28,9 +28,6 @@
namespace swrenderer namespace swrenderer
{ {
extern short floorclip[MAXWIDTH];
extern short ceilingclip[MAXWIDTH];
void R_ClearPlanes (bool fullclear); void R_ClearPlanes (bool fullclear);
void R_AddPlaneLights(visplane_t *plane, FLightNode *light_head); void R_AddPlaneLights(visplane_t *plane, FLightNode *light_head);
@ -42,9 +39,6 @@ void R_MapVisPlane (visplane_t *pl, void (*mapfunc)(int y, int x1, int x2), void
visplane_t *R_FindPlane(const secplane_t &height, FTextureID picnum, int lightlevel, double alpha, bool additive, const FTransform &xform, int sky, FSectorPortal *portal); visplane_t *R_FindPlane(const secplane_t &height, FTextureID picnum, int lightlevel, double alpha, bool additive, const FTransform &xform, int sky, FSectorPortal *portal);
visplane_t *R_CheckPlane(visplane_t *pl, int start, int stop); visplane_t *R_CheckPlane(visplane_t *pl, int start, int stop);
extern visplane_t* floorplane;
extern visplane_t* ceilingplane;
} }
#endif // __R_PLANE_H__ #endif // __R_PLANE_H__

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

@ -37,6 +37,7 @@
#include "swrenderer/segments/r_drawsegment.h" #include "swrenderer/segments/r_drawsegment.h"
#include "r_things.h" #include "r_things.h"
#include "r_3dfloors.h" #include "r_3dfloors.h"
#include "r_segs.h"
#include "swrenderer/r_main.h" #include "swrenderer/r_main.h"
#include "swrenderer/r_memory.h" #include "swrenderer/r_memory.h"

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

@ -141,6 +141,16 @@ FTexture *rw_pic;
static fixed_t *maskedtexturecol; static fixed_t *maskedtexturecol;
visplane_t *floorplane;
visplane_t *ceilingplane;
// Clip values are the solid pixel bounding the range.
// floorclip starts out SCREENHEIGHT and is just outside the range
// ceilingclip starts out 0 and is just inside the range
//
short floorclip[MAXWIDTH];
short ceilingclip[MAXWIDTH];
inline bool IsFogBoundary (sector_t *front, sector_t *back) inline bool IsFogBoundary (sector_t *front, sector_t *back)
{ {

5
src/swrenderer/scene/r_segs.h
View file

@ -56,6 +56,11 @@ extern float rw_lightleft;
extern fixed_t rw_offset; extern fixed_t rw_offset;
extern FTexture *rw_pic; extern FTexture *rw_pic;
extern short floorclip[MAXWIDTH];
extern short ceilingclip[MAXWIDTH];
extern visplane_t *floorplane;
extern visplane_t *ceilingplane;
} }
#endif #endif