Changeset 391 for trunk

Timestamp:

Mar 29, 2006, 6:33:58 PM (18 years ago)

Author:

qiaow

Message:

EventPlayer? sleeps for a little bit before plays back the next event.

Location:

trunk/gui/vizservers/nanovis

Files:

• Event.cpp (modified) (1 diff)
• Event.h (modified) (1 diff)
• Makefile (modified) (1 diff)
• config.h (modified) (1 diff)
• events (added)
• events.txt (deleted)
• events/event.txt (added)
• nanoscale/EventPlayer.cpp (modified) (3 diffs)
• nanovis.cpp (modified) (12 diffs)
• shaders/one_volume.cg (modified) (3 diffs)

trunk/gui/vizservers/nanovis/Event.cpp

@@ -21 +21 @@
 
 
-Event::Event(int _type, float _param[3], long _time){
+Event::Event(int _type, float _param[3], float _time){
   type = _type;
   memcpy(parameter, _param, 3*sizeof(float));
-  msc = _time;
+  msec = _time;
 }
     
 void Event::write(FILE* fd){
-  fprintf(fd, "%d %f %f %f\n", type, parameter[0], parameter[1], parameter[2]);
+  fprintf(fd, "%d %f %f %f %g\n", type, parameter[0], parameter[1], parameter[2], msec);
 }
 

trunk/gui/vizservers/nanovis/Event.h

@@ -29 +29 @@
                         //                  move: x,y,z
                         //                  other: nan 
-   long msc;            //millisecond since the session started
+   float msec;          //millisecond since the session started
         
    Event();
-   Event(int _type, float _param[3], long _time);
+   Event(int _type, float _param[3], float _time);
    ~Event();
    void write(FILE* fd);

trunk/gui/vizservers/nanovis/Makefile

@@ -12 +12 @@
 NANOSCALESRC = ./nanoscale
 
-LIB_NANOVIS = -ltcl8.3 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
+LIB_NANOVIS = -ltcl8.4 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
 LIB_CLIENT = -L/opt/render/lib -lGL -lglut -pthread -lstdc++
 INCLUDES = -I../src2/core -I/opt/render/include -I/autohome/u76/qiaow/Cg/usr/include

trunk/gui/vizservers/nanovis/config.h

@@ -16 +16 @@
 
 #define NV40      //Uncomment if using 6 series card. By default we assume older card the 5xxx series
-#define XINETD  //enable render server
-//#define EVENTLOG  //enable event logging
+//#define XINETD  //enable render server
+#define EVENTLOG  //enable event logging

trunk/gui/vizservers/nanovis/nanoscale/EventPlayer.cpp

@@ -29 +29 @@
 using namespace std;
 
-Event* event[100];
+Event* event[300];
 int cur_event = 0;
 double interval_sum = 0;
@@ -106 +106 @@
   msg = msgstream.str();
 
+  //sleep a little
+  struct timespec ts;
+  ts.tv_sec = 0;
+  ts.tv_nsec = cur->msec*1000000000;
+  nanosleep(&ts, 0);
+  
   //start timer
   struct timeval clock;
@@ -168 +174 @@
     int type;
     float param[3];
-    fscanf(fd, "%d %f %f %f\n", &type, param, param+1, param+2);
-    event[i] = new Event(type, param, 0);
+    double interval;
+    fscanf(fd, "%d %f %f %f %g\n", &type, param, param+1, param+2, &interval);
+    event[i] = new Event(type, param, interval);
     //fprintf(stderr, "%d %f %f %f\n", type, param[0], param[1], param[2]);
   }

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -19 +19 @@
 #include <iostream>
 #include <string>
+#include <sys/time.h>
 
 #include "nanovis.h"
@@ -45 +46 @@
 void init_event_log();
 void end_event_log();
+double cur_time;        //in seconds
+double get_time_interval();
 #endif
 
@@ -667 +670 @@
 #ifdef EVENTLOG
   float param[3] = {0,0,0};
-  Event* tmp = new Event(EVENT_ROTATE, param, 0);
+  Event* tmp = new Event(EVENT_ROTATE, param, get_time_interval());
   tmp->write(event_log);
   delete tmp;
@@ -866 +869 @@
     for (int j=0; j<psys->psys_height; j++){ 
       int index = i + psys->psys_height*j;
-      bool particle = rand() % 256 > 100; 
+      bool particle = rand() % 256 > 200; 
       //particle = true;
       if(particle)
@@ -1103 +1106 @@
 
 
-
-
 void xinetd_listen(){
     //command:
@@ -1993 +1994 @@
    perf->disable();
    //fprintf(stderr, "volume pixels: %d\n", perf->get_pixel_count());
+ 
+#ifdef XINETD
    float cost  = perf->get_pixel_count();
    write(3, &cost, sizeof(cost));
+#endif
    perf->reset();
 
@@ -2002 +2006 @@
    display_final_fbo();
 
+#ifdef XINETD
    read_screen();
-    glClear(GL_COLOR_BUFFER_BIT);
-    glDrawPixels(win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);
+   glClear(GL_COLOR_BUFFER_BIT);
+   glDrawPixels(win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);
+#endif
    glutSwapBuffers(); 
 }
@@ -2143 +2149 @@
    if(log){
      float param[3] = {live_obj_x, live_obj_y, live_obj_z};
-     Event* tmp = new Event(EVENT_MOVE, param, 0);
+     Event* tmp = new Event(EVENT_MOVE, param, get_time_interval());
      tmp->write(event_log);
      delete tmp;
@@ -2167 +2173 @@
 
     //more coarse event handling
-    //if(abs(delta_x)<5 && abs(delta_y)<5)
-      //return;
+    if(abs(delta_x)<10 && abs(delta_y)<10)
+      return;
 
     if(left_down){
@@ -2187 +2193 @@
 #ifdef EVENTLOG
     float param[3] = {live_rot_x, live_rot_y, live_rot_z};
-    Event* tmp = new Event(EVENT_ROTATE, param, 0);
+    Event* tmp = new Event(EVENT_ROTATE, param, get_time_interval());
     tmp->write(event_log);
     delete tmp;
@@ -2218 +2224 @@
   event_log = fopen("event.txt", "w");
   assert(event_log!=0);
+
+  struct timeval time;
+  gettimeofday(&time, NULL);
+  cur_time = time.tv_sec*1000. + time.tv_usec/1000.;
 }
 
@@ -2223 +2233 @@
   fclose(event_log);
 }
+
+double get_time_interval(){
+  struct timeval time;
+  gettimeofday(&time, NULL);
+  double new_time = time.tv_sec*1000. + time.tv_usec/1000.;
+
+  double interval = new_time - cur_time;
+  cur_time = new_time;
+  return interval;
+}
+
 #endif
 

trunk/gui/vizservers/nanovis/shaders/one_volume.cg

@@ -16 +16 @@
  * render one volume 
  */
+
+
+//#define PHONG_SHADING
+
 PixelOut main(v2f IN, /* uniform sampler1D tf,*/
                 uniform sampler3D volume,
@@ -27 +31 @@
   float4 tex_coord = mul(modelViewInv, IN.TexCoord);
         
-  if(renderParameters.y==1){ //1 component
+//if(renderParameters.y==1){ //1 component
 
     float4 sample = tex3D(volume, tex_coord.xyz);
 
-    if (sample.x < 0.) {
-      OUT.Color = float4(0.0, 0.0, 0.0, 0.0);
-    } 
-    else{
-/*
+#ifdef PHONG_SHADING
       //lighting parameters 
-      float4 worldnormal = float4(sample.yzw, 1);
-      float3 normal = normalize(mul(modelView, worldnormal)).xyz;            //eye space normal
-      float3 light_vector = normalize(mul(modelView, float4(0, -1, -2, 1)));            //eye space light vector
-      float3 eye_vector = normalize(mul(modelView, float4(IN.EyeVector,1))).xyz;        //eye space eye vector
+      float4 worldnormal = float4(normalize(sample.yzw), 1);
+      float3 normal = normalize(mul(modelView, worldnormal).xyz);            //eye space normal
+      //float3 light_vector = normalize(mul(modelView, float4(0, -1, -2, 1)));  //eye space light vector
+      float3 light_vector = normalize(float3(0, -1, -2));                       //eye space light vector
+      float3 eye_vector = normalize(mul(modelView, float4(IN.EyeVector,1)).xyz);        //eye space eye vector
       float3 half_vector = normalize(+eye_vector+light_vector);          //eye half angle vector
-*/
+#endif
+
       //sample the transfer function texture
-      float4 color = tex1D(tf, sample.x);
-      color.w = 10*color.w/renderParameters.x;
+      //float4 color = tex1D(tf, sample.x);
+      //color.w = 10*color.w/renderParameters.x;
 
-      if(sample.x > 0.5)
-        color = float4(sample.x, 0, 0, sample.x);
+      float4 color = float4(sample.x, 0, 0, sample.x);
         
-/*
+
+#ifdef PHONG_SHADING
       //lighting computation
       float normal_dot_light = max(dot(normal, light_vector), 0);
       float normal_dot_half = max(dot(normal, half_vector), 0);
 
-      float ambient = 0.3;
+      float ambient = 0.1;
       float diffuse = normal_dot_light * renderParameters.z;
-      float specular = pow(normal_dot_half, renderParameters.w);
+      float specular = pow(normal_dot_half, -renderParameters.w)*(1-ambient-diffuse);
 
       float lighting = ambient + diffuse + specular;
       color.xyz = color.xyz * lighting;
-*/
 
       //debug
       //color.xyz = normal.xyz;       //display normals
-      //if(color.z < 0)
-        //color.xyz = float3(1,0,0);
+#endif
 
       OUT.Color = color;
-    }
-  }
+//  }
 
+/*
   else if(renderParameters.y==0){
     //3 component
@@ -77 +77 @@
     OUT.Color = float4(3*sample, 2*length(sample)/renderParameters.x);
   }
+*/
 
   //debug