Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/lwo/ReaderWriterLWO.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/lwo/ReaderWriterLWO.cpp (modified) (16 diffs)

OpenSceneGraph/trunk/src/osgPlugins/lwo/ReaderWriterLWO.cpp

@@ -7 +7 @@
  * Improved LWO2 reader is (C) 2003-2004 Marco Jez <marco.jez@poste.it>
  *
- * The Open Scene Graph (OSG) is a cross platform C++/OpenGL library for 
- * real-time rendering of large 3D photo-realistic models. 
+ * The Open Scene Graph (OSG) is a cross platform C++/OpenGL library for
+ * real-time rendering of large 3D photo-realistic models.
  * The OSG homepage is http://www.openscenegraph.org/
  */
@@ -55 +55 @@
         supportsExtension("geo","Lightwave geometry format");
     }
-    
+
     virtual const char* className() const { return "Lightwave Object Reader"; }
 
     virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options) const
     {
-        std::string ext = osgDB::getLowerCaseFileExtension(file);        
+        std::string ext = osgDB::getLowerCaseFileExtension(file);
         if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
 
@@ -66 +66 @@
         if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
 
-        // code for setting up the database path so that internally referenced file are searched for on relative paths. 
+        // code for setting up the database path so that internally referenced file are searched for on relative paths.
         osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options;
         local_opt->setDatabasePath(osgDB::getFilePath(fileName));
@@ -72 +72 @@
         ReadResult result = readNode_LWO1(fileName,local_opt.get());
         if (result.success()) return result;
-        
+
         if (!options || options->getOptionString() != "USE_OLD_READER") {
             ReadResult result = readNode_LWO2(fileName, local_opt.get());
@@ -89 +89 @@
 protected:
 
-    
+
 
 };
@@ -197 +197 @@
     typedef std::map<int,GeometryCollection> MaterialToGeometryCollectionMap;
     MaterialToGeometryCollectionMap mtgcm;
-    
+
     // bin the indices for each material into the mtis;
     int i;
@@ -211 +211 @@
         }
     }
-    
+
     MaterialToGeometryCollectionMap::iterator itr;
     for(itr=mtgcm.begin(); itr!=mtgcm.end(); ++itr)
@@ -222 +222 @@
 
             gc._geom = new osg::Geometry;
-            
+
             osg::Vec3Array* vertArray = new osg::Vec3Array(gc._numPoints);
             gc._vertices = vertArray->begin();
@@ -233 +233 @@
                              lw_material.b,
                              1.0f);
-                             
+
             gc._geom->setColorArray(colors);
             gc._geom->setColorBinding(osg::Geometry::BIND_OVERALL);
-    
+
             // set up texture if needed.
             if (gc._numPrimitivesWithTexCoords==gc._numPrimitives)
@@ -267 +267 @@
                         stateset->setTextureAttributeAndModes(0,texture,osg::StateAttribute::ON);
                         gc._texturesActive=true;
-                        
+
                         gc._geom->setStateSet(stateset);
 
@@ -276 +276 @@
                 }
             }
-        }        
-    }
-    
-    
+        }
+    }
+
+
     for (i = 0; i < lw->face_cnt; ++i)
     {
@@ -286 +286 @@
         {
             GeometryCollection& gc = mtgcm[face.material];
-            
+
             osg::PrimitiveSet::Mode mode;
             switch(face.index_cnt)
@@ -309 +309 @@
                     break;
             }
-                        
+
             gc._geom->addPrimitiveSet(new osg::DrawArrays(mode,gc._coordCount,face.index_cnt));
             gc._coordCount += face.index_cnt;
@@ -326 +326 @@
                 (*gc._vertices++).set(lw->vertex[face.index[j]*3], lw->vertex[face.index[j]*3+2], lw->vertex[face.index[j]*3+1]);
             }
-            
+
             if (gc._texturesActive && face.texcoord)
             {
@@ -332 +332 @@
                 {
                     (*gc._texcoords++).set(face.texcoord[j*2],face.texcoord[j*2+1]);
-                }            
-            }            
+                }
+            }
         }
     }
 
     osg::Geode* geode = new osg::Geode;
-    
+
     osgUtil::Tessellator tessellator;
-    
-    // add everthing into the Geode.    
+
+    // add everthing into the Geode.
     osgUtil::SmoothingVisitor smoother;
     for(itr=mtgcm.begin();
@@ -350 +350 @@
         if (gc._geom)
         {
-            
+
             tessellator.retessellatePolygons(*gc._geom);
-        
+
             smoother.smooth(*gc._geom);
-            
+
             geode->addDrawable(gc._geom);
         }