Changeset 2953 for trunk/packages/vizservers/nanovis/PointShader.cpp

Timestamp:

Apr 9, 2012 10:18:09 AM (12 years ago)

Author:

ldelgass

Message:

Remove unused global origin, make default transfer function a bit more
sensible (used to have full opacity at 0). Fix HeightMap? dtor to use delete[]
instead of free() on array allocated with new[]. Document data response in
protocol.

File:

• trunk/packages/vizservers/nanovis/PointShader.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/PointShader.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
 
-#include <R2/R2FilePath.h>
-#include <R2/R2string.h>
+#include <GL/glew.h>
+#include <Cg/cgGL.h>
 
 #include "PointShader.h"
 
 PointShader::PointShader() : 
-    NvShader(), 
+    NvShader(),
+    _scale(1.0f),
     _normal(NULL)
 {
@@ -27 +25 @@
 }
 
-void PointShader::setParameters()
+void PointShader::bind()
 {
     cgGLSetStateMatrixParameter(_modelviewVP, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_IDENTITY);
@@ -35 +33 @@
     cgGLSetParameter4f(_posoffsetVP, 1.0f, 1.0f, 1.0f, 1.0f);
     cgGLSetParameter4f(_baseposVP, 1.0f, 1.0f, 1.0f, 1.0f);
-    cgGLSetParameter4f(_scaleVP, 1.0f, 1.0f, 1.0f, 1.0f);
+    cgGLSetParameter4f(_scaleVP, _scale, 1.0f, 1.0f, 1.0f);
 
-    //cgGLSetTextureParameter(_normalParam,_normal->getGraphicsObjectID());
+    //cgGLSetTextureParameter(_normalParam, _normal->getGraphicsObjectID());
     //cgGLEnableTextureParameter(_normalParam);
+
+    NvShader::bind();
 }
 
-void PointShader::resetParameters()
+void PointShader::unbind()
 {
     //cgGLDisableTextureParameter(_normalParam);
+
+    NvShader::unbind();
 }