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/PaletteRecords.cpp

    r11489 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*/ 
     
    219219        material->setEmission(osg::Material::FRONT_AND_BACK,osg::Vec4(emissive,alpha)); 
    220220        material->setShininess(osg::Material::FRONT_AND_BACK,shininess); 
    221          
     221 
    222222        MaterialPool* mp = document.getOrCreateMaterialPool(); 
    223223        (*mp)[index] = material; 
     
    258258            std::string name = in.readString(12); 
    259259            in.forward(4*28); 
    260              
     260 
    261261            osg::Material* material = new osg::Material; 
    262262            material->setAmbient(osg::Material::FRONT_AND_BACK,osg::Vec4(ambient,alpha)); 
     
    265265            material->setEmission(osg::Material::FRONT_AND_BACK,osg::Vec4(emissive,alpha)); 
    266266            material->setShininess(osg::Material::FRONT_AND_BACK,shininess); 
    267              
     267 
    268268            MaterialPool* mp = document.getOrCreateMaterialPool(); 
    269269            (*mp)[i] = material; 
     
    284284 
    285285    META_Record(TexturePalette) 
    286      
     286 
    287287protected: 
    288288 
     
    558558    META_Record(LightSourcePalette) 
    559559 
    560     enum LightType  
     560    enum LightType 
    561561    { 
    562562        INFINITE_LIGHT = 0, 
     
    656656        appearance->featureID = in.readInt16(); 
    657657 
    658         int32 backColorIndex = in.readInt32();         
    659         appearance->backColor = document.getColorPool() ?  
    660                             document.getColorPool()->getColor(backColorIndex) :  
     658        int32 backColorIndex = in.readInt32(); 
     659        appearance->backColor = document.getColorPool() ? 
     660                            document.getColorPool()->getColor(backColorIndex) : 
    661661                            osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f); 
    662662 
     
    694694        appearance->LODRangeRatio = in.readFloat32(); 
    695695        appearance->LODScale = in.readFloat32(); 
    696            
     696 
    697697        if(document.version() > VERSION_15_8) 
    698698            appearance->texturePatternIndex = in.readInt16(-1); 
    699699        else 
    700700           appearance->texturePatternIndex = -1; 
    701   
     701 
    702702        // The final short is reserved; don't bother reading it. 
    703   
     703 
    704704        // Add to pool 
    705705        LightPointAppearancePool* lpaPool = document.getOrCreateLightPointAppearancePool();