Ignore:
Timestamp:
Feb 26, 2013, 4:34:35 PM (7 years ago)
Author:
ldelgass
Message:

Merge nanovis2 branch to trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp

    r2956 r3362  
    1616}
    1717
    18 void NvStdVertexShader::bind()
     18void NvStdVertexShader::bind(float *mvp, float *mvInv)
    1919{
    20     setGLStateMatrixVPParameter("modelViewProjMatrix", MODELVIEW_PROJECTION_MATRIX, MATRIX_IDENTITY);
    21     setGLStateMatrixVPParameter("modelViewInv", MODELVIEW_MATRIX, MATRIX_INVERSE);
     20    if (mvp != NULL) {
     21        setVPMatrixParameterf("modelViewProjMatrix", mvp);
     22    } else {
     23        setGLStateMatrixVPParameter("modelViewProjMatrix", MODELVIEW_PROJECTION_MATRIX);
     24    }
     25    if (mvInv != NULL) {
     26        setVPMatrixParameterf("modelViewInv", mvInv);
     27    } else {
     28        setGLStateMatrixVPParameter("modelViewInv", MODELVIEW_MATRIX, MATRIX_INVERSE);
     29    }
    2230
    2331    NvShader::bind();
Note: See TracChangeset for help on using the changeset viewer.