Changeset 13041 for OpenSceneGraph/trunk/include/osgTerrain/Layer

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osgTerrain/Layer (modified) (24 diffs)

OpenSceneGraph/trunk/include/osgTerrain/Layer

@@ -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.
 */
@@ -42 +42 @@
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         Layer(const Layer&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
+
         META_Object(osgTerrain, Layer);
-        
+
         /** Set the name of this layer. */
         void setSetName(const std::string& setname) { setName(setname); }
@@ -63 +63 @@
         Locator* getLocator() { return _locator.get(); }
         const Locator* getLocator() const { return _locator.get(); }
- 
+
         void setMinLevel(unsigned int minLevel) { _minLevel = minLevel; }
         unsigned int getMinLevel() const { return _minLevel; }
@@ -88 +88 @@
         void setDefaultValue(const osg::Vec4& value) { _defaultValue = value; }
         const osg::Vec4& getDefaultValue() const { return _defaultValue; }
-        
+
 
         /** Set the minification texture filter to use when a texture is associated with this layer.*/
@@ -105 +105 @@
 
 
-        /** Return image associated with layer if supported. */        
+        /** Return image associated with layer if supported. */
         virtual osg::Image* getImage() { return 0; }
 
-        /** Return const image associated with layer if supported. */        
+        /** Return const image associated with layer if supported. */
         virtual const osg::Image* getImage() const { return 0; }
 
@@ -168 +168 @@
             ir = ndc_x - double(i);
             jr = ndc_y - double(j);
-        } 
+        }
 
         /**
@@ -185 +185 @@
             double div = 0.0f;
             float v,r;
-            
+
             r = (1.0f-ir)*(1.0f-jr);
-            if (r>0.0 && getValue(i,j,v)) 
-            {
-                value += v*r;
-                div += r;
-            }
-            
+            if (r>0.0 && getValue(i,j,v))
+            {
+                value += v*r;
+                div += r;
+            }
+
             r = (ir)*(1.0f-jr);
-            if (r>0.0 && getValue(i+1,j,v)) 
-            {
-                value += v*r;
-                div += r;
-            }
-            
+            if (r>0.0 && getValue(i+1,j,v))
+            {
+                value += v*r;
+                div += r;
+            }
+
             r = (ir)*(jr);
-            if (r>0.0 && getValue(i+1,j+1,v)) 
-            {
-                value += v*r;
-                div += r;
-            }
-            
+            if (r>0.0 && getValue(i+1,j+1,v))
+            {
+                value += v*r;
+                div += r;
+            }
+
             r = (1.0f-ir)*(jr);
-            if (r>0.0 && getValue(i,j+1,v)) 
-            {
-                value += v*r;
-                div += r;
-            }
-            
+            if (r>0.0 && getValue(i,j+1,v))
+            {
+                value += v*r;
+                div += r;
+            }
+
             if (div != 0.0)
             {
@@ -305 +305 @@
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         ImageLayer(const ImageLayer& imageLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
+
         META_Object(osgTerrain, ImageLayer);
 
@@ -315 +315 @@
         void setImage(osg::Image* image);
 
-        /** Return image associated with layer. */  
+        /** Return image associated with layer. */
         virtual osg::Image* getImage() { return _image.get(); }
 
@@ -349 +349 @@
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         ContourLayer(const ContourLayer& tfLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
+
         META_Object(osgTerrain, ContourLayer);
 
@@ -358 +358 @@
         const osg::TransferFunction1D* getTransferFunction() const { return _tf.get(); }
 
-        /** Return image associated with layer. */  
+        /** Return image associated with layer. */
         virtual osg::Image* getImage() { return _tf.valid() ? _tf->getImage() : 0; }
 
@@ -393 +393 @@
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         HeightFieldLayer(const HeightFieldLayer& hfLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
+
         META_Object(osgTerrain, HeightFieldLayer);
 
@@ -435 +435 @@
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         ProxyLayer(const ProxyLayer& proxyLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
+
         META_Object(osgTerrain, ProxyLayer);
-        
-        /** Return image associated with layer if supported. */        
+
+        /** Return image associated with layer if supported. */
         virtual osg::Image* getImage()
         {
@@ -452 +452 @@
         /** Set the implementation layer that does the actual work.*/
         void setImplementation(Layer* layer) { _implementation = layer; }
-        
+
         /** Get the implementation layer that does the actual work.*/
         Layer* getImplementation() { return _implementation.get(); }
@@ -464 +464 @@
         virtual unsigned int getNumColumns() const;
         virtual unsigned int getNumRows() const;
-        
+
         virtual bool transform(float offset, float scale);
 
@@ -481 +481 @@
 
         virtual ~ProxyLayer();
-        
+
         osg::ref_ptr<Layer> _implementation;
 
@@ -495 +495 @@
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         CompositeLayer(const CompositeLayer& compositeLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
+
         META_Object(osgTerrain, CompositeLayer);
 
@@ -522 +522 @@
         void addLayer(const std::string& compoundname);
         void addLayer(const std::string& setname, const std::string& filename);
-        
+
         void addLayer(Layer* layer) { _layers.push_back(CompoundNameLayer(layer->getName(),layer->getFileName(),layer)); }
 
         void removeLayer(unsigned int i) { _layers.erase(_layers.begin()+i); }
-        
+
         unsigned int getNumLayers() const { return _layers.size(); }
 
@@ -536 +536 @@
         {
             CompoundNameLayer() {}
-        
+
             CompoundNameLayer(const CompoundNameLayer& cnl):
                 setname(cnl.setname),
@@ -550 +550 @@
             {
                 if (&cnl==this) return *this;
-                
+
                 setname = cnl.setname;
                 filename = cnl.filename;
@@ -561 +561 @@
             osg::ref_ptr<Layer> layer;
         };
-        
+
         typedef std::vector< CompoundNameLayer > Layers;
-        
+
         Layers _layers;
 };
@@ -576 +576 @@
         /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
         SwitchLayer(const SwitchLayer& switchLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        
+
         META_Object(osgTerrain, SwitchLayer);
-        
+
         void setActiveLayer(int i) { _activeLayer = i; }
         int getActiveLayer() const { return _activeLayer; }
 
-        /** Return image associated with layer if supported. */        
+        /** Return image associated with layer if supported. */
         virtual osg::Image* getImage()
         {
-            if (_activeLayer < 0) return 0;            
+            if (_activeLayer < 0) return 0;
             if (_activeLayer >= static_cast<int>(getNumLayers())) return 0;
-            return _layers[_activeLayer].layer->getImage();            
+            return _layers[_activeLayer].layer->getImage();
         }
 
@@ -593 +593 @@
         virtual const osg::Image* getImage() const
         {
-            if (_activeLayer < 0) return 0;            
+            if (_activeLayer < 0) return 0;
             if (_activeLayer >= static_cast<int>(getNumLayers())) return 0;
-            return _layers[_activeLayer].layer->getImage();            
+            return _layers[_activeLayer].layer->getImage();
         }
 
@@ -601 +601 @@
 
         virtual ~SwitchLayer() {}
-        
+
         int _activeLayer;
 };