Changeset 13041 for OpenSceneGraph/trunk/src/osg/Node.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/Node.cpp (modified) (29 diffs)

OpenSceneGraph/trunk/src/osg/Node.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.
 */
@@ -30 +30 @@
     {
     public:
-        CollectParentPaths(const osg::Node* haltTraversalAtNode=0) : 
+        CollectParentPaths(const osg::Node* haltTraversalAtNode=0) :
             osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_PARENTS),
             _haltTraversalAtNode(haltTraversalAtNode)
@@ -59 +59 @@
     _boundingSphereComputed = false;
     _nodeMask = 0xffffffff;
-    
+
     _numChildrenRequiringUpdateTraversal = 0;
 
@@ -91 +91 @@
 {
     // cleanly detatch any associated stateset (include remove parent links)
-    setStateSet(0);   
+    setStateSet(0);
 }
 
@@ -111 +111 @@
 void Node::accept(NodeVisitor& nv)
 {
-    if (nv.validNodeMask(*this)) 
+    if (nv.validNodeMask(*this))
     {
         nv.pushOntoNodePath(this);
@@ -129 +129 @@
     // do nothing if nothing changed.
     if (_stateset==stateset) return;
-    
+
     // track whether we need to account for the need to do a update or event traversal.
     int delta_update = 0;
     int delta_event = 0;
 
-    // remove this node from the current statesets parent list 
+    // remove this node from the current statesets parent list
     if (_stateset.valid())
     {
@@ -141 +141 @@
         if (_stateset->requiresEventTraversal()) --delta_event;
     }
-    
+
     // set the stateset.
     _stateset = stateset;
-    
+
     // add this node to the new stateset to the parent list.
     if (_stateset.valid())
@@ -152 +152 @@
         if (_stateset->requiresEventTraversal()) ++delta_event;
     }
-    
+
     if (delta_update!=0)
     {
@@ -181 +181 @@
     CollectParentPaths cpp(haltTraversalAtNode);
     const_cast<Node*>(this)->accept(cpp);
-    
+
     MatrixList matrices;
-    
+
     for(NodePathList::iterator itr = cpp._nodePaths.begin();
         itr != cpp._nodePaths.end();
@@ -198 +198 @@
         }
     }
-    
+
     return matrices;
 }
@@ -206 +206 @@
     // if no changes just return.
     if (_updateCallback==nc) return;
-    
+
     // updated callback has been changed, will need to update
     // both _updateCallback and possibly the numChildrenRequiringAppTraversal
@@ -229 +229 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenRequiringUpdateTraversal(
                         (*itr)->getNumChildrenRequiringUpdateTraversal()+delta );
@@ -252 +252 @@
     if (!_updateCallback && !_parents.empty())
     {
-    
-        // need to pass on changes to parents.        
+
+        // need to pass on changes to parents.
         int delta = 0;
         if (_numChildrenRequiringUpdateTraversal>0) --delta;
@@ -265 +265 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenRequiringUpdateTraversal(
                     (*itr)->getNumChildrenRequiringUpdateTraversal()+delta
@@ -273 +273 @@
         }
     }
-    
+
     // finally update this objects value.
     _numChildrenRequiringUpdateTraversal=num;
-    
+
 }
 
@@ -284 +284 @@
     // if no changes just return.
     if (_eventCallback==nc) return;
-    
+
     // event callback has been changed, will need to Event
     // both _EventCallback and possibly the numChildrenRequiringAppTraversal
@@ -307 +307 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenRequiringEventTraversal(
                         (*itr)->getNumChildrenRequiringEventTraversal()+delta );
@@ -330 +330 @@
     if (!_eventCallback && !_parents.empty())
     {
-    
-        // need to pass on changes to parents.        
+
+        // need to pass on changes to parents.
         int delta = 0;
         if (_numChildrenRequiringEventTraversal>0) --delta;
@@ -343 +343 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenRequiringEventTraversal(
                     (*itr)->getNumChildrenRequiringEventTraversal()+delta
@@ -351 +351 @@
         }
     }
-    
+
     // finally Event this objects value.
     _numChildrenRequiringEventTraversal=num;
-    
+
 }
 
@@ -361 +361 @@
     // if no changes just return.
     if (_cullingActive == active) return;
-    
+
     // culling active has been changed, will need to update
     // both _cullActive and possibly the parents numChildrenWithCullingDisabled
@@ -383 +383 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenWithCullingDisabled(
                         (*itr)->getNumChildrenWithCullingDisabled()+delta );
@@ -405 +405 @@
     if (_cullingActive && !_parents.empty())
     {
-    
-        // need to pass on changes to parents.        
+
+        // need to pass on changes to parents.
         int delta = 0;
         if (_numChildrenWithCullingDisabled>0) --delta;
@@ -418 +418 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenWithCullingDisabled(
                     (*itr)->getNumChildrenWithCullingDisabled()+delta
@@ -426 +426 @@
         }
     }
-    
+
     // finally update this objects value.
     _numChildrenWithCullingDisabled=num;
@@ -442 +442 @@
     if (!dynamic_cast<OccluderNode*>(this) && !_parents.empty())
     {
-    
-        // need to pass on changes to parents.        
+
+        // need to pass on changes to parents.
         int delta = 0;
         if (_numChildrenWithOccluderNodes>0) --delta;
@@ -455 +455 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenWithOccluderNodes(
                     (*itr)->getNumChildrenWithOccluderNodes()+delta
@@ -463 +463 @@
         }
     }
-    
+
     // finally update this objects value.
     _numChildrenWithOccluderNodes=num;
-    
+
 }
 
@@ -545 +545 @@
 {
     Object::setThreadSafeRefUnref(threadSafe);
-    
+
     if (_stateset.valid()) _stateset->setThreadSafeRefUnref(threadSafe);
     if (_updateCallback.valid()) _updateCallback->setThreadSafeRefUnref(threadSafe);