Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Deprecate StartScene() and EndScene()

Browse Source
This commit is contained in:
Nick 2020-06-14 11:27:45 -04:00
parent bbfa1f1b8b
commit 8065e76e74
16 changed files with 43 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/rendering/Mapper.h
View File

@ -10,6 +10,7 @@
#ifndef vtk_m_rendering_Mapper_h
#define vtk_m_rendering_Mapper_h
#include <vtkm/Deprecated.h>
#include <vtkm/cont/ColorTable.h>
#include <vtkm/cont/CoordinateSystem.h>
#include <vtkm/cont/DynamicCellSet.h>
@ -38,8 +39,12 @@ public:
virtual void SetActiveColorTable(const vtkm::cont::ColorTable& ct);
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() = 0;
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() = 0;
virtual void SetCanvas(vtkm::rendering::Canvas* canvas) = 0;
virtual vtkm::rendering::Canvas* GetCanvas() const = 0;

10
vtkm/rendering/MapperConnectivity.cxx
View File

@ -85,16 +85,6 @@ void MapperConnectivity::RenderCells(const vtkm::cont::DynamicCellSet& cellset,
tracerProxy.Trace(camera, CanvasRT);
}
void MapperConnectivity::StartScene()
{
// Nothing needs to be done.
}
void MapperConnectivity::EndScene()
{
// Nothing needs to be done.
}
vtkm::rendering::Mapper* MapperConnectivity::NewCopy() const
{
return new vtkm::rendering::MapperConnectivity(*this);

7
vtkm/rendering/MapperConnectivity.h
View File

@ -37,8 +37,11 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
virtual void StartScene() override;
virtual void EndScene() override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
vtkm::rendering::Mapper* NewCopy() const override;
void CreateDefaultView();

10
vtkm/rendering/MapperCylinder.cxx
View File

@ -217,16 +217,6 @@ void MapperCylinder::SetCompositeBackground(bool on)
this->Internals->CompositeBackground = on;
}
void MapperCylinder::StartScene()
{
// Nothing needs to be done.
}
void MapperCylinder::EndScene()
{
// Nothing needs to be done.
}
vtkm::rendering::Mapper* MapperCylinder::NewCopy() const
{
return new vtkm::rendering::MapperCylinder(*this);

8
vtkm/rendering/MapperCylinder.h
View File

@ -68,8 +68,12 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
virtual void StartScene() override;
virtual void EndScene() override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;

10
vtkm/rendering/MapperPoint.cxx
View File

@ -216,16 +216,6 @@ void MapperPoint::SetCompositeBackground(bool on)
this->Internals->CompositeBackground = on;
}
void MapperPoint::StartScene()
{
// Nothing needs to be done.
}
void MapperPoint::EndScene()
{
// Nothing needs to be done.
}
vtkm::rendering::Mapper* MapperPoint::NewCopy() const
{
return new vtkm::rendering::MapperPoint(*this);

7
vtkm/rendering/MapperPoint.h
View File

@ -79,8 +79,11 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
virtual void StartScene() override;
virtual void EndScene() override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;

10
vtkm/rendering/MapperQuad.cxx
View File

@ -138,16 +138,6 @@ void MapperQuad::SetCompositeBackground(bool on)
this->Internals->CompositeBackground = on;
}
void MapperQuad::StartScene()
{
// Nothing needs to be done.
}
void MapperQuad::EndScene()
{
// Nothing needs to be done.
}
vtkm::rendering::Mapper* MapperQuad::NewCopy() const
{
return new vtkm::rendering::MapperQuad(*this);

8
vtkm/rendering/MapperQuad.h
View File

@ -44,8 +44,12 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
virtual void StartScene() override;
virtual void EndScene() override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;

10
vtkm/rendering/MapperRayTracer.cxx
View File

@ -151,16 +151,6 @@ void MapperRayTracer::SetShadingOn(bool on)
this->Internals->Shade = on;
}
void MapperRayTracer::StartScene()
{
// Nothing needs to be done.
}
void MapperRayTracer::EndScene()
{
// Nothing needs to be done.
}
vtkm::rendering::Mapper* MapperRayTracer::NewCopy() const
{
return new vtkm::rendering::MapperRayTracer(*this);

8
vtkm/rendering/MapperRayTracer.h
View File

@ -38,8 +38,12 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
virtual void StartScene() override;
virtual void EndScene() override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;
void SetShadingOn(bool on);

10
vtkm/rendering/MapperVolume.cxx
View File

@ -137,16 +137,6 @@ void MapperVolume::RenderCells(const vtkm::cont::DynamicCellSet& cellset,
}
}
void MapperVolume::StartScene()
{
// Nothing needs to be done.
}
void MapperVolume::EndScene()
{
// Nothing needs to be done.
}
vtkm::rendering::Mapper* MapperVolume::NewCopy() const
{
return new vtkm::rendering::MapperVolume(*this);

7
vtkm/rendering/MapperVolume.h
View File

@ -36,8 +36,11 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
virtual void StartScene() override;
virtual void EndScene() override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
vtkm::rendering::Mapper* NewCopy() const override;
void SetSampleDistance(const vtkm::Float32 distance);

10
vtkm/rendering/MapperWireframer.cxx
View File

@ -231,16 +231,6 @@ void MapperWireframer::SetIsOverlay(bool isOverlay)
this->Internals->IsOverlay = isOverlay;
}
void MapperWireframer::StartScene()
{
// Nothing needs to be done.
}
void MapperWireframer::EndScene()
{
// Nothing needs to be done.
}
void MapperWireframer::RenderCells(const vtkm::cont::DynamicCellSet& inCellSet,
const vtkm::cont::CoordinateSystem& coords,
const vtkm::cont::Field& inScalarField,

7
vtkm/rendering/MapperWireframer.h
View File

@ -42,8 +42,11 @@ public:
bool GetIsOverlay() const;
void SetIsOverlay(bool isOverlay);
virtual void StartScene() override;
virtual void EndScene() override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
virtual void RenderCells(const vtkm::cont::DynamicCellSet& cellset,
const vtkm::cont::CoordinateSystem& coords,

2
vtkm/rendering/Scene.cxx
View File

@ -46,13 +46,11 @@ void Scene::Render(vtkm::rendering::Mapper& mapper,
vtkm::rendering::Canvas& canvas,
const vtkm::rendering::Camera& camera) const
{
mapper.StartScene();
for (vtkm::IdComponent actorIndex = 0; actorIndex < this->GetNumberOfActors(); actorIndex++)
{
const vtkm::rendering::Actor& actor = this->GetActor(actorIndex);
actor.Render(mapper, canvas, camera);
}
mapper.EndScene();
}
vtkm::Bounds Scene::GetSpatialBounds() const