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

OpenSceneGraph/trunk/src/osgPlugins/ive/HeightFieldLayer.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 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.
 */
@@ -37 +37 @@
     {
         osg::HeightField* hf = getHeightField();
-    
+
         // using inline heightfield
-        out->writeBool(true);        
+        out->writeBool(true);
         if (out->getVersion()>=VERSION_0035)
         {
@@ -53 +53 @@
 
             float maxError = 0.0f;
-            
+
             if (getLocator())
             {
                 osg::Vec3d world_origin, world_corner;
-                
+
                 getLocator()->convertLocalToModel(osg::Vec3d(0.0,0.0,0.0), world_origin);
                 getLocator()->convertLocalToModel(osg::Vec3d(1.0,1.0,0.0), world_corner);
-                
+
                 double distance = (world_origin-world_corner).length();
-                
+
                 maxError = distance * out->getTerrainMaximumErrorToSizeRatio();
             }
@@ -71 +71 @@
         {
             out->writeShape(getHeightField());
-        }    
+        }
 
     }
@@ -77 +77 @@
     {
         // using external heightfield file
-        out->writeBool(false);        
-        out->writeString(getFileName());        
+        out->writeBool(false);
+        out->writeString(getFileName());
     }
 
@@ -89 +89 @@
     if (id != IVEHEIGHTFIELDLAYER)
         in_THROW_EXCEPTION("HeightFieldLayer::read(): Expected HeightFieldLayer identification.");
-    
+
     // Read Layer's identification.
     id = in->readInt();
@@ -102 +102 @@
 
     bool useInlineHeightField = in->readBool();
-    
+
     if (useInlineHeightField)
     {
-    
+
         if (in->getVersion()>=VERSION_0035)
         {
             osg::HeightField* hf = new osg::HeightField;
-            
+
             // Read HeightField's properties
             //setColor(in->readVec4());
             unsigned int col = in->readUInt();
-            unsigned int row = in->readUInt();        
+            unsigned int row = in->readUInt();
             hf->allocate(col,row);
 
@@ -128 +128 @@
                 in->readPackedFloatArray(hf->getFloatArray());
             }
-            
+
             setHeightField(hf);
 
@@ -136 +136 @@
             osg::Shape* shape = in->readShape();
             setHeightField(dynamic_cast<osg::HeightField*>(shape));
-        }    
+        }
 
     }
@@ -143 +143 @@
         std::string filename = in->readString();
         setFileName(filename);
-        
+
         setHeightField(osgDB::readHeightFieldFile(filename,in->getOptions()));
     }