Fix editor warp crash (#442)

* reset errored worker * catch non-finite warp errors
elalish · May 27, 2023 · 9dac47a · 9dac47a
1 parent eb41b9d
commit 9dac47a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/bindings/wasm/bindings.js b/bindings/wasm/bindings.js
@@ -72,6 +72,11 @@ Module.setup = function() {
     }, 'vi');
     const out = this._Warp(wasmFuncPtr);
     removeFunction(wasmFuncPtr);
+
+    const status = out.status();
+    if (status.value !== 0) {
+      throw new Module.ManifoldError(status.value);
+    }
     return out;
   };
 

diff --git a/bindings/wasm/examples/editor.js b/bindings/wasm/examples/editor.js
@@ -377,14 +377,16 @@ function createWorker() {
 
     finishRun();
     runButton.disabled = true;
-    setScript('safe', 'true');
 
     URL.revokeObjectURL(objectURL);
     objectURL = e.data.objectURL;
     mv.src = objectURL;
     if (objectURL == null) {
       mv.showPoster();
       poster.textContent = 'Error';
+      createWorker();
+    } else {
+      setScript('safe', 'true');
     }
   }
 }

diff --git a/bindings/wasm/examples/index.html b/bindings/wasm/examples/index.html
@@ -29,6 +29,10 @@
       }
     }
   </script>
+  <script>
+    self.ModelViewerElement = self.ModelViewerElement || {};
+    self.ModelViewerElement.modelCacheSize = 0;
+  </script>
   <script type="module" src="/examples.js"></script>
 </head>
 

diff --git a/src/manifold/src/impl.cpp b/src/manifold/src/impl.cpp
@@ -707,6 +707,22 @@ void Manifold::Impl::MarkFailure(Error status) {
   status_ = status;
 }
 
+void Manifold::Impl::Warp(std::function<void(glm::vec3&)> warpFunc) {
+  thrust::for_each_n(thrust::host, vertPos_.begin(), NumVert(), warpFunc);
+  CalculateBBox();
+  if (!IsFinite()) {
+    MarkFailure(Error::NonFiniteVertex);
+    return;
+  }
+  Update();
+  faceNormal_.resize(0);  // force recalculation of triNormal
+  CalculateNormals();
+  SetPrecision();
+  CreateFaces();
+  SimplifyTopology();
+  Finish();
+}
+
 Manifold::Impl Manifold::Impl::Transform(const glm::mat4x3& transform_) const {
   if (transform_ == glm::mat4x3(1.0f)) return *this;
   auto policy = autoPolicy(NumVert());

diff --git a/src/manifold/src/impl.h b/src/manifold/src/impl.h
@@ -75,6 +75,7 @@ struct Manifold::Impl {
 
   void Update();
   void MarkFailure(Error status);
+  void Warp(std::function<void(glm::vec3&)> warpFunc);
   Impl Transform(const glm::mat4x3& transform) const;
   SparseIndices EdgeCollisions(const Impl& B) const;
   SparseIndices VertexCollisionsZ(const VecDH<glm::vec3>& vertsIn) const;

diff --git a/src/manifold/src/manifold.cpp b/src/manifold/src/manifold.cpp
@@ -563,15 +563,7 @@ Manifold Manifold::Mirror(glm::vec3 normal) const {
  */
 Manifold Manifold::Warp(std::function<void(glm::vec3&)> warpFunc) const {
   auto pImpl = std::make_shared<Impl>(*GetCsgLeafNode().GetImpl());
-  thrust::for_each_n(thrust::host, pImpl->vertPos_.begin(), NumVert(),
-                     warpFunc);
-  pImpl->Update();
-  pImpl->faceNormal_.resize(0);  // force recalculation of triNormal
-  pImpl->CalculateNormals();
-  pImpl->SetPrecision();
-  pImpl->CreateFaces();
-  pImpl->SimplifyTopology();
-  pImpl->Finish();
+  pImpl->Warp(warpFunc);
   return Manifold(std::make_shared<CsgLeafNode>(pImpl));
 }