From 6a809676d67d735c72e9bcbab5b7662bd62631ae Mon Sep 17 00:00:00 2001 From: Matt Larsen Date: Sat, 21 Mar 2020 14:06:25 -0700 Subject: [PATCH] re-set ray camera for default light --- vtkm/rendering/MapperCylinder.cxx | 4 +--- vtkm/rendering/MapperPoint.cxx | 4 +--- vtkm/rendering/MapperQuad.cxx | 4 +--- vtkm/rendering/MapperRayTracer.cxx | 1 + 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/vtkm/rendering/MapperCylinder.cxx b/vtkm/rendering/MapperCylinder.cxx index 38ae8dc39..fd83b98d1 100644 --- a/vtkm/rendering/MapperCylinder.cxx +++ b/vtkm/rendering/MapperCylinder.cxx @@ -192,10 +192,8 @@ void MapperCylinder::RenderCells(const vtkm::cont::DynamicCellSet& cellset, raytracing::RayOperations::MapCanvasToRays( this->Internals->Rays, camera, *this->Internals->Canvas); - - this->Internals->Tracer.SetField(scalarField, scalarRange); - + this->Internals->Tracer.GetCamera() = this->Internals->RayCamera; this->Internals->Tracer.SetColorMap(this->ColorMap); this->Internals->Tracer.Render(this->Internals->Rays); diff --git a/vtkm/rendering/MapperPoint.cxx b/vtkm/rendering/MapperPoint.cxx index cbbb0fc7d..175f67435 100644 --- a/vtkm/rendering/MapperPoint.cxx +++ b/vtkm/rendering/MapperPoint.cxx @@ -191,10 +191,8 @@ void MapperPoint::RenderCells(const vtkm::cont::DynamicCellSet& cellset, raytracing::RayOperations::MapCanvasToRays( this->Internals->Rays, camera, *this->Internals->Canvas); - - this->Internals->Tracer.SetField(scalarField, scalarRange); - + this->Internals->Tracer.GetCamera() = this->Internals->RayCamera; this->Internals->Tracer.SetColorMap(this->ColorMap); this->Internals->Tracer.Render(this->Internals->Rays); diff --git a/vtkm/rendering/MapperQuad.cxx b/vtkm/rendering/MapperQuad.cxx index 127cf638d..912879288 100644 --- a/vtkm/rendering/MapperQuad.cxx +++ b/vtkm/rendering/MapperQuad.cxx @@ -113,10 +113,8 @@ void MapperQuad::RenderCells(const vtkm::cont::DynamicCellSet& cellset, raytracing::RayOperations::MapCanvasToRays( this->Internals->Rays, camera, *this->Internals->Canvas); - - + this->Internals->Tracer.GetCamera() = this->Internals->RayCamera; this->Internals->Tracer.SetField(scalarField, scalarRange); - this->Internals->Tracer.SetColorMap(this->ColorMap); this->Internals->Tracer.Render(this->Internals->Rays); diff --git a/vtkm/rendering/MapperRayTracer.cxx b/vtkm/rendering/MapperRayTracer.cxx index 92582fb48..3016a3778 100644 --- a/vtkm/rendering/MapperRayTracer.cxx +++ b/vtkm/rendering/MapperRayTracer.cxx @@ -113,6 +113,7 @@ void MapperRayTracer::RenderCells(const vtkm::cont::DynamicCellSet& cellset, this->Internals->RayCamera.SetParameters(camera, width, height); this->Internals->RayCamera.CreateRays(this->Internals->Rays, shapeBounds); + this->Internals->Tracer.GetCamera() = this->Internals->RayCamera; this->Internals->Rays.Buffers.at(0).InitConst(0.f); raytracing::RayOperations::MapCanvasToRays( this->Internals->Rays, camera, *this->Internals->Canvas);