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

Added a guard to osg::LOD::evaluate so that it returns -1 if the range

Browse Source 
matched does not have a corresponding child to relate to.  This can happen
if a user creates more than n+1 ranges, where n is the number of LOD children.
This commit is contained in:
Robert Osfield
2002-01-04 20:43:20 +00:00
parent 4ea7de39c6
commit 32c79ca554
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/LOD.cpp
View File

@@ -33,15 +33,17 @@ void LOD::setRange(const unsigned int index, const float range)
const int LOD::evaluate(const Vec3& eye_local, const float bias) const
{
// For cache coherency, use _rangeList2 exclusively
if (_rangeList2.size()==0) return -1;
if (_rangeList2.empty()) return -1;
// Test distance-squared against the stored array of squared ranges
float LODRange = (eye_local-_center).length2()*bias;
if (LODRange<_rangeList2[0]) return -1;
for(unsigned int i=0;i<_rangeList2.size()-1;++i)
unsigned int end_marker = _rangeList2.size()-1;
if (end_marker>_children.size()) end_marker=_children.size();
for(unsigned int i=0;i<end_marker;++i)
{
if (_rangeList2[i]<=LODRange && LODRange<_rangeList2[i+1])
if (LODRange<_rangeList2[i+1])
{
return i;
}