elalish · elalish · Aug 20, 2024 · Aug 10, 2024 · Aug 10, 2024 · Aug 13, 2024
diff --git a/src/manifold/src/impl.cpp b/src/manifold/src/impl.cpp
@@ -478,6 +478,35 @@
   Finish();
 }
 
+void Manifold::Impl::Hull(const std::vector<glm::vec3>& vertPos) {
+  size_t numVert = vertPos.size();
+  if (numVert < 4) {
+    status_ = Error::InvalidConstruction;
+    return;
+  }
+
+  Vec<glm::dvec3> pointCloudVec(numVert);
+  manifold::transform(vertPos.begin(), vertPos.end(), pointCloudVec.begin(),
+                      [](const glm::vec3& v) { return glm::dvec3(v); });
+  QuickHull qh(pointCloudVec);
+  ConvexHull hull = qh.getConvexHullAsMesh(pointCloudVec, false);
+  // TODO : Once double PR lands, replace this with move
+  vertPos_.resize(hull.vertices.size());
+  manifold::transform(hull.vertices.begin(), hull.vertices.end(),
+                      vertPos_.begin(),
+                      [](const glm::dvec3& v) { return glm::vec3(v); });
+  halfedge_ = std::move(hull.halfedges);
+  meshRelation_.originalID = ReserveIDs(1);
+  CalculateBBox();
+  SetPrecision(bBox_.Scale() * kTolerance);
+  SplitPinchedVerts();
+  CalculateNormals();
+  InitializeOriginal();
+  CreateFaces({});
+  SimplifyTopology();
+  Finish();
+}
+
 /**
  * Create either a unit tetrahedron, cube or octahedron. The cube is in the
  * first octant, while the others are symmetric about the origin.

diff --git a/src/manifold/src/impl.h b/src/manifold/src/impl.h
@@ -19,6 +19,7 @@
 #include "manifold.h"
 #include "optional_assert.h"
 #include "polygon.h"
+#include "quickhull.h"
 #include "shared.h"
 #include "sparse.h"
 #include "utils.h"
@@ -189,5 +190,8 @@ struct Manifold::Impl {
   void CreateTangents(int normalIdx);
   void CreateTangents(std::vector<Smoothness>);
   void Refine(std::function<int(glm::vec3)>);
+
+  // quickhull.cpp
+  void Hull(const std::vector<glm::vec3>& vertPos);
 };
 }  // namespace manifold
diff --git a/src/manifold/src/manifold.cpp b/src/manifold/src/manifold.cpp
@@ -915,35 +915,21 @@ ExecutionParams& ManifoldParams() { return manifoldParams; }
  * hull.
  */
 Manifold Manifold::Hull(const std::vector<glm::vec3>& pts) {
-  ZoneScoped;
-  const int numVert = pts.size();
-  if (numVert < 4) return Manifold();
-
-  std::vector<glm::dvec3> vertices(numVert);
-  for (int i = 0; i < numVert; i++) {
-    vertices[i] = {pts[i].x, pts[i].y, pts[i].z};
-  }
-
-  QuickHull qh;
-  // bools: correct triangle winding, and use original indices
-  auto hull = qh.getConvexHull(vertices, false, true);
-  const auto& triangles = hull.getIndexBuffer();
-  const int numTris = triangles.size() / 3;
-
-  Mesh mesh;
-  mesh.vertPos = pts;
-  mesh.triVerts.reserve(numTris);
-  for (int i = 0; i < numTris; i++) {
-    const int j = i * 3;
-    mesh.triVerts.push_back({triangles[j], triangles[j + 1], triangles[j + 2]});
-  }
-  return Manifold(mesh);
+  std::shared_ptr<Impl> impl = std::make_shared<Impl>();
+  impl->Hull(pts);
+  return Manifold(std::make_shared<CsgLeafNode>(impl));
 }
 
 /**
  * Compute the convex hull of this manifold.
  */
-Manifold Manifold::Hull() const { return Hull(GetMesh().vertPos); }
+Manifold Manifold::Hull() const {
+  std::vector<glm::vec3> pts;
+  for (auto vertex : GetCsgLeafNode().GetImpl()->vertPos_) {
+    pts.push_back(vertex);
+  }
+  return Hull(pts);
+}
 
 /**
  * Compute the convex hull enveloping a set of manifolds.