zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Tidy some extra panel coordinate math that was missed in 4d4946fb6b.

Browse source
This commit is contained in:
Mitchell Richters 2021-07-29 17:53:57 +10:00
parent 99508e6f15
commit 32215ba570
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/games/sw/src/panel.cpp
View file

@ -737,12 +737,12 @@ WeaponOK(PLAYERp pp)
inline double pspSinVel(PANEL_SPRITEp const psp, int const ang = INT_MAX) inline double pspSinVel(PANEL_SPRITEp const psp, int const ang = INT_MAX)
{ {
return psp->vel * synctics * bsinf(ang == INT_MAX ? psp->ang : ang, -6) * (1. / FRACUNIT); return psp->vel * synctics * bsinf(ang == INT_MAX ? psp->ang : ang, -22);
} }
inline double pspCosVel(PANEL_SPRITEp const psp, int const ang = INT_MAX) inline double pspCosVel(PANEL_SPRITEp const psp, int const ang = INT_MAX)
{ {
return psp->vel * synctics * bcosf(ang == INT_MAX ? psp->ang : ang, -6) * (1. / FRACUNIT); return psp->vel * synctics * bcosf(ang == INT_MAX ? psp->ang : ang, -22);
} }
inline double pspPresentRetractScale(int const picnum, double const defaultheight) inline double pspPresentRetractScale(int const picnum, double const defaultheight)
@ -1842,14 +1842,14 @@ pUziReload(PANEL_SPRITEp nclip)
nclip->ox = nclip->x; nclip->ox = nclip->x;
nclip->oy = nclip->y; nclip->oy = nclip->y;
nclip->x += nclip->vel * synctics * bcosf(nclip->ang, -6) * (1. / FRACUNIT); nclip->x += pspCosVel(nclip);
nclip->y += nclip->vel * synctics * -bsinf(nclip->ang, -6) * (1. / FRACUNIT); nclip->y -= pspSinVel(nclip);
gun->ox = gun->x; gun->ox = gun->x;
gun->oy = gun->y; gun->oy = gun->y;
gun->x -= gun->vel * synctics * bcosf(gun->ang, -6) * (1. / FRACUNIT); gun->x -= pspCosVel(gun);
gun->y -= gun->vel * synctics * -bsinf(gun->ang, -6) * (1. / FRACUNIT); gun->y += pspSinVel(gun);
if (TEST(nclip->flags, PANF_XFLIP)) if (TEST(nclip->flags, PANF_XFLIP))
{ {
@ -1886,22 +1886,20 @@ pUziReloadRetract(PANEL_SPRITEp nclip)
{ {
PANEL_SPRITEp gun = nclip->sibling; PANEL_SPRITEp gun = nclip->sibling;
double xadj = nclip->vel * synctics * bcosf(nclip->ang, -6) * (1. / FRACUNIT); double xadj = pspCosVel(nclip);
double yadj = nclip->vel * synctics * -bsinf(nclip->ang, -6) * (1. / FRACUNIT); double yadj = pspSinVel(nclip);
nclip->vel += 18 * synctics; nclip->vel += 18 * synctics;
nclip->ox = nclip->x; nclip->backupcoords();
nclip->oy = nclip->y;
nclip->x -= xadj; nclip->x -= xadj;
nclip->y -= yadj; nclip->y += yadj;
gun->ox = gun->x; gun->backupcoords();
gun->oy = gun->y;
gun->x -= xadj; gun->x -= xadj;
gun->y -= yadj; gun->y += yadj;
if (gun->y > UZI_RELOAD_YOFF + tileHeight(gun->picndx)) if (gun->y > UZI_RELOAD_YOFF + tileHeight(gun->picndx))
{ {
@ -1962,8 +1960,8 @@ pUziClip(PANEL_SPRITEp oclip)
oclip->ox = oclip->x; oclip->ox = oclip->x;
oclip->oy = oclip->y; oclip->oy = oclip->y;
oclip->x += oclip->vel * synctics * bcosf(oclip->ang, -6) * (1. / FRACUNIT); oclip->x += pspCosVel(oclip);
oclip->y += oclip->vel * synctics * -bsinf(oclip->ang, -6) * (1. / FRACUNIT); oclip->y -= pspSinVel(oclip);
if (oclip->y > UZI_RELOAD_YOFF) if (oclip->y > UZI_RELOAD_YOFF)
{ {
@ -1974,8 +1972,8 @@ pUziClip(PANEL_SPRITEp oclip)
// so it will end up the same for all synctic values // so it will end up the same for all synctic values
for (oclip->x = oclip->ox, oclip->y = oclip->oy; oclip->y < UZI_RELOAD_YOFF; ) for (oclip->x = oclip->ox, oclip->y = oclip->oy; oclip->y < UZI_RELOAD_YOFF; )
{ {
oclip->x += oclip->vel * bcosf(oclip->ang, -6) * (1. / FRACUNIT); oclip->x += oclip->vel * bcosf(oclip->ang, -22);
oclip->y += oclip->vel * -bsinf(oclip->ang, -6) * (1. / FRACUNIT); oclip->y -= oclip->vel * bsinf(oclip->ang, -22);
} }
oclip->ox = oclip->x; oclip->ox = oclip->x;
@ -5619,8 +5617,8 @@ pChopsShake(PANEL_SPRITEp psp)
{ {
psp->backupcoords(); psp->backupcoords();
psp->x += (RANDOM_P2(4<<8)>>8) - 2; psp->x += (RANDOM_P2(4<<8) * (1. / 256.)) - 2;
psp->y += (RANDOM_P2(4<<8)>>8) - 2; psp->y += (RANDOM_P2(4<<8) * (1. / 256.)) - 2;
if (psp->y < CHOPS_YOFF) if (psp->y < CHOPS_YOFF)
{ {
@ -6029,7 +6027,7 @@ pFistSlideDown(PANEL_SPRITEp psp)
else else
{ {
psp->x -= pspSinVel(psp, ang); psp->x -= pspSinVel(psp, ang);
psp->y -= pspSinVel(psp, ang) * 3.; psp->y -= pspSinVel(psp, ang) * synctics;
} }
psp->vel += 48 * synctics; psp->vel += 48 * synctics;
@ -6132,7 +6130,7 @@ pFistSlideDownR(PANEL_SPRITEp psp)
else else
{ {
psp->x -= pspSinVel(psp, ang); psp->x -= pspSinVel(psp, ang);
psp->y -= pspSinVel(psp, ang) * 3.; psp->y -= pspSinVel(psp, ang) * synctics;
} }
psp->vel += 48 * synctics; psp->vel += 48 * synctics;