Remove Initialize() boilerplate.

This commit is contained in:
NAThompson 2020-06-05 13:38:18 -04:00
parent b57a24e8f3
commit db8f3c9fc9
14 changed files with 3 additions and 13 deletions

@ -200,7 +200,6 @@ scene.AddActor(vtkm::rendering::Actor(outputData.GetCellSet(),
outputData.GetField(fieldName),
colorTable));
vtkm::rendering::View3D view(scene, mapper, canvas, camera, bg);
view.Initialize();
view.Paint();
view.SaveAs("demo_output.png");
```

@ -71,7 +71,6 @@ int main(int argc, char* argv[])
scene.AddActor(actor);
// Create a view and use it to render the input data using OS Mesa
vtkm::rendering::View3D view(scene, mapper, canvas, camera, bg);
view.Initialize();
view.Paint();
view.SaveAs("demo_input.pnm");
@ -96,7 +95,6 @@ int main(int argc, char* argv[])
scene2.AddActor(actor2);
vtkm::rendering::View3D view2(scene2, mapper, canvas, camera, bg);
view2.Initialize();
view2.Paint();
view2.SaveAs("demo_output.pnm");

@ -120,7 +120,6 @@ void TubeThatSpiral(vtkm::FloatDefault radius, vtkm::Id numLineSegments, vtkm::I
tubeDataset.GetField("Spiral Radius"),
colorTable));
vtkm::rendering::View3D view(scene, mapper, canvas, camera, bg);
view.Initialize();
view.Paint();
// We can save the file as a .NetBPM:
std::string output_filename = "tube_output_" + std::to_string(numSides) + "_sides.pnm";

@ -17,7 +17,6 @@ int UnitTestFancyTransferEGL(int argc, char* argv[])
//get egl canvas to construct a context for us
vtkm::rendering::CanvasEGL canvas(1024, 1024);
canvas.Initialize();
canvas.Activate();
//get glew to bind all the opengl functions

@ -18,7 +18,6 @@ int UnitTestFancyTransferOSMesa(int argc, char* argv[])
//get osmesa canvas to construct a context for us
vtkm::rendering::CanvasOSMesa canvas(1024, 1024);
canvas.Initialize();
canvas.Activate();
//get glew to bind all the opengl functions

@ -20,7 +20,6 @@ int UnitTestTransferEGL(int argc, char* argv[])
//get egl canvas to construct a context for us
vtkm::rendering::CanvasEGL canvas(1024, 1024);
canvas.Initialize();
canvas.Activate();
//get glew to bind all the opengl functions

@ -20,7 +20,6 @@ int UnitTestTransferOSMesa(int argc, char* argv[])
//get osmesa canvas to construct a context for us
vtkm::rendering::CanvasOSMesa canvas(1024, 1024);
canvas.Initialize();
canvas.Activate();
//get glew to bind all the opengl functions

@ -151,7 +151,6 @@ void TestImage()
{
vtkm::rendering::Canvas canvas(16, 16);
canvas.SetBackgroundColor(vtkm::rendering::Color::red);
canvas.Initialize();
canvas.Activate();
canvas.Clear();
// Line from top left to bottom right, ensures correct transposedness

@ -43,6 +43,7 @@ public:
virtual vtkm::rendering::Canvas* NewCopy() const;
VTKM_DEPRECATED(1.6, "Initialize() does nothing.")
virtual void Initialize();
virtual void Activate();

@ -341,7 +341,6 @@ void MapperWireframer::RenderCells(const vtkm::cont::DynamicCellSet& inCellSet,
CanvasRayTracer canvas(this->Internals->Canvas->GetWidth(),
this->Internals->Canvas->GetHeight());
canvas.SetBackgroundColor(vtkm::rendering::Color::white);
canvas.Initialize();
canvas.Activate();
canvas.Clear();
MapperRayTracer raytracer;

@ -152,7 +152,7 @@ void View::SetForegroundColor(const vtkm::rendering::Color& color)
void View::Initialize()
{
this->GetCanvas().Initialize();
// does nothing
}
void View::SaveAs(const std::string& fileName) const

@ -82,6 +82,7 @@ public:
VTKM_CONT
void SetForegroundColor(const vtkm::rendering::Color& color);
VTKM_DEPRECATED(1.6, "Initialize() does nothing.");
virtual void Initialize();
virtual void Paint() = 0;

@ -83,7 +83,6 @@ inline void SetCamera<vtkm::rendering::View1D>(vtkm::rendering::Camera& camera,
template <typename MapperType, typename CanvasType, typename ViewType>
void Render(ViewType& view, const std::string& outputFile)
{
view.Initialize();
view.Paint();
view.SaveAs(outputFile);
}

@ -19,7 +19,6 @@ void RenderTests()
{
vtkm::rendering::Canvas canvas;
canvas.SetBackgroundColor(vtkm::rendering::Color::white);
canvas.Initialize();
canvas.Activate();
canvas.Clear();
canvas.AddLine(-0.8, 0.8, 0.8, 0.8, 1.0f, vtkm::rendering::Color::black);