Changeset 134 for osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

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

File:

• osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp (modified) (1 diff)

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
 }