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

Improved the sort callback support in osgUtil::RenderBin, and removed the

Browse Source 
now rendundent DepthSortedBin class.
This commit is contained in:
Robert Osfield
2002-09-17 15:47:23 +00:00
parent 91df37b5c8
commit ed43d97ed3
9 changed files with 133 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgUtil/CullVisitor.cpp
View File

@@ -266,9 +266,9 @@ void CullVisitor::apply(Geode& node)
// push the geoset's state on the geostate stack.
StateSet* stateset = drawable->getStateSet();
if (stateset) pushStateSet(stateset);
bool isTransparent = stateset && stateset->getRenderingHint()==osg::StateSet::TRANSPARENT_BIN;
if (isTransparent)
if (_currentRenderBin->getRequiresDepthValueForSort())
{
Vec3 center = (drawable->getBound().center())*matrix;
@@ -281,18 +281,16 @@ void CullVisitor::apply(Geode& node)
default: depth = center.length2();break;
}
if (stateset) pushStateSet(stateset);
addDrawableAndDepth(drawable,&matrix,depth);
if (stateset) popStateSet();
}
else
{
if (stateset) pushStateSet(stateset);
addDrawable(drawable,&matrix);
if (stateset) popStateSet();
}
if (stateset) popStateSet();
}
// pop the node's state off the geostate stack.
@@ -335,12 +333,10 @@ void CullVisitor::apply(Billboard& node)
}
StateSet* stateset = drawable->getStateSet();
if (stateset) pushStateSet(stateset);
bool isTransparent = stateset && stateset->getRenderingHint()==osg::StateSet::TRANSPARENT_BIN;
if (isTransparent)
if (_currentRenderBin->getRequiresDepthValueForSort())
{
float depth;
switch(_tsm)
{
@@ -349,18 +345,16 @@ void CullVisitor::apply(Billboard& node)
default: depth = center.length2();break;
}
if (stateset) pushStateSet(stateset);
addDrawableAndDepth(drawable,billboard_matrix,depth);
if (stateset) popStateSet();
}
else
{
if (stateset) pushStateSet(stateset);
addDrawable(drawable,billboard_matrix);
if (stateset) popStateSet();
}
if (stateset) popStateSet();
}
// pop the node's state off the geostate stack.