zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-13 05:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed some scaling inconsistencies in the summary screen.

Browse source 
The background size wasn't taken into account for the splats and the widescreen check never verified the height of the background image.
It will now unconditionally use the new widescreen expansion mode for everything to reduce problems, use the background's display size for positioning overlays and only in the case of 200 pixel tall images perform widescreen positioning adjustment.

# Conflicts:
#	src/wi_stuff.cpp
This commit is contained in:
Christoph Oelckers 2020-10-03 09:07:29 +02:00 committed by drfrag
parent a9bf361030
commit 763b460df0
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/wi_stuff.cpp
View file

@ -64,6 +64,8 @@
#include "g_levellocals.h" #include "g_levellocals.h"
#include "vm.h" #include "vm.h"
#define ScaleToFit43 3
CVAR(Bool, wi_percents, true, CVAR_ARCHIVE) CVAR(Bool, wi_percents, true, CVAR_ARCHIVE)
CVAR(Bool, wi_showtotaltime, true, CVAR_ARCHIVE) CVAR(Bool, wi_showtotaltime, true, CVAR_ARCHIVE)
CVAR(Bool, wi_noautostartmap, false, CVAR_USERINFO | CVAR_ARCHIVE) CVAR(Bool, wi_noautostartmap, false, CVAR_USERINFO | CVAR_ARCHIVE)
@ -215,7 +217,7 @@ private:
// //
//==================================================================== //====================================================================
void drawOnLnode(int n, FTexture * c[], int numc) void drawOnLnode(int n, FTexture * c[], int numc, double backwidth, double backheight)
{ {
int i; int i;
for (i = 0; i<numc; i++) for (i = 0; i<numc; i++)
@ -235,7 +237,7 @@ private:
if (left >= 0 && right < 320 && top >= 0 && bottom < 200) if (left >= 0 && right < 320 && top >= 0 && bottom < 200)
{ {
screen->DrawTexture(c[i], lnodes[n].x, lnodes[n].y, DTA_320x200, true, TAG_DONE); screen->DrawTexture(c[i], lnodes[n].x, lnodes[n].y, DTA_FullscreenScale, ScaleToFit43, DTA_VirtualWidthF, backwidth, DTA_VirtualHeightF, backheight, TAG_DONE);
break; break;
} }
} }
@ -605,8 +607,8 @@ void DInterBackground::drawBackground(int state, bool drawsplat, bool snl_pointe
// placing the animations precisely where they belong on the base pic // placing the animations precisely where they belong on the base pic
animwidth = background->GetScaledWidthDouble(); animwidth = background->GetScaledWidthDouble();
animheight = background->GetScaledHeightDouble(); animheight = background->GetScaledHeightDouble();
if (gameinfo.fullscreenautoaspect > 0) animwidth = 320; // deal with widescreen replacements that keep the original coordinates. if (animheight == 200) animwidth = 320; // deal with widescreen replacements that keep the original coordinates.
screen->DrawTexture(background, 0, 0, DTA_Fullscreen, true, TAG_DONE); screen->DrawTexture(background, 0, 0, DTA_FullscreenEx, ScaleToFit43, TAG_DONE);
} }
else else
{ {
@ -662,7 +664,7 @@ void DInterBackground::drawBackground(int state, bool drawsplat, bool snl_pointe
} }
if (a->ctr >= 0) if (a->ctr >= 0)
screen->DrawTexture(a->frames[a->ctr], a->loc.x, a->loc.y, screen->DrawTexture(a->frames[a->ctr], a->loc.x, a->loc.y,
DTA_VirtualWidthF, animwidth, DTA_VirtualHeightF, animheight, DTA_FullscreenScale, gameinfo.fullscreenautoaspect, TAG_DONE); DTA_VirtualWidthF, animwidth, DTA_VirtualHeightF, animheight, DTA_FullscreenScale, ScaleToFit43, TAG_DONE);
} }
if (drawsplat) if (drawsplat)
@ -670,7 +672,7 @@ void DInterBackground::drawBackground(int state, bool drawsplat, bool snl_pointe
for (i = 0; i<lnodes.Size(); i++) for (i = 0; i<lnodes.Size(); i++)
{ {
level_info_t * li = FindLevelInfo(lnodes[i].Level); level_info_t * li = FindLevelInfo(lnodes[i].Level);
if (li && li->flags & LEVEL_VISITED) drawOnLnode(i, &splat, 1); // draw a splat on taken cities. if (li && li->flags & LEVEL_VISITED) drawOnLnode(i, &splat, 1, animwidth, animheight); // draw a splat on taken cities.
} }
} }
@ -679,7 +681,7 @@ void DInterBackground::drawBackground(int state, bool drawsplat, bool snl_pointe
{ {
unsigned int v = MapToIndex(wbs->next); unsigned int v = MapToIndex(wbs->next);
// Draw only if it points to a valid level on the current screen! // Draw only if it points to a valid level on the current screen!
if (v<lnodes.Size()) drawOnLnode(v, &yah[0], yah.Size()); if (v<lnodes.Size()) drawOnLnode(v, &yah[0], yah.Size(), animwidth, animheight);
} }
} }