Changeset 3612 for trunk/packages/vizservers/nanovis/nanovis.cpp

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/nanovis.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -42 +42 @@
 #include "Camera.h"
 #include "LIC.h"
-#include "NvShader.h"
+#include "Shader.h"
 #include "OrientationIndicator.h"
 #include "PlaneRenderer.h"
@@ -461 +461 @@
 void cgErrorCallback(void)
 {
-    if (!NvShader::printErrorInfo()) {
+    if (!Shader::printErrorInfo()) {
         TRACE("Cg error, exiting...");
         exit(1);
@@ -536 +536 @@
     ImageLoaderFactory::getInstance()->addLoaderImpl("bmp", new BMPImageLoaderImpl());
 
-    NvShader::initCg();
-    NvShader::setErrorCallback(cgErrorCallback);
+    Shader::initCg();
+    Shader::setErrorCallback(cgErrorCallback);
 
     fonts = new Fonts();