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

    r12994 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 
     
    7171    updateCurrentDaeNode(); 
    7272    currentNode = daeSafeCast< domNode >(currentNode->add( COLLADA_ELEMENT_NODE ) ); 
    73      
     73 
    7474    // If a multiswitch node, store it's data as extra "MultiSwitch" data in the "OpenSceneGraph" technique 
    7575    osgSim::MultiSwitch* multiswitch = dynamic_cast<osgSim::MultiSwitch*>(&node); 
     
    129129 
    130130    writeNodeExtra(node); 
    131      
     131 
    132132    lastDepth = _nodePath.size(); 
    133133 
     
    176176 
    177177    writeNodeExtra(node); 
    178      
     178 
    179179    lastDepth = _nodePath.size(); 
    180180 
     
    215215        domAny *frameTime = (domAny*)teq->add("FrameTime"); 
    216216        std::stringstream fw; 
    217         for (unsigned int i = 0; i < node.getNumChildren(); i++)  
     217        for (unsigned int i = 0; i < node.getNumChildren(); i++) 
    218218        { 
    219219            if (i > 0) 
     
    238238        domAny *intervalEnd = (domAny*)teq->add("IntervalEnd"); 
    239239        intervalEnd->setValue(toString<int>(end).c_str()); 
    240          
     240 
    241241        // duration 
    242242        float speed; 
     
    254254 
    255255    writeNodeExtra(node); 
    256      
     256 
    257257    lastDepth = _nodePath.size(); 
    258      
     258 
    259259    traverse( node ); 
    260260} 
     
    316316        } 
    317317    } 
    318          
     318 
    319319    writeNodeExtra(node); 
    320320 
     
    323323} 
    324324 
    325 void daeWriter::apply( osg::ProxyNode &node )  
     325void daeWriter::apply( osg::ProxyNode &node ) 
    326326{ 
    327327    OSG_WARN << "ProxyNode. Missing " << node.getNumChildren() << " children" << std::endl; 
     
    348348    domLight *light = daeSafeCast< domLight >( lib_lights->add( COLLADA_ELEMENT_LIGHT ) ); 
    349349    light->setId( name.c_str() ); 
    350      
     350 
    351351    osg::Light* pOsgLight = node.getLight(); 
    352352 
     
    388388        domPoint->add(COLLADA_ELEMENT_QUADRATIC_ATTENUATION); 
    389389        domPoint->getQuadratic_attenuation()->setValue(pOsgLight->getQuadraticAttenuation()); 
    390          
     390 
    391391        if ((position.x() != 0) || (position.y() != 0) || (position.z() != 0)) 
    392392        { 
     
    446446        domLight *ambientDomLight = daeSafeCast< domLight >( lib_lights->add( COLLADA_ELEMENT_LIGHT ) ); 
    447447        ambientDomLight->setId(name.c_str()); 
    448          
     448 
    449449        domLight::domTechnique_common *ambientDomTechniqueCommon = daeSafeCast<domLight::domTechnique_common>(ambientDomLight->add(COLLADA_ELEMENT_TECHNIQUE_COMMON)); 
    450450 
     
    457457        domAmbient->getColor()->setValue(color); 
    458458    } 
    459     
     459 
    460460    traverse( node ); 
    461461} 
     
    514514    switch(node.getFieldOfViewMode()) 
    515515    { 
    516         case(osg::CameraView::UNCONSTRAINED):  
     516        case(osg::CameraView::UNCONSTRAINED): 
    517517            pXfov = daeSafeCast< domTargetableFloat >( pDomPerspective->add( COLLADA_ELEMENT_XFOV ) ); 
    518518            pXfov->setValue(node.getFieldOfView()); 
    519519            break; 
    520         case(osg::CameraView::HORIZONTAL):  
     520        case(osg::CameraView::HORIZONTAL): 
    521521            pXfov = daeSafeCast< domTargetableFloat >( pDomPerspective->add( COLLADA_ELEMENT_XFOV ) ); 
    522522            pXfov->setValue(node.getFieldOfView()); 
    523523            break; 
    524         case(osg::CameraView::VERTICAL):  
     524        case(osg::CameraView::VERTICAL): 
    525525            pYfov = daeSafeCast< domTargetableFloat >( pDomPerspective->add( COLLADA_ELEMENT_YFOV ) ); 
    526526            pYfov->setValue(node.getFieldOfView());