Fix a bug in cloud texture state loading which caused the cloud textures to

be loaded 5 times! for a lot of wasted texture RAM.  Thanks to Erik H. for
noticing the problem.

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index e64d8648ad4332f402c2f8423402c6de5aa7cde5..7f52663fb491bd197d51ee03f6d332c1f492c23f 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -32,8 +32,9 @@
 
 #include "cloud.hxx"
 
-ssgSimpleState *
-SGCloudLayer::layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
+
+static ssgSimpleState *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
+static bool state_initialized = false;
 
 
 // Constructor
@@ -55,9 +56,6 @@ SGCloudLayer::SGCloudLayer( const string &tex_path ) :
     tl[0] = tl[1] = tl[2] = tl[3] = NULL;
     layer[0] = layer[1] = layer[2] = layer[3] = NULL;
 
-    for ( int i = 0; i < SG_MAX_CLOUD_COVERAGES; ++i ) {
-        layer_states[i] = NULL;
-    }
     layer_root->addKid(layer_transform);
     rebuild();
 }
@@ -139,33 +137,37 @@ SGCloudLayer::setCoverage (Coverage coverage)
 void
 SGCloudLayer::rebuild()
 {
-                               // Initialize states and sizes if necessary.
-    if ( layer_states[0] == NULL ) {
+    // Initialize states and sizes if necessary.
+    if ( !state_initialized ) { 
+        state_initialized = true;
+
+        cout << "initializing cloud layers" << endl;
+
         SGPath cloud_path;
 
         cloud_path.set(texture_path.str());
         cloud_path.append("overcast.rgb");
-        layer_states[SG_CLOUD_OVERCAST] = SGCloudMakeState(cloud_path.str());
+        layer_states[SG_CLOUD_OVERCAST] = sgCloudMakeState(cloud_path.str());
 
         cloud_path.set(texture_path.str());
         cloud_path.append("broken.rgba");
         layer_states[SG_CLOUD_BROKEN]
-            = SGCloudMakeState(cloud_path.str());
+            = sgCloudMakeState(cloud_path.str());
 
         cloud_path.set(texture_path.str());
         cloud_path.append("scattered.rgba");
         layer_states[SG_CLOUD_SCATTERED]
-            = SGCloudMakeState(cloud_path.str());
+            = sgCloudMakeState(cloud_path.str());
 
         cloud_path.set(texture_path.str());
         cloud_path.append("few.rgba");
         layer_states[SG_CLOUD_FEW]
-            = SGCloudMakeState(cloud_path.str());
+            = sgCloudMakeState(cloud_path.str());
 
         cloud_path.set(texture_path.str());
         cloud_path.append("cirrus.rgba");
         layer_states[SG_CLOUD_CIRRUS]
-            = SGCloudMakeState(cloud_path.str());
+            = sgCloudMakeState(cloud_path.str());
 
         layer_states[SG_CLOUD_CLEAR] = 0;
     }
@@ -424,9 +426,11 @@ void SGCloudLayer::draw() {
 
 
 // make an ssgSimpleState for a cloud layer given the named texture
-ssgSimpleState *SGCloudMakeState( const string &path ) {
+ssgSimpleState *sgCloudMakeState( const string &path ) {
     ssgSimpleState *state = new ssgSimpleState();
 
+    cout << " texture = " << path << endl;
+
     state->setTexture( (char *)path.c_str() );
     state->setShadeModel( GL_SMOOTH );
     state->disable( GL_LIGHTING );

diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx
index 655de1637ebd89d342843b181cfb2977afde2b01..92463f1db07b5e9d2f62952777510f2aae9f35bf 100644 (file)
--- a/simgear/scene/sky/cloud.hxx
+++ b/simgear/scene/sky/cloud.hxx
@@ -93,12 +93,9 @@ public:
 
 private:
 
-    static ssgSimpleState *layer_states[SG_MAX_CLOUD_COVERAGES];
-    static int layer_sizes[SG_MAX_CLOUD_COVERAGES];
-
     ssgRoot *layer_root;
     ssgTransform *layer_transform;
-    ssgLeaf * layer[4];
+    ssgLeaf *layer[4];
 
     ssgColourArray *cl[4]; 
     ssgVertexArray *vl[4];
@@ -123,7 +120,7 @@ private:
 
 
 // make an ssgSimpleState for a cloud layer given the named texture
-ssgSimpleState *SGCloudMakeState( const string &path );
+ssgSimpleState *sgCloudMakeState( const string &path );
 
 
 #endif // _SG_CLOUD_HXX_