teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-04 15:10:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Pass automap angle vector as an actual vector.

Browse source 
* Also reconfigure setup so that angle requires zero pre-processing or setup in the automap code, have it all handled in `OutAutomapVector()`.
This commit is contained in:
Mitchell Richters 2022-09-20 10:07:15 +10:00 committed by Christoph Oelckers
parent 48c36bd4a2
commit ef56d00d78
6 changed files with 44 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
source/core/automap.cpp
View file

@ -181,7 +181,7 @@ static void CalcMapBounds()
//
//---------------------------------------------------------------------------
void AutomapControl()
static void AutomapControl(const DVector2& cangvect)
{
static double nonsharedtimer;
double ms = screen->FrameTime;
@ -224,7 +224,7 @@ void AutomapControl()
if (min_bounds.X == INT_MAX) CalcMapBounds();
follow = clamp(follow + DVector2(panvert, panhorz).Rotated(follow_a) * zoomspeed, min_bounds, max_bounds);
follow = clamp(follow + DVector2(panvert, panhorz).Rotated(cangvect.X, cangvect.Y) * zoomspeed, min_bounds, max_bounds);
}
}
}
@ -386,7 +386,7 @@ bool ShowRedLine(int j, int i)
//
//---------------------------------------------------------------------------
static void drawredlines(const DVector2& cpos, const double sine, const double cosine, const DVector2& xydim)
static void drawredlines(const DVector2& cpos, const DVector2& cangvect, const DVector2& xydim)
{
for (unsigned i = 0; i < sector.Size(); i++)
{
@ -406,8 +406,8 @@ static void drawredlines(const DVector2& cpos, const double sine, const double c
if (ShowRedLine(wallnum(&wal), i))
{
auto v1 = OutAutomapVector(wal.pos - cpos, sine, cosine, gZoom, xydim);
auto v2 = OutAutomapVector(wal.point2Wall()->pos - cpos, sine, cosine, gZoom, xydim);
auto v1 = OutAutomapVector(wal.pos - cpos, cangvect, gZoom, xydim);
auto v2 = OutAutomapVector(wal.point2Wall()->pos - cpos, cangvect, gZoom, xydim);
drawlinergb(v1, v2, RedLineColor());
}
}
@ -420,7 +420,7 @@ static void drawredlines(const DVector2& cpos, const double sine, const double c
//
//---------------------------------------------------------------------------
static void drawwhitelines(const DVector2& cpos, const double sine, const double cosine, const DVector2& xydim)
static void drawwhitelines(const DVector2& cpos, const DVector2& cangvect, const DVector2& xydim)
{
for (int i = (int)sector.Size() - 1; i >= 0; i--)
{
@ -434,8 +434,8 @@ static void drawwhitelines(const DVector2& cpos, const double sine, const double
if (isSWALL() && !gFullMap && !show2dwall[wallnum(&wal)])
continue;
auto v1 = OutAutomapVector(wal.pos - cpos, sine, cosine, gZoom, xydim);
auto v2 = OutAutomapVector(wal.point2Wall()->pos - cpos, sine, cosine, gZoom, xydim);
auto v1 = OutAutomapVector(wal.pos - cpos, cangvect, gZoom, xydim);
auto v2 = OutAutomapVector(wal.point2Wall()->pos - cpos, cangvect, gZoom, xydim);
drawlinergb(v1, v2, WhiteLineColor());
}
}
@ -495,7 +495,7 @@ static void DrawPlayerArrow(const DVector2& cpos, const DAngle cang, const doubl
//
//---------------------------------------------------------------------------
static void renderDrawMapView(const DVector2& cpos, const double sine, const double cosine, const DVector2& xydim)
static void renderDrawMapView(const DVector2& cpos, const DVector2& cangvect, const DVector2& xydim)
{
TArray<FVector4> vertices;
TArray<DCoreActor*> floorsprites;
@ -536,7 +536,7 @@ static void renderDrawMapView(const DVector2& cpos, const double sine, const dou
vertices.Resize(mesh->vertices.Size());
for (unsigned j = 0; j < mesh->vertices.Size(); j++)
{
auto v = OutAutomapVector(DVector2(mesh->vertices[j].X - cpos.X, -mesh->vertices[j].Y - cpos.Y), sine, cosine, gZoom, xydim);
auto v = OutAutomapVector(DVector2(mesh->vertices[j].X - cpos.X, -mesh->vertices[j].Y - cpos.Y), cangvect, gZoom, xydim);
vertices[j] = { float(v.X), float(v.Y), mesh->texcoords[j].X, mesh->texcoords[j].Y };
}
@ -562,7 +562,7 @@ static void renderDrawMapView(const DVector2& cpos, const double sine, const dou
for (unsigned j = 0; j < 4; j++)
{
auto v = OutAutomapVector(pp[j] - cpos, sine, cosine, gZoom, xydim);
auto v = OutAutomapVector(pp[j] - cpos, cangvect, gZoom, xydim);
vertices[j] = { float(v.X), float(v.Y), j == 1 || j == 2 ? 1.f : 0.f, j == 2 || j == 3 ? 1.f : 0.f };
}
int shade;
@ -600,21 +600,20 @@ void DrawOverheadMap(const DVector2& plxy, const DAngle pl_angle, double const s
follow = plxy;
}
follow_a = -(am_rotate ? pl_angle : DAngle270);
const DVector2 xydim = {screen->GetWidth() * 0.5, screen->GetHeight() * 0.5};
const double sine = follow_a.Sin();
const double cosine = follow_a.Cos();
follow_a = am_rotate ? pl_angle : DAngle270;
const DVector2 xydim = DVector2(screen->GetWidth(), screen->GetHeight()) * 0.5;
const DVector2 avect = follow_a.ToVector();
AutomapControl();
AutomapControl(avect);
if (automapMode == am_full)
{
twod->ClearScreen();
renderDrawMapView(follow, sine, cosine, xydim);
renderDrawMapView(follow, avect, xydim);
}
drawredlines(follow, sine, cosine, xydim);
drawwhitelines(follow, sine, cosine, xydim);
drawredlines(follow, avect, xydim);
drawwhitelines(follow, avect, xydim);
if (!gi->DrawAutomapPlayer(plxy, follow, follow_a, xydim, gZoom, smoothratio))
DrawPlayerArrow(follow, follow_a, gZoom, pl_angle);

4
source/core/automap.h
View file

@ -20,9 +20,9 @@ void DrawOverheadMap(const DVector2& plxy, const DAngle pl_angle, double const s
bool AM_Responder(event_t* ev, bool last);
void drawlinergb(const DVector2& v1, const DVector2& v2, PalEntry p);
inline DVector2 OutAutomapVector(const DVector2& pos, const double sine, const double cosine, const double zoom = 1., const DVector2& xydim = { 0, 0 })
inline DVector2 OutAutomapVector(const DVector2& pos, const DVector2& angvect, const double zoom = 1., const DVector2& xydim = { 0, 0 })
{
return pos.Rotated(cosine, sine).Rotated90CW() * zoom + xydim;
return -pos.Rotated(angvect.Y, angvect.X) * zoom + xydim;
}
enum AM_Mode

5
source/games/blood/src/view.cpp
View file

@ -864,15 +864,14 @@ std::pair<DVector3, DAngle> GameInterface::GetCoordinates()
bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const smoothratio)
{
auto cangsin = cang.Sin();
auto cangcos = cang.Cos();
auto cangvect = cang.ToVector();
for (int i = connecthead; i >= 0; i = connectpoint2[i])
{
if (i == gView->nPlayer || gGameOptions.nGameType == 1)
{
auto actor = gPlayer[i].actor;
auto vect = OutAutomapVector(mxy - cpos, cangsin, cangcos, czoom, xydim);
auto vect = OutAutomapVector(mxy - cpos, cangvect, czoom, xydim);
DrawTexture(twod, tileGetTexture(actor->spr.picnum, true), vect.X, vect.Y, DTA_ClipLeft, viewport3d.Left(), DTA_ClipTop, viewport3d.Top(), DTA_ScaleX, czoom * (2. / 3.), DTA_ScaleY, czoom * (2. / 3.), DTA_CenterOffset, true,
DTA_ClipRight, viewport3d.Right(), DTA_ClipBottom, viewport3d.Bottom(), DTA_Alpha, (actor->spr.cstat & CSTAT_SPRITE_TRANSLUCENT ? 0.5 : 1.), TAG_DONE);

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

@ -387,8 +387,7 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
DVector2 b0, b1, b2, b3, b4, v1, v2, v3, v4;
int xoff, yoff, xspan, yspan, tilenum;
auto cangsin = cang.Sin();
auto cangcos = cang.Cos();
auto cangvect = cang.ToVector();
// Draw sprites
auto pactor = ps[screenpeek].GetActor();
@ -405,8 +404,8 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
if ((act->spr.cstat & CSTAT_SPRITE_BLOCK_ALL) != 0) switch (act->spr.cstat & CSTAT_SPRITE_ALIGNMENT_MASK)
{
case CSTAT_SPRITE_ALIGNMENT_FACING:
v1 = OutAutomapVector(act->spr.pos.XY() - cpos, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(act->spr.angle.ToVector() * 8., cangsin, cangcos, czoom);
v1 = OutAutomapVector(act->spr.pos.XY() - cpos, cangvect, czoom, xydim);
v2 = OutAutomapVector(act->spr.angle.ToVector() * 8., cangvect, czoom);
v3 = v2.Rotated90CW();
v4 = v1 + v2;
@ -428,8 +427,8 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
b1 = act->spr.pos.XY() - b0 * ((xspan * 0.5) + xoff) - cpos;
b2 = b1 + b0 * xspan;
v1 = OutAutomapVector(b1, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b2, cangsin, cangcos, czoom, xydim);
v1 = OutAutomapVector(b1, cangvect, czoom, xydim);
v2 = OutAutomapVector(b2, cangvect, czoom, xydim);
drawlinergb(v1, v2, col);
}
@ -464,10 +463,10 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
b3 = b2 - yscale;
b4 = b1 - yscale;
v1 = OutAutomapVector(b1, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b2, cangsin, cangcos, czoom, xydim);
v3 = OutAutomapVector(b3, cangsin, cangcos, czoom, xydim);
v4 = OutAutomapVector(b4, cangsin, cangcos, czoom, xydim);
v1 = OutAutomapVector(b1, cangvect, czoom, xydim);
v2 = OutAutomapVector(b2, cangvect, czoom, xydim);
v3 = OutAutomapVector(b3, cangvect, czoom, xydim);
v4 = OutAutomapVector(b4, cangvect, czoom, xydim);
drawlinergb(v1, v2, col);
drawlinergb(v2, v3, col);
@ -487,8 +486,8 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
int i = TILE_APLAYERTOP + (act->int_xvel() > 16 && pp.on_ground ? (PlayClock >> 4) & 3 : 0);
double j = clamp(czoom * act->spr.yrepeat + abs(pp.truefz - pp.pos.Z), 21.5, 128.) * REPEAT_SCALE;
auto const vec = OutAutomapVector(mxy - cpos, cangsin, cangcos, czoom, xydim);
auto const daang = -((!SyncInput() ? act->spr.angle : act->interpolatedangle(smoothratio * (1. / MaxSmoothRatio))) + cang).Normalized360().Degrees();
auto const vec = OutAutomapVector(mxy - cpos, cangvect, czoom, xydim);
auto const daang = -((!SyncInput() ? act->spr.angle : act->interpolatedangle(smoothratio * (1. / MaxSmoothRatio))) - cang).Normalized360().Degrees();
DrawTexture(twod, tileGetTexture(i), vec.X, vec.Y, DTA_TranslationIndex, TRANSLATION(Translation_Remap + setpal(&pp), act->spr.pal), DTA_CenterOffset, true,
DTA_Rotate, daang, DTA_Color, shadeToLight(act->spr.shade), DTA_ScaleX, j, DTA_ScaleY, j, TAG_DONE);

5
source/games/exhumed/src/map.cpp
View file

@ -68,15 +68,14 @@ void GetActorExtents(DExhumedActor* actor, int* top, int* bottom)
bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos, const DAngle cang, const DVector2& xydim, const double czoom, double const smoothratio)
{
auto cangsin = cang.Sin();
auto cangcos = cang.Cos();
auto cangvect = cang.ToVector();
for (int i = connecthead; i >= 0; i = connectpoint2[i])
{
if (i == nLocalPlayer)// || gGameOptions.nGameType == 1)
{
auto pPlayerActor = PlayerList[i].pActor;
auto vect = OutAutomapVector(mxy - cpos, cangsin, cangcos, czoom, xydim);
auto vect = OutAutomapVector(mxy - cpos, cangvect, czoom, xydim);
DrawTexture(twod, tileGetTexture(pPlayerActor->spr.picnum /*+ ((PlayClock >> 4) & 3)*/, true), vect.X, vect.Y, DTA_ClipLeft, viewport3d.Left(), DTA_ClipTop, viewport3d.Top(), DTA_ScaleX, czoom * (2. / 3.), DTA_ScaleY, czoom * (2. / 3.), DTA_CenterOffset, true,
DTA_ClipRight, viewport3d.Right(), DTA_ClipBottom, viewport3d.Bottom(), DTA_Alpha, (pPlayerActor->spr.cstat & CSTAT_SPRITE_TRANSLUCENT ? 0.5 : 1.), TAG_DONE);

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

@ -1578,8 +1578,7 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
static int pspr_ndx[8] = { 0,0,0,0,0,0,0,0 };
bool sprisplayer = false;
auto cangsin = cang.Sin();
auto cangcos = cang.Cos();
auto cangvect = cang.ToVector();
// Draw sprites
auto peekActor = Player[screenpeek].actor;
@ -1616,8 +1615,8 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
{
if (czoom > 0.1875)
{
const auto daang = -((!SyncInput() ? actor->spr.angle : actor->interpolatedangle(smoothratio * (1. / MaxSmoothRatio))) + cang).Normalized360().Degrees();
auto vect = OutAutomapVector(mxy - cpos, cangsin, cangcos, czoom, xydim);
const auto daang = -((!SyncInput() ? actor->spr.angle : actor->interpolatedangle(smoothratio * (1. / MaxSmoothRatio))) - cang).Normalized360().Degrees();
auto vect = OutAutomapVector(mxy - cpos, cangvect, czoom, xydim);
// Special case tiles
if (actor->spr.picnum == 3123) break;
@ -1653,8 +1652,8 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
b1 = sprxy - b0 * ((xspan * 0.5) + xoff) - cpos;
b2 = b1 + b0 * xspan;
v1 = OutAutomapVector(b1, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b2, cangsin, cangcos, czoom, xydim);
v1 = OutAutomapVector(b1, cangvect, czoom, xydim);
v2 = OutAutomapVector(b2, cangvect, czoom, xydim);
drawlinergb(v1, v2, col);
break;
@ -1684,10 +1683,10 @@ bool GameInterface::DrawAutomapPlayer(const DVector2& mxy, const DVector2& cpos,
b3 = b2 - yscale;
b4 = b1 - yscale;
v1 = OutAutomapVector(b1, cangsin, cangcos, czoom, xydim);
v2 = OutAutomapVector(b2, cangsin, cangcos, czoom, xydim);
v3 = OutAutomapVector(b3, cangsin, cangcos, czoom, xydim);
v4 = OutAutomapVector(b4, cangsin, cangcos, czoom, xydim);
v1 = OutAutomapVector(b1, cangvect, czoom, xydim);
v2 = OutAutomapVector(b2, cangvect, czoom, xydim);
v3 = OutAutomapVector(b3, cangvect, czoom, xydim);
v4 = OutAutomapVector(b4, cangvect, czoom, xydim);
drawlinergb(v1, v2, col);
drawlinergb(v2, v3, col);