Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add GetCanvas calls to the mapper classes.

Browse Source
This commit is contained in:
Dave Pugmire 2016-11-28 09:41:01 -05:00
parent 87b1cdcacf
commit db522c4cd1
7 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/rendering/Mapper.h
View File

@ -49,7 +49,7 @@ public:
virtual void StartScene() = 0;
virtual void EndScene() = 0;
virtual void SetCanvas(vtkm::rendering::Canvas *canvas) = 0;
virtual vtkm::rendering::Canvas* GetCanvas() {return NULL;} //DRP fix this...
virtual vtkm::rendering::Canvas* GetCanvas() const = 0;
virtual vtkm::rendering::Mapper *NewCopy() const = 0;

6
vtkm/rendering/MapperGL.cxx
View File

@ -468,6 +468,12 @@ void MapperGL::SetCanvas(vtkm::rendering::Canvas *c)
}
}
vtkm::rendering::Canvas *
MapperGL::GetCanvas() const
{
return this->Canvas;
}
vtkm::rendering::Mapper *MapperGL::NewCopy() const
{
return new vtkm::rendering::MapperGL(*this);

2
vtkm/rendering/MapperGL.h
View File

@ -48,7 +48,7 @@ public:
void StartScene() VTKM_OVERRIDE;
void EndScene() VTKM_OVERRIDE;
void SetCanvas(vtkm::rendering::Canvas *canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() {return this->Canvas;}
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
vtkm::rendering::Mapper *NewCopy() const VTKM_OVERRIDE;

6
vtkm/rendering/MapperRayTracer.cxx
View File

@ -100,6 +100,12 @@ void MapperRayTracer::SetCanvas(vtkm::rendering::Canvas *canvas)
}
}
vtkm::rendering::Canvas *
MapperRayTracer::GetCanvas() const
{
return this->Internals->Canvas;
}
struct MapperRayTracer::RenderFunctor
{
vtkm::rendering::MapperRayTracer *Self;

1
vtkm/rendering/MapperRayTracer.h
View File

@ -37,6 +37,7 @@ public:
~MapperRayTracer();
void SetCanvas(vtkm::rendering::Canvas *canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
void RenderCells(const vtkm::cont::DynamicCellSet &cellset,
const vtkm::cont::CoordinateSystem &coords,

6
vtkm/rendering/MapperVolume.cxx
View File

@ -106,6 +106,12 @@ void MapperVolume::SetCanvas(vtkm::rendering::Canvas *canvas)
}
}
vtkm::rendering::Canvas *
MapperVolume::GetCanvas() const
{
return this->Internals->Canvas;
}
struct MapperVolume::RenderFunctor
{
vtkm::rendering::MapperVolume *Self;

1
vtkm/rendering/MapperVolume.h
View File

@ -35,6 +35,7 @@ public:
~MapperVolume();
void SetCanvas(vtkm::rendering::Canvas *canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
virtual void RenderCells(const vtkm::cont::DynamicCellSet &cellset,
const vtkm::cont::CoordinateSystem &coords,