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

Timestamp:

Mar 7, 2012, 2:01:55 PM (12 years ago)

Author:

ldelgass

Message:

Move Vector3/4Array typdefs to the Vector3/4.h headers and remove TypeDefs?.h.
Also misc. cleanups

File:

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

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -38 +38 @@
 #include <unistd.h>
 
+#ifdef USE_POINTSET_RENDERER
 #include "PointSetRenderer.h"
 #include "PointSet.h"
+#endif
+
 #include <NvLIC.h>
 #include <Trace.h>
@@ -108 +111 @@
 Tcl_HashTable NanoVis::heightmapTable;
 VolumeRenderer* NanoVis::vol_renderer = NULL;
+#ifdef USE_POINTSET_RENDERER
 PointSetRenderer* NanoVis::pointset_renderer = NULL;
 std::vector<PointSet*> NanoVis::pointSet;
+#endif
 PlaneRenderer* NanoVis::plane_render = NULL;
 Texture2D* NanoVis::plane[10];
@@ -696 +701 @@
     CGerror lastError = cgGetError();
 
-    if(lastError) {
+    if (lastError) {
         TRACE("\n---------------------------------------------------\n");
         TRACE("%s\n\n", cgGetErrorString(lastError));
@@ -756 +761 @@
     grid->setFont(fonts);
 
-#ifdef notdef
+#ifdef USE_POINTSET_RENDERER
     pointset_renderer = new PointSetRenderer();
 #endif
@@ -1652 +1657 @@
         perf->disable();
     }
-        TRACE("in display: render heightmap\n");
+    TRACE("in display: render heightmap\n");
     perf->reset();
     CHECK_FRAMEBUFFER_STATUS();
@@ -2116 +2121 @@
             fcntl(0, F_SETFL, flags | O_NONBLOCK);
             isComplete = false;
-            nCommands++;
-            CHECK_FRAMEBUFFER_STATUS();
+            nCommands++;
+            CHECK_FRAMEBUFFER_STATUS();
         }
     }
@@ -2186 +2191 @@
     char *newPath;
     struct timeval tv;
+
     newPath = NULL;
     path = NULL;