OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

add WeaponScaleX/WeaponScaleY properties for applying global scaling to a weapon's PSprites

Browse source
This commit is contained in:
Xaser Acheron 2021-11-14 23:21:07 -06:00
commit 0b93aef776
6 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/rendering/hwrenderer/scene/hw_weapon.cpp
View file

@ -428,7 +428,7 @@ bool HUDSprite::GetWeaponRect(HWDrawInfo *di, DPSprite *psp, float sx, float sy,
FloatRect r = spi.GetSpriteRect();
// calculate edges of the shape
scalex = (320.0f / (240.0f * r_viewwindow.WidescreenRatio)) * vw / 320;
scalex = psp->baseScale.X * (320.0f / (240.0f * r_viewwindow.WidescreenRatio)) * (vw / 320);
float x1, y1, x2, y2, u1, v1, u2, v2;
@ -447,7 +447,10 @@ bool HUDSprite::GetWeaponRect(HWDrawInfo *di, DPSprite *psp, float sx, float sy,
// killough 12/98: fix psprite positioning problem
ftexturemid = 100.f - sy - r.top - psp->GetYAdjust(screenblocks >= 11);
scale = (SCREENHEIGHT*vw) / (SCREENWIDTH * 200.0f);
// [XA] note: Doom's native 1.2x aspect ratio was originally
// handled here by multiplying SCREENWIDTH by 200 instead of
// 240, but now the baseScale var defines this from now on.
scale = psp->baseScale.Y * (SCREENHEIGHT*vw) / (SCREENWIDTH * 240.0f);
y1 = viewwindowy + vh / 2 - (ftexturemid * scale);
y2 = y1 + (r.height * scale) + 1;

3
src/rendering/swrenderer/things/r_playersprite.cpp
View file

@ -265,7 +265,8 @@ namespace swrenderer
auto viewport = Thread->Viewport.get();
double pspritexscale = viewport->viewwindow.centerxwide / 160.0;
double pspriteyscale = pspritexscale * viewport->BaseYaspectMul * ((double)SCREENHEIGHT / SCREENWIDTH) * r_viewwindow.WidescreenRatio;
double pspriteyscale = pspritexscale * pspr->baseScale.Y * ((double)SCREENHEIGHT / SCREENWIDTH) * r_viewwindow.WidescreenRatio;
pspritexscale *= pspr->baseScale.X; // [XA] don't accidentally apply this to the Y calculation above; math be weird
double pspritexiscale = 1 / pspritexscale;
int tleft = tex->GetDisplayLeftOffset(0);