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

OpenSceneGraph/trunk/src/osgTerrain/GeometryTechnique.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.
 */
@@ -35 +35 @@
     setFilterWidth(0.1);
     setFilterMatrixAs(GAUSSIAN);
-    
+
 }
 
@@ -66 +66 @@
 void GeometryTechnique::setFilterMatrix(const osg::Matrix3& matrix)
 {
-    _filterMatrix = matrix; 
+    _filterMatrix = matrix;
     if (!_filterMatrixUniform) _filterMatrixUniform = new osg::Uniform("filterMatrix",_filterMatrix);
     else _filterMatrixUniform->set(_filterMatrix);
@@ -97 +97 @@
 {
     OSG_INFO<<"Doing GeometryTechnique::init()"<<std::endl;
-    
+
     if (!_terrainTile) return;
 
@@ -162 +162 @@
     Locator* elevationLocator = elevationLayer ? elevationLayer->getLocator() : 0;
     Locator* colorLocator = colorLayer ? colorLayer->getLocator() : 0;
-    
+
     Locator* masterLocator = elevationLocator ? elevationLocator : colorLocator;
     if (!masterLocator)
@@ -169 +169 @@
         return 0;
     }
-    
+
     return masterLocator;
 }
@@ -182 +182 @@
     Locator* elevationLocator = elevationLayer ? elevationLayer->getLocator() : 0;
     Locator* colorLocator = colorLayer ? colorLayer->getLocator() : 0;
-    
+
     if (!elevationLocator) elevationLocator = masterLocator;
     if (!colorLocator) colorLocator = masterLocator;
@@ -188 +188 @@
     osg::Vec3d bottomLeftNDC(DBL_MAX, DBL_MAX, 0.0);
     osg::Vec3d topRightNDC(-DBL_MAX, -DBL_MAX, 0.0);
-    
+
     if (elevationLayer)
     {
@@ -227 +227 @@
     osg::Vec3d centerModel = (bottomLeftNDC + topRightNDC)*0.5;
     masterLocator->convertLocalToModel(centerNDC, centerModel);
-    
+
     buffer._transform->setMatrix(osg::Matrix::translate(centerModel));
-    
+
     return centerModel;
 }
@@ -465 +465 @@
             {
                 float value = 0.0f;
-                if (sampled) validValue = elevationLayer->getInterpolatedValidValue(ndc.x(), ndc.y(), value); 
+                if (sampled) validValue = elevationLayer->getInterpolatedValidValue(ndc.x(), ndc.y(), value);
                 else validValue = elevationLayer->getValidValue(i,j,value);
                 ndc.z() = value*_scaleHeight;
@@ -784 +784 @@
         unsigned int originalNumColumns = numColumns;
         unsigned int originalNumRows = numRows;
-    
+
         numColumns = std::max((unsigned int) (float(originalNumColumns)*sqrtf(sampleRatio)), minimumNumColumns);
         numRows = std::max((unsigned int) (float(originalNumRows)*sqrtf(sampleRatio)),minimumNumRows);
     }
-    
-    
+
+
 
     bool treatBoundariesToValidDataAsDefaultValue = _terrainTile->getTreatBoundariesToValidDataAsDefaultValue();
     OSG_INFO<<"TreatBoundariesToValidDataAsDefaultValue="<<treatBoundariesToValidDataAsDefaultValue<<std::endl;
-    
+
     float skirtHeight = 0.0f;
     HeightFieldLayer* hfl = dynamic_cast<HeightFieldLayer*>(elevationLayer);
-    if (hfl && hfl->getHeightField()) 
+    if (hfl && hfl->getHeightField())
     {
         skirtHeight = hfl->getHeightField()->getSkirtHeight();
     }
-    
+
     bool createSkirt = skirtHeight != 0.0f;
 
@@ -864 +864 @@
     osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
     (*colors)[0].set(1.0f,1.0f,1.0f,1.0f);
-    
+
     geometry->setColorArray(colors.get());
     geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
@@ -1002 +1002 @@
     // OSG_NOTICE<<"smallTile = "<<smallTile<<std::endl;
 
-    osg::ref_ptr<osg::DrawElements> elements = smallTile ? 
+    osg::ref_ptr<osg::DrawElements> elements = smallTile ?
         static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_TRIANGLES)) :
         static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_TRIANGLES));
@@ -1078 +1078 @@
         osg::ref_ptr<osg::Vec3Array> normals = VNG._normals.get();
 
-        osg::ref_ptr<osg::DrawElements> skirtDrawElements = smallTile ? 
+        osg::ref_ptr<osg::DrawElements> skirtDrawElements = smallTile ?
             static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
             static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
@@ -1163 +1163 @@
         {
             geometry->addPrimitiveSet(skirtDrawElements.get());
-            skirtDrawElements = smallTile ? 
+            skirtDrawElements = smallTile ?
                         static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
                         static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
@@ -1205 +1205 @@
         {
             geometry->addPrimitiveSet(skirtDrawElements.get());
-            skirtDrawElements = smallTile ? 
+            skirtDrawElements = smallTile ?
                         static_cast<osg::DrawElements*>(new osg::DrawElementsUShort(GL_QUAD_STRIP)) :
                         static_cast<osg::DrawElements*>(new osg::DrawElementsUInt(GL_QUAD_STRIP));
@@ -1288 +1288 @@
     typedef std::map<osgTerrain::Layer*, osg::Texture*> LayerToTextureMap;
     LayerToTextureMap layerToTextureMap;
-    
+
     for(unsigned int layerNum=0; layerNum<_terrainTile->getNumColorLayers(); ++layerNum)
     {
@@ -1297 +1297 @@
         if (switchLayer)
         {
-            if (switchLayer->getActiveLayer()<0 || 
+            if (switchLayer->getActiveLayer()<0 ||
                 static_cast<unsigned int>(switchLayer->getActiveLayer())>=switchLayer->getNumLayers())
             {
@@ -1352 +1352 @@
 
             stateset->setTextureAttributeAndModes(layerNum, texture2D, osg::StateAttribute::ON);
-            
+
         }
         else if (contourLayer)
@@ -1369 +1369 @@
                 layerToTextureMap[colorLayer] = texture1D;
             }
-            
+
             stateset->setTextureAttributeAndModes(layerNum, texture1D, osg::StateAttribute::ON);
 
@@ -1478 +1478 @@
 
 
-    if (_terrainTile->getDirty()) 
+    if (_terrainTile->getDirty())
     {
         OSG_INFO<<"******* Doing init ***********"<<std::endl;