zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-23 15:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

polymost.c: factor out 2x dup'd code into get_projhack_ratio().

Browse source 
One use was in determining the ray vector for the mouse-aiming hitscan
in the editor. Unfortunately, the change doesn't make it any less broken
in Polymost, even if the two instances were out of sync.

git-svn-id: https://svn.eduke32.com/eduke32@3401 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-01-17 21:59:05 +00:00
parent e9bd1b7582
commit a147dbcfe3
1 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
polymer/eduke32/build/src/polymost.c
View file

@ -952,10 +952,32 @@ void invalidatecache(void)
initprintf("Deleted and reopened \"%s\" as cache file\n", TEXCACHEFILE); initprintf("Deleted and reopened \"%s\" as cache file\n", TEXCACHEFILE);
} }
static float get_projhack_ratio(void)
{
// Legacy widescreen
if (glwidescreen && !r_usenewaspect)
return 1.2f;
if (glprojectionhacks == 1)
{
double mul = (gshang*gshang);
return 1.05f + mul*mul*mul*mul;
}
if (glprojectionhacks == 2)
{
float abs_shang = fabs(gshang);
if (abs_shang > 0.7f)
return 1.05f + 4.f*(abs_shang-0.7f);
}
// No projection hacks (legacy or new-aspect)
return 1.0f;
}
static void resizeglcheck(void) static void resizeglcheck(void)
{ {
float m[4][4]; float m[4][4];
int32_t fovcorrect;
if (glredbluemode < lastglredbluemode) if (glredbluemode < lastglredbluemode)
{ {
@ -992,41 +1014,23 @@ static void resizeglcheck(void)
if ((glox1 != windowx1) || (gloy1 != windowy1) || (glox2 != windowx2) || (gloy2 != windowy2)) if ((glox1 != windowx1) || (gloy1 != windowy1) || (glox2 != windowx2) || (gloy2 != windowy2))
{ {
double ratio = 1.05; const int32_t ourxdimen = (windowx2-windowx1+1);
const float ratio = get_projhack_ratio();
if (glwidescreen && !r_usenewaspect) const int32_t fovcorrect = (ratio==0) ? 0 : (int32_t)(ourxdimen*ratio - ourxdimen);
ratio = 1.2f;
else if (glprojectionhacks == 1)
{
double mul = (gshang*gshang);
ratio += mul*mul*mul*mul;
}
else if (glprojectionhacks == 2)
{
if (gshang > 0.7f)
ratio += 4.f*(gshang-0.7f);
if (gshang < -0.7f)
ratio += 4.f*(-gshang-0.7f);
}
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 && !r_usenewaspect) ? 0 :
(((windowx2-windowx1+1) * ratio) - (windowx2-windowx1+1))):0);
bglViewport(windowx1-(fovcorrect/2), yres-(windowy2+1), bglViewport(windowx1-(fovcorrect/2), yres-(windowy2+1),
windowx2-windowx1+1 + fovcorrect, windowy2-windowy1+1); ourxdimen+fovcorrect, windowy2-windowy1+1);
bglMatrixMode(GL_PROJECTION); bglMatrixMode(GL_PROJECTION);
memset(m,0,sizeof(m)); memset(m,0,sizeof(m));
m[0][0] = (float)ydimen / (glprojectionhacks?ratio:1.f); m[0][2] = 1.0; m[0][0] = (float)ydimen / ratio; m[0][2] = 1.0;
m[1][1] = (float)xdimen; m[1][2] = 1.0; m[1][1] = (float)xdimen; m[1][2] = 1.0;
m[2][2] = 1.0; m[2][3] = (float)ydimen / (glprojectionhacks?ratio:1.f); m[2][2] = 1.0; m[2][3] = (float)ydimen / ratio;
m[3][2] =-1.0; m[3][2] =-1.0;
bglLoadMatrixf(&m[0][0]); bglLoadMatrixf(&m[0][0]);
//bglLoadIdentity();
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
bglLoadIdentity(); bglLoadIdentity();
@ -4446,24 +4450,8 @@ void polymost_drawrooms()
int32_t cz, fz; int32_t cz, fz;
hitdata_t hit; hitdata_t hit;
vec3_t vect; vec3_t vect;
double ratio = 1.05;
#ifdef USE_OPENGL const float ratio = get_projhack_ratio();
if (glwidescreen)
ratio = 1.2f;
else if (glprojectionhacks == 1)
{
double mul = (gshang*gshang);
ratio += mul*mul*mul*mul;
}
else if (glprojectionhacks == 2)
{
if (gshang > 0.7f)
ratio += 4.f*(gshang-0.7f);
if (gshang < -0.7f)
ratio += 4.f*(-gshang-0.7f);
}
#endif
ox2 = (searchx-ghalfx)/ratio; ox2 = (searchx-ghalfx)/ratio;
oy2 = (searchy-ghoriz)/ratio; // ghoriz is (ydimen>>1) here oy2 = (searchy-ghoriz)/ratio; // ghoriz is (ydimen>>1) here