Changeset 2666 for trunk/packages/vizservers/nanovis

Timestamp:

Nov 10, 2011 2:35:20 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• Makefile.in (modified) (7 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1214 +1214 @@
         }
 #endif  /*__TEST_CODE__*/
-#ifdef HAVE_DX_DX_H
-    } else if ((nBytes > 5) && (strncmp(bytes, "<ODX>", 5) == 0)) {
-        TRACE("Loading DX using OpenDX library...\n");
-        Rappture::Outcome context;
-        volPtr = load_volume_stream_odx(context, tag, bytes + 5, nBytes -5);
-        if (volPtr == NULL) {
-            Tcl_AppendResult(interp, context.remark(), (char*)NULL);
-            return TCL_ERROR;
-        }
-#endif  /*HAVE_DX_DX_H*/
     } else {
-        TRACE("OpenDX loading...\n");
+        TRACE("DX loading...\n");
         std::stringstream fdata;
         fdata.write(bytes, nBytes);

trunk/packages/vizservers/nanovis/Makefile.in

@@ -28 +28 @@
 CG_INC_SPEC     = -I$(CG_DIR)/include
 CG_LIB_SPEC     = -L$(CG_DIR)/lib -lCg -lCgGL
-DX_INC_SPEC     = @DX_INC_SPEC@
-DX_LIB_SPEC     = @DX_LIB_SPEC@
 FF_LIB_SPEC     = @LIBS@
 FF_INC_SPEC     = @FF_INC_SPEC@
@@ -72 +70 @@
 LIBS            = \
                 $(RP_LIB_SPEC) \
-                $(DX_LIB_SPEC) \
                 $(IMG_LIB_SPEC) \
                 $(R2_LIB_SPEC) \
@@ -156 +153 @@
                 RenderVertexArray.o \
                 RpAVTranslate.o \
-                RpDX.o \
                 ScreenSnapper.o \
                 Sphere.o \
@@ -173 +169 @@
                 ZincBlendeVolume.o \
                 dxReader.o \
-                dxReader2.o \
                 dxReaderCommon.o \
                 nanovis.o
@@ -252 +247 @@
         $(CXX) $(CXX_SWITCHES) -o $@ -c $<
 
-dxReader2.o: $(srcdir)/dxReader2.cpp
-        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $<
-RpDX.o: $(srcdir)/RpDX.cpp
-        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $<
 RpAVTranslate.o: $(srcdir)/RpAVTranslate.cpp
         $(CXX) -c $(CXX_SWITCHES) $(FF_INC_SPEC) $<
@@ -351 +342 @@
 RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h
 RpAVTranslate.o: RpAVTranslate.cpp RpAVTranslate.h nvconf.h
-RpDX.o: RpDX.cpp RpDX.h Trace.h
 ScreenSnapper.o: ScreenSnapper.cpp ScreenSnapper.h define.h
 Sphere.o: Sphere.cpp Sphere.h
@@ -368 +358 @@
 ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h $(AUXSRC)
 dxReader.o: dxReader.cpp dxReaderCommon.h Nv.h nanovis.h Unirect.h ZincBlendeVolume.h NvZincBlendeReconstructor.h
-dxReader2.o: dxReader2.cpp dxReaderCommon.h RpDX.h Nv.h nanovis.h
 dxReaderCommon.o: dxReaderCommon.cpp dxReaderCommon.h GradientFilter.h Vector3.h
 nanovis.o: nanovis.cpp nanovis.h $(AUXSRC)