Commit 54afe326 authored by Joachim Pouderoux's avatar Joachim Pouderoux Committed by Code Review
Browse files

Merge topic 'fix_HTG_tests_for_VS9' into master

c91e0136 A single call to the (static) coincident topology resolution method
parents ae34710d c91e0136
......@@ -63,26 +63,20 @@ int TestHyperTreeGridBinary2D( int argc, char* argv[] )
}
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( geometry->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( contour->GetOutputPort() );
mapper3->ScalarVisibilityOff();
mapper3->SetResolveCoincidentTopologyToPolygonOffset();
mapper3->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkDataSetMapper> mapper4;
mapper4->SetInputConnection( htGrid->GetOutputPort() );
mapper4->ScalarVisibilityOff();
mapper4->SetResolveCoincidentTopologyToPolygonOffset();
mapper4->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -65,26 +65,20 @@ int TestHyperTreeGridBinary2DMaterial( int argc, char* argv[] )
}
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( geometry->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( contour->GetOutputPort() );
mapper3->ScalarVisibilityOff();
mapper3->SetResolveCoincidentTopologyToPolygonOffset();
mapper3->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkDataSetMapper> mapper4;
mapper4->SetInputConnection( htGrid->GetOutputPort() );
mapper4->ScalarVisibilityOff();
mapper4->SetResolveCoincidentTopologyToPolygonOffset();
mapper4->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -77,22 +77,18 @@ int TestHyperTreeGridBinaryEllipseMaterial( int argc, char* argv[] )
0., 0., 1., 1. );
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
mapper1->UseLookupTableScalarRangeOn();
mapper1->SetLookupTable( colorFunction.GetPointer() );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( geometry->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( contour->GetOutputPort() );
mapper3->ScalarVisibilityOff();
mapper3->SetResolveCoincidentTopologyToPolygonOffset();
mapper3->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -64,11 +64,11 @@ int TestHyperTreeGridBinaryHyperbolicParaboloidMaterial( int argc, char* argv[]
0., 1., .4, 0. );
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
mapper1->UseLookupTableScalarRangeOn();
mapper1->SetLookupTable( colorFunction.GetPointer() );
......
......@@ -72,29 +72,23 @@ int TestHyperTreeGridTernary3DAxisCut( int argc, char* argv[] )
shrink2->SetShrinkFactor( .8 );
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkDataSetMapper> mapper1;
mapper1->SetInputConnection( shrink1->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( axisCut1->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( outline->GetOutputPort() );
mapper3->ScalarVisibilityOff();
vtkNew<vtkDataSetMapper> mapper4;
mapper4->SetInputConnection( shrink2->GetOutputPort() );
mapper4->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper4->SetResolveCoincidentTopologyToPolygonOffset();
mapper4->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper5;
mapper5->SetInputConnection( axisCut2->GetOutputPort() );
mapper5->ScalarVisibilityOff();
mapper5->SetResolveCoincidentTopologyToPolygonOffset();
mapper5->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -73,29 +73,23 @@ int TestHyperTreeGridTernary3DAxisCutMaterial( int argc, char* argv[] )
shrink2->SetShrinkFactor( .8 );
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkDataSetMapper> mapper1;
mapper1->SetInputConnection( shrink1->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( axisCut1->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( outline->GetOutputPort() );
mapper3->ScalarVisibilityOff();
vtkNew<vtkDataSetMapper> mapper4;
mapper4->SetInputConnection( shrink2->GetOutputPort() );
mapper4->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper4->SetResolveCoincidentTopologyToPolygonOffset();
mapper4->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper5;
mapper5->SetInputConnection( axisCut2->GetOutputPort() );
mapper5->ScalarVisibilityOff();
mapper5->SetResolveCoincidentTopologyToPolygonOffset();
mapper5->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -63,16 +63,14 @@ int TestHyperTreeGridTernary3DContour( int argc, char* argv[] )
vtkPolyData* pd = contour->GetOutput();
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( contour->GetOutputPort() );
mapper1->SetScalarRange( pd->GetPointData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( contour->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( outline->GetOutputPort() );
mapper3->ScalarVisibilityOff();
......
......@@ -65,16 +65,14 @@ int TestHyperTreeGridTernary3DContourMaterial( int argc, char* argv[] )
vtkPolyData* pd = contour->GetOutput();
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( contour->GetOutputPort() );
mapper1->SetScalarRange( pd->GetPointData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( contour->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( outline->GetOutputPort() );
mapper3->ScalarVisibilityOff();
......
......@@ -48,16 +48,14 @@ int TestHyperTreeGridTernary3DGeometry( int argc, char* argv[] )
vtkPolyData* pd = geometry->GetOutput();
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( geometry->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -50,16 +50,14 @@ int TestHyperTreeGridTernary3DGeometryMaterial( int argc, char* argv[] )
vtkPolyData* pd = geometry->GetOutput();
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( geometry->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -61,16 +61,14 @@ int TestHyperTreeGridTernary3DUnstructured( int argc, char* argv[] )
shrink->SetShrinkFactor( .8 );
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkDataSetMapper> mapper1;
mapper1->SetInputConnection( shrink->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkDataSetMapper> mapper2;
mapper2->SetInputConnection( htg2ug->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -63,16 +63,14 @@ int TestHyperTreeGridTernary3DUnstructuredMaterial( int argc, char* argv[] )
shrink->SetShrinkFactor( .8 );
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkDataSetMapper> mapper1;
mapper1->SetInputConnection( shrink->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkDataSetMapper> mapper2;
mapper2->SetInputConnection( htg2ug->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -75,22 +75,18 @@ int TestHyperTreeGridTernaryHyperbola( int argc, char* argv[] )
30., 1., 0., 0.);
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
mapper1->UseLookupTableScalarRangeOn();
mapper1->SetLookupTable( colorFunction.GetPointer() );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( geometry->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper3;
mapper3->SetInputConnection( contour->GetOutputPort() );
mapper3->ScalarVisibilityOff();
mapper3->SetResolveCoincidentTopologyToPolygonOffset();
mapper3->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
......@@ -58,16 +58,14 @@ int TestHyperTreeGridTernarySphereMaterial( int argc, char* argv[] )
vtkPolyData* pd = geometry->GetOutput();
// Mappers
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
vtkNew<vtkPolyDataMapper> mapper1;
mapper1->SetInputConnection( geometry->GetOutputPort() );
mapper1->SetScalarRange( pd->GetCellData()->GetScalars()->GetRange() );
mapper1->SetResolveCoincidentTopologyToPolygonOffset();
mapper1->SetResolveCoincidentTopologyPolygonOffsetParameters( 0, 1 );
vtkNew<vtkPolyDataMapper> mapper2;
mapper2->SetInputConnection( geometry->GetOutputPort() );
mapper2->ScalarVisibilityOff();
mapper2->SetResolveCoincidentTopologyToPolygonOffset();
mapper2->SetResolveCoincidentTopologyPolygonOffsetParameters( 1, 1 );
// Actors
vtkNew<vtkActor> actor1;
......
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