zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Polymost: handle HUD model 'fov' DEF token.

Browse source 
This "simply" requires an appropriate factor in the projection matrix.
Also, get rid of a special-case factor for >=1.6 aspects (making HUD models
wider then, I think).

git-svn-id: https://svn.eduke32.com/eduke32@4172 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-11-22 19:26:46 +00:00
parent 7182f0a7f2
commit 9e3e2baa4d
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4262,14 +4262,36 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
memset(m,0,sizeof(m)); memset(m,0,sizeof(m));
if ((dastat&10) == 2) if ((dastat&10) == 2)
{ {
float ratioratio = (float)xdim/ydim; const float ratioratio = 1.0; //(float)xdim/ydim;
m[0][0] = (float)ydimen*(ratioratio >= 1.6?1.2:1); m[0][2] = 1.0; float f = 1.0;
m[1][1] = (float)xdimen; m[1][2] = 1.0; int32_t fov = hudmem[(dastat&4)>>2][picnum].fov;
#ifdef POLYMER
if (pr_overridehud)
fov = pr_hudfov;
#endif
if (fov != -1)
{
// XXX: what's the cause for this (half-guessed /
// empirically determined) factor being necessary?
fov = (fov*512)/400;
f = 1.f / tanf((PI * fov)/2048.f);
}
m[0][0] = f*(float)ydimen*(ratioratio >= 1.6?1.2:1); m[0][2] = 1.0;
m[1][1] = f*(float)xdimen; m[1][2] = 1.0;
m[2][2] = 1.0; m[2][3] = (float)ydimen*(ratioratio >= 1.6?1.2:1); m[2][2] = 1.0; m[2][3] = (float)ydimen*(ratioratio >= 1.6?1.2:1);
m[3][2] =-1.0; m[3][2] =-1.0;
} }
else { m[0][0] = m[2][3] = 1.0f; m[1][1] = ((float)xdim)/((float)ydim); m[2][2] = 1.0001f; m[3][2] = 1-m[2][2]; } else
{
m[0][0] = m[2][3] = 1.0f;
m[1][1] = ((float)xdim)/((float)ydim);
m[2][2] = 1.0001f;
m[3][2] = 1-m[2][2];
}
bglLoadMatrixf(&m[0][0]); bglLoadMatrixf(&m[0][0]);
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
bglLoadIdentity(); bglLoadIdentity();
} }