Changeset 524 for trunk/gui/vizservers/nanovis/Makefile

Timestamp:

Sep 17, 2006, 4:14:04 PM (18 years ago)

Author:

qiaow

Message:

Added ZincBlendeVolume? as a subclass of Volume.
Added shader to render zincblende volume.
Modified nanovis.cpp to handle render zincblende volume.

Need transfer protocle to actually pass two cubic volumes to create a ZincBlendeVolume?

File:

• trunk/gui/vizservers/nanovis/Makefile (modified) (3 diffs)

trunk/gui/vizservers/nanovis/Makefile

@@ -1 +1 @@
 OBJ_NANOVIS = nanovis.o Socket.o RenderVertexArray.o Plane.o ConvexPolygon.o Vector4.o Vector3.o Mat4x4.o \
-                Texture1D.o Texture3D.o Volume.o Texture2D.o ParticleSystem.o Sphere.o Color.o \
+                Texture1D.o Texture3D.o Volume.o ZincBlendeVolume.o Texture2D.o ParticleSystem.o Sphere.o Color.o \
                 PerfQuery.o TransferFunction.o ControlPoint.o ColorGradient.o ColorPaletteWindow.o\
                 ColorGradientGLUTWindow.o TransferFunctionGLUTWindow.o MainWindow.o Event.o \
@@ -16 +16 @@
 INSTALL_DIR = /opt/nanovis
 
-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
@@ -108 +108 @@
         gcc $(CFLAG) Volume.cpp
 
+ZincBlendeVolume.o: Volume.o ZincBlendeVolume.cpp ZincBlendeVolume.h $(AUXSRC)
+        gcc $(CFLAG) ZincBlendeVolume.cpp
+
 VolumeRenderer.o: $(OBJ_VOLUMERENDERER)  VolumeRenderer.h VolumeRenderer.cpp
         gcc $(CFLAG) VolumeRenderer.cpp