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/FireEffect.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*/ 
     
    3131{ 
    3232    setDefaults(); 
    33      
     33 
    3434    _position.set(0.0f,0.0f,0.0f); 
    3535    _scale = 1.0f; 
    3636    _intensity = 1.0f; 
    37       
     37 
    3838    _emitterDuration = 60.0; 
    3939    _defaultParticleTemplate.setLifeTime(0.5+0.1*_scale); 
    40         
     40 
    4141    if (_automaticSetup) buildEffect(); 
    4242} 
     
    4545{ 
    4646    setDefaults(); 
    47      
     47 
    4848    _position = position; 
    4949    _scale = scale; 
    5050    _intensity = intensity; 
    51       
     51 
    5252    _emitterDuration = 60.0; 
    5353    _defaultParticleTemplate.setLifeTime(0.5+0.1*_scale); 
    54         
     54 
    5555    if (_automaticSetup) buildEffect(); 
    5656} 
     
    6565{ 
    6666    ParticleEffect::setDefaults(); 
    67      
    68     _textureFileName = "Images/smoke.rgb";     
     67 
     68    _textureFileName = "Images/smoke.rgb"; 
    6969    _emitterDuration = 60.0; 
    7070 
     
    7474    _defaultParticleTemplate.setAlphaRange(osgParticle::rangef(0.1f, 1.0f)); 
    7575    _defaultParticleTemplate.setColorRange(osgParticle::rangev4( 
    76                                             osg::Vec4(1, 0.8f, 0.2f, 1.0f),  
     76                                            osg::Vec4(1, 0.8f, 0.2f, 1.0f), 
    7777                                            osg::Vec4(1, 0.3f, 0.2f, 0.0f))); 
    7878} 
     
    9393        osgParticle::Particle& ptemplate = _particleSystem->getDefaultParticleTemplate(); 
    9494 
    95         float radius = 0.25f*_scale;  
     95        float radius = 0.25f*_scale; 
    9696        float density = 0.5f; // 0.5kg/m^3 
    9797 
    9898        ptemplate.setLifeTime(_defaultParticleTemplate.getLifeTime()); 
    9999 
    100         // the following ranges set the envelope of the respective  
     100        // the following ranges set the envelope of the respective 
    101101        // graphical properties in time. 
    102102        ptemplate.setSizeRange(osgParticle::rangef(radius*_defaultParticleTemplate.getSizeRange().minimum, 
     
    158158    // set up program. 
    159159    if (!_program) 
    160     {         
     160    { 
    161161        _program = new osgParticle::FluidProgram; 
    162162    } 
    163      
     163 
    164164    if (_program.valid()) 
    165165    {