Changeset 134

Timestamp:

Oct 17, 2010, 8:32:03 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Silverlining integration updated on the road to Silverlining 2.0 compatibility

Location:

osgVisual

Files:

• include/sky_Silverlining/skySilverLining_skyDrawable.h (modified) (4 diffs)
• src/core/visual_core.cpp (modified) (4 diffs)
• src/sky_Silverlining/skySilverLining_skyDrawable.cpp (modified) (4 diffs)
• src/sky_Silverlining/visual_skySilverLining.cpp (modified) (1 diff)

osgVisual/include/sky_Silverlining/skySilverLining_skyDrawable.h

@@ -30 +30 @@
 
 #include <skySilverLining_cloudLayerSlot.h>
+#include <visual_util.h>
 
 #include <SilverLining.h>
@@ -38 +39 @@
 
 class skySilverLining_atmosphereReference;
+
+struct cloudlayerOrder 
+{
+        int slot;
+        double lat;
+        double lon;
+        double baseLength;
+        double baseWidth;
+        double thickness;
+        double baseHeight;
+        double density;
+        CloudTypes cloudtype;
+        cloudLayerSlot* assocCloudLayerSlot;    // Pointer to the cloudlayerslot managed by visual_skySilverlining. 
+};
+
 
 class skySilverLining_skyDrawable : public osg::Drawable
@@ -60 +76 @@
     virtual void drawImplementation(osg::RenderInfo& renderInfo) const;
 
-        void addCloudLayer(cloudLayerSlot *cloudLayerSlot_);
+        void addCloudLayerOrder(cloudlayerOrder newCL);
 
         void shutdown();
@@ -75 +91 @@
 private:
         OpenThreads::Mutex cloudLayersToAddMutex;
-        mutable std::vector<cloudLayerSlot*> cloudLayerSlots;
+        std::vector<cloudlayerOrder> pendingNewCloudLayers;
         bool newCloudLayersToAdd;
         osg::ref_ptr<osg::CoordinateSystemNode> sceneRoot;

osgVisual/src/core/visual_core.cpp

@@ -85 +85 @@
         viewer->realize();
 
-        // setup scenery
-        setupScenery();
-
         // parse Configuration file
         parseConfigFile(arguments);
@@ -100 +97 @@
 void visual_core::mainLoop()
 {
+        int framestoScenerySetup = 5;
         // run main loop
         while( !viewer->done() )
     {
+                // setup scenery
+                if(framestoScenerySetup-- == 0)
+                        setupScenery();
+
                 // next frame please....
         viewer->advance();
@@ -408 +410 @@
 void visual_core::setupScenery()
 {
-        // iterate manually through one frame to allow some modules like Sky_Silverlining to initialize properly before we configure it according to the scenery data.
-        viewer->advance();
-        viewer->eventTraversal();
-        viewer->updateTraversal();
-        viewer->renderingTraversals();
 
         // Sky settings:        
@@ -423 +420 @@
         //sky->addCloudLayer( 2, 50000, 50000, 600.0, 7351.0, 0.2, CIRROCUMULUS );
         //sky->addCloudLayer( 3, 100000, 100000, 1300.0, 100.0, 0.07, CUMULUS_CONGESTUS );
-        sky->addCloudLayer( 1, 10000, 10000, 600.0, 1000.0, 0.90, STRATOCUMULUS );
+        sky->addCloudLayer( 1, 10000, 10000, 600.0, 2000.0, 0.90, STRATOCUMULUS );
         //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::SLEET, 25.0 );
 

osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp

@@ -39 +39 @@
     setUseVertexBufferObjects(false);
     setUseDisplayList(false);
-        cloudLayerSlots.clear();
+        pendingNewCloudLayers.clear();
         newCloudLayersToAdd = false;
 }
@@ -51 +51 @@
     setUseVertexBufferObjects(false);
     setUseDisplayList(false);
-        cloudLayerSlots.clear();
+        pendingNewCloudLayers.clear();
         newCloudLayersToAdd = false;
         sceneRoot = csn_;
@@ -223 +223 @@
 }
 
-void skySilverLining_skyDrawable::addCloudLayer(cloudLayerSlot *cloudLayerSlot_)
+void skySilverLining_skyDrawable::addCloudLayerOrder(cloudlayerOrder newCL)
 {
         OpenThreads::ScopedLock<OpenThreads::Mutex> sLock(cloudLayersToAddMutex); 
-        cloudLayerSlots.push_back( cloudLayerSlot_ );
+        pendingNewCloudLayers.push_back( newCL );
         newCloudLayersToAdd = true;
 }
-
-
 
 void skySilverLining_skyDrawable::seedAndAddCloudLayers(SilverLining::Atmosphere *atmosphere)
@@ -238 +236 @@
         {
                 OpenThreads::ScopedLock<OpenThreads::Mutex> sLock(cloudLayersToAddMutex); 
-                for ( unsigned int i=0; cloudLayerSlots.size() > 0; i++)
+
+                for ( unsigned int i=0; i<pendingNewCloudLayers.size(); i++)    // Configure & Seed cloudLayer
                 {
-                        // Seed cloudLayer
-                        cloudLayerSlots.back()->cloudLayerPointer->SeedClouds(*atmosphere);
-
-                        // add cloudLayer to atmosphere
-                        cloudLayerSlots.back()->cloudLayerHandle = atmosphere->GetConditions()->AddCloudLayer( cloudLayerSlots.back()->cloudLayerPointer );
-
-                        // Delete this cloudLayer from the ToDo list.
-                        cloudLayerSlots.pop_back();
+                        // Calculation earth radius on specified lat lon position
+                        double radius;
+                        cloudlayerOrder newCL = pendingNewCloudLayers[i];
+                        if ( !util::calculateEarthRadiusAtWGS84Coordinate(newCL.lat, newCL.lon, sceneRoot, radius) )
+                        {
+                                OSG_ALWAYS << "ERROR: skySilverLining_skyDrawable::seedAndAddCloudLayers() - Unable to deterine earth radius for lat=" <<newCL.lat<< " lon="<<newCL.lat<<std::endl;
+                                return;
+                        }
+                        OSG_NOTIFY(osg::ALWAYS) << "lat:" << newCL.lat << std::endl;
+                        OSG_NOTIFY(osg::ALWAYS) << "lon:" << newCL.lon << std::endl;
+                        OSG_NOTIFY(osg::ALWAYS) << "radius:" << radius << std::endl;
+
+                        // generate Cloud Layer
+                        SilverLining::CloudLayer *cloudLayer_;
+                        cloudLayer_ = SilverLining::CloudLayerFactory::Create(newCL.cloudtype);
+                        cloudLayer_->SetBaseAltitude( newCL.baseHeight + radius);
+                        cloudLayer_->SetThickness(newCL.thickness);
+                        cloudLayer_->SetBaseLength(newCL.baseLength);
+                        cloudLayer_->SetBaseWidth(newCL.baseWidth);
+                        cloudLayer_->SetDensity(newCL.density);
+                        cloudLayer_->SetLayerPosition( 0.0, 0.0 );
+                        cloudLayer_->GenerateShadowMaps(false);
+
+                        //Save cloudlayer information into SLOT
+                        newCL.assocCloudLayerSlot->used = true;
+                        newCL.assocCloudLayerSlot->enabled = true;
+                        newCL.assocCloudLayerSlot->cloudLayerPointer = cloudLayer_;
+                        switch(newCL.cloudtype)
+                        {
+                        case 0: newCL.assocCloudLayerSlot->typeName = "CIRROCUMULUS";                           // High planar cloud puffs              
+                                break;
+                        case 1: newCL.assocCloudLayerSlot->typeName = "CIRRUS_FIBRATUS";                        // High, thicker and fibrous clouds that signal changing weather
+                                break;
+                        case 2: newCL.assocCloudLayerSlot->typeName = "STRATUS";                                        // Low clouds represented as a slab
+                                break;
+                        case 3: newCL.assocCloudLayerSlot->typeName = "CUMULUS_MEDIOCRIS";          // Low, puffy clouds on fair days
+                                break;
+                        case 4: newCL.assocCloudLayerSlot->typeName = "CUMULUS_CONGESTUS";          // Large cumulus clouds that could turn into a thunderhead
+                                break;
+                        case 5: newCL.assocCloudLayerSlot->typeName = "CUMULONIMBUS_CAPPILATUS";    // Big storm clouds.
+                                break;
+                        case 6: newCL.assocCloudLayerSlot->typeName = "STRATOCUMULUS";                          // Low, dense, puffy clouds with some sun breaks between them.
+                                break;
+                        default: OSG_NOTIFY( osg::FATAL ) << "skySilverLining_skyDrawable::seedAndAddCloudLayers() - Invalid cloud type." << std::cout;
+                                 break;
+                        };
+
+                        // Seed Cloudlayer
+                        cloudLayer_->SeedClouds(*atmosphere);
+        
+                        // Add cloudLayer to atmosphere
+                        newCL.assocCloudLayerSlot->cloudLayerHandle = atmosphere->GetConditions()->AddCloudLayer( cloudLayer_ );
                 }
+
+                //Clear the ToDo List
+                pendingNewCloudLayers.clear();
 
                 // Note nothing to do.

osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -432 +432 @@
         if (isInitialized() && slot_ >= 0 && slot_ < MAX_CLOUDLAYER_SLOTS)
         {
-                // Calculation earth radius on current lat lon position
-                double radius;
-                if ( util::calculateEarthRadiusAtWGS84Coordinate(lat, lon, sceneRoot, radius) )
-                {
-                        OSG_NOTIFY(osg::ALWAYS) << "radius:" << radius << std::endl;
-                        // generate Cloud Layer
-                        SilverLining::CloudLayer *cloudLayer_;
-                        cloudLayer_ = SilverLining::CloudLayerFactory::Create(cloudtype_);
-                        cloudLayer_->SetBaseAltitude( baseHeight_ + radius);
-                                                
-                        cloudLayer_->SetThickness(thickness_);
-                        cloudLayer_->SetBaseLength(baseLength_);
-                        cloudLayer_->SetBaseWidth(baseWidth_);
-                        cloudLayer_->SetDensity(density_);
-                        cloudLayer_->SetLayerPosition( 0.0, 0.0 );
-                        cloudLayer_->GenerateShadowMaps(false);
-
-                        //Save cloudlayer information into SLOT
-                        cloudLayerSlots[slot_].used = true;
-                        cloudLayerSlots[slot_].enabled = true;
-                        cloudLayerSlots[slot_].cloudLayerPointer = cloudLayer_;
-                        switch(cloudtype_)
-                        {
-                        case 0: cloudLayerSlots[slot_].typeName = "CIRROCUMULUS";                               // High planar cloud puffs              
-                                break;
-                        case 1: cloudLayerSlots[slot_].typeName = "CIRRUS_FIBRATUS";                    // High, thicker and fibrous clouds that signal changing weather
-                        break;
-                        case 2: cloudLayerSlots[slot_].typeName = "STRATUS";                                    // Low clouds represented as a slab
-                        break;
-                        case 3: cloudLayerSlots[slot_].typeName = "CUMULUS_MEDIOCRIS";          // Low, puffy clouds on fair days
-                        break;
-                        case 4: cloudLayerSlots[slot_].typeName = "CUMULUS_CONGESTUS";          // Large cumulus clouds that could turn into a thunderhead
-                        break;
-                        case 5: cloudLayerSlots[slot_].typeName = "CUMULONIMBUS_CAPPILATUS";    // Big storm clouds.
-                        break;
-                        case 6: cloudLayerSlots[slot_].typeName = "STRATOCUMULUS";                              // Low, dense, puffy clouds with some sun breaks between them.
-                                break;
-                        default: OSG_NOTIFY( osg::FATAL ) << "visual_skySilverlining::addCloudLayer - Invalid cloud type." << std::cout;
-                                 break;
-                        };
+                // create cloudlayer order and pass to skyDrawable to instantiate.
+                cloudlayerOrder newCL;
+                newCL.slot = slot_;
+                newCL.lat = lat;
+                newCL.lon = lon;
+                newCL.baseLength = baseLength_;
+                newCL.baseWidth = baseWidth_;
+                newCL.thickness = thickness_;
+                newCL.baseHeight = baseHeight_;
+                newCL.density = density_;
+                newCL.cloudtype = cloudtype_;
+                newCL.assocCloudLayerSlot = &cloudLayerSlots[slot_];
                 
-                        // Pass cloudlayer for seeding and adding to sky framework to the render thread
-                        skyDrawable->addCloudLayer( &cloudLayerSlots[slot_] );
-                } // If valid radius END
+                skyDrawable->addCloudLayerOrder( newCL );
+
         }        // If isInitialized() END
 }