Changeset 1825 for trunk/packages

Timestamp:

Jul 14, 2010, 8:04:17 PM (14 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (4 diffs)
• NvVectorField.h (modified) (2 diffs)
• RpAVTranslate.h (modified) (3 diffs)
• VelocityArrowsSlice.h (modified) (2 diffs)
• VolumeRenderer.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -40 +40 @@
  */
 
+
+
 #include <assert.h>
 #include <stdlib.h>
@@ -50 +52 @@
 #include <RpOutcome.h>
 #include <RpBuffer.h>
-#include <RpAVTranslate.h>
 
 #include "Trace.h"
@@ -78 +79 @@
 
 #if _LOCAL_ZINC_TEST_
-#include "Test.h"
+/* #include "Test.h" */
 #endif
 
@@ -749 +750 @@
 }
 
+/*
+ * cutplane state $bool $axis vol,,,
+ */
 static int
 CutplaneStateOp(ClientData clientData, Tcl_Interp *interp, int objc,

trunk/packages/vizservers/nanovis/NvVectorField.h

@@ -1 @@
-#pragma once
+
+#ifndef NV_VECTOR_FIELD_H
+#define NV_VECTOR_FIELD_H 1
 
 #include "Volume.h"
@@ -86 +88 @@
 };
 
+#endif /* NV_VECTOR_FIELD_H */

trunk/packages/vizservers/nanovis/RpAVTranslate.h

@@ -12 +12 @@
  */
 
-#ifndef RAPPTURE_AVTRANSLATE_H
-#define RAPPTURE_AVTRANSLATE_H
+#ifndef RP_AVTRANSLATE_H
+#define RP_AVTRANSLATE_H 1
 
 #include "nvconf.h"
-#include "RpOutcome.h"
 
 extern "C" {
+#define __STDC_CONSTANT_MACROS 1
 #ifdef HAVE_FFMPEG_AVFORMAT_H
 #include <ffmpeg/avformat.h>
@@ -26 +26 @@
 #endif
 }
+#include "RpOutcome.h"
 
 namespace Rappture {
@@ -89 +90 @@
 } // namespace Rappture
  
-#endif // RAPPTURE_AVTRANSLATE_H
+#endif /* RP_AVTRANSLATE_H */

trunk/packages/vizservers/nanovis/VelocityArrowsSlice.h

@@ -1 @@
-#pragma once
+#ifndef VELOCITY_ARROW_SLICE_H
+#define VELOCITY_ARROW_SLICE_H 1
 
 #include <Cg/cg.h>
@@ -176 +177 @@
         return _renderMode;
 }
+ 
+#endif /* VELOCITY_ARROW_SLICE_H */

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -238 +238 @@
         // These volume slices will be occluded correctly by the cutplanes and
         // vice versa.
-        
+
         ConvexPolygon static_poly;
         for(int j = 0; j < volPtr->get_cutplane_count(); j++) {