Removed cloud layers added for testing.

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

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index dacc1abd5d0c233438f53811787d5f7a057fbf5a..05414d4cd278dfd4b3cbc2e0556dee7229c19fba 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -35,7 +35,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -53,6 +53,10 @@
 #  include <unistd.h>          // for stat()
 #endif
 
+// #ifdef HAVE_LIBX11
+// #  include <GL/glext.h>
+// #endif
+
 #include <plib/pu.h>
 #include <plib/ssg.h>
 
@@ -81,6 +85,7 @@
 #ifdef FG_NETWORK_OLK
 #include <NetworkOLK/network.h>
 #endif
+#include <Objects/matlib.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #ifdef ENABLE_AUDIO_SUPPORT
@@ -365,7 +370,7 @@ void fgRenderFrame( void ) {
 
        sgVec3 po;              // chase view pilot_offset
        sgVec3 wup;             // chase view world up
-       sgSetVec3( po, 0.0, 0.0, 50.0 );
+       sgSetVec3( po, 0.0, 0.0, 100.0 );
        sgCopyVec3( wup, pilot_view->get_world_up() );
        sgMat4 CXFM;            // chase view + pilot offset xform
        sgMakeRotMat4( CXFM,
@@ -1035,6 +1040,9 @@ static void fgMainLoop( void ) {
                            cur_fdm_state->get_Latitude()
                             * SGD_RADIANS_TO_DEGREES );
 
+    // see if we need to load any deferred-load textures
+    material_lib.load_next_deferred();
+
     // Process/manage pending events
     global_events.Process();
 
@@ -1381,9 +1389,7 @@ int main( int argc, char **argv ) {
     // Allocate global data structures.  This needs to happen before
     // we parse command line options
 
-    SGPropertyNode *props = new SGPropertyNode;
     globals = new FGGlobals;
-    globals->set_props( props );
 
     // seed the random number generater
     sg_srandom_time();
@@ -1446,6 +1452,20 @@ int main( int argc, char **argv ) {
     // fonts !!!
     guiInit();
 
+#ifdef GL_EXT_texture_lod_bias
+    glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, -0.5 ) ;
+#endif
+
+#if 0
+#ifdef GL_EXT_texture_filter_anisotropic
+    float max_anisotropy;
+    glGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy );
+    glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
+                     max_anisotropy );
+    cout << "Max anisotropy = " << max_anisotropy << endl;
+#endif
+#endif
+
     // set current_options lon/lat if an airport id is specified
     // cout << "3. airport_id = " << fgGetString("/sim/startup/airport-id") << endl;
     if ( fgGetString("/sim/startup/airport-id").length() ) {
@@ -1525,10 +1545,11 @@ int main( int argc, char **argv ) {
                   0.0 );
     globals->set_ephem( ephem );
 
+    thesky = new SGSky;
+
     SGPath sky_tex_path( globals->get_fg_root() );
     sky_tex_path.append( "Textures" );
     sky_tex_path.append( "Sky" );
-    thesky = new SGSky;
     thesky->texture_path( sky_tex_path.str() );
 
     thesky->build( 550.0, 550.0,
@@ -1538,12 +1559,12 @@ int main( int argc, char **argv ) {
                   globals->get_ephem()->getStars(), 60000.0 );
 
     if ( fgGetBool("/environment/clouds/status") ) {
-       thesky->add_cloud_layer( 2000.0, 200.0, 50.0, 40000.0,
-                                SG_CLOUD_OVERCAST );
+       // thesky->add_cloud_layer( 2000.0, 200.0, 50.0, 40000.0,
+        //                          SG_CLOUD_OVERCAST );
        thesky->add_cloud_layer( 2600.0, 200.0, 50.0, 40000.0,
                                 SG_CLOUD_MOSTLY_CLOUDY );
-       thesky->add_cloud_layer( 3000.0, 200.0, 50.0, 40000.0,
-                                SG_CLOUD_MOSTLY_SUNNY );
+       // thesky->add_cloud_layer( 3000.0, 200.0, 50.0, 40000.0,
+       //                          SG_CLOUD_MOSTLY_SUNNY );
        thesky->add_cloud_layer( 6000.0, 20.0, 10.0, 40000.0,
                                 SG_CLOUD_CIRRUS );
     }
@@ -1580,12 +1601,19 @@ int main( int argc, char **argv ) {
 
 #if !defined( PLIB_1_2_X )
     // this should be redundant ... but it breaks for relative paths
-    // w/ plib-1.2.0
-    ssgModelPath( (char *)full_model.dir().c_str() );
+    // ssgModelPath( (char *)full_model.dir().c_str() );
 #endif
 
     ssgTexturePath( (char *)full_model.dir().c_str() );
     ssgEntity *acmodel_obj = ssgLoad( (char *)full_model.c_str() );
+    if( !acmodel_obj ) {
+        // fall back to default
+        acmodel_obj = ssgLoad( (char *)"Models/Geometry/glider.ac" );
+        if( !acmodel_obj ) {
+            SG_LOG( SG_GENERAL, SG_ALERT, "FAILED to LOAD an AC model! ..." );
+            exit(-1);
+        }
+    }
 
     // find moving parts (if this is an MDL model)
     flaps_selector = (ssgSelector*)fgFindNode( acmodel_obj, "FLAPS" );
@@ -1732,7 +1760,7 @@ void fgLoadDCS(void) {
         SG_LOG ( SG_TERRAIN, SG_ALERT, "Finished object processing." );
 
         ship_sel->clrTraversalMaskBits( SSGTRAV_HOT );
-        scene->addKid( ship_sel ); //add selector node to root node
+        scene->addKid( ship_sel ); //add selector node to root node 
     }
 
     return;