Changeset 2302 for branches/blt4/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

Timestamp:

Jul 10, 2011 5:24:36 PM (13 years ago)

Author:

gah

Message:

update from trunk

File:

• branches/blt4/packages/vizservers/vtkvis/RpVtkRenderServer.cpp (modified) (5 diffs)

branches/blt4/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ -14 +14 @@
 #include <signal.h>
 
+#ifdef WANT_TRACE
+#include <sys/time.h>
+#endif
+
 #include "Trace.h"
 #include "RpVtkRenderServer.h"
@@ -29 +33 @@
 FILE *Rappture::VtkVis::g_fLog = NULL; ///< Trace logging file handle
 Renderer *Rappture::VtkVis::g_renderer = NULL; ///< Main render worker
+
+#define ELAPSED_TIME(t1, t2) \
+    ((t1).tv_sec == (t2).tv_sec ? (((t2).tv_usec - (t1).tv_usec)/1.0e+3f) : \
+     (((t2).tv_sec - (t1).tv_sec))*1.0e+3f + (float)((t2).tv_usec - (t1).tv_usec)/1.0e+3f)
 
 static void
@@ -44 +52 @@
     }
 
+#ifdef RENDER_TARGA
     writeTGAFile("/tmp/frame.tga",
                  imgData->GetPointer(0),
                  g_renderer->getWindowWidth(),
-                 g_renderer->getWindowHeight());
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL);
+#else
+    writeTGAFile("/tmp/frame.tga",
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL,
+                 true);
+#endif
+
 #else
     if (g_renderer->getCameraMode() == Renderer::IMAGE) {
@@ -62 +81 @@
             << xywh[1] << "} -bytes";
 
+#ifdef RENDER_TARGA
+        writeTGA(fd, oss.str().c_str(),
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL);
+#else
         writePPM(fd, oss.str().c_str(),
                  imgData->GetPointer(0),
                  g_renderer->getWindowWidth(),
                  g_renderer->getWindowHeight());
+#endif
     } else {
+#ifdef RENDER_TARGA
+        writeTGA(fd, "nv>image -type image -bytes",
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL);
+#else
         writePPM(fd, "nv>image -type image -bytes",
                  imgData->GetPointer(0),
                  g_renderer->getWindowWidth(),
                  g_renderer->getWindowHeight());
+#endif
     }
 #endif
@@ -158 +193 @@
     }
 
+    exitTcl(interp);
+    interp = NULL;
+
     delete g_renderer;
+    g_renderer = NULL;
 
     TRACE("Exiting VTKVis Server");