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

OpenSceneGraph/trunk/src/osgTerrain/Layer.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.
 */
@@ -26 +26 @@
         return;
     }
-    
+
     if (compoundstring.size()==4)
     {
@@ -33 +33 @@
         return;
     }
-    
+
     std::string::size_type secondcolonpos = compoundstring.find_first_of(':', setcolonpos+4);
     if (secondcolonpos==std::string::npos)
@@ -79 +79 @@
     osg::BoundingSphere bs;
     if (!getLocator()) return bs;
-    
+
     if (treatAsElevationLayer)
     {
@@ -91 +91 @@
                 float value = 0.0f;
                 bool validValue = getValidValue(c,r, value);
-                if (validValue) 
+                if (validValue)
                 {
                     osg::Vec3d ndc, v;
-                    ndc.x() = ((double)c)/(double)(numColumns-1), 
+                    ndc.x() = ((double)c)/(double)(numColumns-1),
                     ndc.y() = ((double)r)/(double)(numRows-1);
                     ndc.z() = value;
@@ -109 +109 @@
     else
     {
-    
+
         osg::Vec3d v;
         if (getLocator()->convertLocalToModel(osg::Vec3d(0.5,0.5,0.0), v))
@@ -122 +122 @@
 
     }
-        
+
     return bs;
 }
@@ -147 +147 @@
 }
 
-template <typename T, class O>    
+template <typename T, class O>
 void _processRow(unsigned int num, GLenum pixelFormat, T* data,const O& operation)
 {
@@ -162 +162 @@
 }
 
-template <class O>    
+template <class O>
 void processRow(unsigned int num, GLenum pixelFormat, GLenum dataType, unsigned char* data, const O& operation)
 {
@@ -177 +177 @@
 }
 
-template <class O>    
+template <class O>
 void processImage(osg::Image* image, const O& operation)
 {
     if (!image) return;
-    
+
     for(int r=0;r<image->r();++r)
     {
@@ -204 +204 @@
     inline void operator() (int& v) const { v = (int)(_offset + (float)v * _scale); }
     inline void operator() (float& v) const { v = _offset + v * _scale; }
-    
+
     float _offset, _scale;
 };
@@ -216 +216 @@
 
     processImage(_image.get(), TransformOperator(offset,scale));
-    
+
     dirty();
 
@@ -227 +227 @@
     switch(_image->getDataType())
     {
-        case(GL_BYTE): 
-            value = *((const char*)data); 
+        case(GL_BYTE):
+            value = *((const char*)data);
             // OSG_NOTICE<<"byte "<<value<<std::endl;
             break;
-        case(GL_UNSIGNED_BYTE): 
+        case(GL_UNSIGNED_BYTE):
             value = *data;
             // OSG_NOTICE<<"Unsigned byte "<<value<<std::endl;
@@ -255 +255 @@
             value = *((const float*)data);
             break;
-        default: 
-            value = _defaultValue.x(); 
+        default:
+            value = _defaultValue.x();
             return false;
     }
@@ -438 +438 @@
     osg::FloatArray* heights = _heightField->getFloatArray();
     if (!heights) return false;
-    
+
     OSG_INFO<<"HeightFieldLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
 
@@ -447 +447 @@
         *itr = offset + (*itr) * scale;
     }
-    
+
     dirty();
 
@@ -614 +614 @@
     std::string filename;
     extractSetNameAndFileName(compoundname, setname, filename);
-    
+
     _layers[i].setname = setname;
     _layers[i].filename = filename;