Changeset 1156 for trunk/packages/vizservers/nanovis

Timestamp:

Sep 16, 2008 8:54:52 AM (16 years ago)

Author:

vrinside

Message:

added new function calls for the 2d-contour lines of heightmaps

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (3 diffs)
• nanovis.cpp (modified) (1 diff)
• nanovis.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -2118 +2118 @@
 
 static int
+HeightMapTopView(ClientData data, Tcl_Interp *interp, int objc,
+                Tcl_Obj *const *objv)
+{
+
+    // the variables below should be reassigned
+    int heightmap_index = 0;
+    int image_width = 512;
+    int image_height = 512;
+    HeightMap* heightmap = 0;
+
+    // HELP ME
+    // GEORGE
+
+
+    NanoVis::render_2d_contour(heightmap, image_width, image_height);
+    
+    return TCL_OK;
+}
+
+static int
 HeightMapTestOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
@@ -2184 +2204 @@
     {"test",         2, HeightMapTestOp,        2, 2, "",},
     {"transfunc",    2, HeightMapTransFuncOp,   3, 0, "name ?indices?",},
+
+    // HELP ME
+    // GOERGE
+    {"topview",      1, HeightMapTopView,     3, 3, "model",},
 };
 static int nHeightMapOps = NumCmdSpecs(heightMapOps);
@@ -2698 +2722 @@
 #endif
 }
+

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -2061 +2061 @@
 }
 
+int
+NanoVis::render_2d_contour(HeightMap* heightmap, int width, int height)
+{
+    int old_width = win_width;
+    int old_height = win_height;
+
+    resize_offscreen_buffer(width, height);
+
+/*
+    plane_render->set_screen_size(width, height);
+
+    // generate data for the legend
+    float data[512];
+    for (int i=0; i < 256; i++) {
+        data[i] = data[i+256] = (float)(i/255.0);
+    }
+    plane[0] = new Texture2D(256, 2, GL_FLOAT, GL_LINEAR, 1, data);
+    int index = plane_render->add_plane(plane[0], tf);
+    plane_render->set_active_plane(index);
+
+    offscreen_buffer_capture();
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen
+
+    //plane_render->render();
+    // INSOO : is going to implement here for the topview of the heightmap
+    heightmap->render(renderContext);
+
+    // INSOO
+    glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, screen_buffer);
+    //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screen_buffer); // INSOO's
+*/
+
+
+    // HELP ME
+    // GEORGE
+    // I am not sure what I should do
+    //char prefix[200];
+    //sprintf(prefix, "nv>height_top_view %s %g %g", volArg, min, max);
+    //ppm_write(prefix);
+    //write(0, "\n", 1);
+    
+
+
+
+    //plane_render->remove_plane(index);
+    
+    resize_offscreen_buffer(old_width, old_height);
+
+    return TCL_OK;
+}

trunk/packages/vizservers/nanovis/nanovis.h

@@ -164 +164 @@
     static Volume *load_volume(int index, int width, int height, int depth, 
         int n, float* data, double vmin, double vmax, double nzero_min);
+    static int render_2d_contour(HeightMap* heightmap, int width, int height);
+
 #ifndef XINETD
     static void keyboard(unsigned char key, int x, int y);