From b53bf073ccab377c398d1f3e4f044d851ba45a85 Mon Sep 17 00:00:00 2001 From: Plagman Date: Sat, 15 Apr 2006 04:32:51 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@16 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/src/polymost.c | 10 +++++----- polymer/eduke32/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c index a5afe5fc6..e622ed3ad 100644 --- a/polymer/build/src/polymost.c +++ b/polymer/build/src/polymost.c @@ -595,9 +595,9 @@ void resizeglcheck () bglMatrixMode(GL_PROJECTION); memset(m,0,sizeof(m)); - m[0][0] = (float)ydimen / 1.2; m[0][2] = 1.0; + m[0][0] = (float)ydimen / (1 + (glratiocorrection / (63 / (ratioratio - 1)))); m[0][2] = 1.0; m[1][1] = (float)xdimen; m[1][2] = 1.0; - m[2][2] = 1.0; m[2][3] = (float)ydimen / 1.2; + m[2][2] = 1.0; m[2][3] = (float)ydimen / (1 + (glratiocorrection / (63 / (ratioratio - 1)))); m[3][2] =-1.0; bglLoadMatrixf(&m[0][0]); //bglLoadIdentity(); @@ -4038,7 +4038,7 @@ void polymost_dorotatesprite (long sx, long sy, long z, short a, short picnum, if ((dastat&10) == 2) { ratioratio = 1.6 / (((float)(windowx2-windowx1+1)) / (windowy2-windowy1)); // computes the ratio between 16/10 and current resolution ratio - fovcorrect = (ratioratio > 1) ? (((windowx2-windowx1+1) * ratioratio) - windowx2-windowx1+1) * ((float)glratiocorrection / 63) : 0; + fovcorrect = (ratioratio > 1) ? (((windowx2-windowx1+1) * ratioratio) - windowx2-windowx1+1) * ((float)glratiocorrection / 63) * 2 : 0; bglViewport(windowx1 - (fovcorrect / 2),yres-(windowy2+1),windowx2-windowx1+1 + fovcorrect,windowy2-windowy1+1); } else @@ -4051,9 +4051,9 @@ void polymost_dorotatesprite (long sx, long sy, long z, short a, short picnum, memset(m,0,sizeof(m)); if ((dastat&10) == 2) { - m[0][0] = (float)ydimen / ratioratio; m[0][2] = 1.0; + m[0][0] = (float)ydimen / (1 + (glratiocorrection / (63 / (ratioratio - 1)))); m[0][2] = 1.0; m[1][1] = (float)xdimen; m[1][2] = 1.0; - m[2][2] = 1.0; m[2][3] = (float)ydimen / ratioratio; + m[2][2] = 1.0; m[2][3] = (float)ydimen / (1 + (glratiocorrection / (63 / (ratioratio - 1)))); m[3][2] =-1.0; } else { m[0][0] = m[2][3] = 1.0; m[1][1] = ((float)xdim)/((float)ydim); m[2][2] = 1.0001; m[3][2] = 1-m[2][2]; } diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 4d1dedafd..8337d95fe 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -13,7 +13,7 @@ NOASM = 0 # Debugging options RELEASE?=1 -JFAUD?=1 +JFAUD?=0 # build locations