zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-04-22 15:47:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Replaced the useless 160x200 scale preset with widescreen 356x200.

Browse source
This commit is contained in:
drfrag 2019-12-12 12:57:35 +01:00
parent 78ace538a6
commit e4c1b1413e
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gl/renderer/gl_renderer.cpp
View file

@ -292,8 +292,7 @@ void FGLRenderer::SetOutputViewport(GL_IRECT *bounds)
scaleX = MIN(clientWidth / (float)screenWidth, clientHeight / (float)screenHeight);
scaleY = scaleX;
}
int factor = screenWidth == 160 && screenHeight == 200? 2 : 1;
mOutputLetterbox.width = (int)round(screenWidth * scaleX * factor);
mOutputLetterbox.width = (int)round(screenWidth * scaleX);
mOutputLetterbox.height = (int)round(screenHeight * scaleY);
mOutputLetterbox.left = (clientWidth - mOutputLetterbox.width) / 2;
mOutputLetterbox.top = (clientHeight - mOutputLetterbox.height) / 2;

3
src/gl/system/gl_swframebuffer.cpp
View file

@ -721,8 +721,7 @@ void OpenGLSWFrameBuffer::GetLetterboxFrame(int &letterboxX, int &letterboxY, in
scaleY = scaleX;
}
int factor = Width == 160 && Height == 200? 2 : 1;
letterboxWidth = (int)round(Width * scaleX * factor);
letterboxWidth = (int)round(Width * scaleX);
letterboxHeight = (int)round(Height * scaleY);
letterboxX = (clientWidth - letterboxWidth) / 2;
letterboxY = (clientHeight - letterboxHeight) / 2;

6
src/r_videoscale.cpp
View file

@ -77,7 +77,7 @@ namespace
{ true, false, [](uint32_t Width)->uint32_t { return 640; }, [](uint32_t Height)->uint32_t { return 400; }, true, false }, // 3 - 640x400
{ true, true, [](uint32_t Width)->uint32_t { return 1280; }, [](uint32_t Height)->uint32_t { return 800; }, true, false }, // 4 - 1280x800
{ true, true, [](uint32_t Width)->uint32_t { return vid_scale_customwidth; }, [](uint32_t Height)->uint32_t { return vid_scale_customheight; }, true, true }, // 5 - Custom
{ true, false, [](uint32_t Width)->uint32_t { return 160; }, [](uint32_t Height)->uint32_t { return 200; }, true, false }, // 6 - 160x200
{ true, false, [](uint32_t Width)->uint32_t { return 356; }, [](uint32_t Height)->uint32_t { return 200; }, false, false }, // 6 - 356x200
};
bool isOutOfBounds(int x)
{
@ -128,8 +128,6 @@ int ViewportScaledWidth(int width, int height)
}
if (isOutOfBounds(vid_scalemode))
vid_scalemode = 0;
if (vid_scalemode == 6)
vid_scalefactor = 1.0;
if (vid_cropaspect && height > 0)
width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width;
return (int)MAX((int32_t)160, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledWidth(width)));
@ -144,8 +142,6 @@ int ViewportScaledHeight(int width, int height)
}
if (isOutOfBounds(vid_scalemode))
vid_scalemode = 0;
if (vid_scalemode == 6)
vid_scalefactor = 1.0;
if (vid_cropaspect && height > 0)
height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height;
return (int)MAX((int32_t)100, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledHeight(height)));

2
wadsrc/static/menudef.txt
View file

@ -2215,7 +2215,7 @@ OptionValue ScaleModes
3, "640x400"
4, "1280x800"
5, "$OPTVAL_CUSTOM"
6, "160x200"
6, "356x200"
}
OptionValue CropAspect
{