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

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 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.
 */
@@ -35 +35 @@
 #include "ExportOptions.h"
 
-#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)  
+#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)
 
 using namespace flt;
@@ -227 +227 @@
         {
             supportsExtension("flt","OpenFlight format");
-            
+
             supportsOption("clampToEdge","Import option");
             supportsOption("keepExternalReferences","Import option");
@@ -263 +263 @@
             return readNode(file, options);
         }
-        
+
         virtual ReadResult readNode(const std::string& file, const Options* options) const
         {
@@ -281 +281 @@
             }
 
-            // setting up the database path so that internally referenced file are searched for on relative paths. 
+            // 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->getDatabasePathList().push_front(osgDB::getFilePath(fileName));
@@ -304 +304 @@
                 // add to local cache.
                 flt::Registry::instance()->addExternalToLocalCache(fileName,rr.getNode());
-        
+
                 bool keepExternalReferences = false;
                 if (options)
@@ -324 +324 @@
                 else
                 {
-                    OSG_DEBUG << "keepExternalReferences found, so externals will be left as ProxyNodes"<<std::endl;    
+                    OSG_DEBUG << "keepExternalReferences found, so externals will be left as ProxyNodes"<<std::endl;
                 }
             }
@@ -334 +334 @@
             return rr;
         }
-        
+
         virtual ReadResult readObject(std::istream& fin, const Options* options) const
         {
             return readNode(fin, options);
         }
-        
+
         virtual ReadResult readNode(std::istream& fin, const Options* options) const
         {
@@ -349 +349 @@
             {
                 const char readerMsg[] = "flt reader option: ";
-                
+
                 document.setReplaceClampWithClampToEdge((options->getOptionString().find("clampToEdge")!=std::string::npos));
                 OSG_DEBUG << readerMsg << "clampToEdge=" << document.getReplaceClampWithClampToEdge() << std::endl;
@@ -429 +429 @@
                 size_type   size   = (size_type)dataStream.readUInt16();
 
-                // If size == 0, an EOF has probably been reached, i.e. there is nothing 
+                // If size == 0, an EOF has probably been reached, i.e. there is nothing
                 // more to read so we must return.
                 if (size==0)
@@ -515 +515 @@
                 optimizer.optimize(document.getHeaderNode(),
                     osgUtil::Optimizer::SHARE_DUPLICATE_STATE |
-                    osgUtil::Optimizer::MERGE_GEOMETRY | 
-                    osgUtil::Optimizer::MERGE_GEODES | 
+                    osgUtil::Optimizer::MERGE_GEOMETRY |
+                    osgUtil::Optimizer::MERGE_GEODES |
                     osgUtil::Optimizer::TESSELLATE_GEOMETRY |
                     osgUtil::Optimizer::STATIC_OBJECT_DETECTION);