zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement renderstyle and transparent actor sprite rendering in automap (#997) 

* Implement renderstyle and transparent actor sprite rendering in automap

* Add "am_advspriterender" CVAR and add invisible actor checks.

* Rename cvar to `am_thingrenderstyles`
This commit is contained in:
Cacodemon345 2019-12-23 21:29:14 +06:00 committed by Rachael Alexanderson
parent e9a7dcd17b
commit 0090925fac
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/am_map.cpp
View File

@ -124,6 +124,7 @@ struct islope_t
//============================================================================= //=============================================================================
CVAR(Bool, am_textured, false, CVAR_ARCHIVE) CVAR(Bool, am_textured, false, CVAR_ARCHIVE)
CVAR(Bool, am_thingrenderstyles, true, CVAR_ARCHIVE)
CVAR(Int, am_showsubsector, -1, 0); CVAR(Int, am_showsubsector, -1, 0);
@ -2882,7 +2883,8 @@ void DAutomap::drawThings ()
t = sec.thinglist; t = sec.thinglist;
while (t) while (t)
{ {
if (am_cheat > 0 || !(t->flags6 & MF6_NOTONAUTOMAP)) if (am_cheat > 0 || !(t->flags6 & MF6_NOTONAUTOMAP)
|| (am_thingrenderstyles && !(t->renderflags & RF_INVISIBLE)))
{ {
DVector3 pos = t->PosRelative(MapPortalGroup); DVector3 pos = t->PosRelative(MapPortalGroup);
p.x = pos.X; p.x = pos.X;
@ -2918,7 +2920,9 @@ void DAutomap::drawThings ()
const double spriteXScale = (t->Scale.X * (10. / 16.) * scale_mtof); const double spriteXScale = (t->Scale.X * (10. / 16.) * scale_mtof);
const double spriteYScale = (t->Scale.Y * (10. / 16.) * scale_mtof); const double spriteYScale = (t->Scale.Y * (10. / 16.) * scale_mtof);
DrawMarker (texture, p.x, p.y, 0, !!(frame->Flip & (1 << rotation)), if (am_thingrenderstyles) DrawMarker(texture, p.x, p.y, 0, !!(frame->Flip & (1 << rotation)),
spriteXScale, spriteYScale, t->Translation, t->Alpha, t->fillcolor, t->RenderStyle);
else DrawMarker(texture, p.x, p.y, 0, !!(frame->Flip & (1 << rotation)),
spriteXScale, spriteYScale, t->Translation, 1., 0, LegacyRenderStyles[STYLE_Normal]); spriteXScale, spriteYScale, t->Translation, 1., 0, LegacyRenderStyles[STYLE_Normal]);
} }
else else