Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/ply/vertexData.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/ply/vertexData.cpp (modified) (27 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ply/vertexData.cpp

@@ -1 @@
-/*  
+/*
     vertexData.cpp
     Copyright (c) 2007, Tobias Wolf <twolf@access.unizh.ch>
-    All rights reserved.  
-    
+    All rights reserved.
+
     Implementation of the VertexData class.
 */
@@ -53 +53 @@
 
 /*  Read the vertex and (if available/wanted) color data from the open file.  */
-void VertexData::readVertices( PlyFile* file, const int nVertices, 
+void VertexData::readVertices( PlyFile* file, const int nVertices,
                                const int fields )
 {
@@ -81 +81 @@
     } vertex;
 
-    PlyProperty vertexProps[] = 
+    PlyProperty vertexProps[] =
     {
         { "x", PLY_FLOAT, PLY_FLOAT, offsetof( _Vertex, x ), 0, 0, 0, 0 },
@@ -104 +104 @@
         { "specular_power", PLY_FLOAT, PLY_FLOAT, offsetof( _Vertex, specular_power ), 0, 0, 0, 0 },
     };
-    
+
     // use all 6 properties when reading colors, only the first 3 otherwise
-    for( int i = 0; i < 3; ++i ) 
+    for( int i = 0; i < 3; ++i )
         ply_get_property( file, "vertex", &vertexProps[i] );
-    
+
     if (fields & NORMALS)
-      for( int i = 3; i < 6; ++i ) 
+      for( int i = 3; i < 6; ++i )
         ply_get_property( file, "vertex", &vertexProps[i] );
 
     if (fields & RGB)
-      for( int i = 6; i < 9; ++i ) 
+      for( int i = 6; i < 9; ++i )
         ply_get_property( file, "vertex", &vertexProps[i] );
 
     if (fields & AMBIENT)
-      for( int i = 9; i < 12; ++i ) 
+      for( int i = 9; i < 12; ++i )
         ply_get_property( file, "vertex", &vertexProps[i] );
 
     if (fields & DIFFUSE)
-      for( int i = 12; i < 15; ++i ) 
+      for( int i = 12; i < 15; ++i )
         ply_get_property( file, "vertex", &vertexProps[i] );
 
     if (fields & SPECULAR)
-      for( int i = 15; i < 20; ++i ) 
+      for( int i = 15; i < 20; ++i )
         ply_get_property( file, "vertex", &vertexProps[i] );
 
     // check whether array is valid otherwise allocate the space
     if(!_vertices.valid())
-        _vertices = new osg::Vec3Array; 
+        _vertices = new osg::Vec3Array;
 
     if( fields & NORMALS )
@@ -138 +138 @@
             _normals = new osg::Vec3Array;
     }
-    
+
     // If read colors allocate space for color array
     if( fields & RGB )
@@ -157 +157 @@
             _diffuse = new osg::Vec4Array;
     }
-    
+
     if( fields & SPECULAR )
     {
@@ -203 +203 @@
     } face;
 
-    PlyProperty faceProps[] = 
-    {
-        { "vertex_indices", PLY_INT, PLY_INT, offsetof( _Face, vertices ), 
+    PlyProperty faceProps[] =
+    {
+        { "vertex_indices", PLY_INT, PLY_INT, offsetof( _Face, vertices ),
           1, PLY_UCHAR, PLY_UCHAR, offsetof( _Face, nVertices ) }
     };
-    
+
     ply_get_property( file, "face", &faceProps[0] );
-    
+
     //triangles.clear();
     //triangles.reserve( nFaces );
@@ -216 +216 @@
         _triangles = new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLES, 0);
 
-    
+
     // read in the faces, asserting that they are only triangles
     int ind1 = _invertFaces ? 2 : 0;
@@ -234 +234 @@
         _triangles->push_back( face.vertices[1]);
         _triangles->push_back( face.vertices[ind3] );
-        
+
         // free the memory that was allocated by ply_get_element
         free( face.vertices );
@@ -251 +251 @@
     int     nComments;
     char**  comments;
-    
+
     PlyFile* file = NULL;
 
     // Try to open ply file as for reading
     try{
-            file  = ply_open_for_reading( const_cast< char* >( filename ), 
-                                          &nPlyElems, &elemNames, 
+            file  = ply_open_for_reading( const_cast< char* >( filename ),
+                                          &nPlyElems, &elemNames,
                                           &fileType, &version );
     }
@@ -263 +263 @@
     catch( exception& e )
     {
-        MESHERROR << "Unable to read PLY file, an exception occured:  " 
+        MESHERROR << "Unable to read PLY file, an exception occured:  "
                     << e.what() << endl;
     }
@@ -269 +269 @@
     if( !file )
     {
-        MESHERROR << "Unable to open PLY file " << filename 
+        MESHERROR << "Unable to open PLY file " << filename
                   << " for reading." << endl;
         return NULL;
@@ -275 +275 @@
 
     MESHASSERT( elemNames != 0 );
-    
+
 
     nComments = file->num_comments;
     comments = file->comments;
-    
-    
+
+
     #ifndef NDEBUG
-    MESHINFO << filename << ": " << nPlyElems << " elements, file type = " 
+    MESHINFO << filename << ": " << nPlyElems << " elements, file type = "
              << fileType << ", version = " << version << endl;
     #endif
@@ -298 +298 @@
         int nElems;
         int nProps;
-        
+
         PlyProperty** props = NULL;
         try{
-                props = ply_get_element_description( file, elemNames[i], 
+                props = ply_get_element_description( file, elemNames[i],
                                                      &nElems, &nProps );
         }
         catch( exception& e )
         {
-            MESHERROR << "Unable to get PLY file description, an exception occured:  " 
+            MESHERROR << "Unable to get PLY file description, an exception occured:  "
                         << e.what() << endl;
         }
         MESHASSERT( props != 0 );
-        
+
         #ifndef NDEBUG
         MESHINFO << "element " << i << ": name = " << elemNames[i] << ", "
@@ -320 +320 @@
         }
         #endif
-        
+
         // if the string is vertex means vertex data is started
         if( equal_strings( elemNames[i], "vertex" ) )
@@ -349 +349 @@
               }
 
-            try {   
+            try {
                 // Read vertices and store in a std::vector array
                 readVertices( file, nElems, fields );
@@ -381 +381 @@
             catch( exception& e )
             {
-                MESHERROR << "Unable to read vertex in PLY file, an exception occured:  " 
+                MESHERROR << "Unable to read vertex in PLY file, an exception occured:  "
                             << e.what() << endl;
                 // stop for loop by setting the loop variable to break condition
                 // this way resources still get released even on error cases
                 i = nPlyElems;
-                
+
             }
         }
@@ -401 +401 @@
         catch( exception& e )
         {
-            MESHERROR << "Unable to read PLY file, an exception occured:  " 
+            MESHERROR << "Unable to read PLY file, an exception occured:  "
                       << e.what() << endl;
             // stop for loop by setting the loop variable to break condition
@@ -407 +407 @@
             i = nPlyElems;
         }
-        
+
         // free the memory that was allocated by ply_get_element_description
         for( int j = 0; j < nProps; ++j )
@@ -413 +413 @@
         free( props );
     }
-    
+
     ply_close( file );
-    
+
     // free the memory that was allocated by ply_open_for_reading
     for( int i = 0; i < nPlyElems; ++i )
@@ -443 +443 @@
             geom->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
         }
-        
+
         // Add the primitive set
         if (_triangles.valid() && _triangles->size() > 0 )
@@ -478 +478 @@
         // set flage true to activate the vertex buffer object of drawable
         geom->setUseVertexBufferObjects(true);
-        
+
 
         osg::Geode* geode = new osg::Geode;
@@ -484 +484 @@
         return geode;
    }
-    
+
     return NULL;
 }
@@ -502 +502 @@
     if(!_normals.valid())
     {
-        _normals = new osg::Vec3Array; 
-    }
-    
+        _normals = new osg::Vec3Array;
+    }
+
     //normals.clear();
     if( vertexNormals )
@@ -515 +515 @@
     }
 
-    
+
     for( size_t i = 0; i < ((_triangles->size()));  i += 3 )
     {
@@ -527 +527 @@
                                (*_vertices)[i1],
                                (*_vertices)[i2] );
-        
+
         // count emtpy normals in debug mode
         #ifndef NDEBUG
@@ -533 +533 @@
             ++wrongNormals;
         #endif
-         
+
         if( vertexNormals )
         {
-            (*_normals)[i0] += triangleNormal.triNormal; 
-            (*_normals)[i1] += triangleNormal.triNormal; 
+            (*_normals)[i0] += triangleNormal.triNormal;
+            (*_normals)[i1] += triangleNormal.triNormal;
             (*_normals)[i2] += triangleNormal.triNormal;
         }
         else
-            _normals->push_back( triangleNormal.triNormal ); 
-    }
-    
+            _normals->push_back( triangleNormal.triNormal );
+    }
+
     // normalize all the normals
     if( vertexNormals )
         for( size_t i = 0; i < _normals->size(); ++i )
             (*_normals)[i].normalize();
-    
+
     #ifndef NDEBUG
     if( wrongNormals > 0 )
         MESHINFO << wrongNormals << " faces had no valid normal." << endl;
-    #endif 
+    #endif
 }