FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Chris Hanson:

Browse Source 
Spelling fixes in include/osg/LOD

   Negated priority in PagedLOD when using _rangeMode==PIXEL_SIZE_ON_SCREEN

   Added clampedPixelSize() methods to CullStack and CullingSet to return fabs()ed values.

   Changed LOD and PagedLOD ::traverse to use clampedPixelSize() methods.
This commit is contained in:
Robert Osfield
2005-09-28 13:33:58 +00:00
parent 3c88b0cae9
commit 05528abf25
5 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/LOD.cpp
View File

@@ -54,7 +54,7 @@ void LOD::traverse(NodeVisitor& nv)
osg::CullStack* cullStack = dynamic_cast<osg::CullStack*>(&nv);
if (cullStack)
{
required_range = cullStack->pixelSize(getBound());
required_range = cullStack->clampedPixelSize(getBound());
}
else
{
@@ -104,7 +104,7 @@ bool LOD::addChild( Node *child )
if (_children.size()>_rangeList.size())
{
float maxRange = !_rangeList.empty()?
_rangeList.back().second : 0.0f;
maxRange=_rangeList.back().second : 0.0f;
_rangeList.resize(_children.size(),MinMaxPair(maxRange,maxRange));
}

12
src/osg/PagedLOD.cpp
View File

@@ -126,7 +126,7 @@ void PagedLOD::traverse(NodeVisitor& nv)
osg::CullStack* cullStack = dynamic_cast<osg::CullStack*>(&nv);
if (cullStack)
{
required_range = cullStack->pixelSize(getBound());
required_range = cullStack->clampedPixelSize(getBound());
}
else
{
@@ -170,12 +170,18 @@ void PagedLOD::traverse(NodeVisitor& nv)
_children[numChildren-1]->accept(nv);
}
// now request the loading of the next unload child.
// now request the loading of the next unloaded child.
if (nv.getDatabaseRequestHandler() && numChildren<_perRangeDataList.size())
{
// compute priority from where abouts in the required range the distance falls.
float priority = (_rangeList[numChildren].second-required_range)/(_rangeList[numChildren].second-_rangeList[numChildren].first);
// invert priority for PIXEL_SIZE_ON_SCREEN mode
if(_rangeMode==PIXEL_SIZE_ON_SCREEN)
{
priority = -priority;
}
// modify the priority according to the child's priority offset and scale.
priority = _perRangeDataList[numChildren]._priorityOffset + priority * _perRangeDataList[numChildren]._priorityScale;
@@ -185,7 +191,7 @@ void PagedLOD::traverse(NodeVisitor& nv)
}
else
{
// prepend the databasePath to the childs filename.
// prepend the databasePath to the child's filename.
nv.getDatabaseRequestHandler()->requestNodeFile(_databasePath+_perRangeDataList[numChildren]._filename,this,priority,nv.getFrameStamp());
}
}