Changeset 7462

Timestamp:

09/24/07 17:24:23

Author:

robert

Message:

From Adrian Egli, further work on PSSM implementation.

Files:

• OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/include/osgShadow/ParallelSplitShadowMap (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgShadow/ParallelSplitShadowMap.cpp (modified) (15 diffs)

OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

@@ -500 +500 @@
-    arguments.getApplicationUsage()->addCommandLineOption("--mapres", "ParallelSplitShadowMap texture resolution.");//ADEGLI
-    arguments.getApplicationUsage()->addCommandLineOption("--debug-color", "ParallelSplitShadowMap display debugging color (only the first 3 maps are color r=0,g=1,b=2.");//ADEGLI
-
+
+
+
+
+
+
+
+
-    arguments.getApplicationUsage()->addCommandLineOption("-1", "Use test model one.");
-    arguments.getApplicationUsage()->addCommandLineOption("-2", "Use test model two.");
@@ -626 +633 @@
-        osg::ref_ptr<osgShadow::ParallelSplitShadowMap> pssm = new osgShadow::ParallelSplitShadowMap(NULL,mapcount);
-
-unsigned 
-;
-
+
+ 
+    
-        
-        while (arguments.read("--debug-color")) { pssm->setDebugColorOn(); }
-         
+
+        int minNearSplit=0;
+        while (arguments.read("--minNearSplit", minNearSplit))
+            if ( minNearSplit > 0 ) {
+                pssm->setMinNearDistanceForSplits(minNearSplit);
+                std::cout << "ParallelSplitShadowMap : setMinNearDistanceForSplits(" << minNearSplit <<")" << std::endl;
+            }
+
+        int maxfardist = 0;
+        while (arguments.read("--maxFarDist", maxfardist))
+            if ( maxfardist > 0 ) {
+                pssm->setMaxFarDistance(maxfardist);
+                std::cout << "ParallelSplitShadowMap : setMaxFarDistance(" << maxfardist<<")" << std::endl;
+            }
+
+        double polyoffsetfactor = -0.02;
+        double polyoffsetunit = 1.0;
+        while (arguments.read("--PolyOffset-Factor", polyoffsetfactor));
+        while (arguments.read("--PolyOffset-Unit", polyoffsetunit));
+        pssm->setPolygonOffset(osg::Vec2(polyoffsetfactor,polyoffsetunit)); //ATI Radeon
+
+        if (arguments.read("--NVidea")){
+            //pssm->setPolygonOffset(osg::Vec2(-0.02,1.0)); //ATI Radeon
+            pssm->setPolygonOffset(osg::Vec2(10.0f,20.0f)); //NVidea 
+        }
+
+        if ( arguments.read("--CullFaceFront") ) {
+            pssm->forceFrontCullFace();
+        }
-
-        shadowedScene->setShadowTechnique(pssm.get());

OpenSceneGraph/trunk/include/osgShadow/ParallelSplitShadowMap

@@ -21 +21 @@
-
-#include <osgShadow/ShadowTechnique>
-
+
-namespace osgShadow {
+
-class OSGSHADOW_EXPORT ParallelSplitShadowMap :  public ShadowTechnique 
-{
@@ -57 +58 @@
-        inline void setTextureResolution(unsigned int resolution) { _resolution = resolution; }
-
+        /** Set the max far distance */ 
+        inline void setMaxFarDistance(double farDist) { _setMaxFarDistance = farDist; _isSetMaxFarDistance = true; }
+
+        /** Force to add a osg::CullFace::FRONT state */
+        inline void forceFrontCullFace() { _useFrontCullFace = true; }
+
+        /** Set min near distance for splits */ 
+        inline void setMinNearDistanceForSplits(double nd){ _split_min_near_dist=nd; }
+
+        /** use linear split (default: linear) */
+        inline void useLinearSplit(bool flag) { _linearSplit = flag;}
+    
+    
+    /** 
+         light              /  | 
+           \             /     |
+     min near dist    /        |
+      for splits   /           |
+              \ /    Š         |
+            ./ \     Š         |
+            |   \    Š         |
+            |    x   Š         |
+            |        Š         |
+            .        |         |
+               \       Š         |
+                \    Š         |
+                    \          |
+                        \      |
+                              \  |
+                              
+            .<- max far dist. ->.
+    */ 
-    protected :
-
@@ -120 +153 @@
-        unsigned int _resolution;
-
+        double _setMaxFarDistance;
+        bool _isSetMaxFarDistance;
+
+        bool _useFrontCullFace;
+
+        double _split_min_near_dist;
+        
+        bool _linearSplit;
+
-};
-}

OpenSceneGraph/trunk/src/osgShadow/ParallelSplitShadowMap.cpp

@@ -20 +20 @@
-
-#include <osgShadow/ParallelSplitShadowMap>
+
-#include <osgShadow/ShadowedScene>
-#include <osg/Notify>
@@ -33 +34 @@
-#include <osg/Texture1D>
-
+
+
-using namespace osgShadow;
+
-
-
@@ -110 +114 @@
-
-
-
-
-
+
+
+
+
+
-
-        for (unsigned int i=0;i<_number_of_splits;i++)    {
-0.5+0.5*
-}
-
-
-
-
+
+    sstr << "    sumTerm=sumTerm+term" << i << ";" << std::endl;
+
+
+
+
-    } else {
-        sstr << "    vec4 color    = gl_Color; "<< std::endl;
-    sstr << "    vec4 texcolor = texture2D(baseTexture,gl_TexCoord[0].st); "    << std::endl;
-
-
-
+}
+
+
+
-
-
-    sstr << "    float enableBaseTextureFilter = enableBaseTexture*(1.0 - step(texcolor.x+texcolor.y+texcolor.z+texcolor.a,0.0)); "    << std::endl;                                                //18
- sstr << " 
+sstr << "
-    sstr << "    gl_FragColor = (color*(1.0-enableBaseTextureFilter) + colorTex*enableBaseTextureFilter)*(1.0-0.30*v); "<< std::endl;
-
-
-
-
@@ -160 +164 @@
-    _debug_color_in_GLSL(false),
-    _user_polgyonOffset_set(false),
-
+
+
+
+
+
-{
-    _displayTexturesGroupingNode = gr;
@@ -172 +180 @@
-    ShadowTechnique(copy,copyop),
-    _textureUnitOffset(copy._textureUnitOffset),
-
+
+
+
+
+
+
+
+
+
+
+
-{
-}
@@ -244 +262 @@
-                }
-            #endif
- 
+
-
-            // set viewport
@@ -274 +292 @@
-                stateset->setMode(GL_POLYGON_OFFSET_FILL, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-            }
+
+            if ( _useFrontCullFace ) {
+                osg::ref_ptr<osg::CullFace> cull_face = new osg::CullFace;
+                cull_face->setMode(osg::CullFace::FRONT);
+                stateset->setAttribute(cull_face.get(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+                stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            }
-        }
-        // set up stateset and append texture, texGen ,...
@@ -305 +330 @@
-            pssmShadowSplitTexture._stateset->addUniform(shadowTextureSampler);
-
- 
+
-            //std::stringstream strAB; strAB << "ambientBias" << (pssmShadowSplitTexture._textureUnit-1);
-            //osg::Uniform* ambientBias = new osg::Uniform(strAB.str().c_str(),pssmShadowSplitTexture._ambientBias);
@@ -331 +356 @@
-            {
-                // fake texture for baseTexture, add a fake texture
- 
- 
- 
-
- 
+
+
+
+
+
-                //       not yet supported !
-
@@ -642 +667 @@
-    pssmShadowSplitTexture._cameraProj.getPerspective(fovy,aspectRatio,camNear,camFar);
-
+
+
+    if ( _isSetMaxFarDistance ) {
+        if ( camNear + _setMaxFarDistance < camFar) camFar = camNear + _setMaxFarDistance;
+    }
+
-    //////////////////////////////////////////////////////////////////////////
-    /// CALCULATE SPLIT
@@ -647 +678 @@
-    double minNear = camNear;
-    double camNearFar_Dist = maxFar - camNear;
-
-
+
-         camFar  = camNear + (camNearFar_Dist) * ((double)(pssmShadowSplitTexture._splitID+1))/((double)(_number_of_splits));
-        camNear = camNear + (camNearFar_Dist) * ((double)(pssmShadowSplitTexture._splitID))/((double)(_number_of_splits));
@@ -687 +717 @@
-    //////////////////////////////////////////////////////////////////////////
-    /// TRANSFORM frustum corners (Optimized for Orthogonal)
-
-
-
-
+
-    osg::Matrixf invProjViewMat;
+
+    osg::Matrixf projMat;
+    projMat.makePerspective(fovy,aspectRatio,camNear,camFar);
+    osg::Matrixf projViewMat(pssmShadowSplitTexture._cameraView*projMat);
-    invProjViewMat.invert(projViewMat);
+
+
+
-
-    //transform frustum vertices to world space
@@ -710 +744 @@
-// compute directional light inital postion;
-void ParallelSplitShadowMap::calculateLightInitalPosition(PSSMShadowSplitTexture &pssmShadowSplitTexture,osg::Vec3d *frustumCorners){
- 
+
-    for(int i=1;i<8;i++) {
-        pssmShadowSplitTexture._frustumSplitCenter +=frustumCorners[i];
@@ -733 +767 @@
-    // set 2.0m distance to the nearest point
-    int count = 0;
-ZNEAR_MIN_FROM_LIGHT_SOURCE
+_split_min_near_dist
-        zNear= DBL_MAX;
-        zFar =-DBL_MAX;
@@ -742 +776 @@
-         }
-
-ZNEAR_MIN_FROM_LIGHT_SOURCE
-ZNEAR_MIN_FROM_LIGHT_SOURCE
+_split_min_near_dist
+_split_min_near_dist
-            pssmShadowSplitTexture._lightCameraSource = pssmShadowSplitTexture._lightCameraSource + dUpdate;
-        }