Pull upstream (#5)

* min distance start algo * loft algorithm improvement * Loft performance enhancements * version bump * Slices algorithm * Version bump * Add slices to java bindings * transform fix * Add CreateSurface function * stb_image.h * Update gh action * Update gh action * gh * Add load surface from file * Point Cloud Meshing (#4) * Surface and .ply loading * New Version * Vertex Colors * new version * syntax fix * LoadImage operator * GetFaceNormals, GetHalfedges * Add IntVector * Fix naming * GetVertices and GetTriangles * migrating * new version is building * start migrating bindings * migration progress * progress * more progress * more progress * more progress * Compiles * more progress * fixes * bad files * fix * Fixes * Fix tests * Export fix * Fix * Fix
SovereignShop · Dec 25, 2024 · af3efdc · af3efdc
1 parent 051bd61
commit af3efdc
Show file tree

Hide file tree

Showing 255 changed files with 157,398 additions and 18,140 deletions.
diff --git a/.gersemirc b/.gersemirc
@@ -0,0 +1,2 @@
+line_length: 80
+indent: 2
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -1,6 +1,6 @@
 name: build_wheels
 
-on: 
+on:
   release:
     types: [published]
   workflow_dispatch:
@@ -11,16 +11,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-latest, macos-latest]
+        # macos-13: x86-64
+        # macos-14: arm64
+        os: [ubuntu-22.04, windows-2019, macos-14, macos-13]
     steps:
       - run: |
           git config --global submodule.fetchJobs 8
           git config --global core.longpaths true
+      - if: matrix.os == 'macos-14'
+        run: echo "CIBW_ARCHS=arm64 universal2" >> "$GITHUB_ENV"
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16
+        uses: pypa/cibuildwheel@v2.21.3
       - uses: actions/upload-artifact@v4
         with:
           name: python-${{ matrix.os }}
@@ -31,10 +33,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
     - name: Build SDist
       run: pipx run build --sdist
+    - name: Confirm SDist can be built
+      run: pip wheel dist/*.tar.gz
     - uses: actions/upload-artifact@v4
       with:
         name: python-sdist

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,9 +1,11 @@
 name: Deploy documentation 
 
 on:
-  push:
-    branches:
-      - master
+  workflow_run:
+    workflows: [CI]
+    types:
+      - completed
+    branches: [master]
 
 jobs:
   deploy_github_pages:
@@ -13,7 +15,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Doxygen Action
-      uses: mattnotmitt/doxygen-action@v1
+      uses: mattnotmitt/doxygen-action@edge
 
     - name: Move deployables
       run: |
@@ -22,19 +24,29 @@ jobs:
         mv ./docs ./public
 
     - name: Download built examples
-      uses: dawidd6/action-download-artifact@v3
+      uses: dawidd6/action-download-artifact@v6
       with:
         workflow: manifold.yml
         workflow_conclusion: completed
-        pr: ${{github.event.pull_request.number}}
+        # specific to the triggering workflow
+        run_id: ${{github.event.workflow_run.id}}
+        # do not download from old run
+        check_artifacts: true 
         name: wasm
         path: ./public
 
+    - name: Deploy Javascript Docs to Github Pages
+      run: |
+        cd bindings/wasm
+        npm install
+        npm run docs
+        mv ./docs ../../public/jsdocs
+
     - name: Deploy to Github Pages
       uses: peaceiris/actions-gh-pages@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_branch: gh-pages
         force_orphan: true
         cname: manifoldcad.org
-        publish_dir: ./public
+        publish_dir: ./public
diff --git a/.github/workflows/publish_npm.yml b/.github/workflows/publish_npm.yml
@@ -1,6 +1,6 @@
 name: publish_npm
 
-on: 
+on:
   release:
     types: [published]
   workflow_dispatch:
@@ -15,14 +15,16 @@ jobs:
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
-        node-version: '20.x'
+        node-version: 20
         registry-url: 'https://registry.npmjs.org'
 
     - name: Download built examples
-      uses: dawidd6/action-download-artifact@v3
+      uses: dawidd6/action-download-artifact@v6
       with:
         workflow: manifold.yml
         workflow_conclusion: completed
+        branch: master
+        check_artifacts: true
         name: wasm
         path: ./bindings/wasm/
 
@@ -31,4 +33,4 @@ jobs:
         cd ./bindings/wasm/
         npm publish
       env:
-        NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
diff --git a/.github/workflows/release_file.yml b/.github/workflows/release_file.yml
@@ -0,0 +1,31 @@
+name: Release File
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  upload_archive:
+    name: Upload archive
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          ref=${{ github.ref_name }}
+          echo "release_name=manifold-${ref#v}" >> $GITHUB_ENV
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ env.release_name }}
+          submodules: recursive
+      - name: Build archive
+        run: >
+          tar --exclude=".git*" -cz ${{ env.release_name }} -f ${{ env.release_name }}.tar.gz
+      - name: Log checksum
+        run: >
+          sha256sum ${{ env.release_name }}.tar.gz
+      - name: Add file to release
+        run: |
+          cd ${{ env.release_name }} || exit 1
+          gh release upload ${{ github.ref_name }} ../${{ env.release_name }}.tar.gz
+        env:
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.gitignore b/.gitignore
@@ -112,11 +112,25 @@ node_modules/
 bindings/wasm/examples/built
 bindings/wasm/examples/dist
 bindings/wasm/examples/public/manifold*
+bindings/wasm/docs
 __pycache__
 .vscode/c_cpp_properties.json
 *.sublime-project
 *.sublime-workspace
 .cache
+CMakeUserPresets.json
+CMakeSettings.json
 
 # PyCharm
-.idea
+.idea
+
+# Temporary files
+*~
+\#*\#
+.\#*
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+
+bindings/java/target
diff --git a/.gitmodules b/.gitmodules
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,11 +7,12 @@
     {
       "name": "manifold test",
       "type": "cppdbg",
+      "MIMode": "lldb",
       "request": "launch",
       "program": "${workspaceFolder}/build/test/manifold_test",
       "args": [
-        "--gtest_break_on_failure",
-        "--gtest_filter=Manifold.GetMesh"
+        "--gtest_catch_exceptions=0",
+        "--gtest_filter=Properties.Tolerance"
       ],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}/build/test",
@@ -20,7 +21,8 @@
           "name": "MALLOC_CHECK_",
           "value": "2"
         }
-      ]
+      ],
+      "externalConsole": false
     }
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -113,7 +113,12 @@
     "format": "cpp",
     "numbers": "cpp",
     "ranges": "cpp",
-    "stop_token": "cpp"
+    "stop_token": "cpp",
+    "execution": "cpp",
+    "csetjmp": "cpp",
+    "cuchar": "cpp",
+    "propagate_const": "cpp",
+    "scoped_allocator": "cpp"
   },
   "C_Cpp.clang_format_fallbackStyle": "google",
   "editor.formatOnSave": true,
@@ -123,7 +128,7 @@
     "-DMANIFOLD_PYBIND=ON",
     "-DMANIFOLD_EXPORT=ON",
     "-DMANIFOLD_DEBUG=ON",
-    "-DMANIFOLD_PAR=TBB",
+    "-DMANIFOLD_PAR=ON",
     "-DCODE_COVERAGE=OFF",
     "-DCMAKE_CXX_FLAGS=''" //'-fsanitize=address,undefined'"
   ],
@@ -142,7 +147,9 @@
     "halfedge",
     "halfedges",
     "Tris",
-    "Verts"
+    "Verts",
+    "Voxel",
+    "voxels"
   ],
   "javascript.format.semicolons": "insert",
   "[python]": {