Skip to content
Snippets Groups Projects
Commit 99b0a6da authored by Andrew Maclean's avatar Andrew Maclean
Browse files

Removing vtkMapper

parent daf3fdf7
No related branches found
No related tags found
1 merge request!397C++ to python api 12
#include <vtkActor.h>
#include <vtkCamera.h>
#include <vtkFrustumSource.h>
#include <vtkMapper.h>
#include <vtkNamedColors.h>
#include <vtkNew.h>
#include <vtkOpenVRRenderWindow.h>
......
......@@ -10,7 +10,6 @@
#include <vtkImageMapToColors.h>
#include <vtkInteractorStyleSwitch.h>
#include <vtkLookupTable.h>
#include <vtkMapper.h>
#include <vtkNamedColors.h>
#include <vtkNew.h>
#include <vtkPlanes.h>
......@@ -44,8 +43,6 @@ vtkSmartPointer<vtkImageData> makeImage(int n, vtkColor3d fillColor,
int main(int, char*[])
{
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
// Define colors
vtkNew<vtkNamedColors> colors;
vtkColor3d backgroundColor = colors->GetColor3d("Wheat");
......@@ -87,6 +84,7 @@ int main(int, char*[])
clipper->SetInputData(image);
vtkNew<vtkDataSetMapper> imageMapper;
imageMapper->SetResolveCoincidentTopologyToPolygonOffset();
vtkNew<vtkActor> imageActor;
imageActor->SetMapper(imageMapper);
renderer->AddViewProp(imageActor);
......
......@@ -11,7 +11,6 @@
#include <vtkImageMapToColors.h>
#include <vtkInteractorStyleSwitch.h>
#include <vtkLookupTable.h>
#include <vtkMapper.h>
#include <vtkNamedColors.h>
#include <vtkNew.h>
#include <vtkPlanes.h>
......@@ -43,8 +42,6 @@ int main(int, char*[])
constexpr int xOffset = 8;
constexpr int yOffset = 8;
vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
vtkNew<vtkNamedColors> colors;
vtkNew<vtkRenderer> renderer;
renderer->SetBackground(colors->GetColor3d("Wheat").GetData());
......@@ -84,6 +81,7 @@ int main(int, char*[])
clipper->SetInputData(image);
vtkNew<vtkDataSetMapper> imageMapper;
imageMapper->SetResolveCoincidentTopologyToPolygonOffset();
vtkNew<vtkActor> imageActor;
imageActor->SetMapper(imageMapper);
renderer->AddViewProp(imageActor);
......
......@@ -31,7 +31,7 @@ namespace {
* @param window the window to render to
* @param randEng the random number generator engine
*/
void Randomize(vtkSphereSource* sphere, vtkMapper* mapper,
void Randomize(vtkSphereSource* sphere, vtkDataSetMapper* mapper,
vtkGenericOpenGLRenderWindow* window, std::mt19937& randEng);
} // namespace
......@@ -103,7 +103,7 @@ int main(int argc, char* argv[])
}
namespace {
void Randomize(vtkSphereSource* sphere, vtkMapper* mapper,
void Randomize(vtkSphereSource* sphere, vtkDataSetMapper* mapper,
vtkGenericOpenGLRenderWindow* window, std::mt19937& randEng)
{
// Generate randomness.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment