Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/MeshOptimizers.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgUtil/MeshOptimizers.cpp (modified) (23 diffs)

OpenSceneGraph/trunk/src/osgUtil/MeshOptimizers.cpp

@@ -2 +2 @@
  * Copyright (C) 2010 Tim Moore
  *
- * 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.
 */
@@ -99 +99 @@
         }
     }
-    
+
     ArrayList _arrayList;
     // True if geometry contains bindings that are compatible with
@@ -114 +114 @@
     {
     }
-    
+
     bool operator() (unsigned int lhs, unsigned int rhs) const
     {
@@ -126 +126 @@
         }
         return false;
-    }   
+    }
 
     int compare(unsigned int lhs, unsigned int rhs)
@@ -142 +142 @@
 
 protected:
-    VertexAttribComparitor& operator = (const VertexAttribComparitor&) { return *this; }    
+    VertexAttribComparitor& operator = (const VertexAttribComparitor&) { return *this; }
 
 };
@@ -151 +151 @@
     public:
         RemapArray(const IndexList& remapping):_remapping(remapping) {}
-        
+
         const IndexList& _remapping;
-        
+
         template<class T>
         inline void remap(T& array)
@@ -166 +166 @@
             array.erase(array.begin()+_remapping.size(),array.end());
         }
-        
+
         virtual void apply(osg::Array&) {}
         virtual void apply(osg::ByteArray& array) { remap(array); }
@@ -180 +180 @@
         virtual void apply(osg::Vec3Array& array) { remap(array); }
         virtual void apply(osg::Vec4Array& array) { remap(array); }
-        
+
         virtual void apply(osg::Vec4ubArray& array) { remap(array); }
 
-        virtual void apply(osg::Vec2bArray& array) { remap(array); }        
-        virtual void apply(osg::Vec3bArray& array) { remap(array); }        
-        virtual void apply(osg::Vec4bArray& array) { remap(array); }        
+        virtual void apply(osg::Vec2bArray& array) { remap(array); }
+        virtual void apply(osg::Vec3bArray& array) { remap(array); }
+        virtual void apply(osg::Vec4bArray& array) { remap(array); }
 
         virtual void apply(osg::Vec2sArray& array) { remap(array); }
@@ -194 +194 @@
         virtual void apply(osg::Vec3dArray& array) { remap(array); }
         virtual void apply(osg::Vec4dArray& array) { remap(array); }
-        
+
         virtual void apply(osg::MatrixfArray& array) { remap(array); }
 protected:
@@ -237 +237 @@
     if (geom.getColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE ||
         geom.getColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;
-    
+
     if (geom.getSecondaryColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE ||
         geom.getSecondaryColorBinding()==osg::Geometry::BIND_PER_PRIMITIVE_SET) return;
@@ -276 +276 @@
             numNonIndexedPrimitives++;
     }
-    
+
     // nothing to index
     if (!numSurfacePrimitives || !numNonIndexedPrimitives) return;
@@ -290 +290 @@
 
     // compute duplicate vertices
-    
+
     typedef std::vector<unsigned int> IndexList;
     unsigned int numVertices = geom.getVertexArray()->getNumElements();
@@ -299 +299 @@
         indices[i] = i;
     }
-    
+
     VertexAttribComparitor arrayComparitor(geom);
     std::sort(indices.begin(),indices.end(),arrayComparitor);
@@ -312 +312 @@
             ++numUnique;
         }
-        
+
     }
     IndexList remapDuplicatesToOrignals(numVertices);
@@ -333 +333 @@
             lastUnique = i;
         }
-        
+
     }
     unsigned int min_index = indices[lastUnique];
@@ -346 +346 @@
 
 
-    // copy the arrays.    
+    // copy the arrays.
     IndexList finalMapping(numVertices);
     IndexList copyMapping;
@@ -353 +353 @@
     for(i=0;i<numVertices;++i)
     {
-        if (remapDuplicatesToOrignals[i]==i) 
+        if (remapDuplicatesToOrignals[i]==i)
         {
             finalMapping[i] = currentIndex;
@@ -360 +360 @@
         }
     }
-    
+
     for(i=0;i<numVertices;++i)
     {
-        if (remapDuplicatesToOrignals[i]!=i) 
+        if (remapDuplicatesToOrignals[i]!=i)
         {
             finalMapping[i] = finalMapping[remapDuplicatesToOrignals[i]];
         }
     }
-   
-    
+
+
     MyTriangleIndexFunctor taf;
     taf._remapIndices.swap(finalMapping);
@@ -839 +839 @@
         assert(triToAdd != 0 && triToAdd->score > 0.0);
         // Add triangle vertices, and remove triangle from the
-        // vertices that use it. 
+        // vertices that use it.
         triToAdd->score = -1.0f;
         unsigned triToAddIdx = triToAdd - &triangles[0];
@@ -1056 +1056 @@
     virtual void apply(osg::Vec3Array& array) { remap(array); }
     virtual void apply(osg::Vec4Array& array) { remap(array); }
-    
+
     virtual void apply(osg::Vec4ubArray& array) { remap(array); }
 
-    virtual void apply(osg::Vec2bArray& array) { remap(array); }        
-    virtual void apply(osg::Vec3bArray& array) { remap(array); }        
-    virtual void apply(osg::Vec4bArray& array) { remap(array); }        
+    virtual void apply(osg::Vec2bArray& array) { remap(array); }
+    virtual void apply(osg::Vec3bArray& array) { remap(array); }
+    virtual void apply(osg::Vec4bArray& array) { remap(array); }
 
     virtual void apply(osg::Vec2sArray& array) { remap(array); }
@@ -1070 +1070 @@
     virtual void apply(osg::Vec3dArray& array) { remap(array); }
     virtual void apply(osg::Vec4dArray& array) { remap(array); }
-    
+
     virtual void apply(osg::MatrixfArray& array) { remap(array); }
 };
@@ -1082 +1082 @@
     vector<unsigned> remap;
 
-    VertexReorderOperator() : seq(0) 
-    {
-    }
-    
+    VertexReorderOperator() : seq(0)
+    {
+    }
+
     void inline doVertex(unsigned v)
     {
@@ -1105 +1105 @@
         remap.resize(numVerts, Remapper::invalidIndex);
     }
-    
+
 };
 }