From e467027946fb4da320e937b9b659d7efd5b956a4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 12 Jun 2002 13:54:14 +0000 Subject: [PATCH] Fix for renaming of ShadowOccluderVolume to ShadowVolumeOccluder. --- include/osg/CullingSet | 2 +- include/osg/ShadowVolumeOccluder | 6 +++--- src/osg/CollectOccludersVisitor.cpp | 2 +- src/osg/ShadowVolumeOccluder.cpp | 14 ++++++++++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/include/osg/CullingSet b/include/osg/CullingSet index 45710bbaa..1ca83ccb2 100644 --- a/include/osg/CullingSet +++ b/include/osg/CullingSet @@ -6,7 +6,7 @@ #define OSG_CullingSet 1 #include -#include +#include #include namespace osg { diff --git a/include/osg/ShadowVolumeOccluder b/include/osg/ShadowVolumeOccluder index f6ab846ed..7dde421c2 100644 --- a/include/osg/ShadowVolumeOccluder +++ b/include/osg/ShadowVolumeOccluder @@ -27,13 +27,13 @@ class SG_EXPORT ShadowVolumeOccluder _occluderVolume(soc._occluderVolume), _holeList(soc._holeList) {} - ShadowVolumeOccluder(const NodePath& nodePath,const ConvexPlanerOccluder& occluder,const Matrix& MVP) + ShadowVolumeOccluder(const NodePath& nodePath,const ConvexPlanerOccluder& occluder,const Matrix& MV,const Matrix& P) { - computeOccluder(nodePath,occluder,MVP); + computeOccluder(nodePath,occluder,MV,P); } /** compute the shadow volume occluder. */ - void computeOccluder(const NodePath& nodePath,const ConvexPlanerOccluder& occluder,const Matrix& MVP); + void computeOccluder(const NodePath& nodePath,const ConvexPlanerOccluder& occluder,const Matrix& MV,const Matrix& P); inline void disableResultMasks(); diff --git a/src/osg/CollectOccludersVisitor.cpp b/src/osg/CollectOccludersVisitor.cpp index 816b3b8dc..604b51b17 100644 --- a/src/osg/CollectOccludersVisitor.cpp +++ b/src/osg/CollectOccludersVisitor.cpp @@ -114,7 +114,7 @@ void CollectOccludersVisitor::apply(osg::OccluderNode& node) // need to test occluder against view frustum. std::cout << " adding in Occluder"< +#include using namespace osg; -void ShadowVolumeOccluder::computeOccluder(const NodePath& nodePath,const ConvexPlanerOccluder& occluder,const Matrix& MVP) +void ShadowVolumeOccluder::computeOccluder(const NodePath& nodePath,const ConvexPlanerOccluder& occluder,const Matrix& MV,const Matrix& P) { std::cout<<" Computing Occluder"<& vertices)