Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/pfb/ConvertFromPerformer.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/pfb/ConvertFromPerformer.cpp (modified) (20 diffs)

OpenSceneGraph/trunk/src/osgPlugins/pfb/ConvertFromPerformer.cpp

@@ -384 +384 @@
     osgTransform = new osg::MatrixTransform;
     if (osgParent) osgParent->addChild(osgTransform);
-    
+
     osgTransform->setDataVariance(osg::Object::STATIC);
 
@@ -585 +585 @@
             geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_TRIANGLE_STRIP,0,np,plen));
             break;
-            
+
         case PFGS_TRIFANS :
             geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_TRIANGLE_FAN,0,np,plen));
@@ -593 +593 @@
             geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_TRIANGLE_STRIP,0,np,plen));
             break;
-            
+
         case PFGS_POLYS :
             geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_POLYGON,0,np,plen));
             break;
-            
+
         case PFGS_LINESTRIPS :
             geom->addPrimitiveSet(new osg::DrawArrayLengths(GL_LINE_STRIP,0,np,plen));
@@ -641 +641 @@
             (*osg_coords)[i][2] = coords[i][2];
         }
-        
+
         geom->setVertexArray(osg_coords);
 
@@ -659 +659 @@
     {
         int bind = geoset->getAttrBind( PFGS_TEXCOORD2 );
-        
-        
+
+
         if (bind==PFGS_PER_VERTEX && bind != PFGS_OFF)
         {
@@ -727 +727 @@
                 cc++;
 
-                // straight forward mapping of normals across.                
+                // straight forward mapping of normals across.
                 osg::Vec3Array* osg_norms = new osg::Vec3Array(cc);
                 for( i = 0; i < cc; i++ )
@@ -735 +735 @@
                     (*osg_norms)[i][2] = norms[i][2];
                 }
-                geom->setNormalArray(osg_norms);            
+                geom->setNormalArray(osg_norms);
 
                 osg::UShortArray* osg_indices = new osg::UShortArray;
                 osg_indices->reserve(nv);
-                
+
                 int ni=0;
                 for( i = 0; i < np; ++i)
@@ -752 +752 @@
                     }
                 }
-                
-                if (ni!=nn) 
+
+                if (ni!=nn)
                 {
                     OSG_INFO << "1 ni!=nn"<<std::endl;
                 }
-                
+
                 geom->setNormalIndices(osg_indices);
-                
-                
+
+
             }
             else
@@ -766 +766 @@
                 osg::Vec3Array* osg_norms = new osg::Vec3Array;
                 osg_norms->reserve(nv);
-                
+
                 int ni=0;
                 for( i = 0; i < np; ++i)
@@ -781 +781 @@
                 }
 
-                geom->setNormalArray(osg_norms);            
+                geom->setNormalArray(osg_norms);
             }
 
@@ -814 +814 @@
                 (*osg_norms)[i][2] = norms[i][2];
             }
-            geom->setNormalArray(osg_norms);            
+            geom->setNormalArray(osg_norms);
 
             if(ilist)
@@ -848 +848 @@
                 cc++;
 
-                // straight forward mapping of normals across.                
+                // straight forward mapping of normals across.
                 osg::Vec4Array* osg_colors = new osg::Vec4Array(cc);
                 for( i = 0; i < cc; i++ )
@@ -857 +857 @@
                     (*osg_colors)[i][3] = colors[i][3];
                 }
-                geom->setColorArray(osg_colors);            
+                geom->setColorArray(osg_colors);
 
                 osg::UShortArray* osg_indices = new osg::UShortArray;
                 osg_indices->reserve(nv);
-                
+
                 int ni=0;
                 for( i = 0; i < np; ++i)
@@ -874 +874 @@
                     }
                 }
-                
-                if (ni!=nn) 
+
+                if (ni!=nn)
                 {
                     OSG_INFO << "1 ni!=nn"<<std::endl;
                 }
-                
+
                 geom->setColorIndices(osg_indices);
-                
-                
+
+
             }
             else
@@ -888 +888 @@
                 osg::Vec4Array* osg_colors = new osg::Vec4Array;
                 osg_colors->reserve(nv);
-                
+
                 int ni=0;
                 for( i = 0; i < np; ++i)
@@ -903 +903 @@
                 }
 
-                geom->setColorArray(osg_colors);            
+                geom->setColorArray(osg_colors);
             }
         }
@@ -949 +949 @@
     {
     }
-    
-    
-        
+
+
+
     visitGeoState(geom,geoset->getGState());
-    
+
     if (flat_shaded_skip_per_primitive)
     {
@@ -1204 +1204 @@
     //         }
     //     }
-    // 
-    
-    
+    //
+
+
     pfMaterial* front_mat = (pfMaterial*)geostate->getAttr(PFSTATE_FRONTMTL);
     pfMaterial* back_mat = (pfMaterial*)geostate->getAttr(PFSTATE_BACKMTL);
@@ -1215 +1215 @@
 
     pfTexEnv* texenv = (pfTexEnv*)geostate->getAttr(PFSTATE_TEXENV);
-   
+
     if(texenv)
     {
       osg::TexEnv* osgTexEnv = new osg::TexEnv();
       int mode = texenv->getMode();
-      
+
       float r,g,b,a;
       texenv->getBlendColor(&r, &g, &b, &a);
-      
+
       switch(mode)
       {
@@ -1448 +1448 @@
         // not quite sure what is supposed to be interpret the Peformer
         // filter modes here so will simple go with OpenGL default.
-    
+
         return osg::Texture2D::LINEAR;
     }