Skip to content

Commit

Permalink
mark ImmediateModeRendering as deprecated
Browse files Browse the repository at this point in the history
Does not make sense for OpenGL2 and is not implemented
Also deprecate PainterDelegate
  • Loading branch information
Ken Martin committed Oct 2, 2017
1 parent 8eaff47 commit 67e054c
Show file tree
Hide file tree
Showing 119 changed files with 133 additions and 191 deletions.
2 changes: 0 additions & 2 deletions Accelerators/Vtkm/Testing/Cxx/TestVTKMExtractVOI.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ int TestVTKMExtractVOI(int argc, char* argv[])

vtkNew<vtkPolyDataMapper> sphereMapper;
sphereMapper->SetInputConnection(sphere->GetOutputPort());
sphereMapper->ImmediateModeRenderingOn();

vtkNew<vtkActor> sphereActor;
sphereActor->SetMapper(sphereMapper);
Expand All @@ -57,7 +56,6 @@ int TestVTKMExtractVOI(int argc, char* argv[])

vtkNew<vtkPolyDataMapper> mapper;
mapper->SetInputConnection(tris->GetOutputPort());
mapper->ImmediateModeRenderingOn();
mapper->SetScalarRange(130, 280);

vtkNew<vtkActor> actor;
Expand Down
1 change: 0 additions & 1 deletion Common/DataModel/Testing/Python/headBone.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def GetRGBColor(colorName):
isoMapper.SetInputConnection(gradient.GetOutputPort())
isoMapper.ScalarVisibilityOn()
isoMapper.SetScalarRange(0, 1200)
isoMapper.ImmediateModeRenderingOn()

isoActor = vtk.vtkActor()
isoActor.SetMapper(isoMapper)
Expand Down
1 change: 0 additions & 1 deletion Common/DataModel/Testing/Tcl/headBone.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ vtkDataSetMapper isoMapper
isoMapper SetInputConnection [gradient GetOutputPort]
isoMapper ScalarVisibilityOn
isoMapper SetScalarRange 0 1200
isoMapper ImmediateModeRenderingOn

vtkActor isoActor
isoActor SetMapper isoMapper
Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Cxx/LabeledMesh/LabeledMesh.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ int main( int , char *[] )
vtkSmartPointer<vtkPolyDataMapper> sphereMapper =
vtkSmartPointer<vtkPolyDataMapper>::New();
sphereMapper->SetInputConnection(sphere->GetOutputPort());
sphereMapper->GlobalImmediateModeRenderingOn();

vtkSmartPointer<vtkActor> sphereActor =
vtkSmartPointer<vtkActor>::New();
Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Python/TestText.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

sphereMapper = vtk.vtkPolyDataMapper()
sphereMapper.SetInputConnection(sphere.GetOutputPort())
sphereMapper.GlobalImmediateModeRenderingOn()
sphereActor = vtk.vtkLODActor()
sphereActor.SetMapper(sphereMapper)

Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Python/TestTextOldWay.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

sphereMapper = vtk.vtkPolyDataMapper()
sphereMapper.SetInputConnection(sphere.GetOutputPort())
sphereMapper.GlobalImmediateModeRenderingOn()
sphereActor = vtk.vtkLODActor()
sphereActor.SetMapper(sphereMapper)

Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Python/annotatePick.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
sphere = vtk.vtkSphereSource()
sphereMapper = vtk.vtkPolyDataMapper()
sphereMapper.SetInputConnection(sphere.GetOutputPort())
sphereMapper.GlobalImmediateModeRenderingOn()
sphereActor = vtk.vtkLODActor()
sphereActor.SetMapper(sphereMapper)

Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Python/labeledMesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
sphere = vtk.vtkSphereSource()
sphereMapper = vtk.vtkPolyDataMapper()
sphereMapper.SetInputConnection(sphere.GetOutputPort())
sphereMapper.GlobalImmediateModeRenderingOn()
sphereActor = vtk.vtkActor()
sphereActor.SetMapper(sphereMapper)

Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Tcl/TestText.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ vtkSphereSource sphere

vtkPolyDataMapper sphereMapper
sphereMapper SetInputConnection [sphere GetOutputPort]
sphereMapper GlobalImmediateModeRenderingOn
vtkLODActor sphereActor
sphereActor SetMapper sphereMapper

Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Tcl/TestTextOldWay.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ vtkSphereSource sphere

vtkPolyDataMapper sphereMapper
sphereMapper SetInputConnection [sphere GetOutputPort]
sphereMapper GlobalImmediateModeRenderingOn
vtkLODActor sphereActor
sphereActor SetMapper sphereMapper

Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Tcl/annotatePick.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ vtkSphereSource sphere

vtkPolyDataMapper sphereMapper
sphereMapper SetInputConnection [sphere GetOutputPort]
sphereMapper GlobalImmediateModeRenderingOn
vtkLODActor sphereActor
sphereActor SetMapper sphereMapper

Expand Down
1 change: 0 additions & 1 deletion Examples/Annotation/Tcl/labeledMesh.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ vtkActor2D rectActor
vtkSphereSource sphere
vtkPolyDataMapper sphereMapper
sphereMapper SetInputConnection [sphere GetOutputPort]
sphereMapper GlobalImmediateModeRenderingOn
vtkActor sphereActor
sphereActor SetMapper sphereMapper

Expand Down
1 change: 0 additions & 1 deletion Examples/GUI/Python/SphereWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
demMapper.SetInputConnection(normals.GetOutputPort())
demMapper.SetScalarRange(lo, hi)
demMapper.SetLookupTable(lut)
demMapper.ImmediateModeRenderingOn()

demActor = vtk.vtkLODActor()
demActor.SetMapper(demMapper)
Expand Down
1 change: 0 additions & 1 deletion Examples/GUI/Qt/SimpleView/SimpleView.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ SimpleView::SimpleView()

// Mapper
VTK_CREATE(vtkPolyDataMapper, mapper);
mapper->ImmediateModeRenderingOn();
mapper->SetInputConnection(elevation->GetOutputPort());

// Actor in scene
Expand Down
1 change: 0 additions & 1 deletion Examples/GUI/Tcl/SphereWidget.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ vtkPolyDataMapper demMapper
demMapper SetInputConnection [normals GetOutputPort]
eval demMapper SetScalarRange $lo $hi
demMapper SetLookupTable lut
demMapper ImmediateModeRenderingOn

vtkLODActor demActor
demActor SetMapper demMapper
Expand Down
1 change: 0 additions & 1 deletion Examples/GUI/Tcl/vtkTkRenderWidgetDemo.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ $renWin AddRenderer ren1
vtkConeSource cone
vtkPolyDataMapper coneMapper
coneMapper SetInputConnection [cone GetOutputPort]
coneMapper GlobalImmediateModeRenderingOn
vtkLODActor coneActor
coneActor SetMapper coneMapper

Expand Down
1 change: 0 additions & 1 deletion Examples/ParallelProcessing/Generic/Cxx/task1.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ vtkPolyDataMapper* task1(vtkRenderWindow* renWin, double data,
vtkPolyDataMapper* mapper = vtkPolyDataMapper::New();
mapper->SetInputData(probe->GetPolyDataOutput());
mapper->SetScalarRange(50, 180);
mapper->ImmediateModeRenderingOn();

vtkActor* actor = vtkActor::New();
actor->SetMapper(mapper);
Expand Down
1 change: 0 additions & 1 deletion Examples/ParallelProcessing/Generic/Cxx/task2.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ vtkPolyDataMapper* task2(vtkRenderWindow* renWin, double data,
vtkPolyDataMapper* mapper = vtkPolyDataMapper::New();
mapper->SetInputConnection(glyph->GetOutputPort());
mapper->SetScalarRange(50, 180);
mapper->ImmediateModeRenderingOn();

vtkActor* actor = vtkActor::New();
actor->SetMapper(mapper);
Expand Down
1 change: 0 additions & 1 deletion Examples/ParallelProcessing/Generic/Cxx/task3.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ void task3(double data)
vtkPolyDataMapper* mapper = vtkPolyDataMapper::New();
mapper->SetInputConnection(append->GetOutputPort());
mapper->SetScalarRange(50, 180);
mapper->ImmediateModeRenderingOn();

vtkActor* actor = vtkActor::New();
actor->SetMapper(mapper);
Expand Down
1 change: 0 additions & 1 deletion Examples/Rendering/Tcl/AbortCheckEvent.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ vtkSphereSource sphere
sphere SetPhiResolution 40
vtkPolyDataMapper sphereMapper
sphereMapper SetInputConnection [sphere GetOutputPort]
sphereMapper GlobalImmediateModeRenderingOn
vtkLODActor sphereActor
sphereActor SetMapper sphereMapper

Expand Down
1 change: 0 additions & 1 deletion Examples/VisualizationAlgorithms/Python/imageWarp.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
mapper = vtk.vtkDataSetMapper()
mapper.SetInputConnection(merge.GetOutputPort())
mapper.SetScalarRange(0, 255)
mapper.ImmediateModeRenderingOff()
actor = vtk.vtkActor()
actor.SetMapper(mapper)

Expand Down
1 change: 0 additions & 1 deletion Examples/VisualizationAlgorithms/Tcl/imageWarp.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ vtkMergeFilter merge
vtkDataSetMapper mapper
mapper SetInputConnection [merge GetOutputPort]
mapper SetScalarRange 0 255
mapper ImmediateModeRenderingOff
vtkActor actor
actor SetMapper mapper

Expand Down
3 changes: 0 additions & 3 deletions Filters/Core/Testing/Python/MassProperties.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,19 @@ def testMassProperties(self):

sphereMapper = vtk.vtkPolyDataMapper()
sphereMapper.SetInputConnection(sphere.GetOutputPort())
sphereMapper.GlobalImmediateModeRenderingOn()

sphereActor = vtk.vtkActor()
sphereActor.SetMapper(sphereMapper)
sphereActor.GetProperty().SetDiffuseColor(1, .2, .4)
coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInputConnection(cone.GetOutputPort())
coneMapper.GlobalImmediateModeRenderingOn()

coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper)
coneActor.GetProperty().SetDiffuseColor(.2, .4, 1)

cubeMapper = vtk.vtkPolyDataMapper()
cubeMapper.SetInputConnection(cube.GetOutputPort())
cubeMapper.GlobalImmediateModeRenderingOn()

cubeActor = vtk.vtkActor()
cubeActor.SetMapper(cubeMapper)
Expand Down
1 change: 0 additions & 1 deletion Filters/Core/Testing/Python/StreamPolyData.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ def NotUsed ():
mapper.ScalarVisibilityOff()
mapper.SetPiece(0)
mapper.SetNumberOfPieces(2)
mapper.ImmediateModeRenderingOn()

actor = vtk.vtkActor()
actor.SetMapper(mapper)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def testAll(self):

# cf ComputeNormalsOff
cfMapper = vtk.vtkPolyDataMapper()
cfMapper.ImmediateModeRenderingOn()
cfMapper.SetInputConnection(cf.GetOutputPort())
cfMapper.SetScalarRange(
pl3d_output.GetPointData().GetScalars().GetRange())
Expand Down
1 change: 0 additions & 1 deletion Filters/Core/Testing/Python/financialField3.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ def parseFile():
popMapper = vtk.vtkPolyDataMapper()
popMapper.SetInputConnection(popSurface.GetOutputPort())
popMapper.ScalarVisibilityOff()
popMapper.ImmediateModeRenderingOn()
popActor = vtk.vtkActor()
popActor.SetMapper(popMapper)
popActor.GetProperty().SetOpacity(0.3)
Expand Down
2 changes: 0 additions & 2 deletions Filters/Core/Testing/Python/multipleComponentContour.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@
cf2.SetArrayComponent(1)
mapper1 = vtk.vtkPolyDataMapper()
mapper1.SetInputConnection(cf1.GetOutputPort())
mapper1.SetImmediateModeRendering(1)
mapper1.SetScalarRange(0,1)
mapper1.SetScalarVisibility(0)
mapper1.Update()
mapper2 = vtk.vtkPolyDataMapper()
mapper2.SetInputConnection(cf2.GetOutputPort())
mapper2.SetImmediateModeRendering(1)
mapper2.SetScalarRange(0,1)
mapper2.SetScalarVisibility(0)
actor1 = vtk.vtkActor()
Expand Down
1 change: 0 additions & 1 deletion Filters/Core/Testing/Python/skinOrder.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ def testSkinOrder(self):

mapper.append(vtk.vtkPolyDataMapper())
mapper[idx].SetInputConnection(iso[idx].GetOutputPort())
mapper[idx].ImmediateModeRenderingOn()

actor.append(vtk.vtkActor())
actor[idx].SetMapper(mapper[idx])
Expand Down
3 changes: 0 additions & 3 deletions Filters/Core/Testing/Tcl/MassProperties.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,19 @@ vtkCubeSource cube

vtkPolyDataMapper sphereMapper
sphereMapper SetInputConnection [sphere GetOutputPort]
sphereMapper GlobalImmediateModeRenderingOn

vtkActor sphereActor
sphereActor SetMapper sphereMapper
[sphereActor GetProperty] SetDiffuseColor 1 .2 .4
vtkPolyDataMapper coneMapper
coneMapper SetInputConnection [cone GetOutputPort]
coneMapper GlobalImmediateModeRenderingOn

vtkActor coneActor
coneActor SetMapper coneMapper
[coneActor GetProperty] SetDiffuseColor .2 .4 1

vtkPolyDataMapper cubeMapper
cubeMapper SetInputConnection [cube GetOutputPort]
cubeMapper GlobalImmediateModeRenderingOn

vtkActor cubeActor
cubeActor SetMapper cubeMapper
Expand Down
1 change: 0 additions & 1 deletion Filters/Core/Testing/Tcl/StreamPolyData.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ vtkPolyDataMapper mapper
mapper ScalarVisibilityOff
mapper SetPiece 0
mapper SetNumberOfPieces 2
mapper ImmediateModeRenderingOn

vtkActor actor
actor SetMapper mapper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ vtkContourFilter cf
#cf ComputeNormalsOff

vtkPolyDataMapper cfMapper
cfMapper ImmediateModeRenderingOn
cfMapper SetInputConnection [cf GetOutputPort]
eval cfMapper SetScalarRange \
[[[$pl3d_output GetPointData] GetScalars] GetRange]
Expand Down
1 change: 0 additions & 1 deletion Filters/Core/Testing/Tcl/financialField2.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ vtkContourFilter popSurface
vtkPolyDataMapper popMapper
popMapper SetInputConnection [popSurface GetOutputPort]
popMapper ScalarVisibilityOff
popMapper ImmediateModeRenderingOn
vtkActor popActor
popActor SetMapper popMapper
[popActor GetProperty] SetOpacity 0.3
Expand Down
1 change: 0 additions & 1 deletion Filters/Core/Testing/Tcl/financialField3.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ vtkContourFilter popSurface
vtkPolyDataMapper popMapper
popMapper SetInputConnection [popSurface GetOutputPort]
popMapper ScalarVisibilityOff
popMapper ImmediateModeRenderingOn
vtkActor popActor
popActor SetMapper popMapper
[popActor GetProperty] SetOpacity 0.3
Expand Down
2 changes: 0 additions & 2 deletions Filters/Core/Testing/Tcl/multipleComponentContour.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,12 @@ vtkContourFilter cf2

vtkPolyDataMapper mapper1
mapper1 SetInputConnection [cf1 GetOutputPort]
mapper1 SetImmediateModeRendering 1
mapper1 SetScalarRange 0 1
mapper1 SetScalarVisibility 0
mapper1 Update

vtkPolyDataMapper mapper2
mapper2 SetInputConnection [cf2 GetOutputPort]
mapper2 SetImmediateModeRendering 1
mapper2 SetScalarRange 0 1
mapper2 SetScalarVisibility 0

Expand Down
1 change: 0 additions & 1 deletion Filters/Core/Testing/Tcl/skinOrder.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ foreach order $orders {

vtkPolyDataMapper mapper$order
mapper$order SetInputConnection [iso$order GetOutputPort]
mapper$order ImmediateModeRenderingOn

vtkActor actor$order
actor$order SetMapper mapper$order
Expand Down
1 change: 0 additions & 1 deletion Filters/Extraction/Testing/Python/extractPolyData.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
extract.PassPointsOn()
sphereMapper = vtk.vtkPolyDataMapper()
sphereMapper.SetInputConnection(extract.GetOutputPort())
sphereMapper.GlobalImmediateModeRenderingOn()
sphereActor = vtk.vtkActor()
sphereActor.SetMapper(sphereMapper)

Expand Down
3 changes: 0 additions & 3 deletions Filters/Extraction/Testing/Python/extractVectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
isoVxMapper = vtk.vtkPolyDataMapper()
isoVxMapper.SetInputConnection(normalsVx.GetOutputPort())
isoVxMapper.ScalarVisibilityOff()
isoVxMapper.ImmediateModeRenderingOn()
isoVxActor = vtk.vtkActor()
isoVxActor.SetMapper(isoVxMapper)
isoVxActor.GetProperty().SetColor(1,0.7,0.6)
Expand All @@ -47,7 +46,6 @@
isoVyMapper = vtk.vtkPolyDataMapper()
isoVyMapper.SetInputConnection(normalsVy.GetOutputPort())
isoVyMapper.ScalarVisibilityOff()
isoVyMapper.ImmediateModeRenderingOn()
isoVyActor = vtk.vtkActor()
isoVyActor.SetMapper(isoVyMapper)
isoVyActor.GetProperty().SetColor(0.7,1,0.6)
Expand All @@ -63,7 +61,6 @@
isoVzMapper = vtk.vtkPolyDataMapper()
isoVzMapper.SetInputConnection(normalsVz.GetOutputPort())
isoVzMapper.ScalarVisibilityOff()
isoVzMapper.ImmediateModeRenderingOn()
isoVzActor = vtk.vtkActor()
isoVzActor.SetMapper(isoVzMapper)
isoVzActor.GetProperty().SetColor(0.4,0.5,1)
Expand Down
1 change: 0 additions & 1 deletion Filters/Extraction/Testing/Tcl/extractPolyData.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ vtkExtractPolyDataGeometry extract
extract PassPointsOn
vtkPolyDataMapper sphereMapper
sphereMapper SetInputConnection [extract GetOutputPort]
sphereMapper GlobalImmediateModeRenderingOn
vtkActor sphereActor
sphereActor SetMapper sphereMapper

Expand Down
3 changes: 0 additions & 3 deletions Filters/Extraction/Testing/Tcl/extractVectors.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ vtkPolyDataNormals normalsVx
vtkPolyDataMapper isoVxMapper
isoVxMapper SetInputConnection [normalsVx GetOutputPort]
isoVxMapper ScalarVisibilityOff
isoVxMapper ImmediateModeRenderingOn
vtkActor isoVxActor
isoVxActor SetMapper isoVxMapper
eval [isoVxActor GetProperty] SetColor 1 0.7 0.6
Expand All @@ -50,7 +49,6 @@ vtkPolyDataNormals normalsVy
vtkPolyDataMapper isoVyMapper
isoVyMapper SetInputConnection [normalsVy GetOutputPort]
isoVyMapper ScalarVisibilityOff
isoVyMapper ImmediateModeRenderingOn
vtkActor isoVyActor
isoVyActor SetMapper isoVyMapper
eval [isoVyActor GetProperty] SetColor 0.7 1 0.6
Expand All @@ -68,7 +66,6 @@ vtkPolyDataNormals normalsVz
vtkPolyDataMapper isoVzMapper
isoVzMapper SetInputConnection [normalsVz GetOutputPort]
isoVzMapper ScalarVisibilityOff
isoVzMapper ImmediateModeRenderingOn
vtkActor isoVzActor
isoVzActor SetMapper isoVzMapper
eval [isoVzActor GetProperty] SetColor 0.4 0.5 1
Expand Down
Loading

0 comments on commit 67e054c

Please sign in to comment.