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/dae/daeWMaterials.cpp

    r12416 r13041  
    22 * Copyright 2006 Sony Computer Entertainment Inc. 
    33 * 
    4  * Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this  
     4 * Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this 
    55 * file except in compliance with the License. You may obtain a copy of the License at: 
    66 * http://research.scea.com/scea_shared_source_license.html 
    77 * 
    8  * Unless required by applicable law or agreed to in writing, software distributed under the License  
    9  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or  
    10  * implied. See the License for the specific language governing permissions and limitations under the  
    11  * License.  
     8 * Unless required by applicable law or agreed to in writing, software distributed under the License 
     9 * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
     10 * implied. See the License for the specific language governing permissions and limitations under the 
     11 * License. 
    1212 */ 
    1313 
     
    7878    domEffect *effect = daeSafeCast< domEffect >( lib_effects->add( COLLADA_ELEMENT_EFFECT ) ); 
    7979    std::string efName = name + "_effect"; 
    80      
     80 
    8181    effect->setId( efName.c_str() ); 
    8282 
     
    143143            domFx_sampler2D_common *sampler = daeSafeCast< domFx_sampler2D_common >( np->add( COLLADA_ELEMENT_SAMPLER2D ) ); 
    144144            domFx_sampler2D_common_complexType::domSource *source = daeSafeCast< domFx_sampler2D_common_complexType::domSource >( sampler->add( COLLADA_ELEMENT_SOURCE ) ); 
    145             source->setValue( surfName.c_str() );  
     145            source->setValue( surfName.c_str() ); 
    146146 
    147147            //set sampler state 
    148148            domFx_sampler2D_common_complexType::domWrap_s *wrap_s = daeSafeCast< domFx_sampler2D_common_complexType::domWrap_s >( sampler->add( COLLADA_ELEMENT_WRAP_S ) ); 
    149149            osg::Texture::WrapMode wrap = tex->getWrap( osg::Texture::WRAP_S ); 
    150             switch( wrap )  
     150            switch( wrap ) 
    151151            { 
    152152            case osg::Texture::CLAMP: 
     
    170170            domFx_sampler2D_common_complexType::domWrap_t *wrap_t = daeSafeCast< domFx_sampler2D_common_complexType::domWrap_t >( sampler->add( COLLADA_ELEMENT_WRAP_T ) ); 
    171171            wrap = tex->getWrap( osg::Texture::WRAP_T ); 
    172             switch( wrap )  
     172            switch( wrap ) 
    173173            { 
    174174            case osg::Texture::CLAMP: 
     
    273273        const osg::Vec4 &sCol = osgmat->getSpecularFrontAndBack()?osgmat->getSpecular( osg::Material::FRONT_AND_BACK ):osgmat->getSpecular( osg::Material::FRONT ); 
    274274        float shininess = osgmat->getShininessFrontAndBack()?osgmat->getShininess( osg::Material::FRONT_AND_BACK ):osgmat->getShininess( osg::Material::FRONT ); 
    275          
     275 
    276276        domCommon_color_or_texture_type *cot = daeSafeCast< domCommon_color_or_texture_type >( phong->add( COLLADA_ELEMENT_EMISSION ) ); 
    277277        domCommon_color_or_texture_type_complexType::domColor *col = daeSafeCast< domCommon_color_or_texture_type_complexType::domColor >( cot->add( COLLADA_ELEMENT_COLOR ) ); 
     
    288288        col->getValue().append( aCol.a() ); 
    289289 
    290          
     290 
    291291        //### check if we really have a texture 
    292292        if ( phong->getDiffuse() == NULL ) 
     
    302302        { 
    303303            cot = phong->getDiffuse(); 
    304              
     304 
    305305            if (_pluginOptions.writeExtras) 
    306306            { 
     
    395395                ctt->setOpaque( FX_OPAQUE_ENUM_A_ONE ); 
    396396                domCommon_color_or_texture_type_complexType::domTexture * dtex = daeSafeCast< domCommon_color_or_texture_type_complexType::domTexture >( ctt->add(COLLADA_ELEMENT_TEXTURE) ); 
    397                  
     397 
    398398                if (!_pluginOptions.earthTex) 
    399399                { 
     
    406406                    dtex->setTexture( iName.c_str() ); 
    407407                } 
    408                 dtex->setTexcoord( "texcoord0" );            
     408                dtex->setTexcoord( "texcoord0" ); 
    409409            } 
    410410            else