Changeset 13041 for OpenSceneGraph/trunk/include/osgUtil/StateGraph

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osgUtil/StateGraph (modified) (18 diffs)

OpenSceneGraph/trunk/include/osgUtil/StateGraph

@@ -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.
 */
@@ -42 +42 @@
 {
     public:
-    
+
 
         typedef std::map< const osg::StateSet*, osg::ref_ptr<StateGraph> >   ChildList;
@@ -58 +58 @@
         ChildList                           _children;
         LeafList                            _leaves;
-        
+
         mutable float                       _averageDistance;
         mutable float                       _minimumDistance;
-        
+
         osg::ref_ptr<osg::Referenced>       _userData;
 
@@ -89 +89 @@
         {
             if (_parent) _depth = _parent->_depth + 1;
-            
+
             if (_parent && _parent->_dynamic) _dynamic = true;
             else _dynamic = stateset->getDataVariance()==osg::Object::DYNAMIC;
         }
-            
+
         ~StateGraph() {}
-        
+
         StateGraph* cloneType() const { return new StateGraph; }
-        
+
         void setUserData(osg::Referenced* obj) { _userData = obj; }
         osg::Referenced* getUserData() { return _userData.get(); }
@@ -115 +115 @@
             return _leaves.empty() && _children.empty();
         }
-        
+
         inline bool leaves_empty() const
         {
@@ -134 +134 @@
                 }
                 _averageDistance /= (float)_leaves.size();
-                
+
             }
             return _averageDistance;
         }
-        
+
         inline float getMinimumDistance() const
         {
@@ -152 +152 @@
                    if ((*itr)->_depth<_minimumDistance) _minimumDistance=(*itr)->_depth;
                 }
-                
+
             }
             return _minimumDistance;
@@ -171 +171 @@
         /** Recursively prune the StateGraph of empty children.*/
         void prune();
-        
-        
+
+
         inline StateGraph* find_or_insert(const osg::StateSet* stateset)
         {
@@ -178 +178 @@
             ChildList::iterator itr = _children.find(stateset);
             if (itr!=_children.end()) return itr->second.get();
-            
+
             // create a state group and insert it into the children list
             // then return the state group.
@@ -210 +210 @@
 
                 // need to pop back root render graph.
-                do 
+                do
                 {
                     return_path.push_back(sg_new);
@@ -225 +225 @@
                 return;
             }
-        
+
 
             // first handle the typical case which is two state groups
@@ -231 +231 @@
             if (sg_curr->_parent==sg_new->_parent)
             {
-                
+
                 // state has changed so need to pop old state.
                 if (sg_curr->getStateSet()) state.popStateSet();
@@ -238 +238 @@
                 return;
             }
-        
+
 
             // need to pop back up to the same depth as the new state group.
@@ -246 +246 @@
                 sg_curr = sg_curr->_parent;
             }
-            
+
             // use return path to trace back steps to sg_new.
             std::vector<StateGraph*> return_path;
@@ -256 +256 @@
                 sg_new = sg_new->_parent;
             }
-            
+
             // now pop back up both parent paths until they agree.
 
@@ -270 +270 @@
                 sg_new = sg_new->_parent;
             }
-            
+
             for(std::vector<StateGraph*>::reverse_iterator itr=return_path.rbegin();
                 itr!=return_path.rend();
@@ -289 +289 @@
                 sg_curr = sg_curr->_parent;
             }
-            
-        }
-        
+
+        }
+
         inline static int numToPop(StateGraph* sg_curr)
         {
@@ -301 +301 @@
                 sg_curr = sg_curr->_parent;
             }
-            
+
             return numToPop;
         }