Ignore:
Timestamp:
Apr 2, 2013, 11:31:43 PM (7 years ago)
Author:
ldelgass
Message:

Remove Nv prefix from shader classes now that they are in nv namespace.

File:
1 moved

Legend:

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

    r3611 r3612  
    44 *
    55 */
    6 #include "NvParticleAdvectionShader.h"
     6#include "ParticleAdvectionShader.h"
    77
    88using namespace nv;
    99
    10 NvParticleAdvectionShader::NvParticleAdvectionShader() :
     10ParticleAdvectionShader::ParticleAdvectionShader() :
    1111    _velocityVolumeID(0),
    1212    _scale(1.0f, 1.0f, 1.0f),
     
    1818}
    1919
    20 NvParticleAdvectionShader::~NvParticleAdvectionShader()
     20ParticleAdvectionShader::~ParticleAdvectionShader()
    2121{
    2222}
    2323
    24 void NvParticleAdvectionShader::init()
     24void ParticleAdvectionShader::init()
    2525{
    2626    loadFragmentProgram("update_pos.cg", "main");
     
    2828
    2929void
    30 NvParticleAdvectionShader::bind(unsigned int texID, unsigned int initPosTexID)
     30ParticleAdvectionShader::bind(unsigned int texID, unsigned int initPosTexID)
    3131{
    3232    setFPTextureParameter("pos_tex", texID);
     
    3939    setFPParameter3f("scale", _scale.x, _scale.y, _scale.z);
    4040
    41     NvShader::bind();
     41    Shader::bind();
    4242}
    4343
    4444void
    45 NvParticleAdvectionShader::unbind()
     45ParticleAdvectionShader::unbind()
    4646{
    4747     disableFPTextureParameter("pos_tex");
     
    4949     disableFPTextureParameter("vel_tex");
    5050
    51      NvShader::unbind();
     51     Shader::unbind();
    5252}
Note: See TracChangeset for help on using the changeset viewer.