Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/RenderBin.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/osgUtil/RenderBin.cpp (modified) (16 diffs)

OpenSceneGraph/trunk/src/osgUtil/RenderBin.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.
 */
@@ -74 +74 @@
         if (prototype) return dynamic_cast<RenderBin*>(prototype->clone(osg::CopyOp::DEEP_COPY_ALL));
     }
-    
+
     OSG_WARN <<"Warning: RenderBin \""<<binName<<"\" implementation not found, using default RenderBin as a fallback."<<std::endl;
     return new RenderBin;
@@ -124 +124 @@
     {
         s_defaultBinSortModeInitialized = true;
-        
+
         const char* str = getenv("OSG_DEFAULT_BIN_SORT_MODE");
         if (str)
@@ -135 +135 @@
         }
     }
-    
+
     return s_defaultBinSortMode;
 }
@@ -161 +161 @@
         _stateset  = new osg::StateSet;
         _stateset->setThreadSafeRefUnref(true);
-        
+
          // set up an alphafunc by default to speed up blending operations.
 #ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
@@ -167 +167 @@
         alphafunc->setFunction(osg::AlphaFunc::GREATER,0.0f);
         alphafunc->setThreadSafeRefUnref(true);
-        
+
         _stateset->setAttributeAndModes(alphafunc, osg::StateAttribute::ON);
 #endif
     }
-#endif    
+#endif
 }
 
@@ -213 +213 @@
         itr->second->sort();
     }
-    
-    if (_sortCallback.valid()) 
+
+    if (_sortCallback.valid())
     {
         _sortCallback->sortImplementation(this);
     }
     else sortImplementation();
-    
+
     _sorted = true;
 }
@@ -297 +297 @@
 };
 
-    
+
 void RenderBin::sortFrontToBack()
 {
@@ -304 +304 @@
     // now sort the list into acending depth order.
     std::sort(_renderLeafList.begin(),_renderLeafList.end(),FrontToBackSortFunctor());
-    
+
 //    cout << "sort front to back"<<endl;
 }
@@ -357 +357 @@
 
     _renderLeafList.reserve(totalsize);
-    
+
     bool detectedNaN = false;
-        
+
     // first copy all the leaves from the render graphs into the leaf list.
     for(itr=_stateGraphList.begin();
@@ -379 +379 @@
         }
     }
-    
+
     if (detectedNaN) OSG_NOTICE<<"Warning: RenderBin::copyLeavesFromStateGraphListToRenderLeafList() detected NaN depth values, database may be corrupted."<<std::endl;
-    
+
     // empty the render graph list to prevent it being drawn along side the render leaf list (see drawImplementation.)
     _stateGraphList.clear();
@@ -418 +418 @@
 void RenderBin::draw(osg::RenderInfo& renderInfo,RenderLeaf*& previous)
 {
-    if (_drawCallback.valid()) 
+    if (_drawCallback.valid())
     {
         _drawCallback->drawImplementation(this,renderInfo,previous);
@@ -536 +536 @@
         const Drawable* dw= rl->getDrawable();
         stats.addDrawable(); // number of geosets
-        
+
         const Geometry* geom = dw->asGeometry();
         if (geom)
@@ -548 +548 @@
             stats.addMatrix(); // number of matrices
         }
-        
+
         if (dw)
         {
@@ -561 +561 @@
         ++oitr)
     {
-        
+
         for(StateGraph::LeafList::const_iterator dw_itr = (*oitr)->_leaves.begin();
             dw_itr != (*oitr)->_leaves.end();
@@ -646 +646 @@
         count += rbitr->second->computeNumberOfDynamicRenderLeaves();
     }
-    
+
     return count;
 }