zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 20:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed relativity from GetWeaponRect.

Browse source 
- Fixed PSPF_PIVOTPERCENT not being applied at start by default.
- Pivots now start in the upper left corner. Alignment flags are planned next for pivot point starting.

Significant progress made, but more testing still required.
This commit is contained in:
Major Cooke 2020-10-01 17:44:18 -05:00 committed by Christoph Oelckers
parent 06b3e384a8
commit 42902959a8
2 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/playsim/p_pspr.cpp
View file

@ -314,7 +314,7 @@ DPSprite *player_t::GetPSprite(PSPLayers layer)
} }
else else
{ {
pspr->Flags = (PSPF_ADDWEAPON|PSPF_ADDBOB|PSPF_CVARFAST|PSPF_POWDOUBLE); pspr->Flags = (PSPF_ADDWEAPON|PSPF_ADDBOB|PSPF_CVARFAST|PSPF_POWDOUBLE|PSPF_PIVOTPERCENT);
} }
if (layer == PSP_STRIFEHANDS) if (layer == PSP_STRIFEHANDS)
{ {

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

@ -489,69 +489,67 @@ bool HUDSprite::GetWeaponRect(HWDrawInfo *di, DPSprite *psp, float sx, float sy,
// Big thanks to IvanDobrovski who helped me modify this. // Big thanks to IvanDobrovski who helped me modify this.
if (psp->rotation != 0.0 || psp->scalex != 1.0 || psp->scaley != 1.0) if (psp->rotation != 0.0 || psp->scalex != 1.0 || psp->scaley != 1.0)
{ {
FAngle rot = (float)psp->rotation; FAngle rot = float(psp->rotation);
rot.Normalized360(); rot.Normalized360();
float radang = rot.Radians(); float cosang = rot.Cos();
float cosang = cos(radang); float sinang = rot.Sin();
float sinang = sin(radang);
float xcenter, ycenter;
float px = float(psp->px); float px = float(psp->px);
float py = float(psp->py); float py = float(psp->py);
float xcenter, ycenter;
float width = MAX(x1, x2) - MIN(x1, x2);
float height = MAX(y1, y2) - MIN(y1, y2);
if (psp->Flags & PSPF_PIVOTSCREEN) if (psp->Flags & PSPF_PIVOTSCREEN)
{ {
if (psp->Flags & PSPF_PIVOTPERCENT) if (psp->Flags & PSPF_PIVOTPERCENT)
{ {
xcenter = vw * psp->px + viewwindowx + psp->x; xcenter = vw * px + viewwindowx;
ycenter = vh * psp->py + viewwindowy + psp->y; ycenter = vh * py + viewwindowy;
} }
else else
{ {
xcenter = vw * 0.5 + viewwindowx + psp->x + psp->px; xcenter = vw * 0.5 + viewwindowx + px;
ycenter = vh * 0.5 + viewwindowy + psp->y + psp->py; ycenter = vh * 0.5 + viewwindowy + py;
} }
} }
else else
{ {
if (psp->Flags & PSPF_PIVOTPERCENT) if (psp->Flags & PSPF_PIVOTPERCENT)
{ {
xcenter = (x1 + x2) * psp->px + psp->x; xcenter = (x1 + width * px);
ycenter = (y1 + y2) * psp->py + psp->y; ycenter = (y1 + height * py);
} }
else else
{ {
xcenter = ((x1 + x2) * 0.5 + psp->x) + psp->px; xcenter = (x1 + width * 0.5) + px;
ycenter = ((x1 + x2) * 0.5 + psp->y) + psp->py; ycenter = (y1 + height * 0.5) - py;
} }
} }
x1 -= xcenter; x1 -= xcenter;
y1 -= ycenter; y1 -= ycenter;
x2 -= xcenter; x2 -= xcenter;
y2 -= ycenter; y2 -= ycenter;
float ssx = (float)psp->scalex; float ssx = float(psp->scalex);
float ssy = (float)psp->scaley; float ssy = float(psp->scaley);
float xx1 = xcenter + ssx * (x1 * cosang + y1 * sinang); float xx1 = xcenter + ssx * (x1 * cosang + y1 * sinang);
float yy1 = ycenter - ssy * (x1 * sinang - y1 * cosang);
float xx2 = xcenter + ssx * (x1 * cosang + y2 * sinang); float xx2 = xcenter + ssx * (x1 * cosang + y2 * sinang);
float yy2 = ycenter - ssy * (x1 * sinang - y2 * cosang);
float xx3 = xcenter + ssx * (x2 * cosang + y1 * sinang); float xx3 = xcenter + ssx * (x2 * cosang + y1 * sinang);
float yy3 = ycenter - ssy * (x2 * sinang - y1 * cosang);
float xx4 = xcenter + ssx * (x2 * cosang + y2 * sinang); float xx4 = xcenter + ssx * (x2 * cosang + y2 * sinang);
float yy1 = ycenter - ssy * (x1 * sinang - y1 * cosang);
float yy2 = ycenter - ssy * (x1 * sinang - y2 * cosang);
float yy3 = ycenter - ssy * (x2 * sinang - y1 * cosang);
float yy4 = ycenter - ssy * (x2 * sinang - y2 * cosang); float yy4 = ycenter - ssy * (x2 * sinang - y2 * cosang);
verts.first[0].Set(xx1, yy1, 0, u1, v1); verts.first[0].Set(xx1, yy1, 0, u1, v1);
verts.first[1].Set(xx2, yy2, 0, u1, v2); verts.first[1].Set(xx2, yy2, 0, u1, v2);
verts.first[2].Set(xx3, yy3, 0, u2, v1); verts.first[2].Set(xx3, yy3, 0, u2, v1);
verts.first[3].Set(xx4, yy4, 0, u2, v2); verts.first[3].Set(xx4, yy4, 0, u2, v2);
} }
else else
{ {