Additional tweaks to fix the ssg texture (state) problems. Tweaked near

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 9ed50324087263ec2490f0af926653ffd0f74fd0..8e06130c8f2d88f3bbf3bba8ae0f268ec16a4c14 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -130,6 +130,7 @@ slSample *s2;
 
 // ssg variables
 ssgRoot *scene = NULL;
+ssgBranch *terrain = NULL;
 ssgTransform *penguin = NULL;
 
 
@@ -380,26 +381,12 @@ static void fgRenderFrame( void ) {
 
        global_tile_mgr.render();
 
-       xglDisable( GL_TEXTURE_2D );
-       xglDisable( GL_FOG );
-
-       // display HUD && Panel
-       xglDisable( GL_CULL_FACE );
-       fgCockpitUpdate();
-
-       // We can do translucent menus, so why not. :-)
-       xglEnable    ( GL_BLEND ) ;
-       xglBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
-       puDisplay();
-       xglDisable   ( GL_BLEND ) ;
-       xglEnable( GL_FOG );
-
        // ssg test
 
        xglMatrixMode(GL_PROJECTION);
        xglLoadIdentity();
        ssgSetFOV(60.0f, 0.0f);
-       ssgSetNearFar(1.0f, 700.0f);
+       ssgSetNearFar(10.0f, 14000.0f);
        sgMat4 sgTRANS;
 
        sgMakeTransMat4( sgTRANS, 
@@ -427,7 +414,21 @@ static void fgRenderFrame( void ) {
        sgMultMat4( sgVIEW, current_view.sgVIEW, sgTRANS );
        ssgSetCamera( sgVIEW );
        // ssgSetCamera( current_view.sgVIEW );
-       // ssgCullAndDraw( scene );
+       ssgCullAndDraw( scene );
+
+       xglDisable( GL_TEXTURE_2D );
+       xglDisable( GL_FOG );
+
+       // display HUD && Panel
+       xglDisable( GL_CULL_FACE );
+       fgCockpitUpdate();
+
+       // We can do translucent menus, so why not. :-)
+       xglEnable    ( GL_BLEND ) ;
+       xglBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
+       puDisplay();
+       xglDisable   ( GL_BLEND ) ;
+       xglEnable( GL_FOG );
 
     }
 
@@ -1066,12 +1067,14 @@ int main( int argc, char **argv ) {
     // distribution) specifically from the ssg tux example
     //
 
-    // ssgModelPath( "/stage/pinky01/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
-    // ssgTexturePath( "/stage/pinky01/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
-    ssgModelPath( "/h/curt/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
-    ssgTexturePath( "/h/curt/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
+    ssgModelPath( "/stage/pinky01/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
+    ssgTexturePath( "/stage/pinky01/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
+    // ssgModelPath( "/h/curt/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
+    // ssgTexturePath( "/h/curt/src/Libs/plib-1.0.12/examples/ssg/tux/data/" );
 
     scene = new ssgRoot;
+    terrain = new ssgBranch;
+    terrain->setName( "Terrain" );
     penguin = new ssgTransform;
 
     ssgEntity *tux_obj = ssgLoadAC( "tuxedo.ac" );
@@ -1079,6 +1082,7 @@ int main( int argc, char **argv ) {
     ssgFlatten( tux_obj );
     ssgStripify( penguin );
 
+    scene->addKid( terrain );
     scene->addKid( penguin );
 
     // pass control off to the master GLUT event handler