From Wojciech Lewandowski, "1: fix for a issue with MinimalShadowMap and LightSpacePerspectiveShadowMapVB techniques ignoring minLightMargin parameter.

2: minor tweak for a DebugHUD drawn improperly case when multiple slave views  shared one window. It now uses slave view viewport to correctly position DebugHUD.
3: deactivated ConvexPolyhedron notifications (they were accidentaly activated when you replaced osg::notify calls with OSG_NOTIFY macro). These warnings are useful only for shadow map developer working on shadow volume optimizations. So there is no sense in having them active all the time."
This commit is contained in:
Robert Osfield 2010-11-24 10:09:04 +00:00
parent 0ee0aad0fe
commit e2a315ee49
7 changed files with 42 additions and 8 deletions

View File

@ -102,6 +102,7 @@ class OSGSHADOW_EXPORT MinimalShadowMap : public StandardShadowMap
osg::Matrix *_modellingSpaceToWorldPtr; osg::Matrix *_modellingSpaceToWorldPtr;
float *_maxFarPlanePtr; float *_maxFarPlanePtr;
float *_minLightMarginPtr; float *_minLightMarginPtr;
int _frameShadowCastingCameraPasses;
ConvexPolyhedron _sceneReceivingShadowPolytope; ConvexPolyhedron _sceneReceivingShadowPolytope;
std::vector< osg::Vec3d > _sceneReceivingShadowPolytopePoints; std::vector< osg::Vec3d > _sceneReceivingShadowPolytopePoints;

View File

@ -64,10 +64,13 @@ class OSGSHADOW_EXPORT ProjectionShadowMap : public MinimalBoundsBaseClass
virtual void frameShadowCastingCamera virtual void frameShadowCastingCamera
( const osg::Camera* cameraMain, osg::Camera* cameraShadow, int pass = 1 ) ( const osg::Camera* cameraMain, osg::Camera* cameraShadow, int pass = 1 )
{
if( pass == BaseClass::ViewData::_frameShadowCastingCameraPasses - 1 )
{ {
// Force dependent name lookup // Force dependent name lookup
ShadowProjectionAlgorithmClass::operator() ShadowProjectionAlgorithmClass::operator()
( &this->_sceneReceivingShadowPolytope, cameraMain, cameraShadow ); ( &this->_sceneReceivingShadowPolytope, cameraMain, cameraShadow );
}
// DebugBoundingBox( computeScenePolytopeBounds(), "ProjectionShadowMap" ); // DebugBoundingBox( computeScenePolytopeBounds(), "ProjectionShadowMap" );
BaseClass::ViewData::frameShadowCastingCamera( cameraMain, cameraShadow, pass ); BaseClass::ViewData::frameShadowCastingCamera( cameraMain, cameraShadow, pass );

View File

@ -31,7 +31,16 @@ using namespace osgShadow;
#if defined( DEBUG ) || defined( _DEBUG ) || defined( _DEBUG_ ) #if defined( DEBUG ) || defined( _DEBUG ) || defined( _DEBUG_ )
#define MAKE_CHECKS 1 // ConvexPolyhedron may produce tons of warnings when it becomes non convex.
// Unfortuantely this condition often happens in daily routine of shadow usage
// due precision errors mixed with repeating frustum cuts performed by MinimalShadowClasses.
// However, in most of above cases this condition is not fatal
// because polyhedron becomes concave by very small margin (mesuring deep the hole).
// Unfortunately warnings are produced even for such small margin cases and can
// easily flood the console.
// So I leave MAKE_CHECKS commented out. Its really useful only for a guy who debugs
// larger concaveness issues which means most developers will want to keep it commented.
// #define MAKE_CHECKS 1
#endif #endif
#if MAKE_CHECKS #if MAKE_CHECKS

View File

@ -391,8 +391,25 @@ void DebugShadowMap::ViewData::init( ThisClass *st, osgUtil::CullVisitor *cv )
_hudSize = st->_hudSize; _hudSize = st->_hudSize;
_hudOrigin = st->_hudOrigin; _hudOrigin = st->_hudOrigin;
_viewportSize = st->_viewportSize;
_viewportOrigin = st->_viewportOrigin; _viewportOrigin = st->_viewportOrigin;
_viewportSize = st->_viewportSize;
osg::Viewport * vp = cv->getViewport();
if( vp )
{
// view can be a slave that covers only a fraction of the screen
// so adjust debug hud location to proper viewport location
_viewportOrigin[0] += vp->x();
_viewportOrigin[1] += vp->y();
if( _viewportSize[0] > vp->width() - _viewportOrigin[0] )
_viewportSize[0] = vp->width() - _viewportOrigin[0];
if( _viewportSize[1] > vp->height() - _viewportOrigin[1] )
_viewportSize[1] = vp->height() - _viewportOrigin[1];
}
_orthoSize = st->_orthoSize; _orthoSize = st->_orthoSize;
_orthoOrigin = st->_orthoOrigin; _orthoOrigin = st->_orthoOrigin;

View File

@ -41,6 +41,7 @@ void MinimalCullBoundsShadowMap::ViewData::init
( ThisClass *st, osgUtil::CullVisitor *cv ) ( ThisClass *st, osgUtil::CullVisitor *cv )
{ {
BaseClass::ViewData::init( st, cv ); BaseClass::ViewData::init( st, cv );
_frameShadowCastingCameraPasses = 2;
} }
void MinimalCullBoundsShadowMap::ViewData::aimShadowCastingCamera void MinimalCullBoundsShadowMap::ViewData::aimShadowCastingCamera

View File

@ -271,6 +271,7 @@ void MinimalDrawBoundsShadowMap::ViewData::init
{ {
BaseClass::ViewData::init( st, cv ); BaseClass::ViewData::init( st, cv );
_frameShadowCastingCameraPasses = 2;
_camera->setCullCallback _camera->setCullCallback
( new CameraCullCallback( this, _camera->getCullCallback() ) ); ( new CameraCullCallback( this, _camera->getCullCallback() ) );

View File

@ -168,7 +168,7 @@ void MinimalShadowMap::ViewData::aimShadowCastingCamera
osg::Matrix mvp = _camera->getViewMatrix() * _camera->getProjectionMatrix(); osg::Matrix mvp = _camera->getViewMatrix() * _camera->getProjectionMatrix();
cutScenePolytope( osg::Matrix::inverse( mvp ), mvp ); cutScenePolytope( osg::Matrix::inverse( mvp ), mvp );
MinimalShadowMap::ViewData::frameShadowCastingCamera frameShadowCastingCamera
( _cv->getRenderStage()->getCamera(), _camera.get(), 0 ); ( _cv->getRenderStage()->getCamera(), _camera.get(), 0 );
} }
@ -207,7 +207,7 @@ void MinimalShadowMap::ViewData::frameShadowCastingCamera
// space (-1..1), it may get "twisted" by precisely adjusted shadow cam // space (-1..1), it may get "twisted" by precisely adjusted shadow cam
// projection in second pass. // projection in second pass.
if ( pass == 0 ) if ( pass == 0 && _frameShadowCastingCameraPasses > 1 )
{ // Make sure extruded polytope does not extend beyond light frustum { // Make sure extruded polytope does not extend beyond light frustum
osg::Polytope lightFrustum; osg::Polytope lightFrustum;
lightFrustum.setToUnitFrustum(); lightFrustum.setToUnitFrustum();
@ -304,6 +304,8 @@ void MinimalShadowMap::ViewData::init( ThisClass *st, osgUtil::CullVisitor *cv )
_modellingSpaceToWorldPtr = &st->_modellingSpaceToWorld; _modellingSpaceToWorldPtr = &st->_modellingSpaceToWorld;
_minLightMarginPtr = &st->_minLightMargin; _minLightMarginPtr = &st->_minLightMargin;
_maxFarPlanePtr = &st->_maxFarPlane; _maxFarPlanePtr = &st->_maxFarPlane;
_frameShadowCastingCameraPasses = 1;
} }
void MinimalShadowMap::ViewData::cutScenePolytope void MinimalShadowMap::ViewData::cutScenePolytope