Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/TriStripVisitor.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/osgUtil/TriStripVisitor.cpp (modified) (32 diffs)

OpenSceneGraph/trunk/src/osgUtil/TriStripVisitor.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.
 */
@@ -34 +34 @@
     public:
         WriteValue(std::ostream& o):_o(o) {}
-        
+
         std::ostream& _o;
-               
+
         virtual void apply(const GLbyte& v) { _o << v; }
         virtual void apply(const GLshort& v) { _o << v; }
@@ -50 +50 @@
 
     protected:
-    
+
         WriteValue& operator = (const WriteValue&) { return *this; }
 };
@@ -74 +74 @@
         }
     }
-    
+
     void add(osg::Array* array, osg::Geometry::AttributeBinding binding)
     {
@@ -83 +83 @@
                 ++itr)
             {
-                if ((*itr) == array) 
+                if ((*itr) == array)
                     return;
             }
@@ -89 +89 @@
         }
     }
-    
+
     typedef std::vector<osg::Array*> ArrayList;
-    
+
     ArrayList _arrayList;
-    
+
     bool operator() (unsigned int lhs, unsigned int rhs) const
     {
@@ -105 +105 @@
         }
         return false;
-    }   
+    }
 
     int compare(unsigned int lhs, unsigned int rhs)
@@ -117 +117 @@
             if (compare==1) return 1;
         }
-//         
+//
 //         WriteValue wv(std::cout);
-//         
+//
 //         std::cout<<"Values equal"<<std::endl;
 //         for(ArrayList::iterator itr=_arrayList.begin();
@@ -129 +129 @@
 //             std::cout<<std::endl;
 //         }
-        
+
 
         return 0;
     }
-    
+
     void accept(osg::ArrayVisitor& av)
     {
@@ -146 +146 @@
 protected:
 
-    VertexAttribComparitor& operator = (const VertexAttribComparitor&) { return *this; }    
+    VertexAttribComparitor& operator = (const VertexAttribComparitor&) { return *this; }
 
 };
@@ -154 +154 @@
     public:
         RemapArray(const IndexList& remapping):_remapping(remapping) {}
-        
+
         const IndexList& _remapping;
-        
+
         template<class T>
         inline void remap(T& array)
@@ -169 +169 @@
             array.erase(array.begin()+_remapping.size(),array.end());
         }
-        
+
         virtual void apply(osg::Array&) {}
         virtual void apply(osg::ByteArray& array) { remap(array); }
@@ -221 +221 @@
     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;
@@ -261 +261 @@
                 ++numNonSurfacePrimitives;
                 break;
-                
-        }
-    }
-    
+
+        }
+    }
+
     // nothitng to tri strip leave.
     if (!numSurfacePrimitives) return;
-    
+
     // compute duplicate vertices
-    
+
     typedef std::vector<unsigned int> IndexList;
     unsigned int numVertices = geom.getVertexArray()->getNumElements();
@@ -278 +278 @@
         indices[i] = i;
     }
-    
+
     VertexAttribComparitor arrayComparitor(geom);
     std::sort(indices.begin(),indices.end(),arrayComparitor);
@@ -292 +292 @@
             ++numDuplicate;
         }
-        else 
+        else
         {
             //std::cout<<"  unique "<<indices[i]<<std::endl;
@@ -298 +298 @@
             ++numUnique;
         }
-        
+
     }
 //     std::cout<<"  Number of duplicates "<<numDuplicate<<std::endl;
@@ -304 +304 @@
 //     std::cout<<"  Total number of vertices required "<<numUnique<<" vs original "<<numVertices<<std::endl;
 //     std::cout<<"  % size "<<(float)numUnique/(float)numVertices*100.0f<<std::endl;
-    
+
     IndexList remapDuplicatesToOrignals(numVertices);
     lastUnique = 0;
@@ -324 +324 @@
             lastUnique = i;
         }
-        
+
     }
     unsigned int min_index = indices[lastUnique];
@@ -337 +337 @@
 
 
-    // copy the arrays.    
+    // copy the arrays.
     IndexList finalMapping(numVertices);
     IndexList copyMapping;
@@ -344 +344 @@
     for(i=0;i<numVertices;++i)
     {
-        if (remapDuplicatesToOrignals[i]==i) 
+        if (remapDuplicatesToOrignals[i]==i)
         {
             finalMapping[i] = currentIndex;
@@ -351 +351 @@
         }
     }
-    
+
     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);
@@ -387 +387 @@
         }
     }
-    
+
     float minimum_ratio_of_indices_to_unique_vertices = 1;
     float ratio_of_indices_to_unique_vertices = ((float)taf._in_indices.size()/(float)numUnique);
@@ -393 +393 @@
     OSG_INFO<<"TriStripVisitor::stripify(Geometry&): Number of indices"<<taf._in_indices.size()<<" numUnique"<< numUnique << std::endl;
     OSG_INFO<<"TriStripVisitor::stripify(Geometry&):     ratio indices/numUnique"<< ratio_of_indices_to_unique_vertices << std::endl;
-    
+
     // only tri strip if there is point in doing so.
     if (!taf._in_indices.empty() && ratio_of_indices_to_unique_vertices>=minimum_ratio_of_indices_to_unique_vertices)
@@ -409 +409 @@
         // so increment to give to the corrent number of verticies.
         ++in_numVertices;
-        
+
         // remap any shared vertex attributes
         RemapArray ra(copyMapping);
@@ -435 +435 @@
             QuadMap quadMap;
 
-            // pick out quads and place them in the quadMap, and also look for the max 
+            // pick out quads and place them in the quadMap, and also look for the max
             for(pitr=outPrimitives.begin();
                 pitr!=outPrimitives.end();
@@ -455 +455 @@
                 indices.reserve(4*quadMap.size());
 
-                // adds all the quads into the quad primitive, in ascending order 
+                // adds all the quads into the quad primitive, in ascending order
                 // and the QuadMap stores the quad's in ascending order.
                 for(QuadMap::iterator qitr=quadMap.begin();
@@ -473 +473 @@
                     indices.push_back(pitr->Indices[(min_pos+2)%4]);
                     indices.push_back(pitr->Indices[(min_pos+3)%4]);
-                }            
+                }
 
                 bool inOrder = true;
@@ -507 +507 @@
                     }
                 }
-            }    
-        }        
-
-        // handle non quad primitives    
+            }
+        }
+
+        // handle non quad primitives
         for(pitr=outPrimitives.begin();
             pitr!=outPrimitives.end();
@@ -554 +554 @@
         geom.setPrimitiveSetList(new_primitives);
 
-        #if 0 
-        // debugging code for indentifying the tri-strips.       
+        #if 0
+        // debugging code for indentifying the tri-strips.
                 osg::Vec4Array* colors = new osg::Vec4Array(new_primitives.size());
                 for(i=0;i<colors->size();++i)
@@ -566 +566 @@
                 geom.setColorArray(colors);
                 geom.setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE_SET);
-        #endif        
+        #endif
     }
     else
@@ -582 +582 @@
     {
         stripify(*(*itr));
-        
+
         // osgUtil::SmoothingVisitor sv;
         // sv.smooth(*(*itr));