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

    r4889 r4904  
    1212    _scale(1.0f, 1.0f, 1.0f),
    1313    _max(1.0f),
    14     _timeStep(0.0005f),
    15     _mode(1)
     14    _timeStep(0.0005f)
    1615{
    1716    init();
     
    2423void ParticleAdvectionShader::init()
    2524{
    26     loadFragmentProgram("update_pos.cg", "main");
     25    loadFragmentProgram("update_pos.cg");
    2726}
    2827
     
    3635    setFPParameter1f("timestep", _timeStep);
    3736    setFPParameter1f("max", _max);
    38     setFPParameter1f("mode", _mode);
    3937    setFPParameter3f("scale", _scale.x, _scale.y, _scale.z);
    4038
Note: See TracChangeset for help on using the changeset viewer.