Add Merge function #394

elalish · 2023-03-28T17:57:23Z

Fixes #363
Fixes #398

This adds a Merge function to MeshGL that will heuristically fill in mergeFromVert and mergeToVert vectors, the purpose of which is to create manifold meshes from GL-style meshes that appear manifold but are not due to unshared verts where materials, UVs, normals, etc. have a boundary.

This will not attempt to fix meshes that are more broken - I'll leave that to external auto-manifold tools for now, since that is more complicated and arbitrary.

codecov · 2023-04-04T19:22:34Z

Codecov Report

Patch coverage: 90.81% and project coverage change: +0.03 🎉

Comparison is base (fbe4cc6) 85.90% compared to head (afd81db) 85.94%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #394      +/-   ##
==========================================
+ Coverage   85.90%   85.94%   +0.03%     
==========================================
  Files          36       38       +2     
  Lines        4492     4574      +82     
==========================================
+ Hits         3859     3931      +72     
- Misses        633      643      +10

Impacted Files	Coverage Δ
meshIO/include/meshIO.h	`100.00% <ø> (ø)`
src/collider/include/collider.h	`66.66% <ø> (ø)`
src/utilities/include/public.h	`55.44% <ø> (-4.04%)`	⬇️
src/manifold/src/shared.h	`55.05% <66.66%> (+0.40%)`	⬆️
src/manifold/src/sort.cpp	`90.26% <90.00%> (-0.12%)`	⬇️
src/collider/src/collider.cpp	`95.00% <100.00%> (+0.08%)`	⬆️
src/manifold/include/manifold.h	`100.00% <100.00%> (ø)`
src/manifold/src/impl.cpp	`95.49% <100.00%> (+0.22%)`	⬆️

... and 3 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

elalish · 2023-04-06T19:11:20Z

This also involved moving MeshGL from public.h to manifold.h. I also updated to CI to link with Assimp on Mac.

elalish · 2023-04-06T19:15:00Z

Here's the output of the Boolean.Normals test, which has lovely smooth reflections, despite the relatively course meshes involved, which you can see in the facets of the intersections.

elalish · 2023-04-06T19:18:39Z

src/utilities/include/public.h

@@ -580,6 +503,21 @@ void Dump(const std::vector<T>& vec) {
  }
  std::cout << std::endl;
 }
+
+template <typename T>
+void Diff(const std::vector<T>& a, const std::vector<T>& b) {


I added an extra debug helper to quickly see just which parts of two vectors are not identical.

elalish · 2023-04-06T19:20:43Z

src/collider/include/collider.h

  template <typename T>
-  SparseIndices Collisions(const VecDH<T>& queriesIn) const;
+  SparseIndices Collisions(const VecDH<T>& queriesIn,
+                           bool selfCollision = false) const;


I updated the Collider so that we can collide a vector with itself and not spend a bunch of time reporting that every index collides with itself. This might come in handy down the road too.

elalish · 2023-04-06T19:23:00Z

src/third_party/graphlite/include/graph_lite.h

 #ifndef GSK_GRAPH_LITE_H
 #define GSK_GRAPH_LITE_H

 #include <algorithm>
 #include <cassert>
+#include <ciso646>  // Added to fix MSVC error


There's not actually much change here - I think it's just formatting. I added this line to make MSVC able to compile and in addition to &&. The only update I pulled in was to not emit warnings about duplicate edges.

Interesting! According to cppreference

This means that in a conforming implementation, including this header has no effect.

Thought MSVC is a conforming implementation :P

elalish · 2023-04-06T19:24:46Z

src/manifold/src/impl.cpp

@@ -242,20 +242,17 @@ struct CoplanarEdge {
    const int edgeIdx = thrust::get<2>(inOut);

    const Halfedge edge = halfedge[edgeIdx];
-    if (!edge.IsForward()) return;


This fixed a bug I found - I was not deduplicating property verts correctly before.

src/collider/src/collider.cpp

pca006132 · 2023-04-06T19:50:49Z

src/manifold/src/sort.cpp

+ * multi-material MeshGL was produced, but its merge vectors were lost due to a
+ * round-trip through a file format.
+ */
+bool MeshGL::Merge() {


Considering the result may not be a manifold, the users may want to use IsManifold to check for manifoldness. Should we move the method out of the testing hooks group?

Oh, that reminds me, I've been meaning to get rid of that function. They can just use the Manifold constructor to check if it's manifold.

Should we add this to the documentation and then merge this?

pca006132 · 2023-04-06T20:00:36Z

src/manifold/src/sort.cpp

+bool MeshGL::Merge() {
+  std::multiset<Edge> openEdges;
+
+  std::vector<int> merge(NumVert());


It seems to me that when mergeFromVert.size() is much smaller than NumVert(), it may be more beneficial to use a sparse hashmap. (just a nitpick)

Well, it might save a bit of memory, but not compute. I figure if I'm not allocating more memory than I already have stored in the structure I'm operating on, then the savings probably isn't worth the trouble.

It depends on the size and sparsity. For large data set, saving memory equals to better cache utilization which means better performance. But yeah this may not worth the trouble.

src/manifold/src/sort.cpp

* start Merge * started Merge function * added collider * refactor now builds * connect vectors * finished Merge, updated Collider * added tests * added sorting, updated graph_lite * revert submodule change * fixed indexing * fixed prop dedupe bug * fixed test * update meshIO linking * fix MSVC * use assimp on Mac * add precision handling * improved tests * revert test tweak * update collider * clean up multiset * updated docs

elalish added 6 commits March 7, 2023 11:06

start Merge

2629e39

Merge branch 'master' of github.com:elalish/manifold into weld

5e26c75

started Merge function

f7a1d1f

Merge branch 'master' of github.com:elalish/manifold into weld

91d45c3

added collider

eab94bc

refactor now builds

1b89019

elalish self-assigned this Mar 28, 2023

elalish added 6 commits March 28, 2023 11:23

connect vectors

40dc78a

finished Merge, updated Collider

ef6f48d

added tests

1044d87

added sorting, updated graph_lite

5eb310d

merging master

01bfdc8

revert submodule change

e42e7bb

elalish mentioned this pull request Apr 3, 2023

Manifold construction from MesGL with duplicate verts gives "re-adding existing edge" warning #398

Closed

elalish added 4 commits April 4, 2023 09:13

fixed indexing

fa3312e

fixed prop dedupe bug

3eaf629

fixed test

086b4c8

Merge branch 'master' of github.com:elalish/manifold into weld2

c115694

elalish marked this pull request as ready for review April 4, 2023 17:20

update meshIO linking

1b3065a

elalish added 4 commits April 4, 2023 12:48

fix MSVC

9edd6db

use assimp on Mac

203a19d

add precision handling

f111ec9

improved tests

6182b9a

revert test tweak

ea71e52

elalish commented Apr 6, 2023

View reviewed changes

elalish requested a review from pca006132 April 6, 2023 19:25

pca006132 reviewed Apr 6, 2023

View reviewed changes

src/collider/src/collider.cpp Outdated Show resolved Hide resolved

pca006132 reviewed Apr 6, 2023

View reviewed changes

src/manifold/src/sort.cpp Outdated Show resolved Hide resolved

elalish added 3 commits April 6, 2023 22:11

update collider

269de44

clean up multiset

6d94771

updated docs

afd81db

elalish merged commit aeba267 into master Apr 10, 2023

elalish deleted the weld2 branch April 10, 2023 00:16

elalish mentioned this pull request May 2, 2023

Build a manifold extension to glTF #422

Closed

elalish mentioned this pull request Nov 3, 2023

V2.2.1 #589

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Merge function #394

Add Merge function #394

elalish commented Mar 28, 2023 •

edited

Loading

codecov bot commented Apr 4, 2023 •

edited

Loading

elalish commented Apr 6, 2023

elalish commented Apr 6, 2023

elalish Apr 6, 2023

elalish Apr 6, 2023

elalish Apr 6, 2023

pca006132 Apr 6, 2023

elalish Apr 6, 2023

pca006132 Apr 6, 2023

elalish Apr 7, 2023

pca006132 Apr 7, 2023

pca006132 Apr 6, 2023

elalish Apr 7, 2023

pca006132 Apr 7, 2023

Add Merge function #394

Add Merge function #394

Conversation

elalish commented Mar 28, 2023 • edited Loading

codecov bot commented Apr 4, 2023 • edited Loading

Codecov Report

elalish commented Apr 6, 2023

elalish commented Apr 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elalish commented Mar 28, 2023 •

edited

Loading

codecov bot commented Apr 4, 2023 •

edited

Loading