Changeset 133


Ignore:
Timestamp:
Oct 17, 2010, 7:02:32 PM (14 years ago)
Author:
Torben Dannhauer
Message:
 
Location:
osgVisual
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/include/sky_Silverlining/skySilverLining_ProjectionMatrixCallback.h

    r130 r133  
    149149
    150150                // Retrieve all atmosphere objects.
    151         //std::vector<SilverLining::ObjectHandle> &objects = atmosphere->GetObjects();  //todo
    152                 SL_VECTOR(SilverLining::ObjectHandle) &objects = atmosphere->GetObjects();
     151                SL_VECTOR(SilverLining::ObjectHandle) &objects = atmosphere->GetObjects();
    153152                int size = objects.size();
    154153               
     
    165164                // Calculations if atmopshere is rendered from space
    166165                bool hasLimb = atmosphere->GetConfigOptionBoolean("enable-atmosphere-from-space");
     166                OSG_ALWAYS << "has limb " << hasLimb << std::endl;
    167167                if (hasLimb)
    168168                {
     
    181181
    182182                // Walk through all objects and check if they influence the near plane or far plane
    183         //std::vector<SilverLining::ObjectHandle>::iterator it; // todo
    184         //for (it = objects.begin(); it != objects.end(); it++) // todo
    185183                SL_VECTOR(SilverLining::ObjectHandle)::iterator it;
    186184        for (it = objects.begin(); it != objects.end(); it++)
  • osgVisual/src/core/visual_core.cpp

    r130 r133  
    419419        //addWindVolume( 0.0, 15000.0, 300.0, 90.0 );
    420420       
    421         //sky->addCloudLayer( 0, 20000, 20000, 600.0, 0.0, 0.5, CUMULONIMBUS_CAPPILATUS );
     421        sky->addCloudLayer( 0, 20000, 20000, 600.0, 1000.0, 0.5, CUMULONIMBUS_CAPPILATUS );
    422422        //sky->addCloudLayer( 1, 5000000, 5000000, 600.0, 7351.0, 0.2, CIRRUS_FIBRATUS );
    423         sky->addCloudLayer( 2, 50000, 50000, 600.0, 7351.0, 0.2, CIRROCUMULUS );
    424         sky->addCloudLayer( 3, 100000, 100000, 1300.0, 100.0, 0.07, CUMULUS_CONGESTUS );
    425         sky->addCloudLayer( 0, 10000, 10000, 1300.0, 4000.0, 0.90, STRATOCUMULUS );
     423        //sky->addCloudLayer( 2, 50000, 50000, 600.0, 7351.0, 0.2, CIRROCUMULUS );
     424        //sky->addCloudLayer( 3, 100000, 100000, 1300.0, 100.0, 0.07, CUMULUS_CONGESTUS );
     425        sky->addCloudLayer( 1, 10000, 10000, 600.0, 1000.0, 0.90, STRATOCUMULUS );
    426426        //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::SLEET, 25.0 );
    427427
  • osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp

    r88 r133  
    146146                if (atmosphere)
    147147        {
     148
    148149                        srand(1234); // constant random seed to ensure consistent clouds across windows
    149150
     
    165166                        atmosphere->SetRightVector(-0.201185, 0.979553, 0.0);
    166167
     168                        /** \todo  :not working!! what is wrong? */
     169                        // override the some options of the configuration file with the required settings to make silverlining upgrades easier
     170                        OSG_ALWAYS << "atmosphere from space before : " << atmosphere->GetConfigOptionBoolean("enable-atmosphere-from-space") << std::endl;
     171                        atmosphere->SetConfigOption("enable-atmosphere-from-space", "yes");
     172                        atmosphere->SetConfigOption("draw-sun-below-horizon", "yes");
     173                        OSG_ALWAYS << "atmosphere from space after: " << atmosphere->GetConfigOptionBoolean("enable-atmosphere-from-space") << std::endl;
     174
    167175            // Set our location (change this to your own latitude and longitude)
    168176            SilverLining::Location loc;
     
    172180            atmosphere->GetConditions()->SetLocation(loc);
    173181
    174             // Set the sstem time in PST
     182            // Set the system time in PST
    175183            SilverLining::LocalTime t;
    176184            t.SetFromSystemTime();
     
    184192                        atmosphere->GetConditions()->SetTurbidity(2.2);
    185193
     194                        // Setting up time passage
    186195                        atmosphere->GetConditions()->EnableTimePassage( true, 5000 );
    187196                       
     
    234243                        cloudLayerSlots.back()->cloudLayerPointer->SeedClouds(*atmosphere);
    235244
    236                         //cloudLayerSlots.back()->cloudLayerPointer->SetEnabled( false );       // Todo: testing, please remove
    237                         //cloudLayerSlots.back()->cloudLayerPointer->SetEnabled( true, 30000);  // Todo: testing, please remove
    238 
    239245                        // add cloudLayer to atmosphere
    240246                        cloudLayerSlots.back()->cloudLayerHandle = atmosphere->GetConditions()->AddCloudLayer( cloudLayerSlots.back()->cloudLayerPointer );
  • osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

    r130 r133  
    440440                        SilverLining::CloudLayer *cloudLayer_;
    441441                        cloudLayer_ = SilverLining::CloudLayerFactory::Create(cloudtype_);
    442                         cloudLayer_->SetBaseAltitude( baseHeight_ + radius); // todo
    443                         //cloudLayer_->SetBaseAltitude( radius - 10000); // todo
     442                        cloudLayer_->SetBaseAltitude( baseHeight_ + radius);
    444443                                               
    445444                        cloudLayer_->SetThickness(thickness_);
Note: See TracChangeset for help on using the changeset viewer.