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

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.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/PointShader.h

@@ -15 +15 @@
     void setScale(float scale)
     {
-        cgGLSetParameter4f(_scaleVP, scale, 1.0f, 1.0f, 1.0f);
+        _scale = scale;
     }
 
-    void setNormalTexture(Texture3D *n)
+    void setNormalTexture(Texture3D *normal)
     {
-        _normal = n;
+        _normal = normal;
     }
 
-    virtual void bind()
-    {
-        setParameters();
+    virtual void bind();
 
-        NvShader::bind();
-    }
-
-    virtual  void unbind()
-    {
-        resetParameters();
-
-        NvShader::unbind();
-    }
-
-protected:
-    virtual void setParameters();
-    virtual void resetParameters();
+    virtual  void unbind();
 
 private:
@@ -51 +37 @@
     CGparameter _normalParam;
 
+    float _scale;
     Texture3D *_normal;
 };