From 0dc867c05e1f6bfe16c6e4ee7d6e7154a151eab5 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sat, 3 Feb 2018 18:30:49 +0000
Subject: [PATCH] Cleanup of the code I've tweaked for skies, added SLOPEPARAMS
macro to R_StoreWallRange for use in getting seg end z positions
---
src/hardware/hw_main.c | 31 ++---------
src/r_bsp.c | 9 +--
src/r_segs.c | 122 ++++++++++++-----------------------------
3 files changed, 43 insertions(+), 119 deletions(-)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index dbc8faf20d..042b8e90b2 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1555,14 +1555,10 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
// hack to allow height changes in outdoor areas
// This is what gets rid of the upper textures if there should be sky
- if (gr_frontsector->ceilingpic == skyflatnum &&
- gr_backsector->ceilingpic == skyflatnum)
+ if (gr_frontsector->ceilingpic == skyflatnum
+ && gr_backsector->ceilingpic == skyflatnum)
{
bothceilingssky = true;
- //worldtop = worldhigh;
-#ifdef ESLOPE
- //worldtopslope = worldhighslope;
-#endif
}
if (!bothceilingssky)
@@ -2464,21 +2460,10 @@ static boolean CheckClip(seg_t * seg, sector_t * afrontsector, sector_t * abacks
if (abacksector->ceilingpic != skyflatnum || afrontsector->ceilingpic != skyflatnum)
{
// now check for closed sectors!
- if (backc1 <= frontf1 && backc2 <= frontf2)
+ if ((backc1 <= frontf1 && backc2 <= frontf2)
+ || (backf1 >= frontc1 && backf2 >= frontc2))
{
checkforemptylines = false;
- //if (!seg->sidedef->toptexture)
- //return false;
-
- return true;
- }
-
- if (backf1 >= frontc1 && backf2 >= frontc2)
- {
- checkforemptylines = false;
- //if (!seg->sidedef->bottomtexture)
- //return false;
-
return true;
}
@@ -2981,9 +2966,7 @@ static void HWR_AddLine(seg_t * line)
// Check for automap fix.
if (backc1 <= backf1 && backc2 <= backf2
&& ((backc1 >= frontc1 && backc2 >= frontc2) || gr_curline->sidedef->toptexture)
- && ((backf1 <= frontf1 && backf2 >= frontf2) || gr_curline->sidedef->bottomtexture)
- //&& (gr_backsector->ceilingpic != skyflatnum || gr_frontsector->ceilingpic != skyflatnum)
- )
+ && ((backf1 <= frontf1 && backf2 >= frontf2) || gr_curline->sidedef->bottomtexture))
goto clipsolid;
}
@@ -3008,9 +2991,7 @@ static void HWR_AddLine(seg_t * line)
// Check for automap fix.
if (gr_backsector->ceilingheight <= gr_backsector->floorheight
&& ((gr_backsector->ceilingheight >= gr_frontsector->ceilingheight) || gr_curline->sidedef->toptexture)
- && ((gr_backsector->floorheight <= gr_backsector->floorheight) || gr_curline->sidedef->bottomtexture)
- //&& (gr_backsector->ceilingpic != skyflatnum || gr_frontsector->ceilingpic != skyflatnum)
- )
+ && ((gr_backsector->floorheight <= gr_backsector->floorheight) || gr_curline->sidedef->bottomtexture))
goto clipsolid;
}
diff --git a/src/r_bsp.c b/src/r_bsp.c
index 7fa6d0481a..3cfad15497 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -220,10 +220,7 @@ static INT32 R_DoorClosed(void)
// preserve a kind of transparent door/lift special effect:
&& (backsector->ceilingheight >= frontsector->ceilingheight || curline->sidedef->toptexture)
- && (backsector->floorheight <= frontsector->floorheight || curline->sidedef->bottomtexture)
-
- // properly render skies (consider door "open" if both ceilings are sky):
- && (backsector->ceilingpic != skyflatnum || frontsector->ceilingpic != skyflatnum);
+ && (backsector->floorheight <= frontsector->floorheight || curline->sidedef->bottomtexture);
}
//
@@ -520,9 +517,7 @@ static void R_AddLine(seg_t *line)
// Check for automap fix. Store in doorclosed for r_segs.c
doorclosed = (backc1 <= backf1 && backc2 <= backf2
&& ((backc1 >= frontc1 && backc2 >= frontc2) || curline->sidedef->toptexture)
- && ((backf1 <= frontf1 && backf2 >= frontf2) || curline->sidedef->bottomtexture)
- //&& (backsector->ceilingpic != skyflatnum || frontsector->ceilingpic != skyflatnum)
- );
+ && ((backf1 <= frontf1 && backf2 >= frontf2) || curline->sidedef->bottomtexture));
if (doorclosed)
goto clipsolid;
diff --git a/src/r_segs.c b/src/r_segs.c
index 200c8c81bc..6ed1417d8e 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -1894,29 +1894,26 @@ void R_StoreWallRange(INT32 start, INT32 stop)
}
}
- if (frontsector->c_slope) {
- worldtop = P_GetZAt(frontsector->c_slope, segleft.x, segleft.y) - viewz;
- worldtopslope = P_GetZAt(frontsector->c_slope, segright.x, segright.y) - viewz;
- } else {
- worldtopslope =
-#else
- {
-#endif
- worldtop = frontsector->ceilingheight - viewz;
- }
-
-#ifdef ESLOPE
- if (frontsector->f_slope) {
- worldbottom = P_GetZAt(frontsector->f_slope, segleft.x, segleft.y) - viewz;
- worldbottomslope = P_GetZAt(frontsector->f_slope, segright.x, segright.y) - viewz;
- } else {
- worldbottomslope =
+#define SLOPEPARAMS(slope, end1, end2, normalheight) \
+ if (slope) { \
+ end1 = P_GetZAt(slope, segleft.x, segleft.y); \
+ end2 = P_GetZAt(slope, segright.x, segright.y); \
+ } else \
+ end1 = end2 = normalheight;
+
+ SLOPEPARAMS(frontsector->c_slope, worldtop, worldtopslope, frontsector->ceilingheight)
+ SLOPEPARAMS(frontsector->f_slope, worldbottom, worldbottomslope, frontsector->floorheight)
+ // subtract viewz from these to turn them into
+ // positions relative to the camera's z position
+ worldtop -= viewz;
+ worldtopslope -= viewz;
+ worldbottom -= viewz;
+ worldbottomslope -= viewz;
#else
- {
+ worldtop = frontsector->ceilingheight - viewz;
+ worldbottom = frontsector->floorheight - viewz;
#endif
- worldbottom = frontsector->floorheight - viewz;
- }
midtexture = toptexture = bottomtexture = maskedtexture = 0;
ds_p->maskedtexturecol = NULL;
@@ -2021,40 +2018,23 @@ void R_StoreWallRange(INT32 start, INT32 stop)
boolean bothceilingssky = false; // turned on if both back and front ceilings are sky
#ifdef ESLOPE
- if (backsector->c_slope) {
- worldhigh = P_GetZAt(backsector->c_slope, segleft.x, segleft.y) - viewz;
- worldhighslope = P_GetZAt(backsector->c_slope, segright.x, segright.y) - viewz;
- } else {
- worldhighslope =
+ SLOPEPARAMS(backsector->c_slope, worldhigh, worldhighslope, backsector->ceilingheight)
+ SLOPEPARAMS(backsector->f_slope, worldlow, worldlowslope, backsector->floorheight)
+ worldhigh -= viewz;
+ worldhighslope -= viewz;
+ worldlow -= viewz;
+ worldlowslope -= viewz;
#else
- {
+ worldhigh = backsector->ceilingheight - viewz;
+ worldlow = backsector->floorheight - viewz;
#endif
- worldhigh = backsector->ceilingheight - viewz;
- }
-
-
-#ifdef ESLOPE
- if (backsector->f_slope) {
- worldlow = P_GetZAt(backsector->f_slope, segleft.x, segleft.y) - viewz;
- worldlowslope = P_GetZAt(backsector->f_slope, segright.x, segright.y) - viewz;
- } else {
- worldlowslope =
-#else
- {
-#endif
- worldlow = backsector->floorheight - viewz;
- }
-
// hack to allow height changes in outdoor areas
+ // This is what gets rid of the upper textures if there should be sky
if (frontsector->ceilingpic == skyflatnum
&& backsector->ceilingpic == skyflatnum)
{
bothceilingssky = true;
-#ifdef ESLOPE
- //worldtopslope = worldhighslope;
-#endif
- //worldtop = worldhigh;
}
ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
@@ -2375,16 +2355,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue;
#ifdef ESLOPE
- if (*rover->t_slope) {
- high1 = P_GetZAt(*rover->t_slope, segleft.x, segleft.y);
- highslope1 = P_GetZAt(*rover->t_slope, segright.x, segright.y);
- } else
- high1 = highslope1 = *rover->topheight;
- if (*rover->b_slope) {
- low1 = P_GetZAt(*rover->b_slope, segleft.x, segleft.y);
- lowslope1 = P_GetZAt(*rover->b_slope, segright.x, segright.y);
- } else
- low1 = lowslope1 = *rover->bottomheight;
+ SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+ SLOPEPARAMS(*rover->b_slope, low1, lowslope1, *rover->bottomheight)
if ((high1 < lowcut && highslope1 < lowcutslope) || (low1 > highcut && lowslope1 > highcutslope))
continue;
@@ -2416,16 +2388,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
}
#ifdef ESLOPE
- if (*r2->t_slope) {
- high2 = P_GetZAt(*r2->t_slope, segleft.x, segleft.y);
- highslope2 = P_GetZAt(*r2->t_slope, segright.x, segright.y);
- } else
- high2 = highslope2 = *r2->topheight;
- if (*r2->b_slope) {
- low2 = P_GetZAt(*r2->b_slope, segleft.x, segleft.y);
- lowslope2 = P_GetZAt(*r2->b_slope, segright.x, segright.y);
- } else
- low2 = lowslope2 = *r2->bottomheight;
+ SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
+ SLOPEPARAMS(*r2->b_slope, low2, lowslope2, *r2->bottomheight)
if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope))
continue;
@@ -2458,16 +2422,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue;
#ifdef ESLOPE
- if (*rover->t_slope) {
- high1 = P_GetZAt(*rover->t_slope, segleft.x, segleft.y);
- highslope1 = P_GetZAt(*rover->t_slope, segright.x, segright.y);
- } else
- high1 = highslope1 = *rover->topheight;
- if (*rover->b_slope) {
- low1 = P_GetZAt(*rover->b_slope, segleft.x, segleft.y);
- lowslope1 = P_GetZAt(*rover->b_slope, segright.x, segright.y);
- } else
- low1 = lowslope1 = *rover->bottomheight;
+ SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+ SLOPEPARAMS(*rover->b_slope, low1, lowslope1, *rover->bottomheight)
if ((high1 < lowcut && highslope1 < lowcutslope) || (low1 > highcut && lowslope1 > highcutslope))
continue;
@@ -2499,17 +2455,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
}
#ifdef ESLOPE
- if (*r2->t_slope) {
- high2 = P_GetZAt(*r2->t_slope, segleft.x, segleft.y);
- highslope2 = P_GetZAt(*r2->t_slope, segright.x, segright.y);
- } else
- high2 = highslope2 = *r2->topheight;
- if (*r2->b_slope) {
- low2 = P_GetZAt(*r2->b_slope, segleft.x, segleft.y);
- lowslope2 = P_GetZAt(*r2->b_slope, segright.x, segright.y);
- } else
- low2 = lowslope2 = *r2->bottomheight;
-
+ SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
+ SLOPEPARAMS(*r2->b_slope, low2, lowslope2, *r2->bottomheight)
+#undef SLOPEPARAMS
if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope))
continue;
if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2))
--
GitLab