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/SmokeEffect.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*/ 
     
    2727{ 
    2828    setDefaults(); 
    29      
     29 
    3030    _position.set(0.0f,0.0f,0.0f); 
    3131    _scale = 1.0f; 
     
    3434    _emitterDuration = 65.0; 
    3535    _defaultParticleTemplate.setLifeTime(5.0*_scale); 
    36          
     36 
    3737    if (_automaticSetup) buildEffect(); 
    3838} 
     
    4141{ 
    4242    setDefaults(); 
    43      
     43 
    4444    _position = position; 
    4545    _scale = scale; 
     
    4848    _emitterDuration = 65.0; 
    4949    _defaultParticleTemplate.setLifeTime(5.0*_scale); 
    50          
     50 
    5151    if (_automaticSetup) buildEffect(); 
    5252} 
     
    6161{ 
    6262    ParticleEffect::setDefaults(); 
    63      
    64     _textureFileName = "Images/smoke.rgb";     
     63 
     64    _textureFileName = "Images/smoke.rgb"; 
    6565    _emitterDuration = 65.0; 
    6666 
     
    7070    _defaultParticleTemplate.setAlphaRange(osgParticle::rangef(0.1f, 1.0f)); 
    7171    _defaultParticleTemplate.setColorRange(osgParticle::rangev4( 
    72                                             osg::Vec4(1, 1.0f, 1.0f, 1.0f),  
     72                                            osg::Vec4(1, 1.0f, 1.0f, 1.0f), 
    7373                                            osg::Vec4(1, 1.0f, 1.f, 0.0f))); 
    7474 
     
    9090        osgParticle::Particle& ptemplate = _particleSystem->getDefaultParticleTemplate(); 
    9191 
    92         float radius = 0.5f*_scale;  
     92        float radius = 0.5f*_scale; 
    9393        float density = 1.0f; // 1.0kg/m^3 
    9494 
    9595        ptemplate.setLifeTime(_defaultParticleTemplate.getLifeTime()); 
    9696 
    97         // the following ranges set the envelope of the respective  
     97        // the following ranges set the envelope of the respective 
    9898        // graphical properties in time. 
    9999        ptemplate.setSizeRange(osgParticle::rangef(radius*_defaultParticleTemplate.getSizeRange().minimum, 
     
    153153    // set up program. 
    154154    if (!_program) 
    155     {         
     155    { 
    156156        _program = new osgParticle::FluidProgram; 
    157157    } 
    158      
     158 
    159159    if (_program.valid()) 
    160160    {