mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
make r_usenewaspect imply NOT glwidescreen (i.e. disable r_anamorphic there, because that would be redundant). r_projectionhack is still active, but doesn't seem to do much.
git-svn-id: https://svn.eduke32.com/eduke32@1961 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
a3443cd1dd
commit
fbb6cc5e7e
1 changed files with 7 additions and 4 deletions
|
@ -963,7 +963,7 @@ void resizeglcheck()
|
||||||
{
|
{
|
||||||
double ratio = 1.05;
|
double ratio = 1.05;
|
||||||
|
|
||||||
if (glwidescreen == 1)
|
if (glwidescreen && !r_usenewaspect)
|
||||||
ratio = 1.2f;
|
ratio = 1.2f;
|
||||||
else if (glprojectionhacks == 1)
|
else if (glprojectionhacks == 1)
|
||||||
{
|
{
|
||||||
|
@ -981,9 +981,12 @@ void resizeglcheck()
|
||||||
glox1 = (float)windowx1; gloy1 = (float)windowy1;
|
glox1 = (float)windowx1; gloy1 = (float)windowy1;
|
||||||
glox2 = (float)windowx2; gloy2 = (float)windowy2;
|
glox2 = (float)windowx2; gloy2 = (float)windowy2;
|
||||||
|
|
||||||
fovcorrect = (int32_t)(glprojectionhacks?(glwidescreen?0:(((windowx2-windowx1+1) * ratio) - (windowx2-windowx1+1))):0);
|
fovcorrect = (int32_t)(glprojectionhacks ?
|
||||||
|
((glwidescreen && !r_usenewaspect) ? 0 :
|
||||||
|
(((windowx2-windowx1+1) * ratio) - (windowx2-windowx1+1))):0);
|
||||||
|
|
||||||
bglViewport(windowx1 - (fovcorrect / 2), yres-(windowy2+1),windowx2-windowx1+1 + fovcorrect, windowy2-windowy1+1);
|
bglViewport(windowx1-(fovcorrect/2), yres-(windowy2+1),
|
||||||
|
windowx2-windowx1+1 + fovcorrect, windowy2-windowy1+1);
|
||||||
|
|
||||||
bglMatrixMode(GL_PROJECTION);
|
bglMatrixMode(GL_PROJECTION);
|
||||||
memset(m,0,sizeof(m));
|
memset(m,0,sizeof(m));
|
||||||
|
@ -4381,7 +4384,7 @@ void polymost_drawrooms()
|
||||||
double ratio = 1.05;
|
double ratio = 1.05;
|
||||||
|
|
||||||
#ifdef USE_OPENGL
|
#ifdef USE_OPENGL
|
||||||
if (glwidescreen == 1)
|
if (glwidescreen)
|
||||||
ratio = 1.2f;
|
ratio = 1.2f;
|
||||||
else if (glprojectionhacks == 1)
|
else if (glprojectionhacks == 1)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue