Changeset 133
- Timestamp:
- Oct 17, 2010, 7:02:32 PM (14 years ago)
- Location:
- osgVisual
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
osgVisual/include/sky_Silverlining/skySilverLining_ProjectionMatrixCallback.h
r130 r133 149 149 150 150 // 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(); 153 152 int size = objects.size(); 154 153 … … 165 164 // Calculations if atmopshere is rendered from space 166 165 bool hasLimb = atmosphere->GetConfigOptionBoolean("enable-atmosphere-from-space"); 166 OSG_ALWAYS << "has limb " << hasLimb << std::endl; 167 167 if (hasLimb) 168 168 { … … 181 181 182 182 // Walk through all objects and check if they influence the near plane or far plane 183 //std::vector<SilverLining::ObjectHandle>::iterator it; // todo184 //for (it = objects.begin(); it != objects.end(); it++) // todo185 183 SL_VECTOR(SilverLining::ObjectHandle)::iterator it; 186 184 for (it = objects.begin(); it != objects.end(); it++) -
osgVisual/src/core/visual_core.cpp
r130 r133 419 419 //addWindVolume( 0.0, 15000.0, 300.0, 90.0 ); 420 420 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 ); 422 422 //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 ); 426 426 //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::SLEET, 25.0 ); 427 427 -
osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp
r88 r133 146 146 if (atmosphere) 147 147 { 148 148 149 srand(1234); // constant random seed to ensure consistent clouds across windows 149 150 … … 165 166 atmosphere->SetRightVector(-0.201185, 0.979553, 0.0); 166 167 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 167 175 // Set our location (change this to your own latitude and longitude) 168 176 SilverLining::Location loc; … … 172 180 atmosphere->GetConditions()->SetLocation(loc); 173 181 174 // Set the s stem time in PST182 // Set the system time in PST 175 183 SilverLining::LocalTime t; 176 184 t.SetFromSystemTime(); … … 184 192 atmosphere->GetConditions()->SetTurbidity(2.2); 185 193 194 // Setting up time passage 186 195 atmosphere->GetConditions()->EnableTimePassage( true, 5000 ); 187 196 … … 234 243 cloudLayerSlots.back()->cloudLayerPointer->SeedClouds(*atmosphere); 235 244 236 //cloudLayerSlots.back()->cloudLayerPointer->SetEnabled( false ); // Todo: testing, please remove237 //cloudLayerSlots.back()->cloudLayerPointer->SetEnabled( true, 30000); // Todo: testing, please remove238 239 245 // add cloudLayer to atmosphere 240 246 cloudLayerSlots.back()->cloudLayerHandle = atmosphere->GetConditions()->AddCloudLayer( cloudLayerSlots.back()->cloudLayerPointer ); -
osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp
r130 r133 440 440 SilverLining::CloudLayer *cloudLayer_; 441 441 cloudLayer_ = SilverLining::CloudLayerFactory::Create(cloudtype_); 442 cloudLayer_->SetBaseAltitude( baseHeight_ + radius); // todo 443 //cloudLayer_->SetBaseAltitude( radius - 10000); // todo 442 cloudLayer_->SetBaseAltitude( baseHeight_ + radius); 444 443 445 444 cloudLayer_->SetThickness(thickness_);
Note: See TracChangeset
for help on using the changeset viewer.