Update manifold.

V-Sekai · Sep 9, 2024 · 9f7ce11 · 9f7ce11
1 parent 2b86e39
commit 9f7ce11
Show file tree

Hide file tree

Showing 39 changed files with 3,740 additions and 2,529 deletions.
diff --git a/modules/csg/SCsub b/modules/csg/SCsub
@@ -12,6 +12,7 @@ thirdparty_obj = []
 thirdparty_dir = "#thirdparty/manifold/"
 thirdparty_sources = [
     "src/polygon/src/polygon.cpp",
+    "src/cross_section/src/cross_section.cpp",
     "src/manifold/src/constructors.cpp",
     "src/manifold/src/edge_op.cpp",
     "src/manifold/src/face_op.cpp",
@@ -24,23 +25,22 @@ thirdparty_sources = [
     "src/manifold/src/sort.cpp",
     "src/manifold/src/csg_tree.cpp",
     "src/manifold/src/subdivision.cpp",
-    "src/collider/src/collider.cpp",
+    "src/manifold/src/quickhull.cpp",
 ]
 
-env_csg.Append(CPPDEFINES=["THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP"])
 env_csg.Append(LINKFLAGS=["-fno-exceptions"])
 env_csg.Append(LINKFLAGS=["-fno-duplicated-branches"])
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 env_csg.Prepend(
     CPPPATH=[
-        "#thirdparty/thrust",
         "#thirdparty/glm",
         "#thirdparty/quickhull",
         thirdparty_dir + "src/polygon/include",
         thirdparty_dir + "src/manifold/include",
         thirdparty_dir + "src/utilities/include",
         thirdparty_dir + "src/collider/include",
+        thirdparty_dir + "src/cross_section/include",
         thirdparty_dir + "src/third_party",
         thirdparty_dir + "src/third_party/quickhull",
     ]

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -548,7 +548,7 @@ in the MSVC debugger.
 ## manifold
 
 - Upstream: https://github.com/elalish/manifold
-- Version: master (ccb682fc440bc621607ae4d84706429f42300705, 2024)
+- Version: master (6f009ca13fab71e53f118179742cc2bb40455721, 2024)
 - License: Apache 2.0
 
 File extracted from upstream source: