Debug output tweaks.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index bb247de9a7eb0456be9f0aae0f8a6e8dc8d4c8cd..3426accc4cf5347393f84b9c9b1f8fd87bc8cc92 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -309,12 +309,21 @@ void fgRenderFrame( void ) {
        xglDisable( GL_DEPTH_TEST );
        xglDisable( GL_LIGHTING );
        xglDisable( GL_CULL_FACE );
+
        xglDisable( GL_FOG );
+       /* if ( current_options.get_fog() > 0 ) {
+           xglEnable( GL_FOG );
+           xglFogi( GL_FOG_MODE, GL_EXP2 );
+           xglFogfv( GL_FOG_COLOR, l->adj_fog_color );
+       } */
+
        xglShadeModel( GL_SMOOTH );
        if ( current_options.get_skyblend() ) {
            fgSkyRender();
        }
 
+       // xglDisable( GL_FOG );
+
        // setup transformation for drawing astronomical objects
        xglPushMatrix();
        // Translate to view position

diff --git a/src/Objects/materialmgr.cxx b/src/Objects/materialmgr.cxx
index d92178c71ca94797e1c4cd472ef2f71c96054135..22e333b29dbcec059e2628c7f25a53bfa9d8458b 100644 (file)
--- a/src/Objects/materialmgr.cxx
+++ b/src/Objects/materialmgr.cxx
@@ -163,8 +163,6 @@ fgMATERIAL_MGR::load_lib ( void )
        in >> material_name >> token;
 
        if ( token == '{' ) {
-           FG_LOG( FG_TERRAIN, FG_INFO,
-                   "  Loading material " << material_name );
            FGMaterial m;
            in >> m;
 
@@ -251,7 +249,7 @@ fgMATERIAL_MGR::load_lib ( void )
     }
 
     materials_loaded = true;
-    return(1);
+    return 1;
 }
 
 

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 1566f49aaf7d3a48bb01fdef90681adaf05941e5..db669c91eff5f0aea8b39b24234c86b677831ba9 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -413,33 +413,33 @@ static bool my_ssg_instersect_leaf( string s, ssgLeaf *leaf, sgMat4 m,
 
     // traverse the triangle list for this leaf
     for ( int i = 0; i < leaf->getNumTriangles(); ++i ) {
-       cout << s << "testing triangle = " << i << endl;
+       // cout << s << "testing triangle = " << i << endl;
 
        leaf->getTriangle( i, &i1, &i2, &i3 );
 
        // get triangle vertex coordinates
 
        tmp = leaf->getVertex( i1 );
-       cout << s << "orig point 1 = " << tmp[0] << " " << tmp[1] 
-            << " " << tmp[2] << endl;
+       // cout << s << "orig point 1 = " << tmp[0] << " " << tmp[1] 
+       //      << " " << tmp[2] << endl;
        sgXformPnt3( p1, tmp, m ) ;
 
        tmp = leaf->getVertex( i2 );
-       cout << s << "orig point 2 = " << tmp[0] << " " << tmp[1] 
-            << " " << tmp[2] << endl;
+       // cout << s << "orig point 2 = " << tmp[0] << " " << tmp[1] 
+       //      << " " << tmp[2] << endl;
        sgXformPnt3( p2, tmp, m ) ;
 
        tmp = leaf->getVertex( i3 );
-       cout << s << "orig point 3 = " << tmp[0] << " " << tmp[1] 
-            << " " << tmp[2] << endl;
+       // cout << s << "orig point 3 = " << tmp[0] << " " << tmp[1] 
+       //      << " " << tmp[2] << endl;
        sgXformPnt3( p3, tmp, m ) ;
 
-       cout << s << "point 1 = " << p1[0] << " " << p1[1] << " " << p1[2]
-            << endl;
-       cout << s << "point 2 = " << p2[0] << " " << p2[1] << " " << p2[2]
-            << endl;
-       cout << s << "point 3 = " << p3[0] << " " << p3[1] << " " << p3[2]
-            << endl;
+       // cout << s << "point 1 = " << p1[0] << " " << p1[1] << " " << p1[2]
+       //      << endl;
+       // cout << s << "point 2 = " << p2[0] << " " << p2[1] << " " << p2[2]
+       //      << endl;
+       // cout << s << "point 3 = " << p3[0] << " " << p3[1] << " " << p3[2]
+       //      << endl;
 
        // calculate two edge vectors, and the face normal
        sgSubVec3(v1, p2, p1);
@@ -647,10 +647,10 @@ void FGTileMgr::my_ssg_los( string s, ssgBranch *branch, sgMat4 m,
            sgVec3 center;
            sgCopyVec3( center, bsphere->getCenter() );
            sgXformPnt3( center, m ) ;
-           cout << s << "entity bounding sphere:" << endl;
-           cout << s << "center = " << center[0] << " "
-                << center[1] << " " << center[2] << endl;
-           cout << s << "radius = " << bsphere->getRadius() << endl;
+           // cout << s << "entity bounding sphere:" << endl;
+           // cout << s << "center = " << center[0] << " "
+               //  << center[1] << " " << center[2] << endl;
+           // cout << s << "radius = " << bsphere->getRadius() << endl;
            double radius_sqd = bsphere->getRadius() * bsphere->getRadius();
            if ( sgPointLineDistSquared( center, p, dir ) < radius_sqd ) {
                // possible intersections