From 6e75be33ec0bcfea8d045a5a5ea68e162abe0b97 Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Wed, 10 May 2023 17:31:50 -0600 Subject: [PATCH] unique_ptr know if itself is valid --- vtkm/rendering/raytracing/ScalarRenderer.cxx | 3 +-- vtkm/rendering/raytracing/ScalarRenderer.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/vtkm/rendering/raytracing/ScalarRenderer.cxx b/vtkm/rendering/raytracing/ScalarRenderer.cxx index 9549c5017..f5d12d847 100644 --- a/vtkm/rendering/raytracing/ScalarRenderer.cxx +++ b/vtkm/rendering/raytracing/ScalarRenderer.cxx @@ -217,7 +217,6 @@ public: void ScalarRenderer::SetShapeIntersector(std::unique_ptr&& intersector) { Intersector = std::move(intersector); - IntersectorValid = true; } void ScalarRenderer::AddField(const vtkm::cont::Field& scalarField) @@ -265,7 +264,7 @@ void ScalarRenderer::RenderOnDevice(Ray& rays, { throw vtkm::cont::ErrorBadValue("ScalarRenderer: no fields added"); } - if (!IntersectorValid) + if (!Intersector) { throw vtkm::cont::ErrorBadValue("ScalarRenderer: intersector never set"); } diff --git a/vtkm/rendering/raytracing/ScalarRenderer.h b/vtkm/rendering/raytracing/ScalarRenderer.h index 7d2e41284..aacecc6c8 100644 --- a/vtkm/rendering/raytracing/ScalarRenderer.h +++ b/vtkm/rendering/raytracing/ScalarRenderer.h @@ -33,7 +33,6 @@ private: protected: std::unique_ptr Intersector; std::vector Fields; - bool IntersectorValid = false; template void RenderOnDevice(Ray& rays,