Changeset 13110

Timestamp:

05/20/13 21:24:34 (13 hours ago)

Author:

robert

Message:

Refactored the support for stereo and keystone RTT setup so that it can be applied to an existing Camera.

Location:

OpenSceneGraph/trunk

Files:

• examples/osgshadow/osgshadow.cpp (modified) (2 diffs)
• include/osgShadow/ShadowSettings (modified) (2 diffs)
• src/osgShadow/ShadowSettings.cpp (modified) (3 diffs)
• src/osgShadow/ViewDependentShadowMap.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

@@ -743 +743 @@
     arguments.getApplicationUsage()->addCommandLineOption("--two-pass", "Use two-pass stencil for shadow volumes.");
     arguments.getApplicationUsage()->addCommandLineOption("--near-far-mode","COMPUTE_NEAR_USING_PRIMITIVES, COMPUTE_NEAR_FAR_USING_PRIMITIVES, COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES, DO_NOT_COMPUTE_NEAR_FAR");
+    arguments.getApplicationUsage()->addCommandLineOption("--max-shadow-distance","<float> Maximum distance that the shadow map should extend from the eye point.");
 
     // construct the viewer.
@@ -860 +861 @@
         OSG_NOTICE<<std::endl;
     }
+
+    double distance;
+    if (arguments.read("--max-shadow-distance",distance))
+    {
+        settings->setMaximumShadowMapDistance(distance);
+        OSG_NOTICE<<"MaximumShadowMapDistance set to "<<settings->getMaximumShadowMapDistance()<<std::endl;
+    }
+
     
     osg::ref_ptr<osgShadow::MinimalShadowMap> msm = NULL;

OpenSceneGraph/trunk/include/osgShadow/ShadowSettings

@@ -66 +66 @@
         double getMinimumShadowMapNearFarRatio() const { return _minimumShadowMapNearFarRatio; }
 
+        void setMaximumShadowMapDistance(double distance) { _maximumShadowMapDistance = distance; }
+        double getMaximumShadowMapDistance() const { return _maximumShadowMapDistance; }
+        
+
         enum ShadowMapProjectionHint
         {
@@ -127 +131 @@
 
         double                  _minimumShadowMapNearFarRatio;
+        double                  _maximumShadowMapDistance;
         ShadowMapProjectionHint _shadowMapProjectionHint;
         double                  _perspectiveShadowMapCutOffAngle;

OpenSceneGraph/trunk/src/osgShadow/ShadowSettings.cpp

@@ -13 +13 @@
 
 #include <osgShadow/ShadowSettings>
+#include <float.h>
 
 using namespace osgShadow;
@@ -25 +26 @@
     _textureSize(2048,2048),
     _minimumShadowMapNearFarRatio(0.05),
+    _maximumShadowMapDistance(DBL_MAX),
     _shadowMapProjectionHint(PERSPECTIVE_SHADOW_MAP),
     _perspectiveShadowMapCutOffAngle(2.0),
@@ -47 +49 @@
     _textureSize(ss._textureSize),
     _minimumShadowMapNearFarRatio(ss._minimumShadowMapNearFarRatio),
+    _maximumShadowMapDistance(ss._maximumShadowMapDistance),
     _shadowMapProjectionHint(ss._shadowMapProjectionHint),
     _perspectiveShadowMapCutOffAngle(ss._perspectiveShadowMapCutOffAngle),

OpenSceneGraph/trunk/src/osgShadow/ViewDependentShadowMap.cpp

@@ -800 +800 @@
     }
 
-    //minZNear = osg::maximum(10.0,minZNear);
-    //maxZFar = osg::minimum(60.0,maxZFar);
-
+    // clamp the minZNear and maxZFar to those provided by ShadowSettings
+    maxZFar = osg::minimum(settings->getMaximumShadowMapDistance(),maxZFar);
+    if (minZNear>maxZFar) minZNear = maxZFar*settings->getMinimumShadowMapNearFarRatio();
+
+    //OSG_NOTICE<<"maxZFar "<<maxZFar<<std::endl;
+    
     Frustum frustum(&cv, minZNear, maxZFar);