Changeset 585 for trunk

Timestamp:

Feb 22, 2007, 2:31:22 PM (18 years ago)

Author:

vrinside

Message:

 

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (2 diffs)
• NvParticleAdvectionShader.cpp (added)
• NvParticleAdvectionShader.h (added)
• NvParticleAdvectionShader.o (added)
• nanovis.cpp (modified) (1 diff)

trunk/gui/vizservers/nanovis/Makefile

@@ -5 +5 @@
                 Lic.o Renderable.o Camera.o ScreenSnapper.o VolumeRenderer.o PlaneRenderer.o Nv.o \
                 NvZincBlendeVolumeShader.o NvShader.o NvVolumeShader.o NvRegularVolumeShader.o NvVolQDVolumeShader.o \
-                NvLoadFile.o NvVolQDVolume.o NvDefaultTFData.o NvColorTableShader.o NvColorTableRenderer.o \
+                NvLoadFile.o NvVolQDVolume.o NvDefaultTFData.o NvColorTableShader.o NvColorTableRenderer.o NvParticleAdvectionShader.o \
                 R2string.o R2FilePath.o R2Fonts.o R2Object.o
 
@@ -48 +48 @@
 NvLoadFile.o: NvLoadFile.cpp NvLoadFile.cpp
         gcc $(CFLAG) NvLoadFile.cpp
+
+NvParticleAdvectionShader.o: NvParticleAdvectionShader.cpp NvParticleAdvectionShader.h
+        gcc $(CFLAG) NvParticleAdvectionShader.cpp
 
 NvColorTableShader.o: NvColorTableShader.cpp NvColorTableShader.h

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -3362 +3362 @@
     float param[3] = {live_rot_x, live_rot_y, live_rot_z};
     Event* tmp = new Event(EVENT_ROTATE, param, get_time_interval());
-    tmp->write(event_log);
+    /tmp->write(event_log);
     delete tmp;
 #endif