Changeset 13041 for OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/Geometry.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/osgWrappers/deprecated-dotosg/osg/Geometry.cpp (modified) (30 diffs)

OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/Geometry.cpp

@@ -49 +49 @@
         int capacity;
         fr[1].getInt(capacity);
-        
+
         Geometry::PrimitiveSetList& primitives = geom.getPrimitiveSetList();
         if (capacity>0) primitives.reserve(capacity);
-        
+
 
         fr += 3;
-        
+
 
         while (!fr.eof() && fr[0].getNoNestedBrackets()>entry)
@@ -63 +63 @@
 
         ++fr;
-        
+
         iteratorAdvanced = true;
 
@@ -115 +115 @@
         }
     }
-    
+
     if (fr[0].matchWord("VertexIndices"))
     {
@@ -292 +292 @@
         int unit=0;
         fr[1].getInt(unit);
-    
+
         fr+=2;
         Array* texcoords = Array_readLocalData(fr);
@@ -300 +300 @@
         }
         iteratorAdvanced = true;
-        
+
     }
 
@@ -307 +307 @@
         int unit=0;
         fr[1].getInt(unit);
-    
+
         fr+=2;
         IndexArray* indices = dynamic_cast<IndexArray*>(Array_readLocalData(fr));
@@ -331 +331 @@
         int unit=0;
         fr[1].getInt(unit);
-        
-        if (fr[2].matchString("TRUE"))        
+
+        if (fr[2].matchString("TRUE"))
             geom.setVertexAttribNormalize(unit,GL_TRUE);
         else
             geom.setVertexAttribNormalize(unit,GL_FALSE);
-        
+
         fr+=3;
         iteratorAdvanced = true;
@@ -345 +345 @@
         int unit=0;
         fr[1].getInt(unit);
-    
+
         fr+=2;
         Array* vertexattrib = Array_readLocalData(fr);
@@ -353 +353 @@
         }
         iteratorAdvanced = true;
-        
+
     }
 
@@ -360 +360 @@
         int unit=0;
         fr[1].getInt(unit);
-    
+
         fr+=2;
         IndexArray* indices = dynamic_cast<IndexArray*>(Array_readLocalData(fr));
@@ -786 +786 @@
         return_array = array;
     }
-    
-    if (return_array) 
+
+    if (return_array)
     {
         if (!uniqueID.empty()) fr.registerUniqueIDForObject(uniqueID.c_str(),return_array);
     }
-    
+
     return return_array;
 }
@@ -1005 +1005 @@
     bool iteratorAdvanced = false;
     bool firstMatched = false;
-    if ((firstMatched = fr.matchSequence("DrawArrays %w %i %i %i")) || 
+    if ((firstMatched = fr.matchSequence("DrawArrays %w %i %i %i")) ||
          fr.matchSequence("DrawArrays %w %i %i") )
     {
-        
+
         GLenum mode;
         Geometry_matchPrimitiveModeStr(fr[1].getStr(),mode);
@@ -1014 +1014 @@
         int first;
         fr[2].getInt(first);
-        
+
         int count;
         fr[3].getInt(count);
@@ -1031 +1031 @@
         geom.addPrimitiveSet(new DrawArrays(mode, first, count, numInstances));
 
-        
-        iteratorAdvanced = true;
-        
-    }
-    else if ((firstMatched = fr.matchSequence("DrawArrayLengths %w %i %i %i {")) || 
+
+        iteratorAdvanced = true;
+
+    }
+    else if ((firstMatched = fr.matchSequence("DrawArrayLengths %w %i %i %i {")) ||
          fr.matchSequence("DrawArrayLengths %w %i %i {") )
     {
@@ -1048 +1048 @@
         int capacity;
         fr[3].getInt(capacity);
-        
+
         int numInstances = 0;
         if (firstMatched)
@@ -1076 +1076 @@
         }
          ++fr;
-         
+
          geom.addPrimitiveSet(prim);
-   
-        iteratorAdvanced = true;
-    }
-    else if ((firstMatched = fr.matchSequence("DrawElementsUByte %w %i %i {")) || 
+
+        iteratorAdvanced = true;
+    }
+    else if ((firstMatched = fr.matchSequence("DrawElementsUByte %w %i %i {")) ||
          fr.matchSequence("DrawElementsUByte %w %i {"))
     {
@@ -1091 +1091 @@
         int capacity;
         fr[2].getInt(capacity);
-        
+
         int numInstances = 0;
         if (firstMatched)
@@ -1118 +1118 @@
         }
          ++fr;
-         
+
          geom.addPrimitiveSet(prim);
-   
-        iteratorAdvanced = true;
-    }
-    else if ((firstMatched = fr.matchSequence("DrawElementsUShort %w %i %i {")) || 
+
+        iteratorAdvanced = true;
+    }
+    else if ((firstMatched = fr.matchSequence("DrawElementsUShort %w %i %i {")) ||
          fr.matchSequence("DrawElementsUShort %w %i {"))
     {
@@ -1133 +1133 @@
         int capacity;
         fr[2].getInt(capacity);
-        
+
         int numInstances = 0;
         if (firstMatched)
@@ -1144 +1144 @@
             fr += 4;
         }
-        
+
         DrawElementsUShort* prim = new DrawElementsUShort;
         prim->setMode(mode);
@@ -1160 +1160 @@
         }
          ++fr;
-         
+
          geom.addPrimitiveSet(prim);
-   
-        iteratorAdvanced = true;
-    }
-    else if ((firstMatched = fr.matchSequence("DrawElementsUInt %w %i %i {")) || 
+
+        iteratorAdvanced = true;
+    }
+    else if ((firstMatched = fr.matchSequence("DrawElementsUInt %w %i %i {")) ||
               fr.matchSequence("DrawElementsUInt %w %i {"))
     {
@@ -1175 +1175 @@
         int capacity;
         fr[2].getInt(capacity);
-        
+
         int numInstances = 0;
         if (firstMatched)
@@ -1186 +1186 @@
             fr += 4;
         }
-        
+
         DrawElementsUInt* prim = new DrawElementsUInt;
         prim->setMode(mode);
@@ -1202 +1202 @@
         }
          ++fr;
-         
+
          geom.addPrimitiveSet(prim);
-   
+
         iteratorAdvanced = true;
     }
@@ -1299 +1299 @@
         fw.indent()<<"VertexArray ";
         Array_writeLocalData(*geom.getVertexArray(),fw);
-        
+
     }
     if (geom.getVertexIndices())
     {
         fw.indent()<<"VertexIndices ";
-        Array_writeLocalData(*geom.getVertexIndices(),fw);        
+        Array_writeLocalData(*geom.getVertexIndices(),fw);
     }
 
     if (geom.getNormalArray())
     {
-        
+
         fw.indent()<<"NormalBinding "<<Geometry_getBindingTypeStr(geom.getNormalBinding())<<std::endl;
-        
+
 //        const Vec3Array& normals = *geom.getNormalArray();
 //        fw.indent()<<"NormalArray "<<normals.size()<<std::endl;
@@ -1317 +1317 @@
 
         fw.indent()<<"NormalArray ";
-        Array_writeLocalData(*geom.getNormalArray(),fw);        
-        
+        Array_writeLocalData(*geom.getNormalArray(),fw);
+
     }
     if (geom.getNormalIndices())
     {
         fw.indent()<<"NormalIndices ";
-        Array_writeLocalData(*geom.getNormalIndices(),fw);        
+        Array_writeLocalData(*geom.getNormalIndices(),fw);
     }
 
@@ -1335 +1335 @@
     {
         fw.indent()<<"ColorIndices ";
-        Array_writeLocalData(*geom.getColorIndices(),fw);        
+        Array_writeLocalData(*geom.getColorIndices(),fw);
     }
 
@@ -1347 +1347 @@
     {
         fw.indent()<<"SecondayColorIndices ";
-        Array_writeLocalData(*geom.getSecondaryColorIndices(),fw);        
+        Array_writeLocalData(*geom.getSecondaryColorIndices(),fw);
     }
 
@@ -1359 +1359 @@
     {
         fw.indent()<<"FogCoordIndices ";
-        Array_writeLocalData(*geom.getFogCoordIndices(),fw);        
+        Array_writeLocalData(*geom.getFogCoordIndices(),fw);
     }
 
@@ -1377 +1377 @@
         }
     }
-    
+
     const Geometry::ArrayDataList& vaal=geom.getVertexAttribArrayList();
     for(i=0;i<vaal.size();++i)
     {
         const osg::Geometry::ArrayData& arrayData = vaal[i];
-    
+
         if (arrayData.array.valid())
         {
             fw.indent()<<"VertexAttribBinding "<<i<<" "<<Geometry_getBindingTypeStr(arrayData.binding)<<std::endl;
-            
+
             if (arrayData.normalize)
                 fw.indent()<<"VertexAttribNormalize "<<i<<" TRUE"<<std::endl;
             else
                 fw.indent()<<"VertexAttribNormalize "<<i<<" FALSE"<<std::endl;
-                
+
             fw.indent()<<"VertexAttribArray "<<i<<" ";
             Array_writeLocalData(*(arrayData.array),fw);