Ignore:
Timestamp:
Apr 16, 2013 12:52:20 AM (7 years ago)
Author:
ldelgass
Message:

Nanovis refactoring to fix problems with scaling and multiple results.
Do rendering in world space to properly place and scale multiple data sets.
Also fix flows to reduce resets of animations. More work toward removing
Cg dependency. Fix panning to convert viewport coords to world coords.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/ParticleAdvectionShader.cpp

    r3612 r3630  
    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
    2928void
    30 ParticleAdvectionShader::bind(unsigned int texID, unsigned int initPosTexID)
     29ParticleAdvectionShader::bind(unsigned int texID, unsigned int initPosTexID, bool init)
    3130{
    3231    setFPTextureParameter("pos_tex", texID);
     
    3534
    3635    setFPParameter1f("timestep", _timeStep);
    37     setFPParameter1f("max", _max);
    38     setFPParameter1f("mode", _mode);
     36    setFPParameter1f("max", init ? 0 : _max);
    3937    setFPParameter3f("scale", _scale.x, _scale.y, _scale.z);
    4038
Note: See TracChangeset for help on using the changeset viewer.