Changeset 12782 for OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

Timestamp:

09/07/11 17:55:54 (21 months ago)

Author:

robert

Message:

Moved ViewDependetShadowMap? parameter settings into a dedicated ShadowSettings? object in prep for making it possible to scale the API to handle multiple lights and multiple shadow maps per light.

Files:

• OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

@@ -599 +599 @@
                 if (geometry)
                 {
-                    OSG_NOTICE<<"geometry->setUseVertexBufferObjects(true);"<<std::endl;
                     geometry->setUseVertexBufferObjects(true);
                 }
@@ -641 +640 @@
         cessnaNode->addUpdateCallback( createAnimationPathCallback(50.0f, 6.0f) );
         cessnaNode->setNodeMask( CastsShadowTraversalMask );
+
+        // cessna is really poorly optimized so fix this by optimizing the mesh and use VBO's.
+        osgUtil::Optimizer optimizer;
+        optimizer.optimize(cessnaNode.get(), osgUtil::Optimizer::INDEX_MESH |
+                                             osgUtil::Optimizer::VERTEX_POSTTRANSFORM |
+                                             osgUtil::Optimizer::VERTEX_PRETRANSFORM);
+
+        UseVBOVisitor useVBOVisitor;
+        cessnaNode->accept(useVBOVisitor);
+
 
         osg::ref_ptr<osg::Group> shadowRoot = new osg::Group;
@@ -655 +664 @@
         }
 
-        // cessna is really poorly optimized so fix this by optimizing the mesh and use VBO's.
-        osgUtil::Optimizer optimizer;
-        optimizer.optimize(shadowRoot.get(), osgUtil::Optimizer::INDEX_MESH |
-                                             osgUtil::Optimizer::VERTEX_POSTTRANSFORM |
-                                             osgUtil::Optimizer::VERTEX_PRETRANSFORM);
-
-        UseVBOVisitor useVBOVisitor;
-        shadowRoot->accept(useVBOVisitor);
 
         return shadowRoot.release();
@@ -918 +919 @@
     else if( arguments.read("--vdsm") )
     {
-        osg::ref_ptr<osgShadow::ViewDependentShadowMap> vdsm = new osgShadow::ViewDependentShadowMap;
-        while( arguments.read("--debugHUD") ) vdsm->setDebugDraw( true );
-
-        if (arguments.read("--persp")) vdsm->setShadowMapProjectionHint(osgShadow::ViewDependentShadowMap::PERSPECTIVE_SHADOW_MAP);
-        if (arguments.read("--ortho")) vdsm->setShadowMapProjectionHint(osgShadow::ViewDependentShadowMap::ORTHOGRAPHIC_SHADOW_MAP);
+        osgShadow::ShadowSettings* settings = new osgShadow::ShadowSettings;
+        shadowedScene->setShadowSettings(settings);
+
+        while( arguments.read("--debugHUD") ) settings->setDebugDraw( true );
+        if (arguments.read("--persp")) settings->setShadowMapProjectionHint(osgShadow::ShadowSettings::PERSPECTIVE_SHADOW_MAP);
+        if (arguments.read("--ortho")) settings->setShadowMapProjectionHint(osgShadow::ShadowSettings::ORTHOGRAPHIC_SHADOW_MAP);
 
         unsigned int unit=1;
-        if (arguments.read("--unit",unit)) vdsm->setBaseShadowTextureUnit(unit);
+        if (arguments.read("--unit",unit)) settings->setBaseShadowTextureUnit(unit);
         
         double n=0.0;
-        if (arguments.read("-n",n)) vdsm->setMinimumShadowMapNearFarRatio(n);
-
+        if (arguments.read("-n",n)) settings->setMinimumShadowMapNearFarRatio(n);
+
+        osg::ref_ptr<osgShadow::ViewDependentShadowMap> vdsm = new osgShadow::ViewDependentShadowMap;
         shadowedScene->setShadowTechnique(vdsm.get());
     }