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/Particle.cpp

    r11814 r13041  
    2626    _ar(1, 0), 
    2727    _cr(osg::Vec4(1, 1, 1, 1), osg::Vec4(1, 1, 1, 1)), 
    28     _si(new LinearInterpolator),  
    29     _ai(new LinearInterpolator),  
     28    _si(new LinearInterpolator), 
     29    _ai(new LinearInterpolator), 
    3030    _ci(new LinearInterpolator), 
    3131    _mustdie(false), 
     
    6666    } 
    6767 
    68     double x = 0;     
     68    double x = 0; 
    6969 
    7070    // if we don't live forever, compute our normalized age. 
     
    8080        return false; 
    8181    } 
    82      
     82 
    8383    // compute the current values for size, alpha and color. 
    8484    if (_lifeTime <= 0) { 
     
    9393       _current_color = _ci.get()->interpolate(x, _cr); 
    9494    } 
    95      
     95 
    9696    // update position 
    9797    _prev_pos = _position; 
    9898    _position += _velocity * dt; 
    99      
     99 
    100100    // return now if we indicate that only time stamp should be updated 
    101101    // the shader will handle remain properties in this case 
     
    104104    //Compute the current texture tile based on our normalized age 
    105105    int currentTile = _start_tile + static_cast<int>(x * getNumTiles()); 
    106      
     106 
    107107    //If the current texture tile is different from previous, then compute new texture coords 
    108108    if(currentTile != _cur_tile) 
    109109    { 
    110      
     110 
    111111        _cur_tile = currentTile; 
    112112        _s_coord = _s_tile * fmod(_cur_tile , 1.0 / _s_tile); 
     
    115115        // OSG_NOTICE<<this<<" setting tex coords "<<_s_coord<<" "<<_t_coord<<std::endl; 
    116116    } 
    117      
     117 
    118118    // update angle 
    119119    _prev_angle = _angle;