Changeset 4068 for trunk/packages

Timestamp:

Nov 25, 2013, 7:55:07 PM (11 years ago)

Author:

ldelgass

Message:

Make DX reader support a build time option in nanovis

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (3 diffs)
• FlowCmd.cpp (modified) (4 diffs)
• Makefile.in (modified) (5 diffs)
• Unirect.cpp (modified) (2 diffs)
• Unirect.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -53 +53 @@
 #include "CmdProc.h"
 #include "FlowCmd.h"
+#ifdef USE_DX_READER
 #include "dxReader.h"
+#endif
 #ifdef USE_VTK
 #include "VtkDataSetReader.h"
@@ -1323 +1325 @@
         }
     } else {
+#ifdef USE_DX_READER
         // **Deprecated** OpenDX format
         if ((nBytes > 5) && (strncmp(bytes, "<ODX>", 5) == 0)) {
@@ -1340 +1343 @@
             return TCL_ERROR;
         }
+#else
+        Tcl_AppendResult(interp, "Loading DX files is not supported by this server", (char*)NULL);
+        return TCL_ERROR;
+#endif
     }
 

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -182 +182 @@
     Flow *flow = (Flow *)clientData;
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
+#ifdef USE_DX_READER
         unirect = new Unirect3d(nComponents);
         if (!unirect->importDx(nComponents, length - 4, bytes + 4)) {
@@ -188 +189 @@
             return TCL_ERROR;
         }
+#else
+        Tcl_AppendResult(interp, "Loading DX files is not supported by this server", (char*)NULL);
+        return TCL_ERROR;
+#endif
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
         unirect = new Unirect3d(nComponents);
@@ -223 +228 @@
         }
     } else {
+#ifdef USE_DX_READER
         TRACE("header is %.14s", buf.bytes());
         unirect = new Unirect3d(nComponents);
@@ -230 +236 @@
             return TCL_ERROR;
         }
+#else
+        Tcl_AppendResult(interp, "Loading DX files is not supported by this server", (char*)NULL);
+        return TCL_ERROR;
+#endif
     }
     if (unirect != NULL && unirect->nValues() == 0) {

trunk/packages/vizservers/nanovis/Makefile.in

@@ -3 +3 @@
 USE_POINTSET_RENDERER   = #yes
 USE_PARTICLE_SYSTEM     = #yes
+USE_DX_READER           = yes
 USE_VTK                 = yes
 
@@ -77 +78 @@
 endif
 
+NEED_RAPPTURE2  =
+ifdef USE_DX_READER
+NEED_RAPPTURE2  = yes
+endif
+ifndef USE_VTK
+NEED_RAPPTURE2  = yes
+endif
+
 EXTRA_LIBS      = -lm -lpthread
 RP_DIR          =  @RP_DIR@
-RP_INC_SPEC     = -I$(RP_DIR)/include -I$(RP_DIR)/include/rappture2
+RP_INC_SPEC     = -I$(RP_DIR)/include
+ifdef NEED_RAPPTURE2
+RP_INC_SPEC     += -I$(RP_DIR)/include/rappture2
+endif
+ifdef NEED_RAPPTURE2
 RP_LIB_SPEC     = -L$(RP_DIR)/lib -lrappture2 -lrappture -lexpat -lz
+else
+RP_LIB_SPEC     = -L$(RP_DIR)/lib -lrappture -lexpat -lz
+endif
 
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
@@ -123 +139 @@
 ifdef TRACE
 DEFINES         += -DWANT_TRACE
+endif
+ifdef USE_DX_READER
+DEFINES         += -DUSE_DX_READER
 endif
 ifdef USE_THREADS
@@ -182 +201 @@
                 ZincBlendeVolume.o \
                 ZincBlendeVolumeShader.o \
-                dxReader.o \
                 md5.o \
                 nanovis.o \
@@ -208 +226 @@
                 $(srcdir)/shaders/vertex_std.cg \
                 $(srcdir)/shaders/zincblende_volume.cg
+
+ifdef USE_DX_READER
+OBJS +=         dxReader.o
+endif
 
 ifdef USE_PARTICLE_SYSTEM

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -486 +486 @@
 }
 
+#ifdef USE_DX_READER
 bool
 nv::Unirect3d::importDx(size_t nComponents,
@@ -630 +631 @@
     return true;
 }
+#endif
 
 void

trunk/packages/vizservers/nanovis/Unirect.h

@@ -222 +222 @@
     int parseBuffer(Tcl_Interp *interp, const char *bytes, size_t len);
 
+#ifdef USE_DX_READER
     bool importDx(size_t nComponents, size_t length, char *string);
+#endif
 
     bool convert(Unirect2d *dataPtr);