From 877d5450d57b035ba4a6fe8742a95127b5931d74 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 31 Oct 2022 19:01:44 -0700
Subject: [PATCH] Use interpolated mobj x/y/z/angle for splats
# Conflicts:
# src/hardware/hw_main.c
# src/r_things.c
---
src/hardware/hw_glob.h | 2 ++
src/hardware/hw_main.c | 77 ++++++++++++++++++++++++------------------
src/r_splats.c | 8 ++---
src/r_things.c | 1 +
src/r_things.h | 2 +-
5 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index 2cfb43a96b..1ec9101c3b 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -84,6 +84,8 @@ typedef struct gl_vissprite_s
boolean rotated;
UINT8 translucency; //alpha level 0-255
+ angle_t angle; // for splats
+
//Hurdler: 25/04/2000: now support colormap in hardware mode
UINT8 *colormap;
INT32 dispoffset; // copy of info->dispoffset, affects ordering but not drawing
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 44483e1965..1b1a26b239 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -4173,7 +4173,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
scale *= spr->shadowscale;
if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD)
- angle = spr->mobj->angle;
+ angle = spr->angle;
else
angle = viewangle;
@@ -4228,8 +4228,8 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// Translate
for (i = 0; i < 4; i++)
{
- wallVerts[i].x = rotated[i].x + FIXED_TO_FLOAT(spr->mobj->x);
- wallVerts[i].z = rotated[i].y + FIXED_TO_FLOAT(spr->mobj->y);
+ wallVerts[i].x = rotated[i].x + spr->x1;
+ wallVerts[i].z = rotated[i].y + spr->z1;
}
if (renderflags & (RF_SLOPESPLAT | RF_OBJECTSLOPESPLAT))
@@ -4256,7 +4256,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else
{
for (i = 0; i < 4; i++)
- wallVerts[i].y = FIXED_TO_FLOAT(spr->mobj->z) + zoffset;
+ wallVerts[i].y = FIXED_TO_FLOAT(spr->gz) + zoffset;
}
}
else
@@ -5321,43 +5321,52 @@ static void HWR_ProjectSprite(mobj_t *thing)
this_xscale = spritexscale * this_scale;
this_yscale = spriteyscale * this_scale;
- if (flip)
+ if (splat)
{
- x1 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale);
- x2 = (FIXED_TO_FLOAT(spr_offset) * this_xscale);
+ z1 = z2 = tr_y;
+ x1 = x2 = tr_x;
+ gz = gzt = interp.z;
}
else
{
- x1 = (FIXED_TO_FLOAT(spr_offset) * this_xscale);
- x2 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale);
- }
+ if (flip)
+ {
+ x1 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale);
+ x2 = (FIXED_TO_FLOAT(spr_offset) * this_xscale);
+ }
+ else
+ {
+ x1 = (FIXED_TO_FLOAT(spr_offset) * this_xscale);
+ x2 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale);
+ }
- // test if too close
-/*
- if (papersprite)
- {
- z1 = tz - x1 * angle_scalez;
- z2 = tz + x2 * angle_scalez;
+ // test if too close
+ /*
+ if (papersprite)
+ {
+ z1 = tz - x1 * angle_scalez;
+ z2 = tz + x2 * angle_scalez;
- if (max(z1, z2) < ZCLIP_PLANE)
- return;
- }
-*/
+ if (max(z1, z2) < ZCLIP_PLANE)
+ return;
+ }
+ */
- z1 = tr_y + x1 * rightsin;
- z2 = tr_y - x2 * rightsin;
- x1 = tr_x + x1 * rightcos;
- x2 = tr_x - x2 * rightcos;
+ z1 = tr_y + x1 * rightsin;
+ z2 = tr_y - x2 * rightsin;
+ x1 = tr_x + x1 * rightcos;
+ x2 = tr_x - x2 * rightcos;
- if (vflip)
- {
- gz = FIXED_TO_FLOAT(interp.z + thing->height) - (FIXED_TO_FLOAT(spr_topoffset) * this_yscale);
- gzt = gz + (FIXED_TO_FLOAT(spr_height) * this_yscale);
- }
- else
- {
- gzt = FIXED_TO_FLOAT(interp.z) + (FIXED_TO_FLOAT(spr_topoffset) * this_yscale);
- gz = gzt - (FIXED_TO_FLOAT(spr_height) * this_yscale);
+ if (vflip)
+ {
+ gz = FIXED_TO_FLOAT(interp.z + thing->height) - (FIXED_TO_FLOAT(spr_topoffset) * this_yscale);
+ gzt = gz + (FIXED_TO_FLOAT(spr_height) * this_yscale);
+ }
+ else
+ {
+ gzt = FIXED_TO_FLOAT(interp.z) + (FIXED_TO_FLOAT(spr_topoffset) * this_yscale);
+ gz = gzt - (FIXED_TO_FLOAT(spr_height) * this_yscale);
+ }
}
if (thing->subsector->sector->cullheight)
@@ -5514,6 +5523,8 @@ static void HWR_ProjectSprite(mobj_t *thing)
vis->vflip = vflip;
vis->precip = false;
+
+ vis->angle = interp.angle;
}
#ifdef HWPRECIP
diff --git a/src/r_splats.c b/src/r_splats.c
index 0a84a3a336..92d12d784f 100644
--- a/src/r_splats.c
+++ b/src/r_splats.c
@@ -185,7 +185,7 @@ void R_DrawFloorSplat(vissprite_t *spr)
splat.scale = FixedMul(splat.scale, ((skin_t *)mobj->skin)->highresscale);
if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD)
- splatangle = mobj->angle;
+ splatangle = spr->centerangle;
else
splatangle = spr->viewpoint.angle;
@@ -209,14 +209,14 @@ void R_DrawFloorSplat(vissprite_t *spr)
xoffset = FixedMul(leftoffset, splat.xscale);
yoffset = FixedMul(topoffset, splat.yscale);
- x = mobj->x;
- y = mobj->y;
+ x = spr->gx;
+ y = spr->gy;
w = (splat.width * splat.xscale);
h = (splat.height * splat.yscale);
splat.x = x;
splat.y = y;
- splat.z = mobj->z;
+ splat.z = spr->pz;
splat.slope = NULL;
// Set positions
diff --git a/src/r_things.c b/src/r_things.c
index 8229295747..081c2b2115 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1863,6 +1863,7 @@ static void R_ProjectSprite(mobj_t *thing)
tr_y = (interp.y - sort_y) - viewy;
sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
sortsplat = FixedDiv(projectiony, sort_z);
+ centerangle = interp.angle;
}
// PORTAL SPRITE CLIPPING
diff --git a/src/r_things.h b/src/r_things.h
index f0a5751e84..6993f201eb 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -165,7 +165,7 @@ typedef struct vissprite_s
fixed_t paperoffset, paperdistance; // for paper sprites, offset/dist relative to the angle
fixed_t xiscale; // negative if flipped
- angle_t centerangle; // for paper sprites
+ angle_t centerangle; // for paper sprites / splats
// for floor sprites
struct {
--
GitLab