elalish · elalish · May 28, 2024 · May 7, 2024 · May 9, 2024 · May 9, 2024
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -12,7 +12,7 @@
       "program": "${workspaceFolder}/build/test/manifold_test",
       "args": [
         "--gtest_break_on_failure",
-        "--gtest_filter=SDF.SineSurface"
+        "--gtest_filter=Smooth.RefineQuads"
       ],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}/build/test",

diff --git a/bindings/wasm/examples/worker.test.js b/bindings/wasm/examples/worker.test.js
@@ -116,8 +116,8 @@ suite('Examples', () => {
   test('Scallop', async () => {
     const result = await runExample('Scallop');
     expect(result.genus).to.equal(0, 'Genus');
-    expect(result.volume).to.be.closeTo(41400, 100, 'Volume');
-    expect(result.surfaceArea).to.be.closeTo(7770, 10, 'Surface Area');
+    expect(result.volume).to.be.closeTo(40900, 100, 'Volume');
+    expect(result.surfaceArea).to.be.closeTo(7740, 10, 'Surface Area');
   });
 
   test('Torus Knot', async () => {

diff --git a/src/manifold/src/impl.h b/src/manifold/src/impl.h
@@ -178,11 +178,13 @@ struct Manifold::Impl {
       const std::vector<Smoothness>&) const;
   Vec<bool> FlatFaces() const;
   Vec<int> VertFlatFace(const Vec<bool>&) const;
+  Vec<int> VertHalfedge() const;
   std::vector<Smoothness> SharpenEdges(float minSharpAngle,
                                        float minSmoothness) const;
   void SharpenTangent(int halfedge, float smoothness);
   void SetNormals(int normalIdx, float minSharpAngle);
   void LinearizeFlatTangents();
+  void DistributeTangents(const Vec<bool>& fixedHalfedges);
   void CreateTangents(int normalIdx);
   void CreateTangents(std::vector<Smoothness>);
   void Refine(std::function<int(glm::vec3)>);

diff --git a/src/manifold/src/manifold.cpp b/src/manifold/src/manifold.cpp
@@ -717,7 +717,18 @@ Manifold Manifold::SmoothByNormals(int normalIdx) const {
 Manifold Manifold::SmoothOut(float minSharpAngle, float minSmoothness) const {
   auto pImpl = std::make_shared<Impl>(*GetCsgLeafNode().GetImpl());
   if (!IsEmpty()) {
-    pImpl->CreateTangents(pImpl->SharpenEdges(minSharpAngle, minSmoothness));
+    if (minSmoothness == 0) {
+      const int numProp = pImpl->meshRelation_.numProp;
+      Vec<float> properties = pImpl->meshRelation_.properties;
+      Vec<glm::ivec3> triProperties = pImpl->meshRelation_.triProperties;
+      pImpl->SetNormals(0, minSharpAngle);
+      pImpl->CreateTangents(0);
+      pImpl->meshRelation_.numProp = 0;
+      pImpl->meshRelation_.properties.swap(properties);
+      pImpl->meshRelation_.triProperties.swap(triProperties);
+    } else {
+      pImpl->CreateTangents(pImpl->SharpenEdges(minSharpAngle, minSmoothness));
+    }
   }
   return Manifold(std::make_shared<CsgLeafNode>(pImpl));
 }