Changeset 2966 for branches/blt4/packages/vizservers/nanovis/NvColorTableShader.cpp

Timestamp:

Apr 13, 2012 12:04:37 PM (12 years ago)

Author:

gah

Message:

sync back with trunk

File:

• branches/blt4/packages/vizservers/nanovis/NvColorTableShader.cpp (modified) (3 diffs)

branches/blt4/packages/vizservers/nanovis/NvColorTableShader.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#include <R2/R2FilePath.h>
-
-#include <GL/glew.h>
-#include <Cg/cgGL.h>
-
 #include "NvColorTableShader.h"
-#include "Trace.h"
 
 NvColorTableShader::NvColorTableShader()
@@ -20 +14 @@
 {
     loadFragmentProgram("one_plane.cg", "main"); 
-    _dataParam = getNamedParameterFromFP("data");
-    _tfParam = getNamedParameterFromFP("tf");
-    _renderParam = getNamedParameterFromFP("render_param");
 }
 
 void NvColorTableShader::bind(Texture2D *plane, TransferFunction *tf)
 {
-    cgGLSetTextureParameter(_dataParam, plane->id());
-    cgGLSetTextureParameter(_tfParam, tf->id());
-    cgGLEnableTextureParameter(_dataParam);
-    cgGLEnableTextureParameter(_tfParam);
-    cgGLSetParameter4f(_renderParam, 0., 0., 0., 0.);
+    setFPTextureParameter("data", plane->id());
+    setFPTextureParameter("tf", tf->id());
+
+    setFPParameter4f("render_param", 0., 0., 0., 0.);
 
     NvShader::bind();
@@ -38 +28 @@
 void NvColorTableShader::unbind()
 {
-    cgGLDisableTextureParameter(_dataParam);
-    cgGLDisableTextureParameter(_tfParam);
+    disableFPTextureParameter("data");
+    disableFPTextureParameter("tf");
 
     NvShader::unbind();