Changeset 3463 for trunk/packages/vizservers/nanovis/Command.cpp

Timestamp:

Mar 6, 2013, 8:39:42 AM (12 years ago)

Author:

ldelgass

Message:

Begin process of renaming R2 library

File:

• trunk/packages/vizservers/nanovis/Command.cpp (modified) (7 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -68 +68 @@
 #include "Volume.h"
 #include "VolumeRenderer.h"
+
+using namespace nv::graphics;
 
 // default transfer function
@@ -137 +139 @@
 static int
 GetCullMode(Tcl_Interp *interp, Tcl_Obj *objPtr,
-            graphics::RenderContext::CullMode *modePtr)
+            RenderContext::CullMode *modePtr)
 {
     const char *string = Tcl_GetString(objPtr);
     if (strcmp(string, "none") == 0) {
-        *modePtr = graphics::RenderContext::NO_CULL;
+        *modePtr = RenderContext::NO_CULL;
     } else if (strcmp(string, "front") == 0) {
-        *modePtr = graphics::RenderContext::FRONT;
+        *modePtr = RenderContext::FRONT;
     } else if (strcmp(string, "back") == 0) {
-        *modePtr = graphics::RenderContext::BACK;
+        *modePtr = RenderContext::BACK;
     } else {
         Tcl_AppendResult(interp, "invalid cull mode \"", string,
@@ -156 +158 @@
 static int
 GetShadingModel(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                graphics::RenderContext::ShadingModel *modelPtr)
+                RenderContext::ShadingModel *modelPtr)
 {
     const char *string = Tcl_GetString(objPtr);
 
     if (strcmp(string,"flat") == 0) {
-        *modelPtr = graphics::RenderContext::FLAT;
+        *modelPtr = RenderContext::FLAT;
     } else if (strcmp(string,"smooth") == 0) {
-        *modelPtr = graphics::RenderContext::SMOOTH;
+        *modelPtr = RenderContext::SMOOTH;
     } else {
         Tcl_AppendResult(interp, "bad shading model \"", string,
@@ -174 +176 @@
 static int
 GetPolygonMode(Tcl_Interp *interp, Tcl_Obj *objPtr,
-               graphics::RenderContext::PolygonMode *modePtr)
+               RenderContext::PolygonMode *modePtr)
 {
     const char *string = Tcl_GetString(objPtr);
 
     if (strcmp(string,"wireframe") == 0) {
-        *modePtr = graphics::RenderContext::LINE;
+        *modePtr = RenderContext::LINE;
     } else if (strcmp(string,"fill") == 0) {
-        *modePtr = graphics::RenderContext::FILL;
+        *modePtr = RenderContext::FILL;
     } else {
         Tcl_AppendResult(interp, "invalid polygon mode \"", string,
@@ -1849 +1851 @@
                 Tcl_Obj *const *objv)
 {
-    graphics::RenderContext::CullMode mode;
+    RenderContext::CullMode mode;
     if (GetCullMode(interp, objv[2], &mode) != TCL_OK) {
         return TCL_ERROR;
@@ -1919 +1921 @@
                    Tcl_Obj *const *objv)
 {
-    graphics::RenderContext::PolygonMode mode;
+    RenderContext::PolygonMode mode;
     if (GetPolygonMode(interp, objv[2], &mode) != TCL_OK) {
         return TCL_ERROR;
@@ -1932 +1934 @@
                  Tcl_Obj *const *objv)
 {
-    graphics::RenderContext::ShadingModel model;
+    RenderContext::ShadingModel model;
     if (GetShadingModel(interp, objv[2], &model) != TCL_OK) {
         return TCL_ERROR;