Changeset 861 for trunk/vizservers

Timestamp:

Jan 29, 2008 2:15:22 PM (16 years ago)

Author:

kostmo

Message:

Added animation routine to FlowCmd?

Location:

trunk/vizservers/nanovis

Files:

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

trunk/vizservers/nanovis/Command.cpp

@@ -56 +56 @@
 // FOR testing new functions
 //#define  _LOCAL_ZINC_TEST_
-//#include "Test.h"
+#include "Test.h"
 
 // EXTERN DECLARATIONS
@@ -276 +276 @@
     }
     */
+
+
+/*
     NanoVis::read_screen();
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -284 +287 @@
    
     NanoVis::resize_offscreen_buffer(old_win_width, old_win_height); 
+*/
+    
 #endif
 
@@ -1124 +1129 @@
         return TCL_ERROR;
     }
+    return TCL_OK;
 }
 
@@ -1260 +1266 @@
     else if (c == 'c' && strcmp(argv[1],"capture") == 0) 
     {
-                int frame_count;
-        if (Tcl_GetInt(interp, argv[2], &frame_count) != TCL_OK) 
+                int total_frame_count = 0;
+        if (Tcl_GetInt(interp, argv[2], &total_frame_count) != TCL_OK) 
                 {
                 return TCL_ERROR;
@@ -1269 +1275 @@
         if (NanoVis::particleRenderer) NanoVis::particleRenderer->activate();
 
-                // Karl
-                // pur your code .. 
+        // Karl
+        {
+
+        for (int frame_count = 0; frame_count<total_frame_count; frame_count++) {
+
+                // Generate the latest frame and send it back to the client
+                if (NanoVis::licRenderer && NanoVis::licRenderer->isActivated())
+                      NanoVis::licRenderer->convolve();               
+
+                if (NanoVis::particleRenderer && NanoVis::particleRenderer->isActivated())
+                        NanoVis::particleRenderer->advect();
+
+                NanoVis::offscreen_buffer_capture();  //enable offscreen render
+                NanoVis::display();
+
+//              printf("Read Screen for Writing to file...\n");
+
+                NanoVis::read_screen();
+                glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+                NanoVis::bmp_write_to_file(frame_count);
+//              printf("Writing to file...\n");
+        }
+
+
+        }// put your code... 
 
         if (NanoVis::licRenderer) NanoVis::licRenderer->deactivate();
@@ -2056 +2086 @@
     Tcl_CreateCommand(interp, "test", TestCmd,
         (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+
+
+//    Tcl_CreateCommand(interp, "flow", FlowCmd,
+ //       (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
 #endif
 
@@ -2128 +2162 @@
 
     //
+    // This is now in "FlowCmd()":
     //  Generate the latest frame and send it back to the client
     //
+    /*
     if (NanoVis::licRenderer && NanoVis::licRenderer->isActivated())
     {
@@ -2139 +2175 @@
         NanoVis::particleRenderer->advect();
     }
+    */
 
     NanoVis::offscreen_buffer_capture();  //enable offscreen render

trunk/vizservers/nanovis/nanovis.cpp

@@ -787 +787 @@
 // FOR DEBUGGING
 void
-NanoVis::bmp_write_to_file()
+NanoVis::bmp_write_to_file(int frame_number)
 {
     unsigned char header[54];
@@ -851 +851 @@
 
     FILE* f;
-    f = fopen("/tmp/image.bmp", "wb");
+    char filename[100];
+    if (frame_number >= 0) {
+        sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number);
+        printf("Writing %s\n", filename);
+        f = fopen(filename, "wb");
+    }
+    else {
+        f = fopen("/tmp/image.bmp", "wb");
+    }
     fwrite((void*) header, sizeof(header), 1, f);
     fwrite((void*) screen_buffer, (3*win_width+pad)*win_height, 1, f);

trunk/vizservers/nanovis/nanovis.h

@@ -150 +150 @@
     static void offscreen_buffer_capture(void);
     static void bmp_write(const char* cmd);
-    static void bmp_write_to_file();
+    static void bmp_write_to_file(int frame_number);
     static void display(void);
     static void display_offscreen_buffer();