zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-15 16:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Hirestex replacements for sprites didn't work properly due to some

Browse source 
incorrect calculations in R_ProjectSprite.


SVN r536 (trunk)
This commit is contained in:
Christoph Oelckers 2007-05-27 15:33:05 +00:00
parent 2345a1a5f0
commit 91241eb96e
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/rh-log.txt
View file

@ -1,4 +1,6 @@
May 27, 2007 (Changes by Graf Zahl) May 27, 2007 (Changes by Graf Zahl)
- Fixed: Hirestex replacements for sprites didn't work properly due to some
incorrect calculations in R_ProjectSprite.
- Fixed: The speed definition of PowerSpeed used PROP_SpeedFixed instead of - Fixed: The speed definition of PowerSpeed used PROP_SpeedFixed instead of
PROP_SpeedLong. PROP_SpeedLong.
- Fixed: The Chainsaw's kickback was initialized to the default - not 0. - Fixed: The Chainsaw's kickback was initialized to the default - not 0.

17
src/r_things.cpp
View file

@ -1302,8 +1302,10 @@ void R_ProjectSprite (AActor *thing, int fakeside)
} }
// [RH] Added scaling // [RH] Added scaling
gzt = fz + MulScale16(thing->scaleY, tex->TopOffset * tex->yScale); int scaled_to = tex->GetScaledTopOffset();
gzb = fz + MulScale16(thing->scaleY, (tex->TopOffset - tex->GetHeight()) * tex->yScale); int scaled_bo = scaled_to - tex->GetScaledHeight();
gzt = fz + thing->scaleY * scaled_to;
gzb = fz + thing->scaleY * scaled_bo;
// [RH] Reject sprites that are off the top or bottom of the screen // [RH] Reject sprites that are off the top or bottom of the screen
if (MulScale12 (globaluclip, tz) > viewz - gzb || if (MulScale12 (globaluclip, tz) > viewz - gzb ||
@ -1319,7 +1321,7 @@ void R_ProjectSprite (AActor *thing, int fakeside)
} }
// calculate edges of the shape // calculate edges of the shape
const fixed_t thingxscalemul = MulScale16(thing->scaleX, tex->xScale); const fixed_t thingxscalemul = DivScale16(thing->scaleX, tex->xScale);
tx -= (flip ? (tex->GetWidth() - tex->LeftOffset - 1) : tex->LeftOffset) * thingxscalemul; tx -= (flip ? (tex->GetWidth() - tex->LeftOffset - 1) : tex->LeftOffset) * thingxscalemul;
x1 = centerx + MulScale32 (tx, xscale); x1 = centerx + MulScale32 (tx, xscale);
@ -1335,7 +1337,7 @@ void R_ProjectSprite (AActor *thing, int fakeside)
if (x2 < WindowLeft || x2 <= x1) if (x2 < WindowLeft || x2 <= x1)
return; return;
xscale = FixedMul(FixedMul(thing->scaleX, xscale), tex->xScale); xscale = FixedDiv(FixedMul(thing->scaleX, xscale), tex->xScale);
iscale = (tex->GetWidth() << FRACBITS) / (x2 - x1); iscale = (tex->GetWidth() << FRACBITS) / (x2 - x1);
x2--; x2--;
@ -1378,20 +1380,21 @@ void R_ProjectSprite (AActor *thing, int fakeside)
vis->heightsec = heightsec; vis->heightsec = heightsec;
vis->sector = thing->Sector; vis->sector = thing->Sector;
fixed_t yscale = DivScale16(thing->scaleY, tex->yScale);
vis->renderflags = thing->renderflags; vis->renderflags = thing->renderflags;
vis->RenderStyle = thing->RenderStyle; vis->RenderStyle = thing->RenderStyle;
vis->AlphaColor = thing->alphacolor; vis->AlphaColor = thing->alphacolor;
vis->xscale = xscale; vis->xscale = xscale;
vis->yscale = Scale (InvZtoScale, MulScale16(thing->scaleY, tex->yScale), tz)>>4; vis->yscale = Scale (InvZtoScale, yscale, tz)>>4;
vis->idepth = (DWORD)DivScale32 (1, tz) >> 1; // tz is 20.12, so idepth ought to be 12.20, but vis->idepth = (DWORD)DivScale32 (1, tz) >> 1; // tz is 20.12, so idepth ought to be 12.20, but
vis->cx = tx2; // signed math makes it 13.19 vis->cx = tx2; // signed math makes it 13.19
vis->gx = fx; vis->gx = fx;
vis->gy = fy; vis->gy = fy;
vis->gz = gzb; // [RH] use gzb, not thing->z vis->gz = gzb; // [RH] use gzb, not thing->z
vis->gzt = gzt; // killough 3/27/98 vis->gzt = gzt; // killough 3/27/98
vis->floorclip = FixedDiv (thing->floorclip, MulScale16(thing->scaleY, tex->yScale)); vis->floorclip = FixedDiv (thing->floorclip, yscale);
vis->texturemid = (tex->TopOffset << FRACBITS) - vis->texturemid = (tex->TopOffset << FRACBITS) -
FixedDiv (viewz-fz+thing->floorclip, MulScale16(thing->scaleY, tex->yScale)); FixedDiv (viewz-fz+thing->floorclip, yscale);
vis->x1 = x1 < WindowLeft ? WindowLeft : x1; vis->x1 = x1 < WindowLeft ? WindowLeft : x1;
vis->x2 = x2 > WindowRight ? WindowRight : x2; vis->x2 = x2 > WindowRight ? WindowRight : x2;
vis->Translation = thing->Translation; // [RH] thing translation table vis->Translation = thing->Translation; // [RH] thing translation table