Replace OpenThreads with SGThread to avoid useless OSG dependency.

[simgear.git] / simgear / scene / sky / sky.cxx

diff --git a/simgear/scene/sky/sky.cxx b/simgear/scene/sky/sky.cxx
index 01f5a2560f7758a3cf7a470a0ae8ed94431ef352..f22a9a6a5a906389c286304e46d566b079c4f9a0 100644 (file)
--- a/simgear/scene/sky/sky.cxx
+++ b/simgear/scene/sky/sky.cxx
@@ -178,11 +178,13 @@ bool SGSky::reposition( const SGSkyState &st, const SGEphemeris& eph, double dt
     moon->reposition( moon_ra, moon_dec, st.moon_dist );
 
     for ( unsigned i = 0; i < cloud_layers.size(); ++i ) {
-        if ( cloud_layers[i]->getCoverage() != SGCloudLayer::SG_CLOUD_CLEAR ) {
+        if ( cloud_layers[i]->getCoverage() != SGCloudLayer::SG_CLOUD_CLEAR ||
+               cloud_layers[i]->get_layer3D()->isDefined3D() ) {
             cloud_layers[i]->reposition( zero_elev, view_up, lon, lat, alt, dt);
-        } else
+        } else {
           cloud_layers[i]->getNode()->setAllChildrenOff();
     }
+    }
 
     return true;
 }
@@ -235,6 +237,16 @@ void SGSky::set_3dCloudVisRange(float vis)
     }
 }
 
+bool SGSky::get_3dCloudWrap() const {
+    return SGCloudField::getWrap();
+}
+
+void SGSky::set_3dCloudWrap(bool wrap)
+{
+    SGCloudField::setWrap(wrap);
+}
+
+
 void SGSky::texture_path( const string& path ) {
        tex_path = SGPath( path );
 }
@@ -272,7 +284,7 @@ void SGSky::modify_vis( float alt, float time_factor ) {
        }
 
         if ( cloud_layers[i]->getCoverage() == SGCloudLayer::SG_CLOUD_CLEAR ||
-             cloud_layers[i]->get_layer3D()->defined3D) {
+             cloud_layers[i]->get_layer3D()->isDefined3D()) {
             // do nothing, clear layers aren't drawn, don't affect
             // visibility andn dont' need to be faded in or out.
         } else if ( (cloud_layers[i]->getCoverage() ==