Commit 2382082e authored by Dave Demarle's avatar Dave Demarle
Browse files

ENH: Add point based frustum extraction. Removed ExactTest OFF option.

parent 4ae7b23d
......@@ -29,7 +29,7 @@
#include <vtkstd/map>
#include <vtkstd/vector>
vtkCxxRevisionMacro(vtkSelection, "1.15");
vtkCxxRevisionMacro(vtkSelection, "1.16");
vtkStandardNewMacro(vtkSelection);
vtkCxxSetObjectMacro(vtkSelection, SelectionList, vtkAbstractArray);
......@@ -49,7 +49,6 @@ vtkInformationKeyMacro(vtkSelection,PRESERVE_TOPOLOGY,Integer);
vtkInformationKeyMacro(vtkSelection,CONTAINING_CELLS,Integer);
vtkInformationKeyMacro(vtkSelection,PIXEL_COUNT,Integer);
vtkInformationKeyMacro(vtkSelection,INVERSE,Integer);
vtkInformationKeyMacro(vtkSelection,EXACT_TEST,Integer);
vtkInformationKeyMacro(vtkSelection,SHOW_BOUNDS,Integer);
struct vtkSelectionInternals
......
......@@ -270,10 +270,6 @@ public:
static vtkSelection* GetData(vtkInformation* info);
static vtkSelection* GetData(vtkInformationVector* v, int i=0);
// Description:
// For Frustum selection.
static vtkInformationIntegerKey* EXACT_TEST();
// Description:
// For Frustum selection.
static vtkInformationIntegerKey* SHOW_BOUNDS();
......
......@@ -27,7 +27,7 @@
#include "vtkstd/vector"
#include "vtkstd/set"
vtkCxxRevisionMacro(vtkSelectionSource, "1.13");
vtkCxxRevisionMacro(vtkSelectionSource, "1.14");
vtkStandardNewMacro(vtkSelectionSource);
class vtkSelectionSourceInternals
......@@ -64,7 +64,6 @@ vtkSelectionSource::vtkSelectionSource()
this->ContainingCells = 1;
this->PreserveTopology = 0;
this->Inverse = 0;
this->ExactTest = 1;
this->ShowBounds = 0;
this->ArrayName = NULL;
}
......@@ -221,7 +220,6 @@ void vtkSelectionSource::PrintSelf(ostream& os, vtkIndent indent)
os << (this->ContainingCells?"CELLS":"POINTS") << endl;
os << indent << "PreserveTopology: " << this->PreserveTopology << endl;
os << indent << "Inverse: " << this->Inverse << endl;
os << indent << "ExactTest: " << this->ExactTest << endl;
os << indent << "ShowBounds: " << this->ShowBounds << endl;
os << indent << "ArrayName: " << (this->ArrayName?this->ArrayName:"NULL") << endl;
}
......@@ -374,9 +372,6 @@ int vtkSelectionSource::RequestData(
output->GetProperties()->Set(vtkSelection::ARRAY_NAME(),
this->ArrayName);
output->GetProperties()->Set(vtkSelection::EXACT_TEST(),
this->ExactTest);
output->GetProperties()->Set(vtkSelection::SHOW_BOUNDS(),
this->ShowBounds);
return 1;
......
......@@ -88,10 +88,6 @@ public:
vtkSetStringMacro(ArrayName);
vtkGetStringMacro(ArrayName);
// Description:
vtkSetMacro(ExactTest, int);
vtkGetMacro(ExactTest, int);
// Description:
vtkSetMacro(ShowBounds, int);
vtkGetMacro(ShowBounds, int);
......@@ -115,7 +111,6 @@ protected:
int ContainingCells;
int PreserveTopology;
int Inverse;
int ExactTest;
int ShowBounds;
char *ArrayName;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment