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

- add 1280x800 scale mode

This commit is contained in:
Rachael Alexanderson 2017-07-27 12:17:11 -04:00
parent 10e1600faf
commit 3540440bf6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/r_videoscale.cpp
View File

@ -27,7 +27,7 @@
CUSTOM_CVAR (Int, vid_scalemode, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CUSTOM_CVAR (Int, vid_scalemode, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
{ {
if (self < 0 || self > 5) if (self < 0 || self > 6)
{ {
self = 0; self = 0;
} }
@ -35,7 +35,13 @@ CUSTOM_CVAR (Int, vid_scalemode, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
bool ViewportLinearScale() bool ViewportLinearScale()
{ {
return vid_scalemode == 4 || vid_scalemode == 5; switch(vid_scalemode)
{
default: return false;
case 4:
case 5:
case 6: return true;
}
} }
int ViewportScaledWidth(int width) int ViewportScaledWidth(int width)
@ -49,6 +55,7 @@ int ViewportScaledWidth(int width)
case 3: return (int)roundf(width * 0.5f); case 3: return (int)roundf(width * 0.5f);
case 4: return (int)roundf(width * 0.75f); case 4: return (int)roundf(width * 0.75f);
case 5: return width * 2; case 5: return width * 2;
case 6: return 1280;
} }
} }
@ -63,6 +70,7 @@ int ViewportScaledHeight(int height)
case 3: return (int)roundf(height * 0.5f); case 3: return (int)roundf(height * 0.5f);
case 4: return (int)roundf(height * 0.75f); case 4: return (int)roundf(height * 0.75f);
case 5: return height * 2; case 5: return height * 2;
case 6: return 800;
} }
} }
@ -72,7 +80,8 @@ bool ViewportIsScaled43()
{ {
default: return false; default: return false;
case 1: case 1:
case 2: return true; case 2:
case 6: return true;
} }
} }

1
wadsrc/static/menudef.txt
View File

@ -1857,6 +1857,7 @@ OptionValue ScaleModes
3, "0.5x" 3, "0.5x"
4, "0.75x" 4, "0.75x"
5, "2x SSAA" 5, "2x SSAA"
6, "1280x800"
} }
OptionMenu VideoModeMenu protected OptionMenu VideoModeMenu protected