Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp

    r12597 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212*/ 
     
    3535#include "ExportOptions.h" 
    3636 
    37 #define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)   
     37#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex) 
    3838 
    3939using namespace flt; 
     
    227227        { 
    228228            supportsExtension("flt","OpenFlight format"); 
    229              
     229 
    230230            supportsOption("clampToEdge","Import option"); 
    231231            supportsOption("keepExternalReferences","Import option"); 
     
    263263            return readNode(file, options); 
    264264        } 
    265          
     265 
    266266        virtual ReadResult readNode(const std::string& file, const Options* options) const 
    267267        { 
     
    281281            } 
    282282 
    283             // setting up the database path so that internally referenced file are searched for on relative paths.  
     283            // setting up the database path so that internally referenced file are searched for on relative paths. 
    284284            osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options; 
    285285            local_opt->getDatabasePathList().push_front(osgDB::getFilePath(fileName)); 
     
    304304                // add to local cache. 
    305305                flt::Registry::instance()->addExternalToLocalCache(fileName,rr.getNode()); 
    306          
     306 
    307307                bool keepExternalReferences = false; 
    308308                if (options) 
     
    324324                else 
    325325                { 
    326                     OSG_DEBUG << "keepExternalReferences found, so externals will be left as ProxyNodes"<<std::endl;     
     326                    OSG_DEBUG << "keepExternalReferences found, so externals will be left as ProxyNodes"<<std::endl; 
    327327                } 
    328328            } 
     
    334334            return rr; 
    335335        } 
    336          
     336 
    337337        virtual ReadResult readObject(std::istream& fin, const Options* options) const 
    338338        { 
    339339            return readNode(fin, options); 
    340340        } 
    341          
     341 
    342342        virtual ReadResult readNode(std::istream& fin, const Options* options) const 
    343343        { 
     
    349349            { 
    350350                const char readerMsg[] = "flt reader option: "; 
    351                  
     351 
    352352                document.setReplaceClampWithClampToEdge((options->getOptionString().find("clampToEdge")!=std::string::npos)); 
    353353                OSG_DEBUG << readerMsg << "clampToEdge=" << document.getReplaceClampWithClampToEdge() << std::endl; 
     
    429429                size_type   size   = (size_type)dataStream.readUInt16(); 
    430430 
    431                 // If size == 0, an EOF has probably been reached, i.e. there is nothing  
     431                // If size == 0, an EOF has probably been reached, i.e. there is nothing 
    432432                // more to read so we must return. 
    433433                if (size==0) 
     
    515515                optimizer.optimize(document.getHeaderNode(), 
    516516                    osgUtil::Optimizer::SHARE_DUPLICATE_STATE | 
    517                     osgUtil::Optimizer::MERGE_GEOMETRY |  
    518                     osgUtil::Optimizer::MERGE_GEODES |  
     517                    osgUtil::Optimizer::MERGE_GEOMETRY | 
     518                    osgUtil::Optimizer::MERGE_GEODES | 
    519519                    osgUtil::Optimizer::TESSELLATE_GEOMETRY | 
    520520                    osgUtil::Optimizer::STATIC_OBJECT_DETECTION);