Changeset 11176 for OpenSceneGraph/trunk/src/osgShadow/MinimalShadowMap.cpp

Timestamp:

03/05/10 17:17:12 (3 years ago)

Author:

robert

Message:

From Wojcoech Lewandowski, "Attched are aimShadowCastingCamera() call changes, I have described in former post. Basically now MinimalShadowMap? overrides first variant and keeps second. So both variants of aimShadowCastingCamera are clearly defined in MinimalShadowMap::ViewData? scope. This way compilers have no problem and code looks less obscure. Changes made against the trunk."

Files:

• OpenSceneGraph/trunk/src/osgShadow/MinimalShadowMap.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgShadow/MinimalShadowMap.cpp

@@ -115 +115 @@
 }
 
+void MinimalShadowMap::ViewData::aimShadowCastingCamera( 
+                                        const osg::BoundingSphere &bs,
+                                        const osg::Light *light,
+                                        const osg::Vec4 &lightPos,
+                                        const osg::Vec3 &lightDir,
+                                        const osg::Vec3 &lightUpVector 
+                                        /* by default = osg::Vec3( 0, 1 0 )*/ )
+{
+    BaseClass::ViewData::aimShadowCastingCamera( bs, light, lightPos, lightDir, lightUpVector );
+}
+
 void MinimalShadowMap::ViewData::aimShadowCastingCamera
  ( const osg::Light *light, const osg::Vec4 &lightPos,
@@ -149 +160 @@
     } 
 
-    BaseClass::ViewData::aimShadowCastingCamera
-                                    ( bb, light, lightPos, lightDir, up );
+    aimShadowCastingCamera( osg::BoundingSphere( bb ), light, lightPos, lightDir, up );
 
     // Intersect scene Receiving Shadow Polytope with shadow camera frustum