Changeset 13041 for OpenSceneGraph/trunk/src/osgTerrain/TerrainTile.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/osgTerrain/TerrainTile.cpp (modified) (12 diffs)

OpenSceneGraph/trunk/src/osgTerrain/TerrainTile.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.
 */
@@ -79 +79 @@
     _blendingPolicy(terrain._blendingPolicy)
 {
-    if (terrain.getTerrainTechnique()) 
+    if (terrain.getTerrainTechnique())
     {
         setTerrainTechnique(dynamic_cast<TerrainTechnique*>(terrain.getTerrainTechnique()->cloneType()));
@@ -98 +98 @@
 {
     if (_terrain == ts) return;
-    
+
     if (_terrain) _terrain->unregisterTerrainTile(this);
-    
+
     _terrain = ts;
 
@@ -132 +132 @@
                 {
                     osgTerrain::Terrain* ts = dynamic_cast<Terrain*>(*itr);
-                    if (ts) 
+                    if (ts)
                     {
                         OSG_INFO<<"Assigning terrain system "<<ts<<std::endl;
@@ -170 +170 @@
     {
         if (_terrain && _terrain->getTerrainTechniquePrototype())
-        {            
+        {
             osg::ref_ptr<osg::Object> object = _terrain->getTerrainTechniquePrototype()->clone(osg::CopyOp::DEEP_COPY_ALL);
             setTerrainTechnique(dynamic_cast<TerrainTechnique*>(object.get()));
@@ -188 +188 @@
 void TerrainTile::setTerrainTechnique(TerrainTechnique* terrainTechnique)
 {
-    if (_terrainTechnique == terrainTechnique) return; 
+    if (_terrainTechnique == terrainTechnique) return;
 
     int dirtyDelta = (_dirtyMask==NOT_DIRTY) ? 0 : -1;
 
-    if (_terrainTechnique.valid()) 
+    if (_terrainTechnique.valid())
     {
         _terrainTechnique->setTerrainTile(0);
@@ -198 +198 @@
 
     _terrainTechnique = terrainTechnique;
-    
-    if (_terrainTechnique.valid()) 
+
+    if (_terrainTechnique.valid())
     {
         _terrainTechnique->setTerrainTile(this);
-        ++dirtyDelta;        
-    }
-    
+        ++dirtyDelta;
+    }
+
     if (dirtyDelta>0) setDirtyMask(ALL_DIRTY);
     else if (dirtyDelta<0) setDirtyMask(NOT_DIRTY);
@@ -249 +249 @@
 {
     if (_colorLayers.size() <= i) _colorLayers.resize(i+1);
-    
+
     _colorLayers[i] = layer;
 }
@@ -256 +256 @@
 {
     osg::BoundingSphere bs;
-    
+
     if (_elevationLayer.valid())
     {
@@ -270 +270 @@
         }
     }
-    
+
     return bs;
 }
@@ -301 +301 @@
 bool WhiteListTileLoadedCallback::readImageLayer(osgTerrain::ImageLayer* imageLayer, const osgDB::ReaderWriter::Options* options) const
 {
-   if (!imageLayer->getImage() && 
+   if (!imageLayer->getImage() &&
         !imageLayer->getFileName().empty())
     {
@@ -341 +341 @@
                 {
                     if (readImageLayer(imageLayer, options))
-                    {                        
-                        // replace SwitchLayer by 
+                    {
+                        // replace SwitchLayer by
                         if (_replaceSwitchLayer) tile->setColorLayer(i, imageLayer);
                         else if (switchLayer->getActiveLayer()<0) switchLayer->setActiveLayer(si);