Changeset 1194 for trunk

Timestamp:

Oct 28, 2008 12:05:25 PM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• NvEventLog.cpp (modified) (4 diffs)
• nanovis.cpp (modified) (28 diffs)
• nanovis.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -675 +675 @@
         nBytes -= nRead;
     }
+    if (NanoVis::recfile != NULL) {
+        fwrite(buf.bytes(), sizeof(char), buf.size(), NanoVis::recfile);
+        fflush(NanoVis::recfile);
+    }
     {
         Rappture::Outcome err;

trunk/packages/vizservers/nanovis/NvEventLog.cpp

@@ -1 @@
-#include "NvEventLog.h"
 #include "config.h"
 #include <stdio.h>
@@ -9 +8 @@
 #include <stdlib.h>
 #include <string.h>
-
+#include "NvEventLog.h"
+#include "nanovis.h"
 
 
@@ -25 +25 @@
     char* logName = NULL;
     int logNameLen = 0;
-    extern int debug_flag;
 
     if (user == NULL) {
@@ -39 +38 @@
     }
 
-    if (!debug_flag) {
+    if (!NanoVis::debug_flag) {
         //open log and map stderr to log file
         xinetd_log = fopen(logName, "w");

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -104 +104 @@
 int NanoVis::updir = Y_POS;
 NvCamera* NanoVis::cam = NULL;
-bool NanoVis::axis_on = true;
-int NanoVis::win_width = NPIX;                  //size of the render window
-int NanoVis::win_height = NPIX;                 //size of the render window
 int NanoVis::n_volumes = 0;
-unsigned char* NanoVis::screen_buffer = NULL;
+vector<Volume*> NanoVis::volume;
 vector<HeightMap*> NanoVis::heightMap;
 VolumeRenderer* NanoVis::vol_renderer = 0;
@@ -119 +116 @@
 graphics::RenderContext* NanoVis::renderContext = 0;
 NvLIC* NanoVis::licRenderer = 0;
+R2Fonts* NanoVis::fonts;
 
 FILE *NanoVis::stdin = NULL;
@@ -127 +125 @@
 bool NanoVis::particle_on = false;
 bool NanoVis::vector_on = false;
+bool NanoVis::axis_on = true;
 bool NanoVis::config_pending = false;
+bool NanoVis::debug_flag = false;
 
 Tcl_Interp *NanoVis::interp;
@@ -136 +136 @@
 NVISid NanoVis::final_color_tex = 0;
 NVISid NanoVis::final_depth_rb = 0;
-int render_window;              //the handle of the render window;
-
-// pointers to volumes, currently handle up to 10 volumes
-/*FIXME: Is the above comment true? Is there a 10 volume limit */
-vector<Volume*> NanoVis::volume;
-
-//if true nanovis renders volumes in 3D, if not renders 2D plane
+int NanoVis::render_window = 0;       /* GLUT handle for the render window */
+int NanoVis::win_width = NPIX;        /* Width of the render window */
+int NanoVis::win_height = NPIX;       /* Height of the render window */
+
+unsigned char* NanoVis::screen_buffer = NULL;
+
 /* FIXME: This variable is always true. */
 bool volume_mode = true; 
 
+#ifdef notdef
 // color table for built-in transfer function editor
 float color_table[256][4];
-
-int debug_flag = false;
+#endif
 
 // in Command.cpp
@@ -168 +167 @@
 CGparameter m_passthru_scale_param, m_passthru_bias_param;
 
-R2Fonts* NanoVis::fonts;
 
 // Variables for mouse events
@@ -411 +409 @@
     start = CVT2SECS(tv);
 
-    if (debug_flag) {
-        fprintf(NanoVis::logfile, "%s\n", Tcl_DStringValue(dsPtr));
+    if (NanoVis::debug_flag) {
+        fprintf(NanoVis::logfile, "(%s)\n", Tcl_DStringValue(dsPtr));
     }
     if (NanoVis::recfile != NULL) {
-        fprintf(NanoVis::recfile, "%s\n", Tcl_DStringValue(dsPtr));
+        fprintf(NanoVis::recfile, "%s", Tcl_DStringValue(dsPtr));
         fflush(NanoVis::recfile);
     }
@@ -507 +505 @@
 }
 
+#ifdef notdef
 //Update the transfer function using local GUI in the non-server mode
 void 
 update_tf_texture()
 {
-    glutSetWindow(render_window);
+    glutSetWindow(NanoVis::render_window);
 
     //fprintf(stderr, "tf update\n");
@@ -537 +536 @@
 #endif
 }
+#endif
 
 int
@@ -1216 +1216 @@
 
 /*----------------------------------------------------*/
-static void
-idle()
-{
+void
+NanoVis::idle()
+{
+    if (debug_flag) {
+        fprintf(stderr, "in idle()\n");
+    }
     glutSetWindow(render_window);
 
@@ -1228 +1231 @@
 #endif
 #ifdef XINETD
-    NanoVis::xinetd_listen();
+    xinetd_listen();
 #else
     glutPostRedisplay();
 #endif
+    if (debug_flag) {
+        fprintf(stderr, "leaving idle()\n");
+    }
 }
 
@@ -1237 +1243 @@
 NanoVis::display_offscreen_buffer()
 {
+    if (debug_flag) {
+        fprintf(stderr, "in display_offscreen_buffer\n");
+    }
     glEnable(GL_TEXTURE_2D);
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -1257 +1266 @@
     }
     glEnd();
+    if (debug_flag) {
+        fprintf(stderr, "leaving display_offscreen_buffer\n");
+    }
 }
 
@@ -1600 +1612 @@
     double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax;
 
+    if (debug_flag) {
+        fprintf(stderr, "in SetVolumeRanges\n");
+    }
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
@@ -1651 +1666 @@
     }
     Volume::update_pending = false;
+    if (debug_flag) {
+        fprintf(stderr, "leaving SetVolumeRanges\n");
+    }
 }
 
@@ -1658 +1676 @@
     double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax;
 
+    if (debug_flag) {
+        fprintf(stderr, "in SetHeightmapRanges\n");
+    }
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
@@ -1715 +1736 @@
     }
     HeightMap::update_pending = false;
+    if (debug_flag) {
+        fprintf(stderr, "leaving SetHeightmapRanges\n");
+    }
 }
 
@@ -1721 +1745 @@
 NanoVis::display()
 {
+    if (debug_flag) {
+        fprintf(stderr, "in display\n");
+    }
     //assert(glGetError()==0);
     if (HeightMap::update_pending) {
@@ -1728 +1755 @@
         SetVolumeRanges();
     }
+    if (debug_flag) {
+        fprintf(stderr, "in display: glClear\n");
+    }
     //start final rendering
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen
 
     if (volume_mode) {
+        if (debug_flag) {
+           fprintf(stderr, "in display: volume_mode\n");
+        }
         //3D rendering mode
         glEnable(GL_TEXTURE_2D);
@@ -1796 +1829 @@
         //perf->disable();
 
+        if (debug_flag) {
+           fprintf(stderr, "in display: render heightmap\n");
+        }
         for (unsigned int i = 0; i < heightMap.size(); ++i) {
             if (heightMap[i]->isVisible()) {
@@ -1814 +1850 @@
 #endif
     perf->reset();
+    if (debug_flag) {
+        fprintf(stderr, "leaving display\n");
+    }
 
 }
@@ -2008 +2047 @@
 init_service()
 {
-    if (!debug_flag) {
+    if (!NanoVis::debug_flag) {
         //open log and map stderr to log file
         xinetd_log = fopen("/tmp/log.txt", "w");
@@ -2109 +2148 @@
         fcntl(0, F_SETFL, flags | O_NONBLOCK);
         npass++;
+        if (NanoVis::debug_flag) {
+           break;
+        }
     }
     fcntl(0, F_SETFL, flags);
@@ -2195 +2237 @@
     glutInitWindowSize(NanoVis::win_width, NanoVis::win_height);
     glutInitWindowPosition(10, 10);
+    NanoVis::render_window = glutCreateWindow("nanovis");
     glutDisplayFunc(NanoVis::display);
-    glutIdleFunc(idle);
+    glutIdleFunc(NanoVis::idle);
     glutReshapeFunc(NanoVis::resize_offscreen_buffer);
+
 #ifndef XINETD
     glutMouseFunc(NanoVis::mouse);
@@ -2203 +2247 @@
     glutKeyboardFunc(NanoVis::keyboard);
 #endif
-
-    render_window = glutCreateWindow("nanovis");
 
 
@@ -2241 +2283 @@
         case 3:
         case 'd':
-            debug_flag = true;
+            NanoVis::debug_flag = true;
             break;
         case 0:
         case 'i':
-            fprintf(stderr, "opening infile %s\n", optarg);
             NanoVis::stdin = fopen(optarg, "r");
             if (NanoVis::stdin == NULL) {
@@ -2254 +2295 @@
         case 1:
         case 'l':
-            fprintf(stderr, "opening logfile %s\n", optarg);
             NanoVis::logfile = fopen(optarg, "w");
             if (NanoVis::logfile == NULL) {
@@ -2266 +2306 @@
             char buf[200];
 
-            fprintf(stderr, "Recording commands to %s\n", optarg);
             Tcl_DStringInit(&ds);
             Tcl_DStringAppend(&ds, optarg, -1);
@@ -2321 +2360 @@
     NvInitEventLog();
 #endif
-    //event loop
     glutMainLoop();
 

trunk/packages/vizservers/nanovis/nanovis.h

@@ -135 +135 @@
     static int win_width;       //size of the render window
     static int win_height;      //size of the render window
- 
+    static int render_window; 
 
+    static bool debug_flag;
     static bool lic_on;
     static bool particle_on;
@@ -159 +160 @@
     static void bmp_write_to_file(int frame_number, const char* directory_name);
     static void display(void);
+    static void idle(void);
     static void update(void);
     static void display_offscreen_buffer();