1
0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-21 12:21:33 +02:00

minor fixes

This commit is contained in:
XProger
2019-07-20 03:58:24 +03:00
parent 62a20ba860
commit 15d8bd5c3d

View File

@@ -3085,9 +3085,9 @@ struct Level : IGame {
Viewport oldViewport = Core::viewportDef; Viewport oldViewport = Core::viewportDef;
GAPI::Texture *oldTarget = Core::defaultTarget; GAPI::Texture *oldTarget = Core::defaultTarget;
bool upsample = !invBG && Core::settings.detail.scale != Core::Settings::SCALE_100; bool upscale = !invBG && Core::settings.detail.scale != Core::Settings::SCALE_100;
if (upsample) { if (upscale) {
int scale = (Core::settings.detail.scale + 1) * 25; int scale = (Core::settings.detail.scale + 1) * 25;
int w = Core::width * scale / 100; int w = Core::width * scale / 100;
int h = Core::height * scale / 100; int h = Core::height * scale / 100;
@@ -3130,7 +3130,7 @@ struct Level : IGame {
Core::defaultTarget = oldTarget; Core::defaultTarget = oldTarget;
Core::viewportDef = oldViewport; Core::viewportDef = oldViewport;
if (!invBG && Core::settings.detail.scale != Core::Settings::SCALE_100) { if (upscale) {
mat4 mProj, mView; mat4 mProj, mView;
mView.identity(); mView.identity();
mProj = GAPI::ortho(-1, +1, -1, +1, 0, 1); mProj = GAPI::ortho(-1, +1, -1, +1, 0, 1);
@@ -3141,7 +3141,10 @@ struct Level : IGame {
setShader(Core::passFilter, Shader::FILTER_UPSCALE, false, false); setShader(Core::passFilter, Shader::FILTER_UPSCALE, false, false);
Core::active.shader->setParam(uParam, vec4(float(scaleTex->width), float(scaleTex->height), 0.0f, 0.0f)); Core::active.shader->setParam(uParam, vec4(float(scaleTex->width), float(scaleTex->height), 0.0f, 0.0f));
scaleTex->bind(sDiffuse); scaleTex->bind(sDiffuse);
Core::setDepthTest(false);
mesh->renderQuad(); mesh->renderQuad();
Core::setDepthTest(true);
Core::setDepthWrite(true);
} }
// TODO render all UI with native resolution here // TODO render all UI with native resolution here