FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust LoD ranges for 3D clouds so that they become visible at maximum range, taking into account the current cloud visibility range, and the possible size of the clouds themselves.

Browse Source
This commit is contained in:
Stuart Buchanan 2012-01-02 23:10:20 +00:00
parent 68625e48b9
commit cc47d33b32
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/scene/sky/cloudfield.cxx
View File

@ -69,7 +69,8 @@ double SGCloudField::timer_dt = 0.0;
float SGCloudField::view_distance = 20000.0f; float SGCloudField::view_distance = 20000.0f;
bool SGCloudField::wrap = true; bool SGCloudField::wrap = true;
float SGCloudField::RADIUS_LEVEL_1 = 5000.0f; float SGCloudField::RADIUS_LEVEL_1 = 5000.0f;
float SGCloudField::RADIUS_LEVEL_2 = 1000.0f; float SGCloudField::RADIUS_LEVEL_2 = 2000.0f;
float SGCloudField::MAX_CLOUD_DEPTH = 2000.0f;
SGVec3f SGCloudField::view_vec, SGCloudField::view_X, SGCloudField::view_Y; SGVec3f SGCloudField::view_vec, SGCloudField::view_X, SGCloudField::view_Y;
@ -186,9 +187,10 @@ void SGCloudField::applyVisRange(void)
for (unsigned int i = 0; i < placed_root->getNumChildren(); i++) { for (unsigned int i = 0; i < placed_root->getNumChildren(); i++) {
osg::ref_ptr<osg::LOD> lodnode1 = (osg::LOD*) placed_root->getChild(i); osg::ref_ptr<osg::LOD> lodnode1 = (osg::LOD*) placed_root->getChild(i);
for (unsigned int j = 0; j < lodnode1->getNumChildren(); j++) { for (unsigned int j = 0; j < lodnode1->getNumChildren(); j++) {
lodnode1->setRange(j, 0.0f, view_distance + RADIUS_LEVEL_1 + RADIUS_LEVEL_2 + MAX_CLOUD_DEPTH);
osg::ref_ptr<osg::LOD> lodnode2 = (osg::LOD*) lodnode1->getChild(j); osg::ref_ptr<osg::LOD> lodnode2 = (osg::LOD*) lodnode1->getChild(j);
for (unsigned int k = 0; k < lodnode2->getNumChildren(); k++) { for (unsigned int k = 0; k < lodnode2->getNumChildren(); k++) {
lodnode2->setRange(k, 0.0f, view_distance); lodnode2->setRange(k, 0.0f, view_distance + MAX_CLOUD_DEPTH);
} }
} }
} }
@ -317,11 +319,11 @@ void SGCloudField::addCloudToTree(osg::ref_ptr<osg::PositionAttitudeTransform> t
if (!found) { if (!found) {
// No suitable leave node was found, so we need to add one. // No suitable leave node was found, so we need to add one.
lodnode = new osg::LOD(); lodnode = new osg::LOD();
lodnode1->addChild(lodnode, 0.0f, 4*RADIUS_LEVEL_1); lodnode1->addChild(lodnode, 0.0f, view_distance + RADIUS_LEVEL_1 + RADIUS_LEVEL_2 + MAX_CLOUD_DEPTH);
} }
transform->setPosition(pos); transform->setPosition(pos);
lodnode->addChild(transform.get(), 0.0f, view_distance); lodnode->addChild(transform.get(), 0.0f, view_distance + MAX_CLOUD_DEPTH);
lodnode->dirtyBound(); lodnode->dirtyBound();
lodnode1->dirtyBound(); lodnode1->dirtyBound();

4
simgear/scene/sky/cloudfield.hxx
View File

@ -76,6 +76,10 @@ private:
static float RADIUS_LEVEL_1; static float RADIUS_LEVEL_1;
static float RADIUS_LEVEL_2; static float RADIUS_LEVEL_2;
// Theoretical maximum cloud depth, used for fudging the LoD
// ranges to ensure that clouds become visible at maximum range
static float MAX_CLOUD_DEPTH;
// this is a relative position only, with that we can move all clouds at once // this is a relative position only, with that we can move all clouds at once
SGVec3f relative_position; SGVec3f relative_position;