Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 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/PrimaryRecords.cpp

    r11961 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*/ 
     
    8888        /*uint8 textureWhite =*/ in.readUInt8(); 
    8989        /*uint32 flags =*/ in.readUInt32(); 
    90          
     90 
    9191        in.forward( 4*6 ); 
    9292        /*int32 projectionType =*/ in.readInt32(); 
     
    223223        if ((document.version() < VERSION_15_8) && (_flags & SWING_ANIM)) 
    224224            _forwardAnim = true; 
    225          
     225 
    226226        // OpenFlight 15.8 adds backwards animations 
    227227        _backwardAnim = ( (document.version() >= VERSION_15_8) && 
     
    260260            if (_forwardAnim) 
    261261                sequence->setInterval(loopMode, 0, -1); 
    262             else  
     262            else 
    263263                sequence->setInterval(loopMode, -1, 0); 
    264264 
     
    394394        float length_y = yAxis.normalize(); 
    395395        float length_z = zAxis.normalize(); 
    396          
     396 
    397397        if ((length_x*length_y*length_z)==0.0f) 
    398398        { 
     
    401401            OSG_NOTICE<<"    pointOnXAxis="<<pointOnXAxis<<std::endl; 
    402402            OSG_NOTICE<<"    pointInXYPlane="<<pointInXYPlane<<std::endl; 
    403              
     403 
    404404            xAxis.set(1.0f,0.0f,0.0f); 
    405405            yAxis.set(0.0f,1.0f,0.0f); 
     
    411411 
    412412        // create putmatrix 
    413         osg::Matrix inv_putmat(xAxis.x(), xAxis.y(), xAxis.z(), 0.0,  
     413        osg::Matrix inv_putmat(xAxis.x(), xAxis.y(), xAxis.z(), 0.0, 
    414414                               yAxis.x(), yAxis.y(), yAxis.z(), 0.0, 
    415415                               zAxis.x(), zAxis.y(), zAxis.z(), 0.0, 
     
    464464 
    465465/** LevelOfDetail - To recreate the LevelOfDetail record in OSG we have to create a LOD node with one Group node under it. 
    466  *  OSG representation Children of the LevelOfDetail record will be added to  
     466 *  OSG representation Children of the LevelOfDetail record will be added to 
    467467*/ 
    468468class LevelOfDetail : public PrimaryRecord 
     
    604604        { 
    605605            unsigned int nChild = _multiSwitch->getNumChildren(); 
    606             for (unsigned int nMask=0; nMask<_numberOfMasks; ++nMask)  
     606            for (unsigned int nMask=0; nMask<_numberOfMasks; ++nMask) 
    607607            { 
    608608                // test if this child is active in the current mask (itMask) 
     
    917917            /*uint32 flags =*/ in.readUInt32(); 
    918918        } 
    919          
     919 
    920920        // Postpone add-to-parent until we know a bit more. 
    921921    } 
     
    10091009        float32 pitch = in.readFloat32(); 
    10101010 
    1011         _lightSource = new osg::LightSource;   
     1011        _lightSource = new osg::LightSource; 
    10121012        _lightSource->setName(id); 
    10131013 
     
    10371037 
    10381038            _lightSource->setLight(light); 
    1039             _lightSource->setLocalStateSetModes((flags & ENABLED) ? osg::StateAttribute::ON : osg::StateAttribute::OFF);  
     1039            _lightSource->setLocalStateSetModes((flags & ENABLED) ? osg::StateAttribute::ON : osg::StateAttribute::OFF); 
    10401040 
    10411041            // Global light.