Changeset 13041 for OpenSceneGraph/trunk/src/osgVolume/VolumeTile.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/osgVolume/VolumeTile.cpp (modified) (10 diffs)

OpenSceneGraph/trunk/src/osgVolume/VolumeTile.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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.
 */
@@ -61 +61 @@
     _layer(volumeTile._layer)
 {
-    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);            
+    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);
 
     if (volumeTile.getVolumeTechnique())
@@ -73 +73 @@
     if (_volume) setVolume(0);
 }
- 
+
 void VolumeTile::setVolume(Volume* volume)
 {
     if (_volume == volume) return;
-    
+
     if (_volume) _volume->unregisterVolumeTile(this);
-    
+
     _volume = volume;
 
@@ -111 +111 @@
                 {
                     osgVolume::Volume* volume = dynamic_cast<Volume*>(*itr);
-                    if (volume) 
+                    if (volume)
                     {
-                        OSG_INFO<<"Assigning volume system "<<volume<<std::endl;                        
+                        OSG_INFO<<"Assigning volume system "<<volume<<std::endl;
                         setVolume(volume);
                     }
@@ -119 +119 @@
             }
         }
-            
+
         _hasBeenTraversal = true;
     }
-    
+
     if (nv.getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR &&
         _layer->requiresUpdateTraversal())
@@ -144 +144 @@
     {
         _volumeTechnique->init();
-        
+
         setDirty(false);
-    }    
+    }
 }
 
@@ -156 +156 @@
 void VolumeTile::setVolumeTechnique(VolumeTechnique* volumeTechnique)
 {
-    if (_volumeTechnique == volumeTechnique) return; 
+    if (_volumeTechnique == volumeTechnique) return;
 
     int dirtyDelta = _dirty ? -1 : 0;
 
-    if (_volumeTechnique.valid()) 
+    if (_volumeTechnique.valid())
     {
         _volumeTechnique->_volumeTile = 0;
@@ -166 +166 @@
 
     _volumeTechnique = volumeTechnique;
-    
-    if (_volumeTechnique.valid()) 
+
+    if (_volumeTechnique.valid())
     {
         _volumeTechnique->_volumeTile = this;
-        ++dirtyDelta;        
-    }
-    
+        ++dirtyDelta;
+    }
+
     if (dirtyDelta>0) setDirty(true);
     else if (dirtyDelta<0) setDirty(false);
@@ -187 +187 @@
         setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);
     }
-    else if (getNumChildrenRequiringUpdateTraversal()>0) 
+    else if (getNumChildrenRequiringUpdateTraversal()>0)
     {
         setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-1);
@@ -196 +196 @@
 {
     const Locator* masterLocator = getLocator();
-    if (_layer.valid() && !masterLocator) 
+    if (_layer.valid() && !masterLocator)
     {
         masterLocator = _layer->getLocator();