mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-18 18:15:44 +00:00
more warning fixes
This commit is contained in:
parent
0943784c22
commit
aa468f5c00
@ -64,7 +64,7 @@ void BenchRayTracing(::benchmark::State& state)
|
|||||||
|
|
||||||
vtkm::rendering::CanvasRayTracer canvas(1920, 1080);
|
vtkm::rendering::CanvasRayTracer canvas(1920, 1080);
|
||||||
vtkm::rendering::raytracing::Camera rayCamera;
|
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;
|
vtkm::rendering::raytracing::Ray<vtkm::Float32> rays;
|
||||||
rayCamera.CreateRays(rays, coords.GetBounds());
|
rayCamera.CreateRays(rays, coords.GetBounds());
|
||||||
|
|
||||||
|
@ -494,16 +494,16 @@ Camera::~Camera()
|
|||||||
|
|
||||||
VTKM_CONT
|
VTKM_CONT
|
||||||
void Camera::SetParameters(const vtkm::rendering::Camera& camera,
|
void Camera::SetParameters(const vtkm::rendering::Camera& camera,
|
||||||
const vtkm::Id width,
|
const vtkm::Int32 width,
|
||||||
const vtkm::Id height)
|
const vtkm::Int32 height)
|
||||||
{
|
{
|
||||||
this->SetUp(camera.GetViewUp());
|
this->SetUp(camera.GetViewUp());
|
||||||
this->SetLookAt(camera.GetLookAt());
|
this->SetLookAt(camera.GetLookAt());
|
||||||
this->SetPosition(camera.GetPosition());
|
this->SetPosition(camera.GetPosition());
|
||||||
this->SetZoom(camera.GetZoom());
|
this->SetZoom(camera.GetZoom());
|
||||||
this->SetFieldOfView(camera.GetFieldOfView());
|
this->SetFieldOfView(camera.GetFieldOfView());
|
||||||
this->SetHeight(vtkm::Int32(height));
|
this->SetHeight(height);
|
||||||
this->SetWidth(vtkm::Int32(width));
|
this->SetWidth(width);
|
||||||
this->CameraView = camera;
|
this->CameraView = camera;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,8 +60,8 @@ public:
|
|||||||
|
|
||||||
VTKM_CONT
|
VTKM_CONT
|
||||||
void SetParameters(const vtkm::rendering::Camera& camera,
|
void SetParameters(const vtkm::rendering::Camera& camera,
|
||||||
const vtkm::Id width,
|
const vtkm::Int32 width,
|
||||||
const vtkm::Id height);
|
const vtkm::Int32 height);
|
||||||
|
|
||||||
|
|
||||||
VTKM_CONT
|
VTKM_CONT
|
||||||
|
Loading…
Reference in New Issue
Block a user