ENH: New GetVectorMacro.

include/Axes.hh

@@ -36,7 +36,7 @@ public:
   // Description:
   // Set the origin of the axes.
   vlSetVector3Macro(Origin,float);
-  vlGetVectorMacro(Origin,float);
+  vlGetVectorMacro(Origin,float,3);
 
   // Description:
   // Set the scale factor of the axes. Used to control size.

include/BoolSPts.hh

@@ -58,11 +58,11 @@ public:
 
   void SetSampleDimensions(int i, int j, int k);
   void SetSampleDimensions(int dim[3]);
-  vlGetVectorMacro(SampleDimensions,int);
+  vlGetVectorMacro(SampleDimensions,int,3);
 
   void SetModelBounds(float *bounds);
   void SetModelBounds(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax);
-  vlGetVectorMacro(ModelBounds,float);
+  vlGetVectorMacro(ModelBounds,float,6);
 
 protected:
   // Usual data generation method

include/ContourF.hh

@@ -47,7 +47,7 @@ public:
 
   // Description:
   // Return pointer to array of contour values (size of numContours).
-  vlGetVectorMacro(Values,float);
+  vlGetVectorMacro(Values,float,MAX_CONTOURS);
 
   void GenerateValues(int numContours, float range[2]);
 

include/Cursor3D.hh

@@ -35,12 +35,12 @@ public:
 
   void SetModelBounds(float *bounds);
   void SetModelBounds(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax);
-  vlGetVectorMacro(ModelBounds,float);
+  vlGetVectorMacro(ModelBounds,float,6);
 
   // Description:
   // Specify the position of cursor focus.
   vlSetVector3Macro(FocalPoint,float);
-  vlGetVectorMacro(FocalPoint,float);
+  vlGetVectorMacro(FocalPoint,float,3);
 
   // Description:
   // Turn on/off the wireframe bounding box.

include/ElevatF.hh

@@ -36,17 +36,17 @@ public:
   // Description:
   // Define one end of the line (small scalar values).
   vlSetVector3Macro(LowPoint,float);
-  vlGetVectorMacro(LowPoint,float);
+  vlGetVectorMacro(LowPoint,float,3);
 
   // Description:
   // Define other end of the line (large scalar values).
   vlSetVector3Macro(HighPoint,float);
-  vlGetVectorMacro(HighPoint,float);
+  vlGetVectorMacro(HighPoint,float,3);
 
   // Description:
   // Specify range to map scalars into.
   vlSetVector2Macro(ScalarRange,float);
-  vlGetVectorMacro(ScalarRange,float);
+  vlGetVectorMacro(ScalarRange,float,2);
 
 protected:
   void Execute();

include/ExtractG.hh

@@ -39,7 +39,7 @@ public:
   // Description:
   // Set the center of the sphere.
   vlSetVector3Macro(Center,float);
-  vlGetVectorMacro(Center,float);
+  vlGetVectorMacro(Center,float,3);
 
 protected:
   // Usual data generation method

include/Glyph3D.hh

@@ -67,7 +67,7 @@ public:
   // Description:
   // Specify range to map scalar values into.
   vlSetVector2Macro(Range,float);
-  vlGetVectorMacro(Range,float);
+  vlGetVectorMacro(Range,float,2);
 
   // Description:
   // Turn on/off orienting of input geometry along vector/normal.

include/ImpMod.hh

@@ -38,7 +38,7 @@ public:
   // Specify i-j-k dimensions on which to sample distance function.
   void SetSampleDimensions(int i, int j, int k);
   void SetSampleDimensions(int dim[3]);
-  vlGetVectorMacro(SampleDimensions,int);
+  vlGetVectorMacro(SampleDimensions,int,3);
 
   // Description:
   // Specify distance away from surface of input geometry to sample. Smaller
@@ -49,7 +49,7 @@ public:
   // Specify the position in space to perform the sampling.
   void SetModelBounds(float *bounds);
   void SetModelBounds(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax);
-  vlGetVectorMacro(ModelBounds,float);
+  vlGetVectorMacro(ModelBounds,float,6);
 
   // Description:
   // The outer boundary of the structured point set can be assigned a 

include/LineSrc.hh

@@ -36,12 +36,12 @@ public:
   // Description:
   // Set position of first end point.
   vlSetVector3Macro(Pt1,float);
-  vlGetVectorMacro(Pt1,float);
+  vlGetVectorMacro(Pt1,float,3);
 
   // Description:
   // Set position of other end point.
   vlSetVector3Macro(Pt2,float);
-  vlGetVectorMacro(Pt2,float);
+  vlGetVectorMacro(Pt2,float,3);
 
   // Description:
   // Divide line into resolution number of pieces.

include/PointSrc.hh

@@ -39,7 +39,7 @@ public:
   // Description:
   // Set the center of the point cloud.
   vlSetVector3Macro(Center,float);
-  vlGetVectorMacro(Center,float);
+  vlGetVectorMacro(Center,float,3);
 
   // Description:
   // Set the radius of the point cloud.

include/PolyNrml.hh

@@ -13,7 +13,7 @@ without the express written consent of the authors.
 Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen 1993, 1994 
 
 =========================================================================*/
-// .NAME vlPolyNormals - compute normals for polygonal mes
+// .NAME vlPolyNormals - compute normals for polygonal mesh
 // .SECTION Description
 // vlPolyNormals is a filter that computes point normals for a polygonal 
 // mesh. The filter can reorder polygons to insure consistent orientation
@@ -22,7 +22,8 @@ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen 1993, 1994
 // also possible to globally flip the normal orientation.
 //     The algorithm works by determing normals for each polyon and then
 // averaging them at shared points. When sharp edges are present, the edges
-// are split and new points generated to prevent blurry edges.
+// are split and new points generated to prevent blurry edges (due to 
+// Gouraud shading).
 
 #ifndef __vlPolyNormals_h
 #define __vlPolyNormals_h

include/SampleF.hh

@@ -43,11 +43,11 @@ public:
 
   void SetSampleDimensions(int i, int j, int k);
   void SetSampleDimensions(int dim[3]);
-  vlGetVectorMacro(SampleDimensions,int);
+  vlGetVectorMacro(SampleDimensions,int,3);
 
   void SetModelBounds(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax);
   void SetModelBounds(float *bounds);
-  vlGetVectorMacro(ModelBounds,float);
+  vlGetVectorMacro(ModelBounds,float,6);
 
   // Description:
   // Turn on/off capping. If capping is on, then the outer boundaries of the

include/Splatter.hh

@@ -39,7 +39,7 @@ public:
 
   void SetSampleDimensions(int i, int j, int k);
   void SetSampleDimensions(int dim[3]);
-  vlGetVectorMacro(SampleDimensions,int);
+  vlGetVectorMacro(SampleDimensions,int,3);
 
   // Description:
   // Specify the radius of propagation of the splat. This value is expressed
@@ -67,7 +67,7 @@ public:
 
   void SetModelBounds(float *bounds);
   void SetModelBounds(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax);
-  vlGetVectorMacro(ModelBounds,float);
+  vlGetVectorMacro(ModelBounds,float,6);
 
   // Description:
   // Turn on/off the generation of elliptical splats.

include/TMap2Pl.hh

@@ -35,17 +35,17 @@ public:
   // Description:
   // Specify plane normal.
   vlSetVector3Macro(Normal,float);
-  vlGetVectorMacro(Normal,float);
+  vlGetVectorMacro(Normal,float,3);
 
   // Description:
   // Specify s-coordinate range for texture s-t coordinate pair.
   vlSetVector2Macro(SRange,float);
-  vlGetVectorMacro(SRange,float);
+  vlGetVectorMacro(SRange,float,2);
 
   // Description:
   // Specify t-coordinate range for texture s-t coordinate pair.
   vlSetVector2Macro(TRange,float);
-  vlGetVectorMacro(TRange,float);
+  vlGetVectorMacro(TRange,float,2);
 
   // Description:
   // Turn on/off automatic plane generation.

include/TranSPts.hh

@@ -41,7 +41,7 @@ public:
   // Description:
   // Specify i-j-k dimensions to sample input with.
   vlSetVector3Macro(SampleDimensions,int);
-  vlGetVectorMacro(SampleDimensions,int);
+  vlGetVectorMacro(SampleDimensions,int,3);
 
   // Description:
   // All voxels not within input structured point set are assigned this value.
@@ -50,7 +50,7 @@ public:
 
   void SetModelBounds(float *bounds);
   void SetModelBounds(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax);
-  vlGetVectorMacro(ModelBounds,float);
+  vlGetVectorMacro(ModelBounds,float,6);
 
   // Description:
   // Specify object to transform output voxels prior to sampling.

include/VoxelMod.hh

@@ -35,7 +35,7 @@ public:
 
   void SetSampleDimensions(int i, int j, int k);
   void SetSampleDimensions(int dim[3]);
-  vlGetVectorMacro(SampleDimensions,int);
+  vlGetVectorMacro(SampleDimensions,int,3);
 
   // Description:
   // Specify distance away from surface of input geometry to sample. Smaller
@@ -46,7 +46,7 @@ public:
   // Specify the position in space to perform the sampling.
   void SetModelBounds(float *bounds);
   void SetModelBounds(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax);
-  vlGetVectorMacro(ModelBounds,float);
+  vlGetVectorMacro(ModelBounds,float,6);
 
   void Write(char *);