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

Timestamp:

05/24/13 19:16:57 (13 hours ago)

Author:

robert

Message:

Resrtuctured the use of static's in the Uniform::getNameID() method to avoid problems under Android.

Files:

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

OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

@@ -837 +837 @@
     osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene = new osgShadow::ShadowedScene;
 
-    shadowedScene->getShadowSettings()->setReceivesShadowTraversalMask(ReceivesShadowTraversalMask);
-    shadowedScene->getShadowSettings()->setCastsShadowTraversalMask(CastsShadowTraversalMask);
+    osgShadow::ShadowSettings* settings = shadowedScene->getShadowSettings();
+    settings->setReceivesShadowTraversalMask(ReceivesShadowTraversalMask);
+    settings->setCastsShadowTraversalMask(CastsShadowTraversalMask);
 
     osg::ref_ptr<osgShadow::MinimalShadowMap> msm = NULL;
@@ -919 +920 @@
     else if( arguments.read("--vdsm") )
     {
-        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);