OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Convert r_clipsegment into a class

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-15 22:57:42 +01:00
commit f6cc75fad5
6 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/swrenderer/segments/r_clipsegment.cpp
View file

@ -34,18 +34,13 @@
namespace swrenderer
{
namespace
RenderClipSegment *RenderClipSegment::Instance()
{
struct cliprange_t
{
short first, last;
};
cliprange_t *newend; // newend is one past the last valid seg
cliprange_t solidsegs[MAXWIDTH / 2 + 2];
static RenderClipSegment instance;
return &instance;
}
void R_ClearClipSegs(short left, short right)
void RenderClipSegment::Clear(short left, short right)
{
solidsegs[0].first = -0x7fff;
solidsegs[0].last = left;
@ -54,7 +49,7 @@ namespace swrenderer
newend = solidsegs+2;
}
bool R_CheckClipWallSegment(int first, int last)
bool RenderClipSegment::Check(int first, int last)
{
cliprange_t *start;
@ -78,7 +73,7 @@ namespace swrenderer
return false;
}
bool R_IsWallSegmentVisible(int sx1, int sx2)
bool RenderClipSegment::IsVisible(int sx1, int sx2)
{
// Does not cross a pixel.
if (sx2 <= sx1)
@ -97,7 +92,7 @@ namespace swrenderer
return true;
}
bool R_ClipWallSegment(int first, int last, bool solid, VisibleSegmentCallback callback)
bool RenderClipSegment::Clip(int first, int last, bool solid, VisibleSegmentCallback callback)
{
cliprange_t *next, *start;
int i, j;

23
src/swrenderer/segments/r_clipsegment.h
View file

@ -17,8 +17,23 @@ namespace swrenderer
{
typedef bool(*VisibleSegmentCallback)(int x1, int x2);
void R_ClearClipSegs(short left, short right);
bool R_ClipWallSegment(int x1, int x2, bool solid, VisibleSegmentCallback callback);
bool R_CheckClipWallSegment(int first, int last);
bool R_IsWallSegmentVisible(int x1, int x2);
class RenderClipSegment
{
public:
static RenderClipSegment *Instance();
void Clear(short left, short right);
bool Clip(int x1, int x2, bool solid, VisibleSegmentCallback callback);
bool Check(int first, int last);
bool IsVisible(int x1, int x2);
private:
struct cliprange_t
{
short first, last;
};
cliprange_t *newend; // newend is one past the last valid seg
cliprange_t solidsegs[MAXWIDTH / 2 + 2];
};
}