zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-18 01:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- always apply vid_scalefactor now, even when vid_scalemode is not 0 or 1.

Browse source
This commit is contained in:
Rachael Alexanderson 2018-12-03 13:38:18 -05:00
parent b6d0492478
commit 493ff5f089
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_videoscale.cpp
View file

@ -113,7 +113,7 @@ int ViewportScaledWidth(int width, int height)
vid_scalemode = 0; vid_scalemode = 0;
if (vid_cropaspect && height > 0) if (vid_cropaspect && height > 0)
width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width; width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width;
return (int)MAX((int32_t)320, (int32_t)vScaleTable[vid_scalemode].GetScaledWidth((int)((float)width * vid_scalefactor))); return (int)MAX((int32_t)320, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledWidth(width)));
} }
int ViewportScaledHeight(int width, int height) int ViewportScaledHeight(int width, int height)
@ -122,7 +122,7 @@ int ViewportScaledHeight(int width, int height)
vid_scalemode = 0; vid_scalemode = 0;
if (vid_cropaspect && height > 0) if (vid_cropaspect && height > 0)
height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height; height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height;
return (int)MAX((int32_t)200, (int32_t)vScaleTable[vid_scalemode].GetScaledHeight((int)((float)height * vid_scalefactor))); return (int)MAX((int32_t)200, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledHeight(height)));
} }
bool ViewportIsScaled43() bool ViewportIsScaled43()