stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-29 15:42:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix top texture offsets

Browse source
This commit is contained in:
Lactozilla 2023-11-23 20:08:46 -03:00
parent 2f20f21eb6
commit f3c98158b6
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/r_segs.c
View file

@ -49,7 +49,7 @@ fixed_t rw_distance;
static INT32 rw_x, rw_stopx; static INT32 rw_x, rw_stopx;
static angle_t rw_centerangle; static angle_t rw_centerangle;
static fixed_t rw_offset, rw_offsetx; static fixed_t rw_offset, rw_offsetx;
static fixed_t rw_offset_top, rw_offset_mid, rw_offset_bot; static fixed_t rw_offset_top, rw_offset_mid, rw_offset_bottom;
static fixed_t rw_scale, rw_scalestep; static fixed_t rw_scale, rw_scalestep;
static fixed_t rw_midtexturemid, rw_toptexturemid, rw_bottomtexturemid; static fixed_t rw_midtexturemid, rw_toptexturemid, rw_bottomtexturemid;
static INT32 worldtop, worldbottom, worldhigh, worldlow; static INT32 worldtop, worldbottom, worldhigh, worldlow;
@ -1046,6 +1046,7 @@ UINT32 nombre = 100000;
static void R_RenderSegLoop (void) static void R_RenderSegLoop (void)
{ {
angle_t angle; angle_t angle;
fixed_t textureoffset;
size_t pindex; size_t pindex;
INT32 yl; INT32 yl;
INT32 yh; INT32 yh;
@ -1223,10 +1224,8 @@ static void R_RenderSegLoop (void)
//SoM: Calculate offsets for Thick fake floors. //SoM: Calculate offsets for Thick fake floors.
// calculate texture offset // calculate texture offset
angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT; angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
textureoffset = rw_offset - FixedMul(FINETANGENT(angle), rw_distance);
fixed_t distance = FixedMul(FINETANGENT(angle), rw_distance); texturecolumn = FixedDiv(textureoffset, rw_invmidtexturescalex);
texturecolumn = FixedDiv(rw_offset - distance, rw_invmidtexturescalex);
// texturecolumn and lighting are independent of wall tiers // texturecolumn and lighting are independent of wall tiers
if (segtextured) if (segtextured)
@ -1343,7 +1342,7 @@ static void R_RenderSegLoop (void)
if (mid >= floorclip[rw_x]) if (mid >= floorclip[rw_x])
mid = floorclip[rw_x]-1; mid = floorclip[rw_x]-1;
toptexturecolumn = FixedDiv(rw_offset - distance, rw_invtoptexturescalex); toptexturecolumn = FixedDiv(textureoffset, rw_invtoptexturescalex);
if (mid >= yl) // back ceiling lower than front ceiling ? if (mid >= yl) // back ceiling lower than front ceiling ?
{ {
@ -1363,7 +1362,7 @@ static void R_RenderSegLoop (void)
dc_yh = mid; dc_yh = mid;
dc_texturemid = rw_toptexturemid; dc_texturemid = rw_toptexturemid;
dc_iscale = FixedMul(0xffffffffu / (unsigned)rw_scale, rw_toptexturescaley); dc_iscale = FixedMul(0xffffffffu / (unsigned)rw_scale, rw_toptexturescaley);
dc_source = R_GetColumn(toptexture, toptexturecolumn >> FRACBITS); dc_source = R_GetColumn(toptexture, offset >> FRACBITS);
dc_texheight = textureheight[toptexture]>>FRACBITS; dc_texheight = textureheight[toptexture]>>FRACBITS;
colfunc(); colfunc();
ceilingclip[rw_x] = (INT16)mid; ceilingclip[rw_x] = (INT16)mid;
@ -1391,7 +1390,7 @@ static void R_RenderSegLoop (void)
if (mid <= ceilingclip[rw_x]) if (mid <= ceilingclip[rw_x])
mid = ceilingclip[rw_x]+1; mid = ceilingclip[rw_x]+1;
bottomtexturecolumn = FixedDiv(rw_offset - distance, rw_invbottomtexturescalex); bottomtexturecolumn = FixedDiv(textureoffset, rw_invbottomtexturescalex);
if (mid <= yh) // back floor higher than front floor ? if (mid <= yh) // back floor higher than front floor ?
{ {
@ -1402,7 +1401,7 @@ static void R_RenderSegLoop (void)
} }
else if (mid < viewheight) // safe to draw bottom texture else if (mid < viewheight) // safe to draw bottom texture
{ {
fixed_t offset = rw_offset_bot; fixed_t offset = rw_offset_bottom;
if (rw_bottomtexturescalex < 0) if (rw_bottomtexturescalex < 0)
offset = -offset; offset = -offset;
offset = bottomtexturecolumn + offset; offset = bottomtexturecolumn + offset;
@ -1434,7 +1433,7 @@ static void R_RenderSegLoop (void)
maskedtexturecol[rw_x] = texturecolumn + rw_offsetx; maskedtexturecol[rw_x] = texturecolumn + rw_offsetx;
if (thicksidecol) if (thicksidecol)
thicksidecol[rw_x] = rw_offset - distance; thicksidecol[rw_x] = textureoffset;
if (maskedtextureheight) if (maskedtextureheight)
{ {
@ -2388,6 +2387,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (segtextured) if (segtextured)
{ {
fixed_t sideoffset = sidedef->textureoffset;
offsetangle = rw_normalangle-rw_angle1; offsetangle = rw_normalangle-rw_angle1;
if (offsetangle > ANGLE_180) if (offsetangle > ANGLE_180)
@ -2415,11 +2416,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
rw_offset += curline->offset; rw_offset += curline->offset;
rw_centerangle = ANGLE_90 + viewangle - rw_normalangle; rw_centerangle = ANGLE_90 + viewangle - rw_normalangle;
rw_offsetx = sidedef->textureoffset; rw_offset_top = sideoffset + sidedef->offsetx_top;
rw_offset_mid = sideoffset + sidedef->offsetx_mid;
rw_offset_top = rw_offsetx + sidedef->offsetx_top; rw_offset_bottom = sideoffset + sidedef->offsetx_bot;
rw_offset_mid = rw_offsetx + sidedef->offsetx_mid;
rw_offset_bot = rw_offsetx + sidedef->offsetx_bot;
rw_offsetx = rw_offset_mid; rw_offsetx = rw_offset_mid;
if (rw_midtexturescalex < 0) if (rw_midtexturescalex < 0)