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

Merge topic 'fix/light_position'

Browse Source 
6a809676d re-set ray camera for default light

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2004
This commit is contained in:
Matt Larsen 2020-03-21 22:40:33 +00:00 committed by Kitware Robot
commit c49390f253
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/rendering/MapperCylinder.cxx
View File

@ -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);

4
vtkm/rendering/MapperPoint.cxx
View File

@ -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);

4
vtkm/rendering/MapperQuad.cxx
View File

@ -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);

1
vtkm/rendering/MapperRayTracer.cxx
View File

@ -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);