zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use consistant right-edge rules in the renderer. 

- The original Doom renderer was inclusive for all right edges. This was
  fine for the wonky projection it did. This was not fine for a standard
  perspective divide, so I had to change walls to be right-edge exclusive
  when I changed the projection. I only touched what was needed. Until
  now. The right edge is always exclusive now, which should prevent any
  more bugs related to mixing the two clusivities incorrectly.
This commit is contained in:
Randy Heit 2016-01-30 21:19:23 -06:00
parent c1b2861362
commit 240ca2af4c
6 changed files with 105 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/r_bsp.cpp
View File

@ -541,7 +541,7 @@ void R_AddLine (seg_t *line)
if (WallC.Init(tx1, ty1, tx2, ty2, 32)) if (WallC.Init(tx1, ty1, tx2, ty2, 32))
return; return;
if (WallC.sx1 > WindowRight || WallC.sx2 < WindowLeft) if (WallC.sx1 >= WindowRight || WallC.sx2 <= WindowLeft)
return; return;
if (line->linedef == NULL) if (line->linedef == NULL)

8
src/r_main.cpp
View File

@ -667,10 +667,10 @@ void R_EnterMirror (drawseg_t *ds, int depth)
ActiveWallMirror = ds->curline; ActiveWallMirror = ds->curline;
R_ClearPlanes (false); R_ClearPlanes (false);
R_ClearClipSegs (ds->x1, ds->x2 + 1); R_ClearClipSegs (ds->x1, ds->x2);
memcpy (ceilingclip + ds->x1, openings + ds->sprtopclip, (ds->x2 - ds->x1 + 1)*sizeof(*ceilingclip)); memcpy (ceilingclip + ds->x1, openings + ds->sprtopclip, (ds->x2 - ds->x1)*sizeof(*ceilingclip));
memcpy (floorclip + ds->x1, openings + ds->sprbottomclip, (ds->x2 - ds->x1 + 1)*sizeof(*floorclip)); memcpy (floorclip + ds->x1, openings + ds->sprbottomclip, (ds->x2 - ds->x1)*sizeof(*floorclip));
WindowLeft = ds->x1; WindowLeft = ds->x1;
WindowRight = ds->x2; WindowRight = ds->x2;
@ -777,7 +777,7 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
} }
WindowLeft = 0; WindowLeft = 0;
WindowRight = viewwidth - 1; WindowRight = viewwidth;
MirrorFlags = 0; MirrorFlags = 0;
ActiveWallMirror = NULL; ActiveWallMirror = NULL;

76
src/r_plane.cpp
View File

@ -708,8 +708,8 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
check->colormap = basecolormap; // [RH] Save colormap check->colormap = basecolormap; // [RH] Save colormap
check->sky = sky; check->sky = sky;
check->skybox = skybox; check->skybox = skybox;
check->minx = viewwidth; // Was SCREENWIDTH -- killough 11/98 check->left = viewwidth; // Was SCREENWIDTH -- killough 11/98
check->maxx = -1; check->right = 0;
check->extralight = stacked_extralight; check->extralight = stacked_extralight;
check->visibility = stacked_visibility; check->visibility = stacked_visibility;
check->viewx = stacked_viewx; check->viewx = stacked_viewx;
@ -740,38 +740,38 @@ visplane_t *R_CheckPlane (visplane_t *pl, int start, int stop)
int x; int x;
assert (start >= 0 && start < viewwidth); assert (start >= 0 && start < viewwidth);
assert (stop >= start && stop < viewwidth); assert (stop > start && stop <= viewwidth);
if (start < pl->minx) if (start < pl->left)
{ {
intrl = pl->minx; intrl = pl->left;
unionl = start; unionl = start;
} }
else else
{ {
unionl = pl->minx; unionl = pl->left;
intrl = start; intrl = start;
} }
if (stop > pl->maxx) if (stop > pl->right)
{ {
intrh = pl->maxx; intrh = pl->right;
unionh = stop; unionh = stop;
} }
else else
{ {
unionh = pl->maxx; unionh = pl->right;
intrh = stop; intrh = stop;
} }
for (x = intrl; x <= intrh && pl->top[x] == 0x7fff; x++) for (x = intrl; x < intrh && pl->top[x] == 0x7fff; x++)
; ;
if (x > intrh) if (x >= intrh)
{ {
// use the same visplane // use the same visplane
pl->minx = unionl; pl->left = unionl;
pl->maxx = unionh; pl->right = unionh;
} }
else else
{ {
@ -811,8 +811,8 @@ visplane_t *R_CheckPlane (visplane_t *pl, int start, int stop)
new_pl->MirrorFlags = pl->MirrorFlags; new_pl->MirrorFlags = pl->MirrorFlags;
new_pl->CurrentSkybox = pl->CurrentSkybox; new_pl->CurrentSkybox = pl->CurrentSkybox;
pl = new_pl; pl = new_pl;
pl->minx = start; pl->left = start;
pl->maxx = stop; pl->right = stop;
clearbufshort (pl->top, viewwidth, 0x7fff); clearbufshort (pl->top, viewwidth, 0x7fff);
} }
return pl; return pl;
@ -922,23 +922,23 @@ static void R_DrawSky (visplane_t *pl)
{ {
int x; int x;
if (pl->minx > pl->maxx) if (pl->left >= pl->right)
return; return;
dc_iscale = skyiscale; dc_iscale = skyiscale;
clearbuf (swall+pl->minx, pl->maxx-pl->minx+1, dc_iscale<<2); clearbuf (swall+pl->left, pl->right-pl->left, dc_iscale<<2);
if (MirrorFlags & RF_XFLIP) if (MirrorFlags & RF_XFLIP)
{ {
for (x = pl->minx; x <= pl->maxx; ++x) for (x = pl->left; x < pl->right; ++x)
{ {
lwall[x] = (viewwidth - x) << FRACBITS; lwall[x] = (viewwidth - x) << FRACBITS;
} }
} }
else else
{ {
for (x = pl->minx; x <= pl->maxx; ++x) for (x = pl->left; x < pl->right; ++x)
{ {
lwall[x] = x << FRACBITS; lwall[x] = x << FRACBITS;
} }
@ -961,7 +961,7 @@ static void R_DrawSky (visplane_t *pl)
{ {
lastskycol[x] = 0xffffffff; lastskycol[x] = 0xffffffff;
} }
wallscan (pl->minx, pl->maxx, (short *)pl->top, (short *)pl->bottom, swall, lwall, wallscan (pl->left, pl->right, (short *)pl->top, (short *)pl->bottom, swall, lwall,
frontyScale, backskytex == NULL ? R_GetOneSkyColumn : R_GetTwoSkyColumns); frontyScale, backskytex == NULL ? R_GetOneSkyColumn : R_GetTwoSkyColumns);
} }
else else
@ -1001,7 +1001,7 @@ static void R_DrawSkyStriped (visplane_t *pl)
while (yl < viewheight) while (yl < viewheight)
{ {
for (x = pl->minx; x <= pl->maxx; ++x) for (x = pl->left; x < pl->right; ++x)
{ {
top[x] = MAX (yl, (short)pl->top[x]); top[x] = MAX (yl, (short)pl->top[x]);
bot[x] = MIN (yh, (short)pl->bottom[x]); bot[x] = MIN (yh, (short)pl->bottom[x]);
@ -1010,7 +1010,7 @@ static void R_DrawSkyStriped (visplane_t *pl)
{ {
lastskycol[x] = 0xffffffff; lastskycol[x] = 0xffffffff;
} }
wallscan (pl->minx, pl->maxx, top, bot, swall, lwall, rw_pic->yScale, wallscan (pl->left, pl->right, top, bot, swall, lwall, rw_pic->yScale,
backskytex == NULL ? R_GetOneSkyColumn : R_GetTwoSkyColumns); backskytex == NULL ? R_GetOneSkyColumn : R_GetTwoSkyColumns);
yl = yh; yl = yh;
yh += drawheight; yh += drawheight;
@ -1094,7 +1094,7 @@ void R_DrawSinglePlane (visplane_t *pl, fixed_t alpha, bool additive, bool maske
{ {
// pl->angle = pa<<ANGLETOFINESHIFT; // pl->angle = pa<<ANGLETOFINESHIFT;
if (pl->minx > pl->maxx) if (pl->left >= pl->right)
return; return;
if (r_drawflat) if (r_drawflat)
@ -1205,7 +1205,7 @@ void R_DrawSkyBoxes ()
visplanes[MAXVISPLANES] = pl->next; visplanes[MAXVISPLANES] = pl->next;
pl->next = NULL; pl->next = NULL;
if (pl->maxx < pl->minx || !r_skyboxes || numskyboxes == MAX_SKYBOX_PLANES) if (pl->right < pl->left || !r_skyboxes || numskyboxes == MAX_SKYBOX_PLANES)
{ {
R_DrawSinglePlane (pl, OPAQUE, false, false); R_DrawSinglePlane (pl, OPAQUE, false, false);
*freehead = pl; *freehead = pl;
@ -1250,11 +1250,11 @@ void R_DrawSkyBoxes ()
validcount++; // Make sure we see all sprites validcount++; // Make sure we see all sprites
R_ClearPlanes (false); R_ClearPlanes (false);
R_ClearClipSegs (pl->minx, pl->maxx + 1); R_ClearClipSegs (pl->left, pl->right);
WindowLeft = pl->minx; WindowLeft = pl->left;
WindowRight = pl->maxx; WindowRight = pl->right;
for (i = pl->minx; i <= pl->maxx; i++) for (i = pl->left; i < pl->right; i++)
{ {
if (pl->top[i] == 0x7fff) if (pl->top[i] == 0x7fff)
{ {
@ -1274,16 +1274,16 @@ void R_DrawSkyBoxes ()
ds_p->siz2 = INT_MAX; ds_p->siz2 = INT_MAX;
ds_p->sz1 = 0; ds_p->sz1 = 0;
ds_p->sz2 = 0; ds_p->sz2 = 0;
ds_p->x1 = pl->minx; ds_p->x1 = pl->left;
ds_p->x2 = pl->maxx; ds_p->x2 = pl->right;
ds_p->silhouette = SIL_BOTH; ds_p->silhouette = SIL_BOTH;
ds_p->sprbottomclip = R_NewOpening (pl->maxx - pl->minx + 1); ds_p->sprbottomclip = R_NewOpening (pl->right - pl->left);
ds_p->sprtopclip = R_NewOpening (pl->maxx - pl->minx + 1); ds_p->sprtopclip = R_NewOpening (pl->right - pl->left);
ds_p->maskedtexturecol = ds_p->swall = -1; ds_p->maskedtexturecol = ds_p->swall = -1;
ds_p->bFogBoundary = false; ds_p->bFogBoundary = false;
ds_p->fake = 0; ds_p->fake = 0;
memcpy (openings + ds_p->sprbottomclip, floorclip + pl->minx, (pl->maxx - pl->minx + 1)*sizeof(short)); memcpy (openings + ds_p->sprbottomclip, floorclip + pl->left, (pl->right - pl->left)*sizeof(short));
memcpy (openings + ds_p->sprtopclip, ceilingclip + pl->minx, (pl->maxx - pl->minx + 1)*sizeof(short)); memcpy (openings + ds_p->sprtopclip, ceilingclip + pl->left, (pl->right - pl->left)*sizeof(short));
firstvissprite = vissprite_p; firstvissprite = vissprite_p;
firstdrawseg = ds_p++; firstdrawseg = ds_p++;
@ -1542,7 +1542,7 @@ void R_DrawNormalPlane (visplane_t *pl, fixed_t alpha, bool additive, bool maske
ystepscale = (DWORD)(-(SDWORD)ystepscale); ystepscale = (DWORD)(-(SDWORD)ystepscale);
} }
int x = pl->maxx - halfviewwidth; int x = pl->right - halfviewwidth - 1;
planeang = (planeang + (ANG90 >> ANGLETOFINESHIFT)) & FINEMASK; planeang = (planeang + (ANG90 >> ANGLETOFINESHIFT)) & FINEMASK;
basexfrac = FixedMul (xscale, finecosine[planeang]) + x*xstepscale; basexfrac = FixedMul (xscale, finecosine[planeang]) + x*xstepscale;
baseyfrac = FixedMul (yscale, -finesine[planeang]) + x*ystepscale; baseyfrac = FixedMul (yscale, -finesine[planeang]) + x*ystepscale;
@ -1742,7 +1742,7 @@ void R_DrawTiltedPlane (visplane_t *pl, fixed_t alpha, bool additive, bool maske
void R_MapVisPlane (visplane_t *pl, void (*mapfunc)(int y, int x1)) void R_MapVisPlane (visplane_t *pl, void (*mapfunc)(int y, int x1))
{ {
int x = pl->maxx; int x = pl->right - 1;
int t2 = pl->top[x]; int t2 = pl->top[x];
int b2 = pl->bottom[x]; int b2 = pl->bottom[x];
@ -1751,7 +1751,7 @@ void R_MapVisPlane (visplane_t *pl, void (*mapfunc)(int y, int x1))
clearbufshort (spanend+t2, b2-t2, x); clearbufshort (spanend+t2, b2-t2, x);
} }
for (--x; x >= pl->minx; --x) for (--x; x >= pl->left; --x)
{ {
int t1 = pl->top[x]; int t1 = pl->top[x];
int b1 = pl->bottom[x]; int b1 = pl->bottom[x];
@ -1790,7 +1790,7 @@ void R_MapVisPlane (visplane_t *pl, void (*mapfunc)(int y, int x1))
// Draw any spans that are still open // Draw any spans that are still open
while (t2 < b2) while (t2 < b2)
{ {
mapfunc (--b2, pl->minx); mapfunc (--b2, pl->left);
} }
} }

2
src/r_plane.h
View File

@ -38,7 +38,7 @@ struct visplane_s
FTextureID picnum; FTextureID picnum;
int lightlevel; int lightlevel;
fixed_t xoffs, yoffs; // killough 2/28/98: Support scrolling flats fixed_t xoffs, yoffs; // killough 2/28/98: Support scrolling flats
int minx, maxx; int left, right;
FDynamicColormap *colormap; // [RH] Support multiple colormaps FDynamicColormap *colormap; // [RH] Support multiple colormaps
fixed_t xscale, yscale; // [RH] Support flat scaling fixed_t xscale, yscale; // [RH] Support flat scaling
angle_t angle; // [RH] Support flat rotation angle_t angle; // [RH] Support flat rotation

92
src/r_segs.cpp
View File

@ -206,13 +206,13 @@ void ClipMidtex(int x1, int x2)
short most[MAXWIDTH]; short most[MAXWIDTH];
WallMost(most, curline->frontsector->ceilingplane, &WallC); WallMost(most, curline->frontsector->ceilingplane, &WallC);
for (int i = x1; i <= x2; ++i) for (int i = x1; i < x2; ++i)
{ {
if (wallupper[i] < most[i]) if (wallupper[i] < most[i])
wallupper[i] = most[i]; wallupper[i] = most[i];
} }
WallMost(most, curline->frontsector->floorplane, &WallC); WallMost(most, curline->frontsector->floorplane, &WallC);
for (int i = x1; i <= x2; ++i) for (int i = x1; i < x2; ++i)
{ {
if (walllower[i] > most[i]) if (walllower[i] > most[i])
walllower[i] = most[i]; walllower[i] = most[i];
@ -398,12 +398,12 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
OWallMost(walllower, textop - texheight, &WallC); OWallMost(walllower, textop - texheight, &WallC);
} }
for (i = x1; i <= x2; i++) for (i = x1; i < x2; i++)
{ {
if (wallupper[i] < mceilingclip[i]) if (wallupper[i] < mceilingclip[i])
wallupper[i] = mceilingclip[i]; wallupper[i] = mceilingclip[i];
} }
for (i = x1; i <= x2; i++) for (i = x1; i < x2; i++)
{ {
if (walllower[i] > mfloorclip[i]) if (walllower[i] > mfloorclip[i])
walllower[i] = mfloorclip[i]; walllower[i] = mfloorclip[i];
@ -426,7 +426,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
// draw the columns one at a time // draw the columns one at a time
if (drawmode == DoDraw0) if (drawmode == DoDraw0)
{ {
for (dc_x = x1; dc_x <= x2; ++dc_x) for (dc_x = x1; dc_x < x2; ++dc_x)
{ {
BlastMaskedColumn (R_DrawMaskedColumn, tex); BlastMaskedColumn (R_DrawMaskedColumn, tex);
} }
@ -434,9 +434,9 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
else else
{ {
// [RH] Draw up to four columns at once // [RH] Draw up to four columns at once
int stop = (x2+1) & ~3; int stop = x2 & ~3;
if (x1 > x2) if (x1 >= x2)
goto clearfog; goto clearfog;
dc_x = x1; dc_x = x1;
@ -458,7 +458,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
dc_x++; dc_x++;
} }
while (dc_x <= x2) while (dc_x < x2)
{ {
BlastMaskedColumn (R_DrawMaskedColumn, tex); BlastMaskedColumn (R_DrawMaskedColumn, tex);
dc_x++; dc_x++;
@ -486,7 +486,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
if (fake3D & FAKE3D_CLIPTOP) if (fake3D & FAKE3D_CLIPTOP)
{ {
OWallMost(wallupper, sclipTop - viewz, &WallC); OWallMost(wallupper, sclipTop - viewz, &WallC);
for (i = x1; i <= x2; i++) for (i = x1; i < x2; i++)
{ {
if (wallupper[i] < mceilingclip[i]) if (wallupper[i] < mceilingclip[i])
wallupper[i] = mceilingclip[i]; wallupper[i] = mceilingclip[i];
@ -496,7 +496,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
if (fake3D & FAKE3D_CLIPBOTTOM) if (fake3D & FAKE3D_CLIPBOTTOM)
{ {
OWallMost(walllower, sclipBottom - viewz, &WallC); OWallMost(walllower, sclipBottom - viewz, &WallC);
for (i = x1; i <= x2; i++) for (i = x1; i < x2; i++)
{ {
if (walllower[i] > mfloorclip[i]) if (walllower[i] > mfloorclip[i])
walllower[i] = mfloorclip[i]; walllower[i] = mfloorclip[i];
@ -520,11 +520,11 @@ clearfog:
if (fake3D & FAKE3D_REFRESHCLIP) if (fake3D & FAKE3D_REFRESHCLIP)
{ {
assert(ds->bkup >= 0); assert(ds->bkup >= 0);
memcpy(openings + ds->sprtopclip, openings + ds->bkup, (ds->x2-ds->x1+1) * 2); memcpy(openings + ds->sprtopclip, openings + ds->bkup, (ds->x2 - ds->x1) * 2);
} }
else else
{ {
clearbufshort(openings + ds->sprtopclip - ds->x1 + x1, x2-x1+1, viewheight); clearbufshort(openings + ds->sprtopclip - ds->x1 + x1, x2 - x1, viewheight);
} }
} }
return; return;
@ -539,7 +539,7 @@ void R_RenderFakeWall(drawseg_t *ds, int x1, int x2, F3DFloor *rover)
fixed_t Alpha = Scale(rover->alpha, OPAQUE, 255); fixed_t Alpha = Scale(rover->alpha, OPAQUE, 255);
ESPSResult drawmode; ESPSResult drawmode;
drawmode = R_SetPatchStyle (LegacyRenderStyles[rover->flags & FF_ADDITIVETRANS ? STYLE_Add : STYLE_Translucent], drawmode = R_SetPatchStyle (LegacyRenderStyles[rover->flags & FF_ADDITIVETRANS ? STYLE_Add : STYLE_Translucent],
Alpha, 0, 0); Alpha, 0, 0);
if(drawmode == DontDraw) { if(drawmode == DontDraw) {
R_FinishSetPatchStyle(); R_FinishSetPatchStyle();
@ -617,12 +617,12 @@ void R_RenderFakeWall(drawseg_t *ds, int x1, int x2, F3DFloor *rover)
OWallMost(wallupper, sclipTop - viewz, &WallC); OWallMost(wallupper, sclipTop - viewz, &WallC);
OWallMost(walllower, sclipBottom - viewz, &WallC); OWallMost(walllower, sclipBottom - viewz, &WallC);
for (i = x1; i <= x2; i++) for (i = x1; i < x2; i++)
{ {
if (wallupper[i] < mceilingclip[i]) if (wallupper[i] < mceilingclip[i])
wallupper[i] = mceilingclip[i]; wallupper[i] = mceilingclip[i];
} }
for (i = x1; i <= x2; i++) for (i = x1; i < x2; i++)
{ {
if (walllower[i] > mfloorclip[i]) if (walllower[i] > mfloorclip[i])
walllower[i] = mfloorclip[i]; walllower[i] = mfloorclip[i];
@ -1093,7 +1093,7 @@ void wallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal, fixed_t
palookupoffse[3] = dc_colormap; palookupoffse[3] = dc_colormap;
} }
for(; (x <= x2) && (x & 3); ++x) for(; (x < x2) && (x & 3); ++x)
{ {
light += rw_lightstep; light += rw_lightstep;
y1ve[0] = uwal[x];//max(uwal[x],umost[x]); y1ve[0] = uwal[x];//max(uwal[x],umost[x]);
@ -1116,7 +1116,7 @@ void wallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal, fixed_t
dovline1(); dovline1();
} }
for(; x <= x2-3; x += 4) for(; x < x2-3; x += 4)
{ {
bad = 0; bad = 0;
for (z = 3; z>= 0; --z) for (z = 3; z>= 0; --z)
@ -1186,7 +1186,7 @@ void wallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal, fixed_t
} }
} }
} }
for(;x<=x2;x++) for(;x<x2;x++)
{ {
light += rw_lightstep; light += rw_lightstep;
y1ve[0] = uwal[x];//max(uwal[x],umost[x]); y1ve[0] = uwal[x];//max(uwal[x],umost[x]);
@ -1227,7 +1227,7 @@ void wallscan_striped (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
down = most1; down = most1;
assert(WallC.sx1 <= x1); assert(WallC.sx1 <= x1);
assert(WallC.sx2 > x2); assert(WallC.sx2 >= x2);
// kg3D - fake floors instead of zdoom light list // kg3D - fake floors instead of zdoom light list
for (unsigned int i = 0; i < frontsector->e->XFloor.lightlist.Size(); i++) for (unsigned int i = 0; i < frontsector->e->XFloor.lightlist.Size(); i++)
@ -1235,7 +1235,7 @@ void wallscan_striped (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
int j = WallMost (most3, frontsector->e->XFloor.lightlist[i].plane, &WallC); int j = WallMost (most3, frontsector->e->XFloor.lightlist[i].plane, &WallC);
if (j != 3) if (j != 3)
{ {
for (int j = x1; j <= x2; ++j) for (int j = x1; j < x2; ++j)
{ {
down[j] = clamp (most3[j], up[j], dwal[j]); down[j] = clamp (most3[j], up[j], dwal[j]);
} }
@ -1317,7 +1317,7 @@ void wallscan_np2(int x1, int x2, short *uwal, short *dwal, fixed_t *swal, fixed
int j = OWallMost(most3, partition - viewz, &WallC); int j = OWallMost(most3, partition - viewz, &WallC);
if (j != 3) if (j != 3)
{ {
for (int j = x1; j <= x2; ++j) for (int j = x1; j < x2; ++j)
{ {
down[j] = clamp(most3[j], up[j], dwal[j]); down[j] = clamp(most3[j], up[j], dwal[j]);
} }
@ -1341,7 +1341,7 @@ void wallscan_np2(int x1, int x2, short *uwal, short *dwal, fixed_t *swal, fixed
int j = OWallMost(most3, partition - viewz, &WallC); int j = OWallMost(most3, partition - viewz, &WallC);
if (j != 12) if (j != 12)
{ {
for (int j = x1; j <= x2; ++j) for (int j = x1; j < x2; ++j)
{ {
up[j] = clamp(most3[j], uwal[j], down[j]); up[j] = clamp(most3[j], uwal[j], down[j]);
} }
@ -1460,7 +1460,7 @@ void maskwallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal, fixe
domvline1(); domvline1();
} }
for(; x <= x2-3; x += 4, p+= 4) for(; x < x2-3; x += 4, p+= 4)
{ {
bad = 0; bad = 0;
for (z = 3, dax = x+3; z >= 0; --z, --dax) for (z = 3, dax = x+3; z >= 0; --z, --dax)
@ -1528,7 +1528,7 @@ void maskwallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal, fixe
} }
} }
} }
for(; x <= x2; ++x, ++p) for(; x < x2; ++x, ++p)
{ {
light += rw_lightstep; light += rw_lightstep;
y1ve[0] = uwal[x]; y1ve[0] = uwal[x];
@ -1612,7 +1612,7 @@ void transmaskwallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
palookupoffse[3] = dc_colormap; palookupoffse[3] = dc_colormap;
} }
for(; (x <= x2) && ((size_t)p & 3); ++x, ++p) for(; (x < x2) && ((size_t)p & 3); ++x, ++p)
{ {
light += rw_lightstep; light += rw_lightstep;
y1ve[0] = uwal[x];//max(uwal[x],umost[x]); y1ve[0] = uwal[x];//max(uwal[x],umost[x]);
@ -1633,7 +1633,7 @@ void transmaskwallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
tmvline1(); tmvline1();
} }
for(; x <= x2-3; x += 4, p+= 4) for(; x < x2-3; x += 4, p+= 4)
{ {
bad = 0; bad = 0;
for (z = 3, dax = x+3; z >= 0; --z, --dax) for (z = 3, dax = x+3; z >= 0; --z, --dax)
@ -1704,7 +1704,7 @@ void transmaskwallscan (int x1, int x2, short *uwal, short *dwal, fixed_t *swal,
} }
} }
} }
for(; x <= x2; ++x, ++p) for(; x < x2; ++x, ++p)
{ {
light += rw_lightstep; light += rw_lightstep;
y1ve[0] = uwal[x]; y1ve[0] = uwal[x];
@ -1855,11 +1855,11 @@ void R_RenderSegLoop ()
} }
if (rw_pic->GetHeight() != 1 << rw_pic->HeightBits) if (rw_pic->GetHeight() != 1 << rw_pic->HeightBits)
{ {
wallscan_np2(x1, x2-1, walltop, wallbottom, swall, lwall, yscale, MAX(rw_frontcz1, rw_frontcz2), MIN(rw_frontfz1, rw_frontfz2), false); wallscan_np2(x1, x2, walltop, wallbottom, swall, lwall, yscale, MAX(rw_frontcz1, rw_frontcz2), MIN(rw_frontfz1, rw_frontfz2), false);
} }
else else
{ {
call_wallscan(x1, x2-1, walltop, wallbottom, swall, lwall, yscale, false); call_wallscan(x1, x2, walltop, wallbottom, swall, lwall, yscale, false);
} }
} }
clearbufshort (ceilingclip+x1, x2-x1, viewheight); clearbufshort (ceilingclip+x1, x2-x1, viewheight);
@ -1898,11 +1898,11 @@ void R_RenderSegLoop ()
} }
if (rw_pic->GetHeight() != 1 << rw_pic->HeightBits) if (rw_pic->GetHeight() != 1 << rw_pic->HeightBits)
{ {
wallscan_np2(x1, x2-1, walltop, wallupper, swall, lwall, yscale, MAX(rw_frontcz1, rw_frontcz2), MIN(rw_backcz1, rw_backcz2), false); wallscan_np2(x1, x2, walltop, wallupper, swall, lwall, yscale, MAX(rw_frontcz1, rw_frontcz2), MIN(rw_backcz1, rw_backcz2), false);
} }
else else
{ {
call_wallscan(x1, x2-1, walltop, wallupper, swall, lwall, yscale, false); call_wallscan(x1, x2, walltop, wallupper, swall, lwall, yscale, false);
} }
} }
memcpy (ceilingclip+x1, wallupper+x1, (x2-x1)*sizeof(short)); memcpy (ceilingclip+x1, wallupper+x1, (x2-x1)*sizeof(short));
@ -1944,11 +1944,11 @@ void R_RenderSegLoop ()
} }
if (rw_pic->GetHeight() != 1 << rw_pic->HeightBits) if (rw_pic->GetHeight() != 1 << rw_pic->HeightBits)
{ {
wallscan_np2(x1, x2-1, walllower, wallbottom, swall, lwall, yscale, MAX(rw_backfz1, rw_backfz2), MIN(rw_frontfz1, rw_frontfz2), false); wallscan_np2(x1, x2, walllower, wallbottom, swall, lwall, yscale, MAX(rw_backfz1, rw_backfz2), MIN(rw_frontfz1, rw_frontfz2), false);
} }
else else
{ {
call_wallscan(x1, x2-1, walllower, wallbottom, swall, lwall, yscale, false); call_wallscan(x1, x2, walllower, wallbottom, swall, lwall, yscale, false);
} }
} }
memcpy (floorclip+x1, walllower+x1, (x2-x1)*sizeof(short)); memcpy (floorclip+x1, walllower+x1, (x2-x1)*sizeof(short));
@ -2368,7 +2368,7 @@ void R_StoreWallRange (int start, int stop)
ds_p->siz1 = (DWORD)DivScale32 (1, WallC.sz1) >> 1; ds_p->siz1 = (DWORD)DivScale32 (1, WallC.sz1) >> 1;
ds_p->siz2 = (DWORD)DivScale32 (1, WallC.sz2) >> 1; ds_p->siz2 = (DWORD)DivScale32 (1, WallC.sz2) >> 1;
ds_p->x1 = rw_x = start; ds_p->x1 = rw_x = start;
ds_p->x2 = stop-1; ds_p->x2 = stop;
ds_p->curline = curline; ds_p->curline = curline;
rw_stopx = stop; rw_stopx = stop;
ds_p->bFogBoundary = false; ds_p->bFogBoundary = false;
@ -2547,7 +2547,7 @@ void R_StoreWallRange (int start, int stop)
{ {
if (ceilingplane) if (ceilingplane)
{ // killough 4/11/98: add NULL ptr checks { // killough 4/11/98: add NULL ptr checks
ceilingplane = R_CheckPlane (ceilingplane, start, stop-1); ceilingplane = R_CheckPlane (ceilingplane, start, stop);
} }
else else
{ {
@ -2559,7 +2559,7 @@ void R_StoreWallRange (int start, int stop)
{ {
if (floorplane) if (floorplane)
{ // killough 4/11/98: add NULL ptr checks { // killough 4/11/98: add NULL ptr checks
floorplane = R_CheckPlane (floorplane, start, stop-1); floorplane = R_CheckPlane (floorplane, start, stop);
} }
else else
{ {
@ -2707,8 +2707,8 @@ int OWallMost (short *mostbuf, fixed_t z, const FWallCoords *wallc)
#endif #endif
if (mostbuf[ix1] < 0) mostbuf[ix1] = 0; if (mostbuf[ix1] < 0) mostbuf[ix1] = 0;
else if (mostbuf[ix1] > viewheight) mostbuf[ix1] = (short)viewheight; else if (mostbuf[ix1] > viewheight) mostbuf[ix1] = (short)viewheight;
if (mostbuf[ix2] < 0) mostbuf[ix2] = 0; if (mostbuf[ix2-1] < 0) mostbuf[ix2-1] = 0;
else if (mostbuf[ix2] > viewheight) mostbuf[ix2] = (short)viewheight; else if (mostbuf[ix2-1] > viewheight) mostbuf[ix2-1] = (short)viewheight;
return bad; return bad;
} }
@ -2865,8 +2865,8 @@ int WallMost (short *mostbuf, const secplane_t &plane, const FWallCoords *wallc)
if (mostbuf[ix1] < 0) mostbuf[ix1] = 0; if (mostbuf[ix1] < 0) mostbuf[ix1] = 0;
else if (mostbuf[ix1] > viewheight) mostbuf[ix1] = (short)viewheight; else if (mostbuf[ix1] > viewheight) mostbuf[ix1] = (short)viewheight;
if (mostbuf[ix2] < 0) mostbuf[ix2] = 0; if (mostbuf[ix2-1] < 0) mostbuf[ix2-1] = 0;
else if (mostbuf[ix2] > viewheight) mostbuf[ix2] = (short)viewheight; else if (mostbuf[ix2-1] > viewheight) mostbuf[ix2-1] = (short)viewheight;
return bad; return bad;
} }
@ -3063,7 +3063,7 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper,
x1 = WallC.sx1; x1 = WallC.sx1;
x2 = WallC.sx2; x2 = WallC.sx2;
if (x1 > clipper->x2 || x2 <= clipper->x1) if (x1 >= clipper->x2 || x2 <= clipper->x1)
goto done; goto done;
WallT.InitFromWallCoords(&WallC); WallT.InitFromWallCoords(&WallC);
@ -3126,14 +3126,8 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper,
dc_texturemid = topoff + FixedDiv (zpos - viewz, yscale); dc_texturemid = topoff + FixedDiv (zpos - viewz, yscale);
// Clip sprite to drawseg // Clip sprite to drawseg
if (x1 < clipper->x1) x1 = MAX<int>(clipper->x1, x1);
{ x2 = MIN<int>(clipper->x2, x2);
x1 = clipper->x1;
}
if (x2 > clipper->x2)
{
x2 = clipper->x2 + 1;
}
if (x1 >= x2) if (x1 >= x2)
{ {
goto done; goto done;

37
src/r_things.cpp
View File

@ -352,7 +352,7 @@ void R_DrawVisSprite (vissprite_t *vis)
else // DoDraw1 else // DoDraw1
{ {
// Up to four columns at a time // Up to four columns at a time
stop4 = (vis->x2 + 1) & ~3; stop4 = vis->x2 & ~3;
} }
tex = vis->pic; tex = vis->pic;
@ -366,7 +366,7 @@ void R_DrawVisSprite (vissprite_t *vis)
sprtopscreen = centeryfrac - FixedMul (dc_texturemid, spryscale); sprtopscreen = centeryfrac - FixedMul (dc_texturemid, spryscale);
dc_x = vis->x1; dc_x = vis->x1;
x2 = vis->x2 + 1; x2 = vis->x2;
if (dc_x < x2) if (dc_x < x2)
{ {
@ -412,7 +412,7 @@ void R_DrawWallSprite(vissprite_t *spr)
fixed_t yscale; fixed_t yscale;
x1 = MAX<int>(spr->x1, spr->wallc.sx1); x1 = MAX<int>(spr->x1, spr->wallc.sx1);
x2 = MIN<int>(spr->x2 + 1, spr->wallc.sx2 + 1); x2 = MIN<int>(spr->x2, spr->wallc.sx2);
if (x1 >= x2) if (x1 >= x2)
return; return;
WallT.InitFromWallCoords(&spr->wallc); WallT.InitFromWallCoords(&spr->wallc);
@ -868,7 +868,7 @@ void R_ProjectSprite (AActor *thing, int fakeside, F3DFloor *fakefloor, F3DFloor
x1 = centerx + MulScale32 (tx, xscale); x1 = centerx + MulScale32 (tx, xscale);
// off the right side? // off the right side?
if (x1 > WindowRight) if (x1 >= WindowRight)
return; return;
tx += tex->GetWidth() * thingxscalemul; tx += tex->GetWidth() * thingxscalemul;
@ -880,7 +880,6 @@ void R_ProjectSprite (AActor *thing, int fakeside, F3DFloor *fakefloor, F3DFloor
xscale = FixedDiv(FixedMul(spritescaleX, xscale), tex->xScale); xscale = FixedDiv(FixedMul(spritescaleX, xscale), tex->xScale);
iscale = (tex->GetWidth() << FRACBITS) / (x2 - x1); iscale = (tex->GetWidth() << FRACBITS) / (x2 - x1);
x2--;
fixed_t yscale = SafeDivScale16(spritescaleY, tex->yScale); fixed_t yscale = SafeDivScale16(spritescaleY, tex->yScale);
@ -1062,7 +1061,7 @@ static void R_ProjectWallSprite(AActor *thing, fixed_t fx, fixed_t fy, fixed_t f
if (wallc.Init(lx1, ly1, lx2, ly2, TOO_CLOSE_Z)) if (wallc.Init(lx1, ly1, lx2, ly2, TOO_CLOSE_Z))
return; return;
if (wallc.sx1 > WindowRight || wallc.sx2 <= WindowLeft) if (wallc.sx1 >= WindowRight || wallc.sx2 <= WindowLeft)
return; return;
// Sprite sorting should probably treat these as walls, not sprites, // Sprite sorting should probably treat these as walls, not sprites,
@ -1076,7 +1075,7 @@ static void R_ProjectWallSprite(AActor *thing, fixed_t fx, fixed_t fy, fixed_t f
vis = R_NewVisSprite(); vis = R_NewVisSprite();
vis->x1 = wallc.sx1 < WindowLeft ? WindowLeft : wallc.sx1; vis->x1 = wallc.sx1 < WindowLeft ? WindowLeft : wallc.sx1;
vis->x2 = wallc.sx2 >= WindowRight ? WindowRight : wallc.sx2-1; vis->x2 = wallc.sx2 >= WindowRight ? WindowRight : wallc.sx2;
vis->yscale = yscale; vis->yscale = yscale;
vis->idepth = (unsigned)DivScale32(1, tz) >> 1; vis->idepth = (unsigned)DivScale32(1, tz) >> 1;
vis->depth = tz; vis->depth = tz;
@ -1213,10 +1212,10 @@ void R_DrawPSprite (pspdef_t* psp, int pspnum, AActor *owner, fixed_t sx, fixed_
return; return;
tx += tex->GetScaledWidth() << FRACBITS; tx += tex->GetScaledWidth() << FRACBITS;
x2 = ((centerxfrac + FixedMul (tx, pspritexscale)) >>FRACBITS) - 1; x2 = ((centerxfrac + FixedMul (tx, pspritexscale)) >>FRACBITS);
// off the left side // off the left side
if (x2 < 0) if (x2 <= 0)
return; return;
// store information in a vissprite // store information in a vissprite
@ -1255,7 +1254,7 @@ void R_DrawPSprite (pspdef_t* psp, int pspnum, AActor *owner, fixed_t sx, fixed_
vis->texturemid -= BaseRatioSizes[WidescreenRatio][2]; vis->texturemid -= BaseRatioSizes[WidescreenRatio][2];
} }
vis->x1 = x1 < 0 ? 0 : x1; vis->x1 = x1 < 0 ? 0 : x1;
vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2; vis->x2 = x2 >= viewwidth ? viewwidth : x2;
vis->xscale = DivScale16(pspritexscale, tex->xScale); vis->xscale = DivScale16(pspritexscale, tex->xScale);
vis->yscale = DivScale16(pspriteyscale, tex->yScale); vis->yscale = DivScale16(pspriteyscale, tex->yScale);
vis->Translation = 0; // [RH] Use default colors vis->Translation = 0; // [RH] Use default colors
@ -1807,7 +1806,7 @@ void R_DrawSprite (vissprite_t *spr)
x2 = spr->x2; x2 = spr->x2;
// [RH] Quickly reject sprites with bad x ranges. // [RH] Quickly reject sprites with bad x ranges.
if (x1 > x2) if (x1 >= x2)
return; return;
// [RH] Sprites split behind a one-sided line can also be discarded. // [RH] Sprites split behind a one-sided line can also be discarded.
@ -2050,7 +2049,7 @@ void R_DrawSprite (vissprite_t *spr)
return; return;
} }
i = x2 - x1 + 1; i = x2 - x1;
clip1 = clipbot + x1; clip1 = clipbot + x1;
clip2 = cliptop + x1; clip2 = cliptop + x1;
do do
@ -2073,7 +2072,7 @@ void R_DrawSprite (vissprite_t *spr)
// kg3D - no clipping on fake segs // kg3D - no clipping on fake segs
if(ds->fake) continue; if(ds->fake) continue;
// determine if the drawseg obscures the sprite // determine if the drawseg obscures the sprite
if (ds->x1 > x2 || ds->x2 < x1 || if (ds->x1 >= x2 || ds->x2 <= x1 ||
(!(ds->silhouette & SIL_BOTH) && ds->maskedtexturecol == -1 && (!(ds->silhouette & SIL_BOTH) && ds->maskedtexturecol == -1 &&
!ds->bFogBoundary) ) !ds->bFogBoundary) )
{ {
@ -2116,7 +2115,7 @@ void R_DrawSprite (vissprite_t *spr)
{ {
clip1 = clipbot + r1; clip1 = clipbot + r1;
clip2 = openings + ds->sprbottomclip + r1 - ds->x1; clip2 = openings + ds->sprbottomclip + r1 - ds->x1;
i = r2 - r1 + 1; i = r2 - r1;
do do
{ {
if (*clip1 > *clip2) if (*clip1 > *clip2)
@ -2130,7 +2129,7 @@ void R_DrawSprite (vissprite_t *spr)
{ {
clip1 = cliptop + r1; clip1 = cliptop + r1;
clip2 = openings + ds->sprtopclip + r1 - ds->x1; clip2 = openings + ds->sprtopclip + r1 - ds->x1;
i = r2 - r1 + 1; i = r2 - r1;
do do
{ {
if (*clip1 < *clip2) if (*clip1 < *clip2)
@ -2182,7 +2181,7 @@ void R_DrawSprite (vissprite_t *spr)
} }
if (x2 < viewwidth - 1) if (x2 < viewwidth - 1)
{ {
clearbufshort(cliptop + x2 + 1, viewwidth - x2 - 1, viewheight); clearbufshort(cliptop + x2, viewwidth - x2, viewheight);
} }
int minvoxely = spr->gzt <= hzt ? 0 : (spr->gzt - hzt) / spr->yscale; int minvoxely = spr->gzt <= hzt ? 0 : (spr->gzt - hzt) / spr->yscale;
int maxvoxely = spr->gzb > hzb ? INT_MAX : (spr->gzt - hzb) / spr->yscale; int maxvoxely = spr->gzb > hzb ? INT_MAX : (spr->gzt - hzb) / spr->yscale;
@ -2459,13 +2458,13 @@ static void R_DrawMaskedSegsBehindParticle (const vissprite_t *vis)
drawseg_t *ds = &drawsegs[InterestingDrawsegs[p]]; drawseg_t *ds = &drawsegs[InterestingDrawsegs[p]];
// kg3D - no fake segs // kg3D - no fake segs
if(ds->fake) continue; if(ds->fake) continue;
if (ds->x1 >= x2 || ds->x2 < x1) if (ds->x1 >= x2 || ds->x2 <= x1)
{ {
continue; continue;
} }
if (Scale (ds->siz2 - ds->siz1, (x2 + x1)/2 - ds->sx1, ds->sx2 - ds->sx1) + ds->siz1 < vis->idepth) if (Scale (ds->siz2 - ds->siz1, (x2 + x1)/2 - ds->sx1, ds->sx2 - ds->sx1) + ds->siz1 < vis->idepth)
{ {
R_RenderMaskedSegRange (ds, MAX<int> (ds->x1, x1), MIN<int> (ds->x2, x2-1)); R_RenderMaskedSegRange (ds, MAX<int>(ds->x1, x1), MIN<int>(ds->x2, x2));
} }
} }
} }
@ -2480,7 +2479,7 @@ void R_DrawParticle (vissprite_t *vis)
int yl = vis->gzb; int yl = vis->gzb;
int ycount = vis->gzt - yl + 1; int ycount = vis->gzt - yl + 1;
int x1 = vis->x1; int x1 = vis->x1;
int countbase = vis->x2 - x1 + 1; int countbase = vis->x2 - x1;
R_DrawMaskedSegsBehindParticle (vis); R_DrawMaskedSegsBehindParticle (vis);