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

OpenSceneGraph/trunk/src/osgPlugins/obj/obj.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -48 +48 @@
         if (s[0] != '-')
             break;
- 
+
         int n;
         if (s[1] == 's' || s[1] == 'o')
@@ -137 +137 @@
                 if (skipNewline)
                 {
-                    skipNewline = false; 
+                    skipNewline = false;
                     *ptr++ = ' ';
                     continue;
@@ -147 +147 @@
             if (skipNewline)
             {
-                skipNewline = false; 
+                skipNewline = false;
                 *ptr++ = ' ';
                 continue;
@@ -167 +167 @@
         {
             // need to keep return;
-            skipNewline = true;   
+            skipNewline = true;
         }
         else if (c!=std::ifstream::traits_type::eof()) // don't copy eof.
@@ -179 +179 @@
             }
         }
-        
-        
-    }
-    
+
+
+    }
+
     // strip trailing spaces
     while (ptr>line && *(ptr-1)==' ')
@@ -190 +190 @@
 
     *ptr = 0;
-    
+
     if (changeTabsToSpaces)
     {
-        
+
         for(ptr = line; *ptr != 0; ++ptr)
         {
@@ -199 +199 @@
         }
     }
-    
+
     return true;
 }
@@ -448 +448 @@
                 // map_opacity doesn't exist in the spec, but was already in the plugin
                 // so leave it or plugin will break for some users
-                else if (strncmp(line,"map_opacity ",12)==0) 
+                else if (strncmp(line,"map_opacity ",12)==0)
                 {
                     material->maps.push_back(parseTextureMap(strip(line+12),Material::Map::OPACITY));
@@ -496 +496 @@
                 OSG_NOTICE <<"*** line not handled *** :"<<line<<std::endl;
             }
-        
+
         }
 
@@ -563 +563 @@
             {
                 char* ptr = line+2;
-                
+
                 Element* element = new Element( (line[0]=='p') ? Element::POINTS :
                                                 (line[0]=='l') ? Element::POLYLINE :
@@ -575 +575 @@
                     // skip white space
                     while(*ptr==' ') ++ptr;
-                    
+
                     if (sscanf(ptr, "%d/%d/%d", &vi, &ti, &ni) == 3)
                     {
@@ -603 +603 @@
                     // skip to white space or end of line
                     while(*ptr!=' ' && *ptr!=0) ++ptr;
-                
-                }
-                
+
+                }
+
                 if (!element->normalIndices.empty() && element->normalIndices.size() != element->vertexIndices.size())
                 {
                     element->normalIndices.clear();
                 }
-                
+
                 if (!element->texCoordIndices.empty() && element->texCoordIndices.size() != element->vertexIndices.size())
                 {
                     element->texCoordIndices.clear();
                 }
-                
+
                 if (!element->vertexIndices.empty())
                 {
@@ -705 +705 @@
                 if (strncmp(line+2,"off",3)==0) smoothingGroup = 0;
                 else sscanf(line+2,"%d",&smoothingGroup);
-                
+
                 if (currentElementState.smoothingGroup != smoothingGroup)
                 {
@@ -716 +716 @@
                 OSG_NOTICE <<"*** line not handled *** :"<<line<<std::endl;
             }
-        
+
         }
 
@@ -726 +726 @@
     OSG_NOTICE <<"materials :"<<materialMap.size()<<std::endl;
     OSG_NOTICE <<"elementStates :"<<elementStateMap.size()<<std::endl;
-    
+
     unsigned int pos=0;
     for(ElementStateMap::iterator itr=elementStateMap.begin();
@@ -740 +740 @@
         OSG_NOTICE<<"    es.smoothGroup="<<es.smoothingGroup<<std::endl;
         OSG_NOTICE<<"    ElementList ="<<el.size()<<std::endl;
-        
+
     }
 #endif
@@ -754 +754 @@
     }
     currentElementList->push_back(element);
-    
+
 }
 
@@ -767 +767 @@
     }
     normal.normalize();
-    
+
     return normal;
 }
@@ -783 +783 @@
     }
     normal.normalize();
-    
+
     return normal;
 }
@@ -790 +790 @@
 {
     if (element.normalIndices.empty()) return false;
-    
+
     return computeNormal(element)*averageNormal(element) < 0.0f;
 }