AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-26 22:44:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply various interpolations for automap (#626)

Browse Source 
* Smooth player arrow rotation

* Interpolate thing triangles movement

* Interpolate player arrow in non-follow mode

* Prevent player arrow from jittering

* Fix losing grid lines near the automap boundary
This commit is contained in:
Julia Nechaevskaya 2022-06-27 09:18:35 +03:00 committed by GitHub
parent ad2193c404
commit 2f213685bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/am_map.c
View File

@ -944,8 +944,10 @@ void AM_doFollowPlayer(void)
{ {
if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y) if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
{ {
m_x = FTOM(MTOF(plr->mo->x)) - m_w/2; // [JN] Prevent player arrow from jittering
m_y = FTOM(MTOF(plr->mo->y)) - m_h/2; // by not using FTOM->MTOF conversion.
m_x = plr->mo->x - m_w/2;
m_y = plr->mo->y - m_h/2;
m_x2 = m_x + m_w; m_x2 = m_x + m_w;
m_y2 = m_y + m_h; m_y2 = m_y + m_h;
f_oldloc.x = plr->mo->x; f_oldloc.x = plr->mo->x;
@ -1275,8 +1277,9 @@ void AM_drawGrid(int color)
{ {
start -= m_h / 2; start -= m_h / 2;
} }
// [crispy] fix losing grid lines near the automap boundary
if ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS)) if ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS))
start += (MAPBLOCKUNITS<<FRACBITS) start += // (MAPBLOCKUNITS<<FRACBITS)
- ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS)); - ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS));
end = m_x + m_w; end = m_x + m_w;
if (automaprotate) if (automaprotate)
@ -1308,8 +1311,9 @@ void AM_drawGrid(int color)
{ {
start -= m_w / 2; start -= m_w / 2;
} }
// [crispy] fix losing grid lines near the automap boundary
if ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS)) if ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS))
start += (MAPBLOCKUNITS<<FRACBITS) start += // (MAPBLOCKUNITS<<FRACBITS)
- ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS)); - ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS));
end = m_y + m_h; end = m_y + m_h;
if (automaprotate) if (automaprotate)
@ -1724,11 +1728,22 @@ void AM_drawPlayers(void)
int their_color = -1; int their_color = -1;
int color; int color;
mpoint_t pt; mpoint_t pt;
// [crispy] smooth player arrow rotation
const angle_t smoothangle = automaprotate ? plr->mo->angle : viewangle;
if (!netgame) if (!netgame)
{ {
pt.x = plr->mo->x; // [crispy] interpolate player arrow in non-follow mode
pt.y = plr->mo->y; if (!followplayer && leveltime > oldleveltime)
{
pt.x = plr->mo->oldx + FixedMul(plr->mo->x - plr->mo->oldx, fractionaltic);
pt.y = plr->mo->oldy + FixedMul(plr->mo->y - plr->mo->oldy, fractionaltic);
}
else
{
pt.x = plr->mo->x;
pt.y = plr->mo->y;
}
if (automaprotate) if (automaprotate)
{ {
AM_rotatePoint(&pt); AM_rotatePoint(&pt);
@ -1740,7 +1755,7 @@ void AM_drawPlayers(void)
cheat_player_arrow, cheat_player_arrow,
NUMCHEATPLYRLINES, NUMCHEATPLYRLINES,
0, 0,
plr->mo->angle, smoothangle,
mapcolor_sngl, //jff color mapcolor_sngl, //jff color
pt.x, pt.x,
pt.y pt.y
@ -1751,7 +1766,7 @@ void AM_drawPlayers(void)
player_arrow, player_arrow,
NUMPLYRLINES, NUMPLYRLINES,
0, 0,
plr->mo->angle, smoothangle,
mapcolor_sngl, //jff color mapcolor_sngl, //jff color
pt.x, pt.x,
pt.y); pt.y);
@ -1824,8 +1839,17 @@ void AM_drawThings
continue; continue;
} }
pt.x = t->x; // [crispy] interpolate thing triangles movement
pt.y = t->y; if (leveltime > oldleveltime)
{
pt.x = t->oldx + FixedMul(t->x - t->oldx, fractionaltic);
pt.y = t->oldy + FixedMul(t->y - t->oldy, fractionaltic);
}
else
{
pt.x = t->x;
pt.y = t->y;
}
if (automaprotate) if (automaprotate)
{ {
AM_rotatePoint(&pt); AM_rotatePoint(&pt);