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/daeWriter.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 
     
    240240    c->setValue( "2006-07-25T00:00:00Z" ); 
    241241    m->setValue( "2006-07-25T00:00:00Z" ); 
    242      
     242 
    243243    u->setName( "meter" ); 
    244244    u->setMeter( 1 ); 
     
    278278 
    279279 
    280    // get description info as name value pairs  
     280   // get description info as name value pairs 
    281281   if (node.getDescriptions().size()%2 == 0) 
    282282   { 
     
    287287         std::string attrName( *ditr );   ++ditr; 
    288288         std::string attrValue( *ditr ); 
    289   
     289 
    290290         if (attrName=="collada_created" && !attrValue.empty()) 
    291291         { 
    292292            c->setValue( attrValue.c_str() ); 
    293          }  
     293         } 
    294294         else if (attrName=="collada_modified" && !attrValue.empty()) 
    295295         { 
    296296            m->setValue( attrValue.c_str() ); 
    297          }  
     297         } 
    298298         else if (attrName=="collada_keywords" && !attrValue.empty()) 
    299299         { 
     
    352352         else if (attrName=="collada_contributor{0}.author" && !attrValue.empty()) 
    353353         { 
    354             domAsset::domContributor::domAuthor *author =  
     354            domAsset::domContributor::domAuthor *author = 
    355355               daeSafeCast< domAsset::domContributor::domAuthor >(contributor->add("author" )); 
    356356            author->setValue( attrValue.c_str() ); 
     
    358358         else if (attrName=="collada_contributor{0}.authoring_tool" && !attrValue.empty()) 
    359359         { 
    360             domAsset::domContributor::domAuthoring_tool *authoring_tool =  
     360            domAsset::domContributor::domAuthoring_tool *authoring_tool = 
    361361               daeSafeCast< domAsset::domContributor::domAuthoring_tool >(contributor->add("authoring_tool" )); 
    362362            authoring_tool->setValue( attrValue.c_str() ); 
     
    364364         else if (attrName=="collada_contributor{0}.comments" && !attrValue.empty()) 
    365365         { 
    366             domAsset::domContributor::domComments *comments =  
     366            domAsset::domContributor::domComments *comments = 
    367367               daeSafeCast< domAsset::domContributor::domComments >(contributor->add("comments" )); 
    368368            comments->setValue( attrValue.c_str() ); 
     
    370370         else if (attrName=="collada_contributor{0}.source_data" && !attrValue.empty()) 
    371371         { 
    372             domAsset::domContributor::domSource_data *source_data =  
     372            domAsset::domContributor::domSource_data *source_data = 
    373373               daeSafeCast< domAsset::domContributor::domSource_data >(contributor->add("source_data" )); 
    374374            source_data->setValue( attrValue.c_str() ); 
     
    376376         else if (attrName=="collada_contributor{0}.copyright" && !attrValue.empty()) 
    377377         { 
    378             domAsset::domContributor::domCopyright *copyright =  
     378            domAsset::domContributor::domCopyright *copyright = 
    379379               daeSafeCast< domAsset::domContributor::domCopyright >(contributor->add("copyright" )); 
    380380            copyright->setValue( attrValue.c_str() ); 
    381381         } 
    382           
     382 
    383383         // TODO:  handle array of contributor data rather that just the first. 
    384384         // also there is probably a better way to pass attribute data as DescriptionList is a bit fragile 
     
    402402    // Save our current stateset 
    403403    stateSetStack.push(currentStateSet.get()); 
    404      
     404 
    405405    // merge with node stateset 
    406406    currentStateSet = static_cast<osg::StateSet*>(currentStateSet->clone(osg::CopyOp::SHALLOW_COPY)); 
    407     currentStateSet->merge(*ss);     
     407    currentStateSet->merge(*ss); 
    408408  } 
    409409}