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

Fixes to the occluder culling code to properly disable occluders to prevent

Browse Source 
self occlusion.
This commit is contained in:
Robert Osfield
2002-06-17 09:10:26 +00:00
parent 156a9fbaea
commit 27412c27c9
10 changed files with 151 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/osg/CullStack
View File

@@ -85,9 +85,14 @@ class SG_EXPORT CullStack
return pixelSize(bs.center(),bs.radius());
}
inline void disableOccluder(NodePath& nodePath)
inline void disableAndPushOccludersCurrentMask(NodePath& nodePath)
{
_modelviewCullingStack.back()->disableOccluder(nodePath);
_modelviewCullingStack.back()->disableAndPushOccludersCurrentMask(nodePath);
}
inline void popOccludersCurrentMask(NodePath& nodePath)
{
_modelviewCullingStack.back()->popOccludersCurrentMask(nodePath);
}
inline bool isCulled(const std::vector<Vec3>& vertices)

4
include/osg/CullingSet
View File

@@ -77,7 +77,6 @@ class SG_EXPORT CullingSet : public Referenced
/** Compute the pixel of an bounding sphere.*/
float pixelSize(const BoundingSphere& bs) const { return bs.radius()/(bs.center()*_pixelSizeVector); }
void disableOccluder(NodePath& nodePath);
inline bool isCulled(const std::vector<Vec3>& vertices)
{
@@ -197,6 +196,9 @@ class SG_EXPORT CullingSet : public Referenced
}
}
void disableAndPushOccludersCurrentMask(NodePath& nodePath);
void popOccludersCurrentMask(NodePath& nodePath);
protected:

8
include/osg/Polytope
View File

@@ -19,7 +19,8 @@ class SG_EXPORT Polytope
public:
typedef unsigned int ClippingMask;
typedef std::vector<osg::Plane> PlaneList;
typedef std::vector<Plane> PlaneList;
typedef fast_back_stack<ClippingMask> MaskStack;
inline Polytope() {setupMask();}
@@ -94,6 +95,9 @@ class SG_EXPORT Polytope
inline ClippingMask getResultMask() const { return _resultMask; }
MaskStack& getMaskStack() { return _maskStack; }
const MaskStack& getMaskStack() const { return _maskStack; }
inline void pushCurrentMask()
@@ -305,7 +309,7 @@ class SG_EXPORT Polytope
protected:
fast_back_stack<ClippingMask> _maskStack;
MaskStack _maskStack;
ClippingMask _resultMask;
PlaneList _planeList;

3
include/osg/ShadowVolumeOccluder
View File

@@ -103,6 +103,7 @@ typedef std::vector<ShadowVolumeOccluder> ShadowVolumeOccluderList;
inline void ShadowVolumeOccluder::disableResultMasks()
{
//std::cout<<"ShadowVolumeOccluder::disableResultMasks() - _occluderVolume.getMaskStack().size()="<<_occluderVolume.getMaskStack().size()<<" "<<_occluderVolume.getCurrentMask()<<std::endl;
_occluderVolume.setResultMask(0);
for(HoleList::iterator itr=_holeList.begin();
itr!=_holeList.end();
@@ -114,6 +115,7 @@ inline void ShadowVolumeOccluder::disableResultMasks()
inline void ShadowVolumeOccluder::pushCurrentMask()
{
//std::cout<<"ShadowVolumeOccluder::pushCurrentMasks() - _occluderVolume.getMaskStack().size()="<<_occluderVolume.getMaskStack().size()<<" "<<_occluderVolume.getCurrentMask()<<std::endl;
_occluderVolume.pushCurrentMask();
if (!_holeList.empty())
{
@@ -138,6 +140,7 @@ inline void ShadowVolumeOccluder::popCurrentMask()
itr->popCurrentMask();
}
}
//std::cout<<"ShadowVolumeOccluder::popCurrentMasks() - _occluderVolume.getMaskStack().size()="<<_occluderVolume.getMaskStack().size()<<" "<<_occluderVolume.getCurrentMask()<<std::endl;
}
} // end of namespace