Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 01:02:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

more warning fixes

Browse Source
This commit is contained in:
Matt Larsen 2020-02-17 20:09:51 -08:00
parent 0943784c22
commit aa468f5c00
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarking/BenchmarkRayTracing.cxx
View File

@ -64,7 +64,7 @@ void BenchRayTracing(::benchmark::State& state)
vtkm::rendering::CanvasRayTracer canvas(1920, 1080);
vtkm::rendering::raytracing::Camera rayCamera;
rayCamera.SetParameters(camera, canvas.GetWidth(), canvas.GetHeight());
rayCamera.SetParameters(camera, vtkm::Int32(canvas.GetWidth()), vtkm::Int32(canvas.GetHeight()));
vtkm::rendering::raytracing::Ray<vtkm::Float32> rays;
rayCamera.CreateRays(rays, coords.GetBounds());

8
vtkm/rendering/raytracing/Camera.cxx
View File

@ -494,16 +494,16 @@ Camera::~Camera()
VTKM_CONT
void Camera::SetParameters(const vtkm::rendering::Camera& camera,
const vtkm::Id width,
const vtkm::Id height)
const vtkm::Int32 width,
const vtkm::Int32 height)
{
this->SetUp(camera.GetViewUp());
this->SetLookAt(camera.GetLookAt());
this->SetPosition(camera.GetPosition());
this->SetZoom(camera.GetZoom());
this->SetFieldOfView(camera.GetFieldOfView());
this->SetHeight(vtkm::Int32(height));
this->SetWidth(vtkm::Int32(width));
this->SetHeight(height);
this->SetWidth(width);
this->CameraView = camera;
}

4
vtkm/rendering/raytracing/Camera.h
View File

@ -60,8 +60,8 @@ public:
VTKM_CONT
void SetParameters(const vtkm::rendering::Camera& camera,
const vtkm::Id width,
const vtkm::Id height);
const vtkm::Int32 width,
const vtkm::Int32 height);
VTKM_CONT