Changeset 1111 for trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp

Timestamp:

Aug 13, 2008, 4:33:28 PM (11 years ago)

Author:

gah

Message:

nanovis/heightmap update

File:

• trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp

@@ -1 @@
-#include <R2/R2FilePath.h>
+#include <stdio.h>
+#include "global.h"
 #include "NvStdVertexShader.h"
 
@@ -13 +14 @@
 void NvStdVertexShader::init()
 {
-    R2string path = R2FilePath::getInstance()->getPath("vertex_std.cg");
-    _cgVP= cgCreateProgramFromFile(g_context, CG_SOURCE,
-                (const char*) path, CG_PROFILE_VP30, "main", NULL);
-    cgGLLoadProgram(_cgVP);
-
+    _cgVP = LoadCgSourceProgram(g_context, "vertex_std.cg", CG_PROFILE_VP30, 
+        "main");
     _mvp_vert_std_param = cgGetNamedParameter(_cgVP, "modelViewProjMatrix");
     _mvi_vert_std_param = cgGetNamedParameter(_cgVP, "modelViewInv");