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

Timestamp:

08/07/11 17:54:21 (23 months ago)

Author:

robert

Message:

From Jean-Sebestien Guay and Robert Osfield, mixture of two sets of change - one from JS that adds more controls for specifying positional and spot lights, and from RO adding support for the new ViewDepedentShadowMap?

Files:

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

OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

@@ -44 +44 @@
 #include <osgShadow/LightSpacePerspectiveShadowMap>
 #include <osgShadow/StandardShadowMap>
+#include <osgShadow/ViewDependentShadowMap>
 
 #include <osgDB/ReadFile>
@@ -651 +652 @@
 
     osg::Vec4 lightpos(0.0,0.0,1,0.0);
+    bool spotlight = false;
     while (arguments.read("--positionalLight")) { lightpos.set(0.5,0.5,1.5,1.0); }
     while (arguments.read("--directionalLight")) { lightpos.set(0.0,0.0,1,0.0); }
-
-    while ( arguments.read("--light-pos", lightpos.x(), lightpos.y(), lightpos.z(), lightpos.w())) {}
-    while ( arguments.read("--light-pos", lightpos.x(), lightpos.y(), lightpos.z())) { lightpos.w()=1.0; }
-    while ( arguments.read("--light-dir", lightpos.x(), lightpos.y(), lightpos.z())) { lightpos.w()=0.0; }
+    while (arguments.read("--spotLight")) { lightpos.set(0.5,0.5,1.5,1.0); spotlight = true; }
+
+    bool keepLightPos = false;
+    osg::Vec3 spotLookat(0.0,0.0,0.0);
+    while ( arguments.read("--light-pos", lightpos.x(), lightpos.y(), lightpos.z(), lightpos.w())) { keepLightPos = true; }
+    while ( arguments.read("--light-pos", lightpos.x(), lightpos.y(), lightpos.z())) { lightpos.w()=1.0; keepLightPos = true; }
+    while ( arguments.read("--light-dir", lightpos.x(), lightpos.y(), lightpos.z())) { lightpos.w()=0.0; keepLightPos = true; }
+    while ( arguments.read("--spot-lookat", spotLookat.x(), spotLookat.y(), spotLookat.z())) { }
 
 
@@ -806 +812 @@
             msm = new osgShadow::MinimalDrawBoundsShadowMap;
     }
+    else if( arguments.read("--vdsm") )
+    {
+        osg::ref_ptr<osgShadow::ViewDependentShadowMap> vdsm = new osgShadow::ViewDependentShadowMap;
+        shadowedScene->setShadowTechnique(vdsm.get());
+    }
     else /* if (arguments.read("--sm")) */
     {
@@ -861 +872 @@
     osg::BoundingBox bb = cbbv.getBoundingBox();
 
-    if (lightpos.w()==1.0)
+    if (lightpos.w()==1.0 && !keepLightPos)
     {
         lightpos.x() = bb.xMin()+(bb.xMax()-bb.xMin())*lightpos.x();
@@ -890 +901 @@
     ls->getLight()->setPosition(lightpos);
 
-    bool spotlight = false;
-    if (arguments.read("--spotLight"))
-    {
-        spotlight = true;
-
-        osg::Vec3 center = bb.center();
+    if (spotlight)
+    {
+        osg::Vec3 center = spotLookat;
         osg::Vec3 lightdir = center - osg::Vec3(lightpos.x(), lightpos.y(), lightpos.z());
         lightdir.normalize();