Merge pull request #1509 from LLNL/feature/han12/2d_shaping

Initial 2D intersection shaping

Author: bmhan12

RELEASE-NOTES.md

@@ -42,6 +42,7 @@ to use Open Cascade's file I/O capabilities in support of Quest applications.
   of `loadExternalData` in `sidre::IOManager` and `sidre::Group`.
 - Adds intersection routines between `primal::Ray` objects and `primal::NURBSCurve`/`primal::NURBSPatch` objects.
 - Adds LineFileTagCombiner to Lumberjack to allow combining messages if line number, file, and tag are equal.
+- Adds some support for 2D shaping in `quest::IntersectionShaper`, using STL meshes with zero for z-coordinates or in-memory triangles as input.
 
 ###  Changed
 - `primal::NumericArray` has been moved to `core`.  The header is `core/NumericArray.hpp`.

data

@@ -100,11 +100,28 @@ class Polygon
   ~Polygon() { m_vertices.clear(); }
 
   /*!
-   * \brief Copy assignment operator for Polygon. Suppress CUDA warnings for
-   *        dynamic axom::Array.
+   * \brief Copy assignment operator for Polygon (static array specialization).
+   *        Specializations are necessary to remove warnings.
    */
-  AXOM_SUPPRESS_HD_WARN
-  AXOM_HOST_DEVICE
+  template <PolygonArray P_ARRAY_TYPE = ARRAY_TYPE,
+            std::enable_if_t<P_ARRAY_TYPE == PolygonArray::Static, int> = 0>
+  AXOM_HOST_DEVICE Polygon& operator=(const Polygon& other)
+  {
+    if(this == &other)
+    {
+      return *this;
+    }
+
+    m_vertices = other.m_vertices;
+    return *this;
+  }
+
+  /*!
+   * \brief Copy assignment operator for Polygon.
+   *        (dynamic array specialization)
+   */
+  template <PolygonArray P_ARRAY_TYPE = ARRAY_TYPE,
+            std::enable_if_t<P_ARRAY_TYPE == PolygonArray::Dynamic, int> = 0>
   Polygon& operator=(const Polygon& other)
   {
     if(this == &other)

src/axom/primal/geometry/Polygon.hpp

@@ -41,13 +41,15 @@ void check_point_policy()
 //------------------------------------------------------------------------------
 TEST(primal_point, point_default_constructor)
 {
-  static const int DIM = 2;
+  static const int DIM = 3;
   using CoordType = double;
   using QPoint = primal::Point<CoordType, DIM>;
 
   QPoint pt;
 
   EXPECT_EQ(pt[0], CoordType());
+  EXPECT_EQ(pt[1], CoordType());
+  EXPECT_EQ(pt[2], CoordType());
   EXPECT_EQ(pt.dimension(), DIM);
 }
 

src/axom/primal/tests/primal_point.cpp

@@ -90,7 +90,7 @@ void checkIntersections(const primal::Ray<CoordType, 3>& ray,
          << "\n\t" << ray << "\n\t" << patch;
 
     sstr << "\ns (" << u.size() << "): ";
-    for(auto i = 0u; i < u.size(); ++i)
+    for(auto i = 0; i < u.size(); ++i)
     {
       sstr << std::setprecision(16) << "(" << u[i] << "," << v[i] << "),";
     }