FG_ to SG_ namespace changes.

[flightgear.git] / src / Scenery / newcache.cxx

diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index 8ec1e841a08172939e2b67f80fb8020062443efe..c0e64720d77d44fed32e4e434cf4e259cbcb3558 100644 (file)
--- a/src/Scenery/newcache.cxx
+++ b/src/Scenery/newcache.cxx
@@ -51,7 +51,7 @@
 #include "tileentry.hxx"
 #include "tilemgr.hxx"         // temp, need to delete later
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 // a cheesy hack (to be fixed later)
 extern ssgBranch *terrain;
@@ -100,7 +100,7 @@ void FGNewCache::init( void ) {
     
     for ( ; current != end; ++current ) {
        long index = current->first;
-       cout << "clearing " << index << endl;
+       FG_LOG( FG_TERRAIN, FG_DEBUG, "clearing " << index );
        FGTileEntry *e = current->second;
        e->tile_bucket.make_bad();
        entry_free(index);
@@ -114,7 +114,7 @@ void FGNewCache::init( void ) {
 
 
 // Search for the specified "bucket" in the cache
-bool FGNewCache::exists( const FGBucket& b ) {
+bool FGNewCache::exists( const SGBucket& b ) {
     long tile_index = b.gen_index();
     tile_map_iterator it = tile_cache.find( tile_index );
 
@@ -134,6 +134,11 @@ static void print_refs( ssgSelector *sel, ssgTransform *trans,
 
 
 static ssgLeaf *gen_lights( ssgVertexArray *lights, int inc, float bright ) {
+    // generate a repeatable random seed
+    float *p1 = lights->get( 0 );
+    unsigned int *seed = (unsigned int *)p1;
+    sg_srandom( *seed );
+
     int size = lights->getNum() / inc;
 
     // Allocate ssg structure
@@ -143,25 +148,34 @@ static ssgLeaf *gen_lights( ssgVertexArray *lights, int inc, float bright ) {
     ssgColourArray   *cl = new ssgColourArray( size + 1 );
 
     sgVec4 color;
-    for ( int i = 0; i < lights->getNum(); i += inc ) {
-       vl->add( lights->get(i) );
-
-       // yellow = 1,1,0
+    for ( int i = 0; i < lights->getNum(); ++i ) {
+       // this loop is slightly less efficient than it otherwise
+       // could be, but we want a red light to always be red, and a
+       // yellow light to always be yellow, etc. so we are trying to
+       // preserve the random sequence.
        float zombie = sg_random();
-       if ( zombie > 0.5 ) {
-           // 50% chance of yellowish
-           sgSetVec4( color, 0.9, 0.9, 0.3, bright );
-       } else if ( zombie > 0.15 ) {
-           // 35% chance of whitish
-           sgSetVec4( color, 0.9, 0.9, 0.6, bright );
-       } else if ( zombie > 0.05 ) {
-           // 10% chance of orangish
-           sgSetVec4( color, 0.9, 0.6, 0.2, bright );
-       } else {
-           // 5% chance of redish
-           sgSetVec4( color, 0.9, 0.2, 0.2, bright );
+       if ( i % inc == 0 ) {
+           vl->add( lights->get(i) );
+
+           // factor = sg_random() ^ 2, range = 0 .. 1 concentrated towards 0
+           float factor = sg_random();
+           factor *= factor;
+
+           if ( zombie > 0.5 ) {
+               // 50% chance of yellowish
+               sgSetVec4( color, 0.9, 0.9, 0.3, bright - factor * 0.2 );
+           } else if ( zombie > 0.15 ) {
+               // 35% chance of whitish
+               sgSetVec4( color, 0.9, 0.9, 0.8, bright - factor * 0.2 );
+           } else if ( zombie > 0.05 ) {
+               // 10% chance of orangish
+               sgSetVec4( color, 0.9, 0.6, 0.2, bright - factor * 0.2 );
+           } else {
+               // 5% chance of redish
+               sgSetVec4( color, 0.9, 0.2, 0.2, bright - factor * 0.2 );
+           }
+           cl->add( color );
        }
-       cl->add( color );
     }
 
     // create ssg leaf
@@ -177,7 +191,7 @@ static ssgLeaf *gen_lights( ssgVertexArray *lights, int inc, float bright ) {
 
 
 // Fill in a tile cache entry with real data for the specified bucket
-void FGNewCache::fill_in( const FGBucket& b ) {
+void FGNewCache::fill_in( const SGBucket& b ) {
     FG_LOG( FG_TERRAIN, FG_INFO, "FILL IN CACHE ENTRY = " << b.gen_index() );
 
     // clear out a distant entry in the cache if needed.
@@ -204,10 +218,10 @@ void FGNewCache::fill_in( const FGBucket& b ) {
     e->tile_bucket = b;
 
     FGPath tile_path;
-    if ( globals->get_options()->get_fg_scenery() != "" ) {
-       tile_path.set( globals->get_options()->get_fg_scenery() );
+    if ( globals->get_fg_scenery() != "" ) {
+       tile_path.set( globals->get_fg_scenery() );
     } else {
-       tile_path.set( globals->get_options()->get_fg_root() );
+       tile_path.set( globals->get_fg_root() );
        tile_path.append( "Scenery" );
     }
     tile_path.append( b.gen_base_path() );
@@ -225,13 +239,13 @@ void FGNewCache::fill_in( const FGBucket& b ) {
     }
   
     // load custom objects
-    cout << "CUSTOM OBJECTS" << endl;
+    FG_LOG( FG_TERRAIN, FG_DEBUG, "CUSTOM OBJECTS" );
 
     FGPath index_path = tile_path;
     index_path.append( b.gen_index_str() );
     index_path.concat( ".ind" );
 
-    cout << "Looking in " << index_path.str() << endl;
+    FG_LOG( FG_TERRAIN, FG_DEBUG, "Looking in " << index_path.str() );
 
     fg_gzifstream in( index_path.str() );
 
@@ -246,7 +260,8 @@ void FGNewCache::fill_in( const FGBucket& b ) {
 #else
            in >> skipws;
 #endif
-           cout << "token = " << token << " name = " << name << endl;
+           FG_LOG( FG_TERRAIN, FG_DEBUG, "token = " << token
+                   << " name = " << name );
 
            FGPath custom_path = tile_path;
            custom_path.append( name );
@@ -273,7 +288,7 @@ void FGNewCache::fill_in( const FGBucket& b ) {
     e->lights_range = NULL;
     /* uncomment this section for testing ground lights */
     if ( light_pts->getNum() ) {
-       cout << "generating lights" << endl;
+       FG_LOG( FG_TERRAIN, FG_DEBUG, "generating lights" );
        e->lights_transform = new ssgTransform;
        e->lights_range = new ssgRangeSelector;
        e->lights_brightness = new ssgSelector;
@@ -302,8 +317,8 @@ void FGNewCache::make_space() {
     FG_LOG( FG_TERRAIN, FG_INFO, "Make space in cache" );
 
     
-    cout << "cache size = " << tile_cache.size() << endl;
-    cout << "max size = " << max_cache_size << endl;
+    FG_LOG( FG_TERRAIN, FG_DEBUG, "cache entries = " << tile_cache.size() );
+    FG_LOG( FG_TERRAIN, FG_INFO, "max size = " << max_cache_size );
 
     if ( (int)tile_cache.size() < max_cache_size ) {
        // space in the cache, return