zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Minor consistency fix with Duke and SW's automap code.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-02 17:36:53 +10:00 committed by Christoph Oelckers
parent 5407de6924
commit e57ef59900
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/duke/src/game_misc.cpp
View file

@ -384,7 +384,7 @@ ReservedSpace GameInterface::GetReservedScreenSpace(int viewsize)
bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const smoothratio)
{
DVector2 b1, b2, b3, b4, v1, v2, v3, v4;
DVector2 b0, b1, b2, b3, b4, v1, v2, v3, v4;
int xoff, yoff, xspan, yspan, tilenum;
auto cangsin = cang.Sin();
@ -427,12 +427,12 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
xspan = tileWidth(tilenum);
b1 = act->spr.angle.ToVector().Rotated90CW() * act->spr.xrepeat * (1. / 64.);
b2 = act->spr.pos.XY() - b1 * ((xspan * 0.5) + xoff);
b3 = b2 + b1 * xspan;
b0 = act->spr.angle.ToVector().Rotated90CW() * act->spr.xrepeat * (1. / 64.);
b1 = act->spr.pos.XY() - b0 * ((xspan * 0.5) + xoff);
b2 = b1 + b0 * xspan;
v1 = OutAutomapVector(b2 - cpos, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b3 - cpos, cangsin, cangcos, czoom, xydim);
v1 = OutAutomapVector(b1 - cpos, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b2 - cpos, cangsin, cangcos, czoom, xydim);
drawlinergb(v1.X, v1.Y, v2.X, v2.Y, col);
}
@ -463,7 +463,7 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
auto xscale = DVector2(-sprsin * xspan * xrep, +sprcos * xspan * xrep);
auto yscale = DVector2(-sprcos * yspan * yrep, -sprsin * yspan * yrep);
auto b0 = DVector2(((xspan * 0.5) + xoff) * xrep, ((yspan * 0.5) + yoff) * yrep);
b0 = DVector2(((xspan * 0.5) + xoff) * xrep, ((yspan * 0.5) + yoff) * yrep);
b1 = act->spr.pos.XY() + (b0 * sprsin) + (b0.Rotated90CW() * sprcos);
b2 = b1 + xscale;
b3 = b2 + yscale;

15
source/games/sw/src/draw.cpp
View file

@ -1572,7 +1572,7 @@ bool GameInterface::GenerateSavePic()
bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const smoothratio)
{
DVector2 b1, b2, b3, b4, v1, v2, v3, v4;
DVector2 b0, b1, b2, b3, b4, v1, v2, v3, v4;
int xoff, yoff, xspan, yspan, tilenum, p;
static int pspr_ndx[8] = { 0,0,0,0,0,0,0,0 };
bool sprisplayer = false;
@ -1629,6 +1629,7 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
}
else spnum = actor->spr.picnum;
// This yrepeat scale is correct.
double sc = czoom * actor->spr.yrepeat * (1. / 32.);
if (spnum >= 0)
{
@ -1647,12 +1648,12 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
xspan = tileWidth(tilenum);
b1 = actor->spr.angle.ToVector().Rotated90CW() * actor->spr.xrepeat * (1. / 64.);
b2 = sprxy - b1 * ((xspan * 0.5) + xoff);
b3 = b2 + b1 * xspan;
b0 = actor->spr.angle.ToVector().Rotated90CW() * actor->spr.xrepeat * (1. / 64.);
b1 = sprxy - b0 * ((xspan * 0.5) + xoff);
b2 = b1 + b0 * xspan;
v1 = OutAutomapVector(b2 - cpos, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b3 - cpos, cangsin, cangcos, czoom, xydim);
v1 = OutAutomapVector(b1 - cpos, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b2 - cpos, cangsin, cangcos, czoom, xydim);
drawlinergb(v1.X, v1.Y, v2.X, v2.Y, col);
break;
@ -1678,7 +1679,7 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
auto xscale = DVector2(-sprsin * xspan * xrep, +sprcos * xspan * xrep);
auto yscale = DVector2(-sprcos * yspan * yrep, -sprsin * yspan * yrep);
auto b0 = DVector2(((xspan * 0.5) + xoff) * xrep, ((yspan * 0.5) + yoff) * yrep);
b0 = DVector2(((xspan * 0.5) + xoff) * xrep, ((yspan * 0.5) + yoff) * yrep);
b1 = sprxy + (b0 * sprsin) + (b0.Rotated90CW() * sprcos);
b2 = b1 + xscale;
b3 = b2 + yscale;