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 343b842792825056c098f846bc9c1f79ede0da51..f22a9a6a5a906389c286304e46d566b079c4f9a0 100644 (file)
--- a/simgear/scene/sky/sky.cxx
+++ b/simgear/scene/sky/sky.cxx
@@ -31,6 +31,7 @@
 
 #include <simgear/math/sg_random.h>
 #include <simgear/scene/util/RenderConstants.hxx>
+#include <simgear/sg_inlines.h>
 
 #include <osg/StateSet>
 #include <osg/Depth>
@@ -113,8 +114,8 @@ bool SGSky::repaint( const SGSkyColor &sc, const SGEphemeris& eph )
 {
     if ( effective_visibility > 1000.0 ) {
        enable();
-       dome->repaint( sc.sky_color, sc.fog_color, sc.sun_angle,
-                       effective_visibility );
+       dome->repaint( sc.adj_sky_color, sc.sky_color, sc.fog_color,
+                       sc.sun_angle, effective_visibility );
 
         stars->repaint( sc.sun_angle, eph.getNumStars(), eph.getStars() );
         planets->repaint( sc.sun_angle, eph.getNumPlanets(), eph.getPlanets() );
@@ -131,7 +132,7 @@ bool SGSky::repaint( const SGSkyColor &sc, const SGEphemeris& eph )
        disable();
     }
     SGCloudField::updateFog((double)effective_visibility,
-                            osg::Vec4f(sc.fog_color.osg(), 1.0f));
+                            osg::Vec4f(toOsg(sc.fog_color), 1.0f));
     return true;
 }
 
@@ -147,27 +148,43 @@ bool SGSky::reposition( const SGSkyState &st, const SGEphemeris& eph, double dt
     double angle = st.gst * 15;        // degrees
     double angleRad = SGMiscd::deg2rad(angle);
 
-    dome->reposition( st.zero_elev, st.alt, st.lon, st.lat, st.spin );
+    SGVec3f zero_elev, view_up;
+    double lon, lat, alt;
+
+    SGGeod geodZeroViewPos = SGGeod::fromGeodM(st.pos_geod, 0);
+    zero_elev = toVec3f( SGVec3d::fromGeod(geodZeroViewPos) );
+
+    // calculate the scenery up vector
+    SGQuatd hlOr = SGQuatd::fromLonLat(st.pos_geod);
+    view_up = toVec3f(hlOr.backTransform(-SGVec3d::e3()));
+
+    // viewer location
+    lon = st.pos_geod.getLongitudeRad();
+    lat = st.pos_geod.getLatitudeRad();
+    alt = st.pos_geod.getElevationM();
+
+    dome->reposition( zero_elev, alt, lon, lat, st.spin );
 
     osg::Matrix m = osg::Matrix::rotate(angleRad, osg::Vec3(0, 0, -1));
-    m.postMultTranslate(st.view_pos.osg());
+    m.postMultTranslate(toOsg(st.pos));
     _ephTransform->setMatrix(m);
 
     double sun_ra = eph.getSunRightAscension();
     double sun_dec = eph.getSunDeclination();
-    oursun->reposition( sun_ra, sun_dec, st.sun_dist, st.lat, st.alt, st.sun_angle );
+    oursun->reposition( sun_ra, sun_dec, st.sun_dist, lat, alt, st.sun_angle );
 
     double moon_ra = eph.getMoonRightAscension();
     double moon_dec = eph.getMoonDeclination();
     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 ) {
-            cloud_layers[i]->reposition( st.zero_elev, st.view_up,
-                                         st.lon, st.lat, st.alt, dt );
-        } else
+        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 {
           cloud_layers[i]->getNode()->setAllChildrenOff();
     }
+    }
 
     return true;
 }
@@ -220,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 );
 }
@@ -257,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() == 
@@ -345,10 +372,8 @@ void SGSky::modify_vis( float alt, float time_factor ) {
        }
 #endif
 
-        // never let visibility drop below 25 meters
-        if ( effvis <= 25.0 ) {
-            effvis = 25.0;
-        }
+        // never let visibility drop below the layer's configured visibility
+       effvis = SG_MAX2<float>(cloud_layers[i]->getVisibility_m(), effvis );
 
     } // for