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/osgParticle/ParticleEffect.cpp

    r8500 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*/ 
     
    3636{ 
    3737    if (_useLocalParticleSystem==local) return; 
    38      
     38 
    3939    _useLocalParticleSystem = local; 
    4040 
     
    8686{ 
    8787    if (_startTime==startTime) return; 
    88      
     88 
    8989    _startTime =startTime; 
    9090 
     
    106106 
    107107    _defaultParticleTemplate.setLifeTime(duration); 
    108      
     108 
    109109    if (_automaticSetup) setUpEmitterAndProgram(); 
    110110} 
     
    122122{ 
    123123    if (_particleSystem==ps) return; 
    124      
     124 
    125125    _particleSystem = ps; 
    126126 
     
    146146    osg::ref_ptr<ParticleSystem> particleSystem = getParticleSystem(); 
    147147 
    148     if (!emitter || !particleSystem || !program) return;  
     148    if (!emitter || !particleSystem || !program) return; 
    149149 
    150150 
    151151    // clear the children. 
    152152    removeChildren(0,getNumChildren()); 
    153      
     153 
    154154    // add the emitter 
    155155    addChild(emitter.get()); 
    156      
     156 
    157157    // add the program to update the particles 
    158158    addChild(program.get()); 
     
    166166    { 
    167167        particleSystem->setParticleScaleReferenceFrame(ParticleSystem::LOCAL_COORDINATES); 
    168      
     168 
    169169        // add the geode to the scene graph 
    170170        osg::Geode* geode = new osg::Geode;