Ignore:
Timestamp:
Dec 20, 2014, 1:00:34 AM (5 years ago)
Author:
ldelgass
Message:

Merge r3611:3618 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/VolumeRenderer.cpp

    r4818 r4889  
    2828#include "Plane.h"
    2929#include "ConvexPolygon.h"
    30 #include "NvStdVertexShader.h"
     30#include "StdVertexShader.h"
    3131#include "Trace.h"
    3232
     33using namespace nv;
    3334using namespace vrmath;
    3435
     
    5253void VolumeRenderer::initShaders()
    5354{
    54     _cutplaneShader = new NvShader();
     55    _cutplaneShader = new Shader();
    5556    _cutplaneShader->loadVertexProgram("cutplane_vp.cg", "main");
    5657    _cutplaneShader->loadFragmentProgram("cutplane_fp.cg", "main");
    5758
    5859    //standard vertex program
    59     _stdVertexShader = new NvStdVertexShader();
     60    _stdVertexShader = new StdVertexShader();
    6061
    6162    //volume rendering shader: one cubic volume
    62     _regularVolumeShader = new NvRegularVolumeShader();
     63    _regularVolumeShader = new RegularVolumeShader();
    6364
    6465    //volume rendering shader: one zincblende orbital volume.
     
    7071    //The engine is already capable of rendering multiple volumes and combine them. Thus, we just invoke this shader on
    7172    //S, P, D and SS orbitals with different transfor functions. The result is a multi-orbital rendering.
    72     _zincBlendeShader = new NvZincBlendeVolumeShader();
     73    _zincBlendeShader = new ZincBlendeVolumeShader();
    7374}
    7475
     
    286287            glScalef(volScaling.x, volScaling.y, volScaling.z);
    287288            _cutplaneShader->setGLStateMatrixVPParameter("modelViewProjMatrix",
    288                                                          NvShader::MODELVIEW_PROJECTION_MATRIX);
     289                                                         Shader::MODELVIEW_PROJECTION_MATRIX);
    289290            glPopMatrix();
    290291
Note: See TracChangeset for help on using the changeset viewer.