Fixing VTKm references in Visit Camera branch

Signed-off-by: Emily Howell <[email protected]>

Author: emily-howell

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 ### Preferred dependency versions for ascent@develop
 - [email protected] or newer
 - [email protected]
-- [email protected].0
+- [email protected].0
 - [email protected]
 - [email protected]
 - [email protected]

src/docs/sphinx/Actions/Scenes.rst

@@ -405,7 +405,7 @@ Now we add a second render to the same example using every available parameter:
 Rendering Camera Configuration
 ---------------------------------
 Ascent supports rendering in both 2D and 3D. For 3D rendering, Ascent supports two primary methods for defining the camera:
-the Ascent native (VTKm style) camera, which is camera-centric, and the VisIt style camera, which is view-centric.
+the Ascent native (Viskores style) camera, which is camera-centric, and the VisIt style camera, which is view-centric.
 Both formats provide control over how scenes are rendered, but they differ in terminology, orientation, and internal computation of the view matrix.
 
 2D Camera
@@ -414,9 +414,9 @@ Both formats provide control over how scenes are rendered, but they differ in te
 
 - ``2d`` or ``windowCoords``: Enables 2D rendering mode. Expects a 4-element array defining the 2D view bounds [x0 (left), x1 (right), y0 (bottom), y1 (top)].
 
-Ascent Native (VTKm Style) Camera
+Ascent Native (Viskores Style) Camera
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The native Ascent camera follows the VTKm camera model which focuses on defining the camera's physical parameters and orientation in 3D space.
+The native Ascent camera follows the Viskores camera model which focuses on defining the camera's physical parameters and orientation in 3D space.
 This camera-centric approach specifies where the camera is located, what it is looking at, and how it is oriented.
 The following parameters are supported:
 
@@ -451,7 +451,7 @@ The following parameters are supported:
 
 Unsupported VisIt Camera Parameters
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-In addition to the above supported VisIt camera parameters, there are a number of VisIt camera parameters that are not completely translatable to the VTKm style camera and are therefore currently ignored.
+In addition to the above supported VisIt camera parameters, there are a number of VisIt camera parameters that are not completely translatable to the Viskores style camera and are therefore currently ignored.
 
 .. Note::
    These parameters are safely ignored if provided. They will not influence the rendered image but also will not produce errors.

src/docs/sphinx/BuildingAscent.rst

@@ -56,7 +56,7 @@ Ascent requires Conduit and provides optional features that depend on third-part
      - Required TPLS
 
    * - VTK-h Rendering and Filtering Pipelines
-     - VTk-m (Serial, OpenMP, CUDA, Kokkos)
+     - Viskores (Serial, OpenMP, CUDA, Kokkos)
 
    * - MFEM High-Order to Low-Order Refinement for VTK-h Pipelines
      - MFEM

src/libs/ascent/runtimes/flow_filters/ascent_runtime_conduit_to_viskores_parsing.cpp

@@ -209,7 +209,7 @@ parse_camera(const conduit::Node camera_node, viskores::rendering::Camera &camer
   if(camera_node.has_child("focus"))
   {
       float64_accessor coords = camera_node["focus"].value();
-      vtkmVec3f look_at(coords[0], coords[1], coords[2]);
+      viskoresVec3f look_at(coords[0], coords[1], coords[2]);
       camera.SetLookAt(look_at);
   }
 
@@ -219,7 +219,7 @@ parse_camera(const conduit::Node camera_node, viskores::rendering::Camera &camer
      camera_node.has_child("parallel_scale"))
   {
       // Compute camera distance using perspective projection formula
-      conduit::float64 view_angle = camera_node["view_angle"].to_float64() * (vtkm::Pi() / 360.0);
+      conduit::float64 view_angle = camera_node["view_angle"].to_float64() * (viskores::Pi() / 360.0);
       conduit::float64 parallel_scale = camera_node["parallel_scale"].to_float64();
       conduit::float64 distance = (parallel_scale) / std::tan(view_angle);
 
@@ -235,20 +235,20 @@ parse_camera(const conduit::Node camera_node, viskores::rendering::Camera &camer
         pos[i] = focus[i] + view_norm[i] * distance;
       }
 
-      vtkmVec3f position(pos[0], pos[1], pos[2]);
+      viskoresVec3f position(pos[0], pos[1], pos[2]);
       camera.SetPosition(position);
 
       // Clipping planes require positional information to be computed
       if(camera_node.has_child("near_plane"))
       {
-        vtkm::Range clipping_range = camera.GetClippingRange();
+        viskores::Range clipping_range = camera.GetClippingRange();
         clipping_range.Min =std::max(CONDUIT_EPSILON, distance + camera_node["near_plane"].to_float64());
         camera.SetClippingRange(clipping_range);
       }
 
       if(camera_node.has_child("far_plane"))
       {
-        vtkm::Range clipping_range = camera.GetClippingRange();
+        viskores::Range clipping_range = camera.GetClippingRange();
         clipping_range.Max = distance + camera_node["far_plane"].to_float64();
         camera.SetClippingRange(clipping_range);
       }
@@ -262,8 +262,8 @@ parse_camera(const conduit::Node camera_node, viskores::rendering::Camera &camer
   if(camera_node.has_child("view_up"))
   {
       float64_accessor coords = camera_node["view_up"].value();
-      vtkmVec3f up(coords[0], coords[1], coords[2]);
-      vtkm::Normalize(up);
+      viskoresVec3f up(coords[0], coords[1], coords[2]);
+      viskores::Normalize(up);
       camera.SetViewUp(up);
   }
 
@@ -275,7 +275,7 @@ parse_camera(const conduit::Node camera_node, viskores::rendering::Camera &camer
 
   if(camera_node.has_child("image_zoom"))
   {
-      camera.Zoom(zoom_to_vtkm_zoom(camera_node["image_zoom"].to_float64()));
+      camera.Zoom(zoom_to_viskores_zoom(camera_node["image_zoom"].to_float64()));
   }
 
   if(camera_node.has_child("perspective"))

src/tests/ascent/t_ascent_render_3d.cpp

@@ -3660,8 +3660,8 @@ TEST(ascent_render_3d, test_render_ascent_camera)
     Node n;
     ascent::about(n);
 
-    // only run this test if ascent was built with vtkm support
-    if(n["runtimes/ascent/vtkm/status"].as_string() == "disabled")
+    // only run this test if ascent was built with viskores support
+    if(n["runtimes/ascent/viskores/status"].as_string() == "disabled")
     {
 
         ASCENT_INFO("Ascent support disabled, skipping 3D default"
@@ -3787,8 +3787,8 @@ TEST(ascent_render_3d, test_render_visit_camera)
     Node n;
     ascent::about(n);
 
-    // only run this test if ascent was built with vtkm support
-    if(n["runtimes/ascent/vtkm/status"].as_string() == "disabled")
+    // only run this test if ascent was built with viskores support
+    if(n["runtimes/ascent/viskores/status"].as_string() == "disabled")
     {
 
         ASCENT_INFO("Ascent support disabled, skipping 3D default"
@@ -3917,8 +3917,8 @@ TEST(ascent_render_3d, test_render_invalid_camera)
     // the ascent runtime is currently our only rendering runtime
     Node n;
     ascent::about(n);
-    // only run this test if ascent was built with vtkm support
-    if(n["runtimes/ascent/vtkm/status"].as_string() == "disabled")
+    // only run this test if ascent was built with viskores support
+    if(n["runtimes/ascent/viskores/status"].as_string() == "disabled")
     {
         ASCENT_INFO("Ascent support disabled, skipping 3D default"
                       "Pipeline test");