Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.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/osgPlugins/Inventor/ConvertToInventor.cpp (modified) (28 diffs)

OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp

@@ -229 +229 @@
 
   osgType *ptr = (osgType*)array->getDataPointer() + startIndex;
-  
+
   if (numItemsUntilMinusOne <= 0)
     for (i=0; i<num; i++, ptr++)
@@ -370 +370 @@
     }
   }
-  else if (ivApplicateIntType<SoMFInt32,  int32_t>(array, (SoMFInt32&) field, startIndex, stopIndex, numItemsUntilMinusOne)) return; 
+  else if (ivApplicateIntType<SoMFInt32,  int32_t>(array, (SoMFInt32&) field, startIndex, stopIndex, numItemsUntilMinusOne)) return;
   else if (ivApplicateIntType<SoMFUInt32,uint32_t>(array, (SoMFUInt32&)field, startIndex, stopIndex, numItemsUntilMinusOne)) return;
-  else if (ivApplicateIntType<SoMFShort,  int16_t>(array, (SoMFShort&) field, startIndex, stopIndex, numItemsUntilMinusOne)) return; 
+  else if (ivApplicateIntType<SoMFShort,  int16_t>(array, (SoMFShort&) field, startIndex, stopIndex, numItemsUntilMinusOne)) return;
   else if (ivApplicateIntType<SoMFUShort,uint16_t>(array, (SoMFUShort&)field, startIndex, stopIndex, numItemsUntilMinusOne)) return;
   else if (field.isOfType(SoMFVec2f::getClassTypeId()))
@@ -474 +474 @@
 
   if (indices || drawElemIndices) {
-    
+
     // "deindex" original data
     if (indices && !drawElemIndices)
@@ -747 +747 @@
   // Coin: no (until current version Coin 2.5.0b3)
   // TGS Inventor: introduced in TGS Inventor 5.0 (available in SoTexture class)
-  
+
   // note: Coin (since 2.0) uses CLAMP_TO_EDGE for rendering if SoTexture2::CLAMP is specified.
 
@@ -790 +790 @@
 
   if (ss) {
-    
+
     //
     // Lighting
     //
-    
+
     // enable/disable lighting
     updateMode(ivState->osgLighting, ss->getMode(GL_LIGHTING));
@@ -834 +834 @@
 
         // set two-sided lighting and backface culling off
-        sh->vertexOrdering = ivState->osgFrontFace==osg::FrontFace::COUNTER_CLOCKWISE ? 
+        sh->vertexOrdering = ivState->osgFrontFace==osg::FrontFace::COUNTER_CLOCKWISE ?
                              SoShapeHints::COUNTERCLOCKWISE : SoShapeHints::CLOCKWISE;
         sh->shapeType = SoShapeHints::UNKNOWN_SHAPE_TYPE;
@@ -850 +850 @@
             // Inventor does not support this setup and it lits the unculled faces only.
             OSG_WARN << "IvWriter: Culling was set in a way that one-sided lighting will lit the culled sides of faces. "
-                                      "Using lighting on correct faces." << std::endl; 
+                                      "Using lighting on correct faces." << std::endl;
 
           // face culling on
@@ -880 +880 @@
       if (!ivState->osgTexture2Enabled ||
           ivState->osgTexture==NULL || ivState->osgTexture->getImage(0)==NULL)
-        
+
         // empty texture disables texturing
         ivState->ivTexture = new SoTexture2;
-      
+
       else {
-        
+
         // reuse texture if possible
         ivState->ivTexture = ivTexturesMap[ivState->osgTexture][ivState->osgTexEnv];
@@ -899 +899 @@
           const std::string &textureName = ivState->osgTexture->getImage(0)->getFileName();
           ivState->ivTexture->filename.setValue(textureName.c_str()); // FIXME: handle inlined texture data in the files
-          
+
           // wrap
           ivState->ivTexture->wrapS.setValue(convertTextureWrap(
@@ -951 +951 @@
                                   "back faces. This is not handled properly. Using front material only." << std::endl;
       }
-    
+
       // Convert colors
       // OSG represents colors by: Vec3, Vec4,Vec4ub
@@ -1180 +1180 @@
     // Post-processing for DrawArrayLengths
     if (drawArrayLengths && primSize==0 && drawArrayLengths->size()>=2) {
-      
+
       postProcessDrawArrayLengths(drawArrayLengths, &((SoIndexedShape*)shape)->coordIndex);
-      
+
       if (ivNormals && g->getNormalBinding()==osg::Geometry::BIND_PER_VERTEX)
         postProcessDrawArrayLengths(drawArrayLengths, &((SoIndexedShape*)shape)->normalIndex);
-      
+
       if (ivMaterial && g->getColorBinding()==osg::Geometry::BIND_PER_VERTEX)
         postProcessDrawArrayLengths(drawArrayLengths, &((SoIndexedShape*)shape)->materialIndex);
-      
+
       if (ivTexCoords && !ivTexCoords->isOfType(SoTextureCoordinateFunction::getClassTypeId()))
         postProcessDrawArrayLengths(drawArrayLengths, &((SoIndexedShape*)shape)->textureCoordIndex);
@@ -1258 +1258 @@
                                                startIndex, n);
         }
-      } 
+      }
       else
 #endif  // __COIN__
         nonIndexedTexCoords = ivTexCoords;
     }
-    
+
     // create alternate normals
     if (ivNormals) {
@@ -1301 +1301 @@
     if (shape->isOfType(SoPointSet::getClassTypeId()))
       ((SoPointSet*)shape)->numPoints.setValue(elementsCount); else
-    
+
     if (shape->isOfType(SoLineSet::getClassTypeId())) {
       switch (pset->getMode()) {
@@ -1562 +1562 @@
         texCoords = new SoTextureCoordinate2;
         osgArray2ivMField(g->getTexCoordArray(0), ((SoTextureCoordinate2*)texCoords)->point);
-      } 
+      }
 #ifdef __COIN__
       else {
@@ -1607 +1607 @@
       case GL_TRIANGLES:
       case GL_TRIANGLE_STRIP:
-      case GL_QUAD_STRIP:     if (useIndices) 
+      case GL_QUAD_STRIP:     if (useIndices)
                                 if (vrml1Conversion) {
                                   shape = new SoIndexedFaceSet;
@@ -1665 +1665 @@
         const osg::DrawArrayLengths *drawArrayLengths =
           dynamic_cast<const osg::DrawArrayLengths*>(pset);
-        
+
         int startIndex = drawArrayLengths->getFirst();
-          
+
         ok = processPrimitiveSet(g, pset, NULL, needSeparateTriangles,
                                   -1, primSize, startIndex, -1, normalIndex, colorIndex,
@@ -1679 +1679 @@
         break;
       }
-      
+
       case osg::PrimitiveSet::DrawElementsUBytePrimitiveType:
       case osg::PrimitiveSet::DrawElementsUShortPrimitiveType:
@@ -1755 +1755 @@
       // convert rotation
       rotation = osg::Quat(-M_PI_2, osg::Vec3(0.,1.,0.)) * osg::Quat(M_PI_2, osg::Vec3(1.,0.,0.)) * rotation;
-      
+
       if (center.length2()==0. && rotation.zeroRotation() && ivState->ivTexture==NULL)
 
         // optimized handling of single node
         root->addChild(ivNode);
-      
+
       else {
         SoSeparator *root2 = new SoSeparator;
-        
+
         // handle transformation
         if (center.length2()!=0. || !rotation.zeroRotation()) {
@@ -1774 +1774 @@
         if (ivState->ivTexture)
           root2->addChild(ivState->ivTexture);
-        
+
         // build graph
         root2->addChild(ivNode);
@@ -1780 +1780 @@
       }
     }
-    
-    virtual void apply(const osg::Sphere &s) { 
+
+    virtual void apply(const osg::Sphere &s) {
       SoSphere *ivSphere = new SoSphere;
       ivSphere->radius.setValue(s.getRadius());
@@ -1807 +1807 @@
       processNode(ivCylinder, c.getCenter(), c.getRotation(), ivState->ivHead);
     }
-    
+
     void warnNonSupported() {
       OSG_WARN << "IvWriter: Not supported ShapeDrawable found. Skipping it." << std::endl;
@@ -1817 +1817 @@
     virtual void apply(const osg::HeightField&)    { warnNonSupported(); }
     virtual void apply(const osg::CompositeShape&) { warnNonSupported(); }
-  
+
     InventorState *ivState;
     MyShapeVisitor(InventorState *ivState) { this->ivState = ivState; }
@@ -1840 +1840 @@
     processGeometry(g, ivDrawableState);
   else
-  
+
   if ((sd = dynamic_cast<osg::ShapeDrawable*>(d)) != NULL) {
     processShapeDrawable(sd, ivDrawableState);
@@ -1898 +1898 @@
 
   if (useIvExtensions) {
-    
+
     // Create SoSeparator and convert StateSet
     InventorState *ivState = createInventorState(node.getStateSet());
@@ -1928 +1928 @@
       billboard->axisOfRotation.setValue(axis);
     #else
-      
+
       billboard->axisOfRotation.setValue(SbVec3f(0.f,0.f,0.f));
 
@@ -1955 +1955 @@
 
     popInventorState();
-  
+
   } else
     apply((osg::Geode&)node);
@@ -2022 +2022 @@
   osg::LOD::RangeMode rangeMode = node.getRangeMode();
   if (rangeMode == osg::LOD::DISTANCE_FROM_EYE_POINT) {
-    
+
     // use SoLOD for DISTANCE_FROM_EYE_POINT
     SoLOD *lod = new SoLOD;
@@ -2051 +2051 @@
 
   } else {
-    
+
     // undefined mode -> put warning
     OSG_WARN << "IvWriter: Undefined LOD::RangeMode value." << std::endl;