Changeset 3612 for trunk/packages/vizservers/nanovis/Shader.h

Timestamp:

Apr 2, 2013, 8:31:43 PM (12 years ago)

Author:

ldelgass

Message:

Remove Nv prefix from shader classes now that they are in nv namespace.

File:

• trunk/packages/vizservers/nanovis/Shader.h (moved) (moved from trunk/packages/vizservers/nanovis/NvShader.h) (4 diffs)

trunk/packages/vizservers/nanovis/Shader.h

@@ -18 +18 @@
 namespace nv {
 
-class NvShader
+class Shader
 {
 public:
-    enum NvGLMatrix {
+    enum GLMatrix {
         MODELVIEW_MATRIX = CG_GL_MODELVIEW_MATRIX,
         PROJECTION_MATRIX = CG_GL_PROJECTION_MATRIX,
         MODELVIEW_PROJECTION_MATRIX = CG_GL_MODELVIEW_PROJECTION_MATRIX
     };
-    enum NvGLMatrixType {
+    enum GLMatrixType {
         MATRIX_IDENTITY = CG_GL_MATRIX_IDENTITY,
         MATRIX_INVERSE = CG_GL_MATRIX_INVERSE
     };
 
-    typedef void NvCgCallbackFunction(void);
-
-    NvShader();
-
-    virtual ~NvShader();
+    typedef void CgCallbackFunction(void);
+
+    Shader();
+
+    virtual ~Shader();
 
     /**
@@ -201 +201 @@
     }
 
-    void setGLStateMatrixVPParameter(const char *name, NvGLMatrix matrix,
-                                     NvGLMatrixType type = MATRIX_IDENTITY)
+    void setGLStateMatrixVPParameter(const char *name, GLMatrix matrix,
+                                     GLMatrixType type = MATRIX_IDENTITY)
     {
         CGparameter param = getVPParam(name);
@@ -210 +210 @@
     }
 
-    void setGLStateMatrixFPParameter(const char *name, NvGLMatrix matrix,
-                                     NvGLMatrixType type = MATRIX_IDENTITY)
+    void setGLStateMatrixFPParameter(const char *name, GLMatrix matrix,
+                                     GLMatrixType type = MATRIX_IDENTITY)
     {
         CGparameter param = getFPParam(name);
@@ -266 +266 @@
     static bool printErrorInfo();
 
-    static void setErrorCallback(NvCgCallbackFunction callback);
+    static void setErrorCallback(CgCallbackFunction callback);
 
     static CGcontext getCgContext()