Ignore:
Timestamp:
Dec 22, 2014, 7:18:59 AM (5 years ago)
Author:
ldelgass
Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/ParticleRenderer.cpp

    r4890 r4904  
    2727    _initPosTex(0),
    2828    _data(NULL),
    29     _psysFrame(0),
     29    _psysFrame(0U),
    3030    _reborn(true),
    3131    _flip(true),
    32     _maxLife(500),
     32    _maxLife(500U),
    3333    _particleSize(1.2),
    3434    _vertexArray(NULL),
     
    3737    _activate(false),
    3838    _slicePos(0.0),
    39     _sliceAxis(0),
     39    _sliceAxis(AXIS_Z),
    4040    _color(0.2, 0.2, 1.0, 1.0),
    4141    _psysWidth(w),
     
    220220    _flip = true;
    221221    _reborn = false;
    222     _psysFrame = 0;
     222    _psysFrame = 0U;
    223223}
    224224
     
    282282    _psysFrame++;
    283283    if (_psysFrame == _maxLife) {
    284         _psysFrame = 0;
     284        _psysFrame = 0U;
    285285        // _reborn = true;
    286286    }
     
    339339
    340340void
    341 ParticleRenderer::setAxis(int axis)
     341ParticleRenderer::setSliceAxis(FlowSliceAxis axis)
    342342{
    343343    _sliceAxis = axis;
     
    346346
    347347void
    348 ParticleRenderer::setPos(float pos)
     348ParticleRenderer::setSlicePosition(float pos)
    349349{
    350350    _slicePos = pos;
Note: See TracChangeset for help on using the changeset viewer.