Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-22 05:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Applied Nik's fix for cyclical scene graphs. Improves Harley Davidson, Ski Champ, Emergency Call Ambulance, and Ocean Hunter.

Browse source
This commit is contained in:
Bart Trzynadlowski 2012-03-31 19:41:55 +00:00
parent 1bce444668
commit 93b71c8429
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Src/Graphics/Render3D.cpp
View file

@ -706,7 +706,8 @@ void CRender3D::DescendCullingNode(UINT32 addr)
// Proceed to second link // Proceed to second link
glPopMatrix(); glPopMatrix();
DescendNodePtr(node2Ptr); if ((node[0x00] & 0x07) != 0x06) // seems to indicate second link is invalid (fixes circular references)
DescendNodePtr(node2Ptr);
--stackDepth; --stackDepth;
// Restore old texture offsets // Restore old texture offsets
@ -815,7 +816,7 @@ void CRender3D::RenderViewport(UINT32 addr, int pri)
int curPri; int curPri;
int vpX, vpY, vpWidth, vpHeight; int vpX, vpY, vpWidth, vpHeight;
int spotColorIdx; int spotColorIdx;
GLfloat vpTopAngle, vpBotAngle, fovYDegrees, near, far; GLfloat vpTopAngle, vpBotAngle, fovYDegrees;
GLfloat scrollFog, scrollAtt; GLfloat scrollFog, scrollAtt;
// Translate address and obtain pointer // Translate address and obtain pointer
@ -848,20 +849,8 @@ void CRender3D::RenderViewport(UINT32 addr, int pri)
vpTopAngle = (float) asin(*(float *)&vpnode[0x0E]); // FOV Y upper half-angle (radians) vpTopAngle = (float) asin(*(float *)&vpnode[0x0E]); // FOV Y upper half-angle (radians)
vpBotAngle = (float) asin(*(float *)&vpnode[0x12]); // FOV Y lower half-angle vpBotAngle = (float) asin(*(float *)&vpnode[0x12]); // FOV Y lower half-angle
fovYDegrees = (vpTopAngle+vpBotAngle)*(float)(180.0/3.14159265358979323846); fovYDegrees = (vpTopAngle+vpBotAngle)*(float)(180.0/3.14159265358979323846);
// TO-DO: figure out how near and far planes are stored // TO-DO: investigate clipping planes
if (step >= 0x15)
{
near = 1e-2;
far = 1e5;
}
else
{
// Move near plane out a bit on Step 1.0 to avoid issues w/ Z-fighting.
// This may be unnecessary.
near = 1e-1;
far = 1e5;
}
// Set up viewport and projection (TO-DO: near and far clipping) // Set up viewport and projection (TO-DO: near and far clipping)
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
@ -872,8 +861,7 @@ void CRender3D::RenderViewport(UINT32 addr, int pri)
viewportY = yOffs + (GLint) ((float)(384-(vpY+vpHeight))*yRatio); viewportY = yOffs + (GLint) ((float)(384-(vpY+vpHeight))*yRatio);
viewportWidth = totalXRes; viewportWidth = totalXRes;
viewportHeight = (GLint) ((float)vpHeight*yRatio); viewportHeight = (GLint) ((float)vpHeight*yRatio);
gluPerspective(fovYDegrees,(GLfloat)viewportWidth/(GLfloat)viewportHeight,0.01f,1e5); gluPerspective(fovYDegrees,(GLfloat)viewportWidth/(GLfloat)viewportHeight,0.1f,1e5); // use actual full screen ratio to get proper X FOV
//gluPerspective(fovYDegrees,(GLfloat)viewportWidth/(GLfloat)viewportHeight,0.1f,1e5); // use actual full screen ratio to get proper X FOV
//printf("viewportX=%d, viewportY=%d, viewportWidth=%d, viewportHeight=%d\tvpY=%d vpHeight=%d\n", viewportX, viewportY, viewportWidth, viewportHeight, vpY,vpHeight); //printf("viewportX=%d, viewportY=%d, viewportWidth=%d, viewportHeight=%d\tvpY=%d vpHeight=%d\n", viewportX, viewportY, viewportWidth, viewportHeight, vpY,vpHeight);
} }
else else