Changeset 13041 for OpenSceneGraph/trunk/src/osgShadow/MinimalCullBoundsShadowMap.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgShadow/MinimalCullBoundsShadowMap.cpp (modified) (24 diffs)

OpenSceneGraph/trunk/src/osgShadow/MinimalCullBoundsShadowMap.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
  *
@@ -34 +34 @@
 }
 
-MinimalCullBoundsShadowMap::~MinimalCullBoundsShadowMap() 
+MinimalCullBoundsShadowMap::~MinimalCullBoundsShadowMap()
 {
 }
@@ -48 +48 @@
                                              ( const osg::Light *light,
                                                const osg::Vec4 &lightPos,
-                                               const osg::Vec3 &lightDir,                                                 
+                                               const osg::Vec3 &lightDir,
                                                const osg::Vec3 &lightUp )
 {
@@ -61 +61 @@
 {
     RenderLeafList rllOld, rllNew;
-    
+
     GetRenderLeaves( _cv->getRenderStage(), rllOld );
 
@@ -71 +71 @@
     RemoveIgnoredRenderLeaves( rllNew );
 
-    osg::Matrix projectionToModelSpace = 
-        osg::Matrix::inverse( *_modellingSpaceToWorldPtr * 
+    osg::Matrix projectionToModelSpace =
+        osg::Matrix::inverse( *_modellingSpaceToWorldPtr *
             *_cv->getModelViewMatrix() * *_cv->getProjectionMatrix() );
 
@@ -79 +79 @@
 
         osg::Polytope polytope;
-#if 1        
+#if 1
         polytope.setToUnitFrustum();
 #else
@@ -86 +86 @@
         polytope.transformProvidingInverse( *_modellingSpaceToWorldPtr *
                                   *_cv->getModelViewMatrix() * _clampedProjection );
-                
+
         bb = ComputeRenderLeavesBounds( rllNew, projectionToModelSpace, polytope );
     } else {
         bb = ComputeRenderLeavesBounds( rllNew, projectionToModelSpace );
     }
-    
-    cutScenePolytope( *_modellingSpaceToWorldPtr, 
+
+    cutScenePolytope( *_modellingSpaceToWorldPtr,
                       osg::Matrix::inverse( *_modellingSpaceToWorldPtr ), bb );
 }
@@ -102 +102 @@
     osgUtil::RenderBin::RenderBinList::const_iterator rbitr;
 
-    // scan pre render bins 
+    // scan pre render bins
     for(rbitr = bins.begin(); rbitr!=bins.end() && rbitr->first<0; ++rbitr )
        GetRenderLeaves( rbitr->second.get(), rll );
@@ -111 +111 @@
     for( rlitr= renderLeafList.begin(); rlitr!= renderLeafList.end(); ++rlitr )
     {
-        rll.push_back( *rlitr );        
+        rll.push_back( *rlitr );
     }
 
     // scan coarse grained ordering.
     osgUtil::RenderBin::StateGraphList& stateGraphList = rb->getStateGraphList();
-    osgUtil::RenderBin::StateGraphList::const_iterator oitr;    
+    osgUtil::RenderBin::StateGraphList::const_iterator oitr;
     for( oitr= stateGraphList.begin(); oitr!= stateGraphList.end(); ++oitr )
     {
-        for( osgUtil::StateGraph::LeafList::const_iterator dw_itr = 
+        for( osgUtil::StateGraph::LeafList::const_iterator dw_itr =
             (*oitr)->_leaves.begin(); dw_itr != (*oitr)->_leaves.end(); ++dw_itr)
         {
@@ -127 +127 @@
 
     // scan post render bins
-    for(; rbitr!=bins.end(); ++rbitr ) 
+    for(; rbitr!=bins.end(); ++rbitr )
        GetRenderLeaves( rbitr->second.get(), rll );
 }
@@ -137 +137 @@
       if ( !a ) return false; // NULL render leaf goes last
       return !b ||
-             a->_projection < b->_projection || 
+             a->_projection < b->_projection ||
              (a->_projection == b->_projection && a->_modelview < b->_modelview);
   }
@@ -171 +171 @@
     for( int i = 0; i < 3; i ++ )
         for( int j = 0; j < 3; j ++ )
-            if( s[i][j] < 0 ) bb._min[j] += s[i][j]; else bb._max[j] += s[i][j];    
+            if( s[i][j] < 0 ) bb._min[j] += s[i][j]; else bb._max[j] += s[i][j];
 #else
     b.expandBy( o + s[0] );
@@ -216 +216 @@
     unsigned count = 0;
 
-    for( RenderLeafList::iterator it = rll.begin(); it != rll.end(); ++it ) 
+    for( RenderLeafList::iterator it = rll.begin(); it != rll.end(); ++it )
     {
         if( !*it ) continue;
@@ -226 +226 @@
 
         if( !strcmp( name, "LightPointDrawable" ) ||
-            !strcmp( name, "LightPointSpriteDrawable" ) ) 
+            !strcmp( name, "LightPointSpriteDrawable" ) )
         {
             *it = NULL; //ignored = invalidate this in new render leaves list
-            count++;        
+            count++;
         }
     }
@@ -238 +238 @@
 osg::BoundingBox MinimalCullBoundsShadowMap::ViewData::ComputeRenderLeavesBounds
     ( RenderLeafList &rll, osg::Matrix & projectionToWorld )
-{       
+{
     osg::BoundingBox bbResult;
 
@@ -259 +259 @@
         // Don't trust already computed bounds for cull generated drawables
         // LightPointDrawable & LightPointSpriteDrawable are such examples
-        // they store wrong recorded bounds from very first pass  
-        if( rl && rl->_modelview == NULL ) 
+        // they store wrong recorded bounds from very first pass
+        if( rl && rl->_modelview == NULL )
             rl->_drawable->dirtyBound();
 
@@ -268 +268 @@
         } else {
             if( bb.valid() ) {
-                // Conditions to avoid matrix multiplications  
-                if( projection.valid() ) 
+                // Conditions to avoid matrix multiplications
+                if( projection.valid() )
                 {
-                    if( projection.get() != ptrProjection ) 
+                    if( projection.get() != ptrProjection )
                     {
                         ptrProjection = projection.get();
@@ -281 +281 @@
                 }
 
-                if( modelview.valid() ) 
+                if( modelview.valid() )
                 {
                     modelToWorld = *modelview.get() * *ptrViewToWorld;
@@ -292 +292 @@
                     bbResult.expandBy( bb.corner( i ) * *ptrModelToWorld );
             }
-            if( !rl ) break;            
+            if( !rl ) break;
             bb = rl->_drawable->getBound();
             modelview = rl->_modelview;
@@ -306 +306 @@
 osg::BoundingBox MinimalCullBoundsShadowMap::ViewData::ComputeRenderLeavesBounds
     ( RenderLeafList &rll, osg::Matrix & projectionToWorld, osg::Polytope & p )
-{       
+{
     osg::BoundingBox bbResult, bb;
 
@@ -317 +317 @@
     osg::Matrix viewToWorld, modelToWorld,
                 *ptrProjection = NULL,
-                *ptrViewToWorld = &projectionToWorld, 
+                *ptrViewToWorld = &projectionToWorld,
                 *ptrModelToWorld = NULL;
 
@@ -328 +328 @@
         // Don't trust already computed bounds for cull generated drawables
         // LightPointDrawable & LightPointSpriteDrawable are such examples
-        // they store wrong recorded bounds from very first pass  
+        // they store wrong recorded bounds from very first pass
         if(rl->_modelview == NULL )
             rl->_drawable->dirtyBound();
@@ -334 +334 @@
         bb = rl->_drawable->getBound();
         if( !bb.valid() ) continue;
-        
+
         // Stay as long as possible in model space to minimize matrix ops
         if( rl->_modelview != modelview || rl->_projection != projection ) {
 
             projection = rl->_projection;
-            if( projection.valid() ) 
+            if( projection.valid() )
             {
-               if( projection.get() != ptrProjection ) 
+               if( projection.get() != ptrProjection )
                {
                    ptrProjection = projection.get();
@@ -352 +352 @@
 
             modelview = rl->_modelview;
-            if( modelview.valid() ) 
+            if( modelview.valid() )
             {
                 modelToWorld = *modelview.get() * *ptrViewToWorld;