fix(ams): leerer AMS-Slot zeigt kein altes Filament mehr (Moonraker/KX-Bridge)

Bei Pull-Mode-Agents (Moonraker/AMS-Lite) wird das DevAmsTray-Objekt
zwischen Updates gemergt statt neu aufgebaut. Ein Slot, der zuvor belegt
war und jetzt leer ist (placeholder bzw. exist-Bit nicht gesetzt), behielt
Name/Typ/Farbe des alten Filaments und wurde als belegt gerendert.

- ParseV1_0: is_slot_placeholder jedes Update neu setzen; bei leerem Slot
  setting_id/m_fila_type/color/sub_brands/cols aktiv zuruecksetzen.
- AMSItem::parse_ams_info: Placeholder-Slot unabhaengig von stale is_exists
  als leer (grau) rendern, Position bleibt erhalten.

.clang-format

@@ -5,7 +5,7 @@ Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: false
+AlignConsecutiveDeclarations: true
 AlignEscapedNewlines: DontAlign
 AlignOperands:   true
 AlignTrailingComments: true

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 		"dockerfile": "Dockerfile",
 			"args": {
 				"PLATFORM": "linux/amd64",
-				"BASE_IMAGE": "mcr.microsoft.com/devcontainers/cpp:ubuntu-24.04"
+				"BASE_IMAGE": "mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04"
 			},
 			"options": ["--platform=linux/amd64"]
 	},

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -11,15 +11,6 @@ body:
         For this, please use the [Feature request](https://github.com/OrcaSlicer/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
         
         Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
-  - type: checkboxes
-    attributes:
-      label: Is this issue reproducible in the latest nightly build?
-      description: >
-        Please verify this issue still happens in the latest nightly build first. It may already be fixed there:
-        [Nightly builds](https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/nightly-builds).
-      options:
-        - label: I have checked the latest nightly build and the issue is still reproducible
-          required: true
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this problem?

.github/pull_request_template.md

@@ -19,9 +19,3 @@
 <!--
 > Please describe the tests that you have conducted to verify the changes made in this PR.
 -->
-
-<!--
-> A guide for users on how to download the artifacts from this PR.
--->
-
-[How to Download Pull Requests Artifacts for Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)

.github/workflows/build_all.yml

@@ -5,7 +5,6 @@ on:
     branches:
      - main
      - release/*
-     - belt-printer
     paths:
      - 'deps/**'
      - 'src/**'
@@ -15,8 +14,6 @@ on:
      - 'resources/**'
      - ".github/workflows/build_*.yml"
      - 'scripts/flatpak/**'
-     - 'scripts/msix/**'
-     - 'tests/**'
 
   pull_request:
     branches:
@@ -30,12 +27,9 @@ on:
      - 'version.inc'
      - ".github/workflows/build_*.yml"
      - 'build_linux.sh'
-     - 'build_release_vs.bat'
      - 'build_release_vs2022.bat'
      - 'build_release_macos.sh'
      - 'scripts/flatpak/**'
-     - 'scripts/msix/**'
-     - 'tests/**'
 
 
   schedule:
@@ -57,42 +51,19 @@ jobs:
   build_linux:
     strategy:
       fail-fast: false
-      # Build both arches on every event (PRs included), through the same
-      # build_check_cache -> build_deps -> build_orca chain (the AppImage).
-      # aarch64 always uses the GitHub-hosted arm runner (there is no arm
-      # self-hosted server). amd64's empty arch is load-bearing: it keeps the
-      # historical 'linux-clang' deps cache key and the unsuffixed asset names.
-      matrix:
-        include:
-          - arch: ""
-            os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
-          - arch: "aarch64"
-            os: ubuntu-24.04-arm
     # Don't run scheduled builds on forks:
     if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
     uses: ./.github/workflows/build_check_cache.yml
     with:
-      os: ${{ matrix.os }}
-      arch: ${{ matrix.arch }}
+      os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
     secrets: inherit
   build_windows:
-    name: Build Windows ${{ matrix.arch }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - arch: x64
-            os: windows-latest
-          - arch: arm64
-            os: windows-11-arm
     # Don't run scheduled builds on forks:
     if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
     uses: ./.github/workflows/build_check_cache.yml
     with:
-      # Self-hosted runner is x64-only; ARM64 always uses the GitHub-hosted runner.
-      os: ${{ (matrix.arch == 'x64' && vars.SELF_HOSTED) && 'orca-win-server' || matrix.os }}
-      arch: ${{ matrix.arch }}
+      os: ${{ vars.SELF_HOSTED && 'orca-win-server' || 'windows-latest' }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
       force-build: ${{ github.event_name == 'schedule' }}
     secrets: inherit
@@ -124,9 +95,7 @@ jobs:
     secrets: inherit
   unit_tests:
     name: Unit Tests
-    # Tests are built on the aarch64 leg by default (faster GitHub arm runner),
-    # so run them there; self-hosted builds them on the amd64 server instead.
-    runs-on: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04-arm' }}
+    runs-on: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
     needs: build_linux
     if: ${{ !cancelled() && success() }}
     steps:
@@ -141,7 +110,7 @@ jobs:
         if: ${{ !vars.SELF_HOSTED }}
         uses: ./.github/actions/apt-install-deps
       - name: Restore Test Artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: ${{ github.sha }}-tests
       - uses: lukka/get-cmake@latest
@@ -155,7 +124,7 @@ jobs:
           tar -xvf build_tests.tar
           scripts/run_unit_tests.sh
       - name: Upload Test Logs
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         if: ${{ failure() }}
         with:
           name: unit-test-logs
@@ -167,13 +136,13 @@ jobs:
           files: "ctest_results.xml"
       - name: Delete Test Artifact
         if: success()
-        uses: geekyeggo/delete-artifact@v6
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: ${{ github.sha }}-tests
   flatpak:
     name: "Flatpak"
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-50
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-49
       options: --privileged
       volumes:
         - /usr/local/lib/android:/usr/local/lib/android
@@ -191,15 +160,11 @@ jobs:
             runner: ubuntu-24.04-arm
     # Don't run scheduled builds on forks; skip entirely on self-hosted runners
     if: ${{ !cancelled() && !vars.SELF_HOSTED && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
-
     runs-on: ${{ matrix.variant.runner }}
     env:
       date:
       ver:
       ver_pure:
-      # Belt-printer nightlies share the main nightly release but carry a `_belt`
-      # suffix so they never overwrite the main assets.
-      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}
     steps:
     - name: "Remove unneeded stuff to free disk space"
       run:
@@ -223,14 +188,14 @@ jobs:
     # Manage flatpak-builder cache externally so PRs restore but never upload
     - name: Restore flatpak-builder cache
       if: github.event_name == 'pull_request'
-      uses: actions/cache/restore@v5
+      uses: actions/cache/restore@v4
       with:
         path: .flatpak-builder
         key: flatpak-builder-${{ matrix.variant.arch }}-${{ github.event.pull_request.base.sha }}
         restore-keys: flatpak-builder-${{ matrix.variant.arch }}-
     - name: Save/restore flatpak-builder cache
       if: github.event_name != 'pull_request'
-      uses: actions/cache@v5
+      uses: actions/cache@v4
       with:
         path: .flatpak-builder
         key: flatpak-builder-${{ matrix.variant.arch }}-${{ github.sha }}
@@ -253,17 +218,18 @@ jobs:
         arch: ${{ matrix.variant.arch }}
         upload-artifact: false
     - name: Upload artifacts Flatpak
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v6
       with:
         name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
         path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
     - name: Deploy Flatpak to nightly release
-      if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer')
+      if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main'
       uses: WebFreak001/deploy-nightly@v3.2.0
       with:
         upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
         release_id: 137995723
         asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        asset_name: OrcaSlicer-Linux-flatpak_nightly${{ env.nightly_suffix }}_${{ matrix.variant.arch }}.flatpak
+        asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
         asset_content_type: application/octet-stream
         max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
+

.github/workflows/build_check_cache.yml

@@ -12,23 +12,11 @@ on:
       build-deps-only:
         required: false
         type: boolean
-      force-build:
-        required: false
-        type: boolean
-      release-version:
-        required: false
-        type: string
-        default: ''
-      build_windows_installer:
-        required: false
-        type: boolean
-        default: false
-      build_without_pch_windows:
-        required: false
-        type: boolean
-        default: false
-
-jobs:
+      force-build:
+        required: false
+        type: boolean
+  
+jobs:
   check_cache: # determines if there is a cache and outputs variables used in caching process
     name: Check Cache
     runs-on: ${{ inputs.os }}
@@ -40,17 +28,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          lfs: 'false'
+          lfs: 'true'
         
       - name: set outputs
         id: set_outputs
         env:
-          # Keep macOS/Windows cache keys architecture-specific. amd64 Linux passes
-          # no arch (key stays 'linux-clang', preserving the existing cache);
-          # aarch64 gets its own 'linux-clang-aarch64' key.
-          cache-os: ${{ runner.os == 'macOS' && format('macos-{0}', inputs.arch) || (runner.os == 'Windows' && format('windows-{0}', inputs.arch) || format('linux-clang{0}', inputs.arch && format('-{0}', inputs.arch) || '')) }}
-          # ARM64 builds use the build-arm64 tree (see build_release_vs.bat); x64/other use build.
-          dep-folder-name: ${{ runner.os == 'macOS' && format('/{0}', inputs.arch) || (runner.os == 'Windows' && inputs.arch == 'arm64') && '-arm64/OrcaSlicer_dep' || '/OrcaSlicer_dep' }}
+          # Keep macOS cache keys and paths architecture-specific.
+          cache-os: ${{ runner.os == 'macOS' && format('macos-{0}', inputs.arch) || (runner.os == 'Windows' && 'windows' || 'linux-clang') }}
+          dep-folder-name: ${{ runner.os == 'macOS' && format('/{0}', inputs.arch) || '/OrcaSlicer_dep' }}
           output-cmd: ${{ runner.os == 'Windows' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
         run: |
           echo cache-key=${{ env.cache-os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
@@ -74,9 +59,6 @@ jobs:
       valid-cache: ${{ needs.check_cache.outputs.valid-cache == 'true' }}
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
-      build-deps-only: ${{ inputs.build-deps-only }}
-      force-build: ${{ inputs.force-build }}
-      release-version: ${{ inputs.release-version }}
-      build_windows_installer: ${{ inputs.build_windows_installer }}
-      build_without_pch_windows: ${{ inputs.build_without_pch_windows }}
-    secrets: inherit
+      build-deps-only: ${{ inputs.build-deps-only }}
+      force-build: ${{ inputs.force-build }}
+    secrets: inherit

.github/workflows/build_deps.yml

@@ -22,18 +22,6 @@ on:
       force-build:
         required: false
         type: boolean
-      release-version:
-        required: false
-        type: string
-        default: ''
-      build_windows_installer:
-        required: false
-        type: boolean
-        default: false
-      build_without_pch_windows:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   build_deps:
@@ -48,7 +36,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          lfs: 'false'
+          lfs: 'true'
 
       - name: load cached deps
         uses: actions/cache@v5
@@ -57,31 +45,14 @@ jobs:
           key: ${{ inputs.cache-key }}
 
       - uses: lukka/get-cmake@latest
-        # The windows-11-arm runner needs CMake <= 3.31 (handled in the next step).
-        if: ${{ !(runner.os == 'Windows' && inputs.arch == 'arm64') }}
         with:
           cmakeVersion: "~4.3.0"  # use most recent 4.3.x version
           useLocalCache: true         # <--= Use the local cache (default is 'false').
           useCloudCache: true
 
-      - name: Install CMake 3.31.x (Windows ARM64)
-        # windows-11-arm ships CMake 4.x, which removed pre-3.5 policy
-        # compatibility AND has incomplete ASM_ARMASM linker modules
-        # (breaks Boost.Context on ARM64). Pin to the last 3.x release.
-        if: runner.os == 'Windows' && inputs.arch == 'arm64'
-        shell: pwsh
-        run: |
-          $ver = "3.31.6"
-          $url = "https://github.com/Kitware/CMake/releases/download/v$ver/cmake-$ver-windows-arm64.zip"
-          Invoke-WebRequest -Uri $url -OutFile "$env:RUNNER_TEMP\cmake.zip"
-          Expand-Archive -Path "$env:RUNNER_TEMP\cmake.zip" -DestinationPath "$env:RUNNER_TEMP\cmake" -Force
-          $cmakeBin = "$env:RUNNER_TEMP\cmake\cmake-$ver-windows-arm64\bin"
-          if (-not (Test-Path "$cmakeBin\cmake.exe")) { throw "cmake.exe not found at $cmakeBin" }
-          Add-Content -Path $env:GITHUB_PATH -Value $cmakeBin
-
       - name: setup dev on Windows
         if: runner.os == 'Windows'
-        uses: microsoft/setup-msbuild@v3
+        uses: microsoft/setup-msbuild@v2
 
       - name: Get the date on Ubuntu and macOS
         if: runner.os != 'Windows'
@@ -94,50 +65,6 @@ jobs:
         shell: pwsh
 
 
-      - name: Install MSYS2 (clangarm64) with GMP/MPFR and LLVM tools
-        if: runner.os == 'Windows' && inputs.arch == 'arm64'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: CLANGARM64
-          update: true
-          install: >-
-            mingw-w64-clang-aarch64-gmp
-            mingw-w64-clang-aarch64-mpfr
-            mingw-w64-clang-aarch64-llvm
-
-      - name: Stage ARM64 GMP/MPFR (no prebuilt blobs exist for win-arm64)
-        # GMP/MPFR ship prebuilt x64/x86 blobs in-tree but none for ARM64.
-        # Pull them from MSYS2 clangarm64 and generate MSVC import libs via
-        # llvm-dlltool, then stage into deps/{GMP,MPFR}/.../win-arm64 where the
-        # MSVC branch of GMP.cmake/MPFR.cmake copies them into the dep prefix.
-        if: runner.os == 'Windows' && inputs.arch == 'arm64'
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          BIN=/clangarm64/bin
-          REPO=$(cygpath -u "$GITHUB_WORKSPACE")
-
-          make_import_lib() {
-            local dll="$1"; local lib="$2"; local def="/tmp/${dll%.dll}.def"
-            echo "EXPORTS" > "$def"
-            llvm-readobj --coff-exports "$BIN/$dll" | awk '/Name: /{print $2}' >> "$def"
-            llvm-dlltool -m arm64 -D "$dll" -d "$def" -l "$BIN/$lib"
-          }
-
-          make_import_lib libgmp-10.dll libgmp-10.lib
-
-          # MPFR 4.x ships as libmpfr-6.dll; rename to libmpfr-4 BEFORE generating
-          # the import lib so the baked-in runtime DLL name is correct.
-          MPFR_DLL=$(ls $BIN/libmpfr-*.dll | head -1 | xargs basename)
-          if [ "$MPFR_DLL" != "libmpfr-4.dll" ]; then cp "$BIN/$MPFR_DLL" "$BIN/libmpfr-4.dll"; fi
-          make_import_lib libmpfr-4.dll libmpfr-4.lib
-
-          mkdir -p $REPO/deps/GMP/gmp/lib/win-arm64 $REPO/deps/MPFR/mpfr/lib/win-arm64
-          cp $BIN/libgmp-10.dll $BIN/libgmp-10.lib $REPO/deps/GMP/gmp/lib/win-arm64/
-          cp $BIN/libmpfr-4.dll $BIN/libmpfr-4.lib $REPO/deps/MPFR/mpfr/lib/win-arm64/
-          cp /clangarm64/include/gmp.h  $REPO/deps/GMP/gmp/include/
-          cp /clangarm64/include/mpfr.h $REPO/deps/MPFR/mpfr/include/ || true
-
       # Build Dependencies
       - name: Build on Windows
         if: runner.os == 'Windows'
@@ -146,14 +73,8 @@ jobs:
             if (-not "${{ vars.SELF_HOSTED }}") {
               choco install strawberryperl
             }
-            $arch = "${{ inputs.arch }}"
-            if ($arch -eq "arm64") {
-              .\build_release_vs.bat deps arm64
-              .\build_release_vs.bat pack arm64
-            } else {
-              .\build_release_vs.bat deps
-              .\build_release_vs.bat pack
-            }
+            .\build_release_vs.bat deps
+            .\build_release_vs.bat pack
         shell: pwsh
 
       - name: Build on Mac ${{ inputs.arch }}
@@ -216,7 +137,4 @@ jobs:
       cache-path: ${{ inputs.cache-path }}
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
-      release-version: ${{ inputs.release-version }}
-      build_windows_installer: ${{ inputs.build_windows_installer }}
-      build_without_pch_windows: ${{ inputs.build_without_pch_windows }}
     secrets: inherit

.github/workflows/build_orca.yml

@@ -26,20 +26,15 @@ jobs:
       date:
       ver:
       ver_pure:
-      ubuntu-ver: '2404'
-      ubuntu-ver-str: '_Ubuntu2404'
+      ubuntu-ver: '2204'
+      ubuntu-ver-str: '_Ubuntu2204'
       ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }}
-      # Branches whose builds are published to the nightly release. The
-      # belt-printer branch ships alongside main but its assets carry a `_belt`
-      # suffix (nightly_suffix) so they never overwrite the main nightly assets.
-      deploy_nightly: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' }}
-      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          lfs: 'false'
+          lfs: 'true'
 
       - name: load cached deps
         if: ${{ !(runner.os == 'macOS' && inputs.macos-combine-only) }}
@@ -50,28 +45,11 @@ jobs:
           fail-on-cache-miss: true
 
       - uses: lukka/get-cmake@latest
-        # The windows-11-arm runner needs CMake <= 3.31 (handled in the next step).
-        if: ${{ !(runner.os == 'Windows' && inputs.arch == 'arm64') }}
         with:
           cmakeVersion: "~4.3.0"  # use most recent 4.3.x version
           useLocalCache: true         # <--= Use the local cache (default is 'false').
           useCloudCache: true
 
-      - name: Install CMake 3.31.x (Windows ARM64)
-        # windows-11-arm ships CMake 4.x, which removed pre-3.5 policy
-        # compatibility AND has incomplete ASM_ARMASM linker modules
-        # (breaks Boost.Context on ARM64). Pin to the last 3.x release.
-        if: runner.os == 'Windows' && inputs.arch == 'arm64'
-        shell: pwsh
-        run: |
-          $ver = "3.31.6"
-          $url = "https://github.com/Kitware/CMake/releases/download/v$ver/cmake-$ver-windows-arm64.zip"
-          Invoke-WebRequest -Uri $url -OutFile "$env:RUNNER_TEMP\cmake.zip"
-          Expand-Archive -Path "$env:RUNNER_TEMP\cmake.zip" -DestinationPath "$env:RUNNER_TEMP\cmake" -Force
-          $cmakeBin = "$env:RUNNER_TEMP\cmake\cmake-$ver-windows-arm64\bin"
-          if (-not (Test-Path "$cmakeBin\cmake.exe")) { throw "cmake.exe not found at $cmakeBin" }
-          Add-Content -Path $env:GITHUB_PATH -Value $cmakeBin
-
       - name: Get the version and date on Ubuntu and macOS
         if: runner.os != 'Windows'
         run: |
@@ -87,11 +65,6 @@ jobs:
           echo "ver_pure=$ver_pure" >> $GITHUB_ENV
           echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
           echo "git_commit_hash=$git_commit_hash" >> $GITHUB_ENV
-          # Per-arch Linux AppImage naming: amd64 keeps the historical unsuffixed
-          # name (arch_suffix empty). Unused on macOS/Windows.
-          if [ '${{ inputs.arch }}' = 'aarch64' ]; then
-            echo "arch_suffix=_aarch64" >> $GITHUB_ENV
-          fi
         shell: bash
 
       - name: Get the version and date on Windows
@@ -152,14 +125,14 @@ jobs:
 
       - name: Upload macOS app bundle ${{ inputs.arch }}
         if: runner.os == 'macOS' && !inputs.macos-combine-only
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}
           path: ${{ github.workspace }}/OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}.tar.gz
 
       - name: Download macOS app bundles
         if: runner.os == 'macOS' && inputs.macos-combine-only
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           pattern: OrcaSlicer_Mac_bundle_*_${{ github.sha }}
           path: ${{ github.workspace }}/mac_bundles
@@ -180,9 +153,17 @@ jobs:
         run: |
           ./build_release_macos.sh -u -x ${{ !vars.SELF_HOSTED && '-1' || '' }} -a universal -t 10.15
 
+      - name: Delete intermediate per-arch artifacts
+        if: runner.os == 'macOS' && inputs.macos-combine-only
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: |
+            OrcaSlicer_Mac_bundle_arm64_${{ github.sha }}
+            OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }}
+
  # Thanks to RaySajuuk, it's working now
       - name: Sign app and notary
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -190,8 +171,6 @@ jobs:
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
           CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
         run: |
-          # Load the `retry` helper (retries flaky commands such as `hdiutil create`).
-          source ${{ github.workspace }}/scripts/retry.sh
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
           echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
@@ -214,7 +193,7 @@ jobs:
           rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/*
           cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/
           ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications
-          retry hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           
           # Create separate OrcaSlicer_profile_validator DMG if the app exists
@@ -223,7 +202,7 @@ jobs:
             rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/*
             cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/
             ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications
-            retry hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
+            hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
             codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
           fi
           
@@ -238,16 +217,14 @@ jobs:
           fi
 
       - name: Create DMG without notary
-        if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/belt-printer' && runner.os == 'macOS' && inputs.macos-combine-only
+        if: github.ref != 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
         run: |
-          # Load the `retry` helper (retries flaky commands such as `hdiutil create`).
-          source ${{ github.workspace }}/scripts/retry.sh
           mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg
           rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/*
           cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/
           ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications
-          retry hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           
           # Create separate OrcaSlicer_profile_validator DMG if the app exists
           if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
@@ -255,42 +232,32 @@ jobs:
             rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/*
             cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/
             ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications
-            retry hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
+            hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
           fi
 
-      # Delete the per-arch bundles only after signing/DMG creation succeeded, so a
-      # failed run keeps them available for a re-run instead of forcing a full rebuild.
-      - name: Delete intermediate per-arch artifacts
-        if: success() && runner.os == 'macOS' && inputs.macos-combine-only
-        uses: geekyeggo/delete-artifact@v6
-        with:
-          name: |
-            OrcaSlicer_Mac_bundle_arm64_${{ github.sha }}
-            OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }}
-
       - name: Upload artifacts mac
         if: runner.os == 'macOS' && inputs.macos-combine-only
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: OrcaSlicer_Mac_universal_${{ env.ver }}
           path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
 
       - name: Upload OrcaSlicer_profile_validator DMG mac
         if: runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }}
           path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
           if-no-files-found: ignore
 
       - name: Deploy Mac release
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
           asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          asset_name: OrcaSlicer_Mac_universal_nightly${{ env.nightly_suffix }}.dmg
+          asset_name: OrcaSlicer_Mac_universal_nightly.dmg
           asset_content_type: application/octet-stream
           max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
 
@@ -306,21 +273,9 @@ jobs:
           max_releases: 1
 
 # Windows
-      - name: Set Windows build variables
-        if: runner.os == 'Windows'
-        shell: pwsh
-        run: |
-          if ("${{ inputs.arch }}" -eq "arm64") {
-            "BUILD_DIR=build-arm64"  | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
-            "ARCH_SUFFIX=_arm64"     | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
-          } else {
-            "BUILD_DIR=build"        | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
-            "ARCH_SUFFIX=_x64"       | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
-          }
-
       - name: setup MSVC
         if: runner.os == 'Windows'
-        uses: microsoft/setup-msbuild@v3
+        uses: microsoft/setup-msbuild@v2
 
       - name: Install nsis
         if: runner.os == 'Windows' && !vars.SELF_HOSTED
@@ -331,87 +286,81 @@ jobs:
       - name: Build slicer Win
         if: runner.os == 'Windows'
         working-directory: ${{ github.workspace }}
-        # Orca: Removed Netfabb STL fixing service support in favor of CGAL.
-        # env:
-        #   WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\'
-        #   WindowsSDKVersion: '10.0.26100.0\'
-        run: |
-          $arch = "${{ inputs.arch }}"
-          if ($arch -eq "arm64") { .\build_release_vs.bat slicer arm64 } else { .\build_release_vs.bat slicer }
-        shell: pwsh
+        env:
+          WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\'
+          WindowsSDKVersion: '10.0.26100.0\'
+        run: .\build_release_vs.bat slicer
 
-      # NSIS is x86-only; it runs (and the installer it emits runs) under ARM64's
-      # x86 emulation, packaging the native arm64 payload from build-arm64.
       - name: Create installer Win
         if: runner.os == 'Windows' && !vars.SELF_HOSTED
-        working-directory: ${{ github.workspace }}/${{ env.BUILD_DIR }}
+        working-directory: ${{ github.workspace }}/build
         run: |
           cpack -G NSIS
 
       - name: Pack app
         if: runner.os == 'Windows'
-        working-directory: ${{ github.workspace }}/${{ env.BUILD_DIR }}
+        working-directory: ${{ github.workspace }}/build
         shell: cmd
-        run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}${{ env.ARCH_SUFFIX }}_portable.zip ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer'
+        run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/OrcaSlicer'
 
       - name: Pack PDB
-        if: runner.os == 'Windows' && inputs.arch != 'arm64' && !vars.SELF_HOSTED
-        working-directory: ${{ github.workspace }}/${{ env.BUILD_DIR }}/src/Release
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        working-directory: ${{ github.workspace }}/build/src/Release
         shell: cmd
         run: '"C:/Program Files/7-Zip/7z.exe" a -m0=lzma2 -mx9 Debug_PDB_${{ env.ver }}_for_developers_only.7z  *.pdb'
 
       - name: Upload artifacts Win zip
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
-          name: OrcaSlicer_Windows_${{ env.ver }}${{ env.ARCH_SUFFIX }}_portable
-          path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer
+          name: OrcaSlicer_Windows_${{ env.ver }}_portable
+          path: ${{ github.workspace }}/build/OrcaSlicer
 
       - name: Upload artifacts Win installer
         if: runner.os == 'Windows' && !vars.SELF_HOSTED
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
-          name: OrcaSlicer_Windows_${{ env.ver }}${{ env.ARCH_SUFFIX }}
-          path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer*.exe
+          name: OrcaSlicer_Windows_${{ env.ver }}
+          path: ${{ github.workspace }}/build/OrcaSlicer*.exe
 
       - name: Upload artifacts Win PDB
-        if: runner.os == 'Windows' && inputs.arch != 'arm64' && !vars.SELF_HOSTED
-        uses: actions/upload-artifact@v7
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        uses: actions/upload-artifact@v6
         with:
           name: PDB
           path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
 
       - name: Upload OrcaSlicer_profile_validator Win
-        if: runner.os == 'Windows' && inputs.arch != 'arm64' && !vars.SELF_HOSTED
-        uses: actions/upload-artifact@v7
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        uses: actions/upload-artifact@v6
         with:
           name: OrcaSlicer_profile_validator_Windows_${{ env.ver }}
           path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe
 
       - name: Deploy Windows release portable
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'Windows' && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
-          asset_path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer_Windows_${{ env.ver }}${{ env.ARCH_SUFFIX }}_portable.zip
-          asset_name: OrcaSlicer_Windows${{ env.ARCH_SUFFIX }}_nightly${{ env.nightly_suffix }}_portable.zip
+          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
+          asset_name: OrcaSlicer_Windows_nightly_portable.zip
           asset_content_type: application/x-zip-compressed
           max_releases: 1
 
       - name: Deploy Windows release installer
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'Windows' && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
-          asset_path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer_Windows_Installer_${{ env.ver }}${{ env.ARCH_SUFFIX }}.exe
-          asset_name: OrcaSlicer_Windows_Installer${{ env.ARCH_SUFFIX }}_nightly${{ env.nightly_suffix }}.exe
+          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
+          asset_name: OrcaSlicer_Windows_Installer_nightly.exe
           asset_content_type: application/x-msdownload
           max_releases: 1
 
       - name: Deploy Windows OrcaSlicer_profile_validator release
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && inputs.arch != 'arm64' && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
@@ -421,26 +370,6 @@ jobs:
           asset_content_type: application/x-msdownload
           max_releases: 1
 
-      - name: Build MSIX Store package Win
-        if: runner.os == 'Windows' && !vars.SELF_HOSTED
-        working-directory: ${{ github.workspace }}
-        shell: pwsh
-        run: |
-          ./scripts/msix/build_msix.ps1 `
-            -InstallDir "${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer" `
-            -OutputPath "${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer_Windows_MSIX_${{ env.ver }}${{ env.ARCH_SUFFIX }}.msix" `
-            -Architecture "${{ inputs.arch }}" `
-            -IdentityName "${{ vars.ORCA_MSIX_IDENTITY_NAME || 'OrcaSlicer.OrcaSlicer' }}" `
-            -Publisher "${{ vars.ORCA_MSIX_PUBLISHER || 'CN=38F7EA55-C73B-4072-B3B2-C8E0EA15BB82' }}" `
-            -PublisherDisplayName "${{ vars.ORCA_MSIX_PUBLISHER_DISPLAY_NAME || 'OrcaSlicer' }}"
-
-      - name: Upload artifacts Win MSIX
-        if: runner.os == 'Windows' && !vars.SELF_HOSTED
-        uses: actions/upload-artifact@v7
-        with:
-          name: OrcaSlicer_Windows_MSIX_${{ env.ver }}${{ env.ARCH_SUFFIX }}
-          path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer_Windows_MSIX_${{ env.ver }}${{ env.ARCH_SUFFIX }}.msix
-
 # Ubuntu
       - name: Apt-Install Dependencies
         if: runner.os == 'Linux' && !vars.SELF_HOSTED
@@ -452,24 +381,17 @@ jobs:
         if: runner.os == 'Linux'
         shell: bash
         run: |
-          # Build + tar the unit tests (-t) only on the leg that runs them: the
-          # aarch64 leg by default (faster GitHub arm runner), or amd64 when using
-          # self-hosted runners (no arm self-hosted server). unit_tests downloads
-          # this tarball. The profile validator is built with -s, so amd64 keeps it.
-          tests=${{ (!vars.SELF_HOSTED && inputs.arch == 'aarch64') || (vars.SELF_HOSTED && inputs.arch != 'aarch64') }}
-          if $tests; then flags=-istrlL; else flags=-isrlL; fi
-          ./build_linux.sh "$flags"
+          ./build_linux.sh -istrlL
           ./scripts/check_appimage_libs.sh ./build/package ./build/package/bin/orca-slicer
-          appimage=./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage
-          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage "$appimage"
-          chmod +x "$appimage"
-          if $tests; then tar -cvpf build_tests.tar build/tests; fi
+          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
+          chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
+          tar -cvpf build_tests.tar build/tests
 
         # Use tar because upload-artifacts won't always preserve directory structure
         # and doesn't preserve file permissions
       - name: Upload Test Artifact
-        if: runner.os == 'Linux' && ((!vars.SELF_HOSTED && inputs.arch == 'aarch64') || (vars.SELF_HOSTED && inputs.arch != 'aarch64'))
-        uses: actions/upload-artifact@v7
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ github.sha }}-tests
           overwrite: true
@@ -477,18 +399,8 @@ jobs:
           retention-days: 5
           if-no-files-found: error
 
-      - name: Run external slicer regression tests
-        if: runner.os == 'Linux' && inputs.arch != 'aarch64'
-        timeout-minutes: 20
-        shell: bash
-        run: |
-          test_repo_dir="${{ runner.temp }}/orca-test-repo"
-          rm -rf "$test_repo_dir"
-          git clone --depth 1 https://github.com/OrcaSlicer/orca-test-repo.git "$test_repo_dir"
-          python3 "$test_repo_dir/run_test.py" "${{ github.workspace }}/build/package/bin/orca-slicer"
-
       - name: Build orca_custom_preset_tests
-        if: github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64'
+        if: github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED
         working-directory: ${{ github.workspace }}/build/src/Release
         shell: bash
         run: |
@@ -498,30 +410,30 @@ jobs:
 
       - name: Upload artifacts Ubuntu
         if: ${{ ! env.ACT && runner.os == 'Linux' }}
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
-          name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}${{ env.arch_suffix }}_${{ env.ver }}
-          path: "./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage"
+          name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
+          path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage'
 
       - name: Upload OrcaSlicer_profile_validator Ubuntu
-        if: ${{ ! env.ACT && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
-        uses: actions/upload-artifact@v7
+        if: ${{ ! env.ACT && runner.os == 'Linux' && !vars.SELF_HOSTED }}
+        uses: actions/upload-artifact@v6
         with:
           name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
           path: './build/src/Release/OrcaSlicer_profile_validator'
 
       - name: Deploy Ubuntu release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && env.deploy_nightly == 'true' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
-          asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage
-          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_nightly${{ env.nightly_suffix }}.AppImage
+          asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
+          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_nightly.AppImage
           asset_content_type: application/octet-stream
           max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
       - name: Deploy Ubuntu release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: rickstaa/action-create-tag@v1
         with:
           tag: "nightly-builds"
@@ -530,7 +442,7 @@ jobs:
           message: "nightly-builds"
 
       - name: Deploy Ubuntu OrcaSlicer_profile_validator release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
@@ -541,7 +453,7 @@ jobs:
           max_releases: 1
 
       - name: Deploy orca_custom_preset_tests
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}

.github/workflows/check_profiles.yml

@@ -38,10 +38,10 @@ jobs:
       - name: Download
         working-directory: ${{ github.workspace }}
         run: |
-          curl -L -o OrcaSlicer_profile_validator https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/OrcaSlicer_profile_validator_Linux_Ubuntu2404_nightly
+          curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/OrcaSlicer_profile_validator
           chmod +x ./OrcaSlicer_profile_validator
 
-      # Validate all system profiles.
+      # validate profiles
       - name: validate system profiles
         id: validate_system
         continue-on-error: true
@@ -49,128 +49,24 @@ jobs:
           set +e
           ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_system.log
           exit ${PIPESTATUS[0]}
-      # For now run filament subtype check only for BBL profiles until we fix other vendors' profiles.
-      - name: validate filament subtype check for BBL profiles
-        id: validate_filament_subtypes
-        continue-on-error: true
-        run: |
-          set +e
-          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 -v BBL -f 2>&1 | tee ${{ runner.temp }}/validate_filament_subtypes.log
-          exit ${PIPESTATUS[0]}
 
       - name: validate custom presets
         id: validate_custom
         continue-on-error: true
         working-directory: ${{ github.workspace }}
         run: |
-          fixtures_dir="${{ runner.temp }}/profile-fixtures"
-          output_dir="${{ runner.temp }}/custom-preset-validation"
-          combined_log="${{ runner.temp }}/validate_custom.log"
-          summary="${output_dir}/summary.md"
-          release_url="https://github.com/OrcaSlicer/OrcaSlicer-profile-validator/releases/download/fixture-archive"
-
-          rm -rf "${fixtures_dir}" "${output_dir}"
-          mkdir -p "${fixtures_dir}" "${output_dir}"
-
-          curl -fsSL -o "${fixtures_dir}/manifest.json" "${release_url}/manifest.json"
-
-          MANIFEST_PATH="${fixtures_dir}/manifest.json" python3 <<'PY' > "${fixtures_dir}/fixtures.tsv"
-          import json
-          import os
-
-          with open(os.environ["MANIFEST_PATH"], encoding="utf-8") as fh:
-              manifest = json.load(fh)
-
-          if isinstance(manifest, dict):
-              entries = manifest.get("fixtures", [])
-          else:
-              entries = manifest
-
-          for entry in entries:
-              version = entry.get("version", "")
-              asset = entry.get("asset", "")
-              sha256 = entry.get("asset_sha256", "")
-              if not version or not asset:
-                  continue
-              print(f"{version}\t{asset}\t{sha256}")
-          PY
-
-          if [ ! -s "${fixtures_dir}/fixtures.tsv" ]; then
-            echo "No custom preset fixtures found in ${release_url}/manifest.json" | tee "${combined_log}"
-            exit 1
-          fi
-
-          {
-            echo "## Custom Preset Fixture Validation"
-            echo ""
-            echo "| Version | Status | Log |"
-            echo "| --- | --- | --- |"
-          } > "${summary}"
-
-          status=0
-          failed_logs=()
-
-          while IFS=$'\t' read -r version asset expected_sha256; do
-            fixture_zip="${fixtures_dir}/${asset}"
-            asset_url_name="$(python3 -c 'import sys, urllib.parse; print(urllib.parse.quote(sys.argv[1], safe=""))' "${asset}")"
-            profile_tree="${output_dir}/profiles-${version}"
-            log_path="${output_dir}/${version}.log"
-
-            curl -fsSL -o "${fixture_zip}" "${release_url}/${asset_url_name}"
-
-            if [ -n "${expected_sha256}" ] && [ "${expected_sha256}" != "<sha256>" ]; then
-              echo "${expected_sha256}  ${fixture_zip}" | sha256sum -c -
-            fi
-
-            rm -rf "${profile_tree}"
-            mkdir -p "${profile_tree}"
-            cp -a "${{ github.workspace }}/resources/profiles/." "${profile_tree}/"
-            rm -rf "${profile_tree}/user"
-            unzip -q "${fixture_zip}" -d "${profile_tree}"
-
-            set +e
-            ./OrcaSlicer_profile_validator -p "${profile_tree}" -l 2 > "${log_path}" 2>&1
-            result=$?
-            set -e
-
-            if [ "${result}" -eq 0 ]; then
-              echo "| ${version} | PASS | ${version}.log |" >> "${summary}"
-            else
-              echo "| ${version} | FAIL | ${version}.log |" >> "${summary}"
-              failed_logs+=("${log_path}")
-              status=1
-            fi
-          done < "${fixtures_dir}/fixtures.tsv"
-
-          {
-            cat "${summary}"
-            if [ "${#failed_logs[@]}" -gt 0 ]; then
-              echo ""
-              echo "## Failed Fixture Logs"
-              for log_path in "${failed_logs[@]}"; do
-                echo ""
-                echo "### $(basename "${log_path}" .log)"
-                echo '```'
-                head -c 12000 "${log_path}" || echo "No output captured"
-                echo '```'
-              done
-            fi
-          } | tee "${combined_log}"
-
-          exit "${status}"
-
-      - name: Prepare PR number for comment workflow
-        if: ${{ always() && github.event_name == 'pull_request' }}
-        run: |
-          mkdir -p ${{ runner.temp }}/profile-check-results
-          echo "${{ github.event.pull_request.number }}" > ${{ runner.temp }}/profile-check-results/pr_number.txt
+          set +e
+          curl -LJO https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
+          unzip -q ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
+          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_custom.log
+          exit ${PIPESTATUS[0]}
 
       - name: Prepare comment artifact
-        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
         run: |
+          mkdir -p ${{ runner.temp }}/profile-check-results
+
           {
-            # Marker matched by check_profiles_comment.yml to delete prior comments.
-            echo "<!-- profile-validation-comment -->"
             echo "## :x: Profile Validation Errors"
             echo ""
 
@@ -192,15 +88,6 @@ jobs:
               echo ""
             fi
 
-            if [ "${{ steps.validate_filament_subtypes.outcome }}" = "failure" ]; then
-              echo "### BBL Filament Subtype Validation Failed"
-              echo ""
-              echo '```'
-              head -c 30000 ${{ runner.temp }}/validate_filament_subtypes.log || echo "No output captured"
-              echo '```'
-              echo ""
-            fi
-
             if [ "${{ steps.validate_custom.outcome }}" = "failure" ]; then
               echo "### Custom Preset Validation Failed"
               echo ""
@@ -214,16 +101,18 @@ jobs:
             echo "*Please fix the above errors and push a new commit.*"
           } > ${{ runner.temp }}/profile-check-results/pr_comment.md
 
+          echo "${{ github.event.pull_request.number }}" > ${{ runner.temp }}/profile-check-results/pr_number.txt
+
       - name: Upload comment artifact
-        if: ${{ always() && github.event_name == 'pull_request' }}
-        uses: actions/upload-artifact@v7
+        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        uses: actions/upload-artifact@v4
         with:
           name: profile-check-results
           path: ${{ runner.temp }}/profile-check-results/
           retention-days: 1
 
       - name: Fail if any check failed
-        if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
         run: |
           echo "One or more profile checks failed. See above for details."
           exit 1

.github/workflows/check_profiles_comment.yml

@@ -10,37 +10,30 @@ on:
 
 permissions:
   pull-requests: write
-  # Needed to delete outdated bot comments via the issues/comments endpoint.
-  issues: write
-
-# Serialize handlers per source branch so parallel runs don't race delete-and-post.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: false
 
 jobs:
   post_comment:
     name: Post PR comment
     runs-on: ubuntu-24.04
-    if: ${{ github.event.workflow_run.event == 'pull_request' && (github.event.workflow_run.conclusion == 'success' || github.event.workflow_run.conclusion == 'failure') }}
+    if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure' }}
     steps:
       - name: Download artifact
         id: download
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
         continue-on-error: true
         with:
           name: profile-check-results
           run-id: ${{ github.event.workflow_run.id }}
           github-token: ${{ github.token }}
 
-      - name: Update PR comment
+      - name: Post comment on PR
         if: ${{ steps.download.outcome == 'success' }}
         env:
           GH_TOKEN: ${{ github.token }}
           GH_REPO: ${{ github.repository }}
         run: |
-          if [ ! -f pr_number.txt ]; then
-            echo "No pr_number.txt in artifact, skipping."
+          if [ ! -f pr_number.txt ] || [ ! -f pr_comment.md ]; then
+            echo "No comment artifact found, skipping."
             exit 0
           fi
 
@@ -50,17 +43,4 @@ jobs:
             exit 1
           fi
 
-          # Delete prior comments matching the marker (from check_profiles.yml) or the legacy heading.
-          OLD_IDS=$(gh api --paginate "repos/${GH_REPO}/issues/${PR_NUMBER}/comments" \
-            --jq '.[] | select(.user.login == "github-actions[bot]") | select((.body | startswith("<!-- profile-validation-comment -->")) or (.body | startswith("## :x: Profile Validation Errors"))) | .id')
-          for comment_id in $OLD_IDS; do
-            echo "Deleting outdated profile-validation comment ${comment_id}"
-            gh api -X DELETE "repos/${GH_REPO}/issues/comments/${comment_id}" || true
-          done
-
-          # Post a new comment only when validation failed (pr_comment.md present).
-          if [ -f pr_comment.md ]; then
-            gh pr comment "$PR_NUMBER" --body-file pr_comment.md
-          else
-            echo "Validation succeeded; cleaned up prior comments without posting."
-          fi
+          gh pr comment "$PR_NUMBER" --body-file pr_comment.md

.github/workflows/pr-label-bot.yml

@@ -1,275 +0,0 @@
-name: PR Label Bot
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - reopened
-  issue_comment:
-    types:
-      - created
-
-permissions:
-  contents: read
-  pull-requests: write
-  issues: write
-
-jobs:
-  request-label:
-    if: github.event_name == 'pull_request_target' && github.event.pull_request.author_association != 'COLLABORATOR' && github.event.pull_request.author_association != 'OWNER' && github.event.pull_request.author_association != 'MEMBER'
-    permissions:
-      contents: read
-      pull-requests: write
-      issues: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Ask PR author for label
-        uses: actions/github-script@v9
-        with:
-          script: |
-            function isPermissionDenied(error) {
-              return error && error.status === 403 && /Resource not accessible by integration/i.test(error.message || '');
-            }
-
-            const allowedLabels = [
-              'bug-fix',
-              'enhancement',
-              'Localization',
-              'profile',
-              'QoL',
-              'UI/UX',
-              'dependencies'
-            ];
-            const pr = context.payload.pull_request;
-            const labelsList = `${allowedLabels
-              .slice(0, -1)
-              .map((label) => `\`${label}\``)
-              .join(', ')} and \`${allowedLabels[allowedLabels.length - 1]}\`.`;
-            const examplesText = [
-              '```',
-              '/bot add-label bug-fix',
-              '```',
-              '```',
-              '/bot add-label bug-fix, UI/UX',
-              '```',
-              '```',
-              '/bot remove-label bug-fix, UI/UX',
-              '```'
-            ].join('\n');
-
-            try {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                body:
-                  `Hi @${pr.user.login}, you can manage the labels for this PR by \`/bot add-label\` and \`/bot remove-label\`\n\n` +
-                  `Allowed labels are:\n${labelsList}\n\n` +
-                  `Examples:\n${examplesText}`
-              });
-            } catch (error) {
-              if (isPermissionDenied(error)) {
-                core.warning(
-                  'Skipping PR comment because token cannot write. Enable Actions write permissions, ' +
-                  'or run with a token that has issues:write and pull_requests:write.'
-                );
-                return;
-              }
-
-              throw error;
-            }
-
-  apply-label:
-    if: github.event_name == 'issue_comment'
-    permissions:
-      contents: read
-      pull-requests: write
-      issues: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Apply label command from PR author
-        uses: actions/github-script@v9
-        with:
-          script: |
-            function isPermissionDenied(error) {
-              return error && error.status === 403 && /Resource not accessible by integration/i.test(error.message || '');
-            }
-
-            const allowedLabels = [
-              'bug-fix',
-              'enhancement',
-              'Localization',
-              'profile',
-              'QoL',
-              'UI/UX',
-              'dependencies'
-            ];
-
-            const issue = context.payload.issue;
-            if (!issue.pull_request) {
-              core.info('Ignoring comment that is not on a pull request.');
-              return;
-            }
-
-            const body = (context.payload.comment.body || '').trim();
-            const commandLine = body
-              .split('\n')
-              .map((line) => line.trim())
-              .find((line) => /^\/bot\s+(add-label|remove-label)(?:\s*:\s*|\s+)/i.test(line));
-
-            if (!commandLine) {
-              core.info('No /bot add-label or /bot remove-label command found.');
-              return;
-            }
-
-            const commandMatch = commandLine.match(/^\/bot\s+(add-label|remove-label)(?:\s*:\s*|\s+)(.+)\s*$/i);
-            if (!commandMatch) {
-              core.info('Label command format is invalid.');
-              return;
-            }
-
-            const action = commandMatch[1].toLowerCase() === 'add-label' ? 'add' : 'remove';
-            let labelsExpr = (commandMatch[2] || '').trim();
-            if (!labelsExpr) {
-              core.info('Label command is missing label name.');
-              return;
-            }
-
-            if (labelsExpr.startsWith('[') && labelsExpr.endsWith(']')) {
-              labelsExpr = labelsExpr.slice(1, -1).trim();
-            }
-
-            const requestedRawLabels = labelsExpr
-              .split(',')
-              .map((part) => part.trim())
-              .filter(Boolean);
-
-            if (!requestedRawLabels.length) {
-              core.info('No labels were provided in the command.');
-              return;
-            }
-
-            const { data: pr } = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: issue.number
-            });
-
-            const commenter = context.payload.comment.user.login;
-            if (commenter !== pr.user.login) {
-              core.info('Ignoring command because commenter is not the PR author.');
-              return;
-            }
-
-            const labelsByLower = new Map(
-              allowedLabels.map((label) => [label.toLowerCase(), label])
-            );
-
-            const resolvedLabels = [];
-            const invalidLabels = [];
-
-            for (const rawLabel of requestedRawLabels) {
-              const resolved = labelsByLower.get(rawLabel.toLowerCase());
-              if (resolved) {
-                resolvedLabels.push(resolved);
-              } else {
-                invalidLabels.push(rawLabel);
-              }
-            }
-            const uniqueRequestedLabels = [...new Set(resolvedLabels)];
-
-            if (action === 'add' && uniqueRequestedLabels.length) {
-              try {
-                await github.rest.issues.addLabels({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: issue.number,
-                  labels: uniqueRequestedLabels
-                });
-              } catch (error) {
-                if (isPermissionDenied(error)) {
-                  core.warning(
-                    'Cannot add labels because token cannot write. Enable Actions write permissions, ' +
-                    'or run with a token that has issues:write and pull_requests:write.'
-                  );
-                  return;
-                }
-
-                throw error;
-              }
-
-              core.info(`Added labels: ${uniqueRequestedLabels.join(', ')}`);
-            }
-
-            if (action === 'remove' && uniqueRequestedLabels.length) {
-              let removedCount = 0;
-              try {
-                for (const label of uniqueRequestedLabels) {
-                  try {
-                    await github.rest.issues.removeLabel({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: issue.number,
-                      name: label
-                    });
-                    removedCount += 1;
-                  } catch (error) {
-                    if (isPermissionDenied(error)) {
-                      core.warning(
-                        'Cannot remove labels because token cannot write. Enable Actions write permissions, ' +
-                        'or run with a token that has issues:write and pull_requests:write.'
-                      );
-                      return;
-                    }
-
-                    if (error.status === 404) {
-                      core.info(`Label is not currently applied: ${label}`);
-                      continue;
-                    }
-
-                    throw error;
-                  }
-                }
-
-                core.info(`Removed labels count: ${removedCount}`);
-              } catch (error) {
-                throw error;
-              }
-            }
-
-            if (!uniqueRequestedLabels.length) {
-              core.info('No valid labels were provided in the command.');
-            }
-
-            if (invalidLabels.length) {
-              const allowedText = allowedLabels.map((label) => `\`${label}\``).join(', ');
-              const invalidText = invalidLabels.map((label) => `\`${label}\``).join(', ');
-              const validText = uniqueRequestedLabels.length
-                ? `\n\nProcessed valid label(s): ${uniqueRequestedLabels.map((label) => `\`${label}\``).join(', ')}`
-                : '';
-
-              try {
-                await github.rest.issues.createComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: issue.number,
-                  body:
-                    `@${commenter} invalid label(s): ${invalidText}.${validText}\n\n` +
-                    `Allowed labels: ${allowedText}\n\n` +
-                    `Use:\n` +
-                    `- \`/bot add-label label\`\n` +
-                    `- \`/bot remove-label label\`\n` +
-                    `- \`/bot add-label label1, label2\``
-                });
-              } catch (error) {
-                if (isPermissionDenied(error)) {
-                  core.warning('Cannot post invalid-label feedback because token cannot write comments.');
-                  return;
-                }
-
-                throw error;
-              }
-            }
-
-            const processedLabelsText = uniqueRequestedLabels.length ? uniqueRequestedLabels.join(', ') : '(none)';
-            core.info(`Processed label command: ${action} ${processedLabelsText}`);

.github/workflows/publish_release.yml

@@ -1,131 +0,0 @@
-name: Publish to draft release
-
-# Manually pulls the platform binaries produced by a "Build all" run and uploads
-# them to an existing DRAFT release. Decoupled from the build so you can test a
-# build first, then publish exactly that run's artifacts once you're happy.
-#
-# Trigger: Actions tab -> "Publish to draft release" -> Run workflow.
-# Locked to a single person: the first step aborts unless the actor matches the
-# `RELEASE_PUBLISHER` repo variable (set to "SoftFever"). To allow someone else,
-# change that variable: gh variable set RELEASE_PUBLISHER --body "<login>".
-
-on:
-  workflow_dispatch:
-    inputs:
-      run_id:
-        description: 'Run ID of the "Build all" workflow to pull binaries from (the number in the Actions run URL)'
-        required: true
-        type: string
-      tag:
-        description: 'Tag of the draft release to upload to (e.g. v2.4.0)'
-        required: true
-        type: string
-
-permissions:
-  contents: write   # upload release assets
-  actions: read     # download artifacts from another run
-
-jobs:
-  publish:
-    name: Publish binaries to draft release
-    runs-on: ubuntu-latest
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      RUN_ID: ${{ inputs.run_id }}
-      TAG: ${{ inputs.tag }}
-    steps:
-      - name: Restrict to the release publisher
-        env:
-          PUBLISHER: ${{ vars.RELEASE_PUBLISHER }}
-        run: |
-          if [ -z "$PUBLISHER" ]; then
-            echo "::error::RELEASE_PUBLISHER repo variable is not set."
-            exit 1
-          fi
-          if [ "${{ github.actor }}" != "$PUBLISHER" ]; then
-            echo "::error::Only @$PUBLISHER may run this workflow (you are @${{ github.actor }})."
-            exit 1
-          fi
-          echo "Authorized: @${{ github.actor }}"
-
-      - name: Verify target is a draft release
-        run: |
-          if ! gh release view "$TAG" --repo "$GITHUB_REPOSITORY" --json isDraft >/dev/null 2>&1; then
-            echo "::error::Release '$TAG' not found. Create the draft (with this tag) first."
-            exit 1
-          fi
-          is_draft=$(gh release view "$TAG" --repo "$GITHUB_REPOSITORY" --json isDraft --jq '.isDraft')
-          if [ "$is_draft" != "true" ]; then
-            echo "::error::Release '$TAG' is published, not a draft. Aborting to avoid touching a live release."
-            exit 1
-          fi
-
-      - name: Verify source build run
-        run: |
-          info=$(gh run view "$RUN_ID" --repo "$GITHUB_REPOSITORY" --json workflowName,conclusion,headBranch)
-          name=$(echo "$info" | jq -r '.workflowName')
-          conclusion=$(echo "$info" | jq -r '.conclusion')
-          branch=$(echo "$info" | jq -r '.headBranch')
-          echo "Source run #$RUN_ID: '$name' on '$branch' (conclusion: $conclusion)"
-          if [ "$conclusion" != "success" ]; then
-            echo "::warning::Source run did not conclude 'success' ($conclusion). Some assets may be missing."
-          fi
-
-      - name: Download release artifacts from build run
-        run: |
-          # Windows_V* (not Windows_*) keeps the MSIX Store artifact out: it goes to Partner Center, not GitHub releases.
-          gh run download "$RUN_ID" --repo "$GITHUB_REPOSITORY" --dir artifacts \
-            -p 'OrcaSlicer_Windows_V*' \
-            -p 'OrcaSlicer_Mac_universal_*' \
-            -p 'OrcaSlicer_Linux_ubuntu_*' \
-            -p 'OrcaSlicer-Linux-flatpak_*' \
-            -p 'PDB'
-          echo "Downloaded artifact folders:"
-          ls -1 artifacts
-
-      - name: Assemble release assets
-        run: |
-          set -euo pipefail
-          mkdir -p upload
-
-          # gh run download auto-extracts each artifact into a folder, so the inner
-          # binaries are already unzipped. Copy the inner binary for each platform.
-          # -type f is required (some artifact *folders* are named "*.flatpak").
-
-          # Windows installers (x64 + arm64): the .exe inside each installer
-          # artifact, NOT the orca-slicer.exe in the portable app folder. CPack
-          # now bakes the arch into the filename (…_x64.exe / …_arm64.exe), so
-          # copy them straight through.
-          find artifacts -type f -name '*.exe' -path '*OrcaSlicer_Windows_V*' ! -path '*_portable*' -exec cp -v {} upload/ \;
-          # macOS universal DMG (profile-validator DMG isn't downloaded).
-          find artifacts -type f -name '*.dmg' -path '*OrcaSlicer_Mac_universal_*' -exec cp -v {} upload/ \;
-          # Linux AppImage.
-          find artifacts -type f -name '*.AppImage' -exec cp -v {} upload/ \;
-          # Flatpak bundles (x86_64 + aarch64).
-          find artifacts -type f -name '*.flatpak' -exec cp -v {} upload/ \;
-          # Windows debug symbols (PDB archive, for developers).
-          find artifacts -type f -name 'Debug_PDB_*.7z' -exec cp -v {} upload/ \;
-
-          # Portable Windows builds (x64 + arm64) are unzipped folder artifacts;
-          # re-zip each to its released filename (these stay .zip on the release).
-          mapfile -t portable_dirs < <(find artifacts -maxdepth 1 -type d -name 'OrcaSlicer_Windows_*_portable')
-          if [ ${#portable_dirs[@]} -eq 0 ]; then
-            echo "::warning::Windows portable artifact not found."
-          fi
-          for portable_dir in "${portable_dirs[@]}"; do
-            ( cd "$portable_dir" && zip -qr "$GITHUB_WORKSPACE/upload/$(basename "$portable_dir").zip" . )
-            echo "Zipped portable -> $(basename "$portable_dir").zip"
-          done
-
-          echo "Assets to upload:"
-          ls -lh upload
-          if [ -z "$(ls -A upload)" ]; then
-            echo "::error::No assets assembled. Check the run_id and that its artifacts haven't expired."
-            exit 1
-          fi
-
-      - name: Upload assets to draft release
-        run: |
-          gh release upload "$TAG" upload/* --repo "$GITHUB_REPOSITORY" --clobber
-          echo "Uploaded to draft release: $TAG"
-          gh release view "$TAG" --repo "$GITHUB_REPOSITORY" --json assets --jq '.assets[].name'

.gitignore

@@ -45,6 +45,4 @@ test.js
 .clangd
 internal_docs/
 *.flatpak
-/flatpak-repo/
-*.3mf
-*.gcode
+/flatpak-repo/

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/OrcaSlicer.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />

.idea/codeStyles/Project.xml

@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <clangFormatSettings>
+      <option name="ENABLED" value="true" />
+    </clangFormatSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/OrcaSlicer.iml" filepath="$PROJECT_DIR$/.idea/OrcaSlicer.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

AGENTS.md

@@ -1,57 +1,23 @@
-# CLAUDE.md
+# Repository Guidelines
 
-OrcaSlicer — open-source C++17 3D slicer. wxWidgets GUI, CMake build system.
+## Project Structure & Module Organization
+OrcaSlicer’s C++17 sources live in `src/`, split by feature modules and platform adapters. User assets, icons, and printer presets are in `resources/`; translations stay in `localization/`. Tests sit in `tests/`, grouped by domain (`libslic3r/`, `sla_print/`, etc.) with fixtures under `tests/data/`. CMake helpers reside in `cmake/`, and longer references in `doc/` and `SoftFever_doc/`. Automation scripts belong in `scripts/` and `tools/`. Treat everything in `deps/` and `deps_src/` as vendored snapshots—do not modify without mirroring upstream tags.
 
-## Build Commands
+## Build, Test, and Development Commands
+Use out-of-source builds:
+- `cmake -S . -B build -DCMAKE_BUILD_TYPE=Release` configures dependencies and generates build files.
+- `cmake --build build --target OrcaSlicer --config Release` compiles the app; add `--parallel` to speed up.
+- `cmake --build build --target tests` then `ctest --test-dir build --output-on-failure` runs automated suites.
+Platform helpers such as `build_linux.sh`, `build_release_macos.sh`, and `build_release_vs2022.bat` wrap the same flow with toolchain flags. Use `build_release_macos.sh -sx` when reproducing macOS build issues, and `scripts/DockerBuild.sh` for reproducible container builds.
 
-```bash
-# macOS
-cmake --build build/arm64 --config RelWithDebInfo --target all --
+## Coding Style & Naming Conventions
+`.clang-format` enforces 4-space indents, a 140-column limit, aligned initializers, and brace wrapping for classes and functions. Run `clang-format -i <file>` before committing; the CMake `clang-format` target is available when LLVM tools are on your PATH. Prefer `CamelCase` for classes, `snake_case` for functions and locals, and `SCREAMING_CASE` for constants, matching conventions in `src/`. Keep headers self-contained and align include order with the IWYU pragmas.
 
-# Linux
-cmake --build build --config RelWithDebInfo --target all --
+## Testing Guidelines
+Unit tests rely on Catch2 (`tests/catch2/`). Name specs after the component under test—for example `tests/libslic3r/TestPlanarHole.cpp`—and tag long-running cases so `ctest -L fast` remains useful. Cover new algorithms with deterministic fixtures or sample G-code stored in `tests/data/`. Document manual printer validation or regression slicer checks in your PR when automated coverage is insufficient.
 
-# Windows (replace %build_type% with Debug/Release/RelWithDebInfo)
-cmake --build . --config %build_type% --target ALL_BUILD -- -m
-```
+## Commit & Pull Request Guidelines
+The history favors concise, sentence-style subject lines with optional issue references, e.g., `Fix grid lines origin for multiple plates (#10724)`. Squash fixups locally before opening a PR. Complete `.github/pull_request_template.md`, include reproduction steps or screenshots for UI changes, and mention impacted presets or translations. Link issues via `Closes #NNNN` when applicable, and call out dependency bumps or profile migrations for maintainer review.
 
-## Testing
-
-Catch2 framework. Tests in `tests/` directory.
-
-```bash
-cd build && ctest --output-on-failure           # all tests
-ctest --test-dir ./tests/libslic3r              # individual suite
-ctest --test-dir ./tests/fff_print
-```
-
-## Code Style
-
-- C++17, selective C++20. PascalCase classes, snake_case functions/variables
-- `#pragma once` for headers. Smart pointers and RAII preferred
-- Parallelization via TBB — be mindful of shared state
-
-## Key Entry Points
-
-- App startup: `src/OrcaSlicer.cpp`
-- Slicing pipeline: `src/libslic3r/Print.cpp`
-- All print/printer/material settings: `src/libslic3r/PrintConfig.cpp`
-- GUI: `src/slic3r/GUI/`
-- Core algorithms: `src/libslic3r/` (GCode/, Fill/, Support/, Geometry/, Format/, Arachne/)
-- Printer profiles: `resources/profiles/[manufacturer].json`
-
-## Critical Constraints
-
-- **Backward compatibility required** for .3mf project files and printer profiles
-- **Cross-platform** — all changes must work on Windows, macOS, and Linux
-- Profile/format changes need version migration handling
-- Dependencies built separately in `deps/build/`, then linked to main app
-
-## Code review focus areas
-
-- Changes must not cause regressions in existing functionality, defaults, profiles, or project compatibility.
-- Features gated by options must not affect existing behavior when those options are disabled.
-- Changes should follow the existing code style and architecture. Architectural changes should be justified in code comments and the PR description.
-- Add helper functions or utilities only when existing code cannot reasonably be reused. Avoid duplication.
-- Keep code concise and clear. Manually simplify AI generated bloated codes before review.
-- Include targeted tests or documented verification for behavior changes, especially in slicing logic, profiles, formats, and GUI defaults.
+## Security & Configuration Tips
+Follow `SECURITY.md` for vulnerability reporting. Keep API tokens and printer credentials out of tracked configs; use `sandboxes/` for experimental settings. When touching third-party code in `deps_src/`, record the upstream commit or release in your PR description and run the relevant platform build script to confirm integration.

CLAUDE.md

@@ -1 +1,234 @@
-@AGENTS.md
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Overview
+
+OrcaSlicer is an open-source 3D slicer application forked from Bambu Studio, built using C++ with wxWidgets for the GUI and CMake as the build system. The project uses a modular architecture with separate libraries for core slicing functionality, GUI components, and platform-specific code.
+
+## Build Commands
+
+### Building on Windows
+**Always use this command to build the project when testing build issues on Windows.**
+```bash
+cmake --build . --config %build_type% --target ALL_BUILD -- -m
+```
+
+### Building on macOS
+**Always use this command to build the project when testing build issues on macOS.**
+```bash
+cmake --build build/arm64 --config RelWithDebInfo --target all --
+```
+
+### Building on Linux
+ **Always use this command to build the project when testing build issues on Linux.**
+```bash
+cmake --build build/arm64 --config RelWithDebInfo --target all --
+
+```
+### Build test:
+
+**Always use this command to build the project when testing build issues on Windows.**
+```bash
+cmake --build . --config %build_type% --target ALL_BUILD -- -m
+```
+
+### Building on macOS
+**Always use this command to build the project when testing build issues on macOS.**
+```bash
+cmake --build build/arm64 --config RelWithDebInfo --target all --
+```
+
+### Building on Linux
+ **Always use this command to build the project when testing build issues on Linux.**
+```bash
+cmake --build build --config RelWithDebInfo --target all --
+
+```
+
+
+### Build System
+- Uses CMake with minimum version 3.13 (maximum 3.31.x on Windows)
+- Primary build directory: `build/`
+- Dependencies are built in `deps/build/`
+- The build process is split into dependency building and main application building
+- Windows builds use Visual Studio generators
+- macOS builds use Xcode by default, Ninja with -x flag
+- Linux builds use Ninja generator
+
+### Testing
+Tests are located in the `tests/` directory and use the Catch2 testing framework. Test structure:
+- `tests/libslic3r/` - Core library tests (21 test files)
+  - Geometry processing, algorithms, file formats (STL, 3MF, AMF)
+  - Polygon operations, clipper utilities, Voronoi diagrams
+- `tests/fff_print/` - Fused Filament Fabrication tests (12 test files)
+  - Slicing algorithms, G-code generation, print mechanics
+  - Fill patterns, extrusion, support material
+- `tests/sla_print/` - Stereolithography tests (4 test files)
+  - SLA-specific printing algorithms, support generation
+- `tests/libnest2d/` - 2D nesting algorithm tests
+- `tests/slic3rutils/` - Utility function tests
+- `tests/sandboxes/` - Experimental/sandbox test code
+
+Run all tests after building:
+```bash
+cd build && ctest
+```
+
+Run tests with verbose output:
+```bash
+cd build && ctest --output-on-failure
+```
+
+Run individual test suites:
+```bash
+# From build directory
+ctest --test-dir ./tests/libslic3r/libslic3r_tests
+ctest --test-dir ./tests/fff_print/fff_print_tests
+ctest --test-dir ./tests/sla_print/sla_print_tests
+# and so on
+```
+
+## Architecture
+
+### Core Libraries
+- **libslic3r/**: Core slicing engine and algorithms (platform-independent)
+  - Main slicing logic, geometry processing, G-code generation
+  - Key classes: Print, PrintObject, Layer, GCode, Config
+  - Modular design with specialized subdirectories:
+    - `GCode/` - G-code generation, cooling, pressure equalization, thumbnails
+    - `Fill/` - Infill pattern implementations (gyroid, honeycomb, lightning, etc.)
+    - `Support/` - Tree supports and traditional support generation
+    - `Geometry/` - Advanced geometry operations, Voronoi diagrams, medial axis
+    - `Format/` - File I/O for 3MF, AMF, STL, OBJ, STEP formats
+    - `SLA/` - SLA-specific print processing and support generation
+    - `Arachne/` - Advanced wall generation using skeletal trapezoidation
+
+- **src/slic3r/**: Main application framework and GUI
+  - GUI application built with wxWidgets
+  - Integration between libslic3r core and user interface
+  - Located in `src/slic3r/GUI/` (not shown in this directory but exists)
+
+### Key Algorithmic Components
+- **Arachne Wall Generation**: Variable-width perimeter generation using skeletal trapezoidation
+- **Tree Supports**: Organic support generation algorithm  
+- **Lightning Infill**: Sparse infill optimization for internal structures
+- **Adaptive Slicing**: Variable layer height based on geometry
+- **Multi-material**: Multi-extruder and soluble support processing
+- **G-code Post-processing**: Cooling, fan control, pressure advance, conflict checking
+
+### File Format Support
+- **3MF/BBS_3MF**: Native format with extensions for multi-material and metadata
+- **STL**: Standard tessellation language for 3D models
+- **AMF**: Additive Manufacturing Format with color/material support  
+- **OBJ**: Wavefront OBJ with material definitions
+- **STEP**: CAD format support for precise geometry
+- **G-code**: Output format with extensive post-processing capabilities
+
+### External Dependencies
+- **Clipper2**: Advanced 2D polygon clipping and offsetting
+- **libigl**: Computational geometry library for mesh operations
+- **TBB**: Intel Threading Building Blocks for parallelization
+- **wxWidgets**: Cross-platform GUI framework
+- **OpenGL**: 3D graphics rendering and visualization
+- **CGAL**: Computational Geometry Algorithms Library (selective use)
+- **OpenVDB**: Volumetric data structures for advanced operations
+- **Eigen**: Linear algebra library for mathematical operations
+
+## File Organization
+
+### Resources and Configuration
+- `resources/profiles/` - Printer and material profiles organized by manufacturer
+- `resources/printers/` - Printer-specific configurations and G-code templates  
+- `resources/images/` - UI icons, logos, calibration images
+- `resources/calib/` - Calibration test patterns and data
+- `resources/handy_models/` - Built-in test models (benchy, calibration cubes)
+
+### Internationalization and Localization  
+- `localization/i18n/` - Source translation files (.pot, .po)
+- `resources/i18n/` - Runtime language resources
+- Translation managed via `scripts/run_gettext.sh` / `scripts/run_gettext.bat`
+
+### Platform-Specific Code
+- `src/libslic3r/Platform.cpp` - Platform abstractions and utilities
+- `src/libslic3r/MacUtils.mm` - macOS-specific utilities (Objective-C++)
+- Windows-specific build scripts and configurations
+- Linux distribution support scripts in `scripts/linux.d/`
+
+### Build and Development Tools
+- `cmake/modules/` - Custom CMake find modules and utilities
+- `scripts/` - Python utilities for profile generation and validation  
+- `tools/` - Windows build tools (gettext utilities)
+- `deps/` - External dependency build configurations
+
+## Development Workflow
+
+### Code Style and Standards
+- **C++17 standard** with selective C++20 features
+- **Naming conventions**: PascalCase for classes, snake_case for functions/variables
+- **Header guards**: Use `#pragma once` 
+- **Memory management**: Prefer smart pointers, RAII patterns
+- **Thread safety**: Use TBB for parallelization, be mindful of shared state
+
+### Common Development Tasks
+
+#### Adding New Print Settings
+1. Define setting in `PrintConfig.cpp` with proper bounds and defaults
+2. Add UI controls in appropriate GUI components  
+3. Update serialization in config save/load
+4. Add tooltips and help text for user guidance
+5. Test with different printer profiles
+
+#### Modifying Slicing Algorithms  
+1. Core algorithms live in `libslic3r/` subdirectories
+2. Performance-critical code should be profiled and optimized
+3. Consider multi-threading implications (TBB integration)
+4. Validate changes don't break existing profiles
+5. Add regression tests where appropriate
+
+#### GUI Development
+1. GUI code resides in `src/slic3r/GUI/` (not visible in current tree)
+2. Use existing wxWidgets patterns and custom controls
+3. Support both light and dark themes
+4. Consider DPI scaling on high-resolution displays
+5. Maintain cross-platform compatibility
+
+#### Adding Printer Support
+1. Create JSON profile in `resources/profiles/[manufacturer].json`
+2. Add printer-specific start/end G-code templates
+3. Configure build volume, capabilities, and material compatibility
+4. Test thoroughly with actual hardware when possible
+5. Follow existing profile structure and naming conventions
+
+### Dependencies and Build System
+- **CMake-based** with separate dependency building phase
+- **Dependencies** built once in `deps/build/`, then linked to main application  
+- **Cross-platform** considerations important for all changes
+- **Resource files** embedded at build time, platform-specific handling
+
+### Performance Considerations
+- **Slicing algorithms** are CPU-intensive, profile before optimizing
+- **Memory usage** can be substantial with complex models
+- **Multi-threading** extensively used via TBB
+- **File I/O** optimized for large 3MF files with embedded textures
+- **Real-time preview** requires efficient mesh processing
+
+## Important Development Notes
+
+### Codebase Navigation
+- Use search tools extensively - codebase has 500k+ lines
+- Key entry points: `src/OrcaSlicer.cpp` for application startup
+- Core slicing: `libslic3r/Print.cpp` orchestrates the slicing pipeline
+- Configuration: `PrintConfig.cpp` defines all print/printer/material settings
+
+### Compatibility and Stability
+- **Backward compatibility** maintained for project files and profiles
+- **Cross-platform** support essential (Windows/macOS/Linux)  
+- **File format** changes require careful version handling
+- **Profile migrations** needed when settings change significantly
+
+### Quality and Testing
+- **Regression testing** important due to algorithm complexity
+- **Performance benchmarks** help catch performance regressions
+- **Memory leak** detection important for long-running GUI application
+- **Cross-platform** testing required before releases

CMakeLists.txt

@@ -1,9 +1,13 @@
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "4.0")
-    set(CMAKE_POLICY_VERSION_MINIMUM 3.13 CACHE STRING "" FORCE)
+    set(CMAKE_POLICY_VERSION_MINIMUM 3.5 CACHE STRING "" FORCE)
 endif()
 
 cmake_minimum_required(VERSION 3.13)
 
+# Verify that your CMake version is exactly 3.5 series or higher on windows
+if ( (MSVC OR WIN32) AND (${CMAKE_VERSION} VERSION_LESS "3.5") )
+    message(FATAL_ERROR "CMake current version ${CMAKE_VERSION} is too old. Minimum required is 3.5.")
+endif()
 
 # The following line used to be in tests/CMakeLists.txt
 # Having it there causes rebuilds of all targets on any CMakeLists.txt change under tests/
@@ -85,7 +89,6 @@ else ()
 endif ()
 
 find_package(Git)
-set(GIT_COMMIT_HASH "0000000")
 if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
     message(STATUS "Specified git commit hash: $ENV{git_commit_hash}")
     if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
@@ -100,6 +103,7 @@ if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
         # No .git directory (e.g., Flatpak sandbox) — truncate directly
         string(SUBSTRING "$ENV{git_commit_hash}" 0 7 GIT_COMMIT_HASH)
     endif()
+    add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
 elseif(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     # Check current Git commit hash
     execute_process(
@@ -108,6 +112,7 @@ elseif(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
         OUTPUT_VARIABLE GIT_COMMIT_HASH
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+    add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
 endif()
 
 if(DEFINED ENV{SLIC3R_STATIC})
@@ -116,9 +121,10 @@ else()
     set(SLIC3R_STATIC_INITIAL 1)
 endif()
 
-option(SLIC3R_STATIC 			"Compile OrcaSlicer with static libraries (Boost, TBB)" ${SLIC3R_STATIC_INITIAL})
+option(SLIC3R_STATIC 			"Compile OrcaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
 option(SLIC3R_GUI    			"Compile OrcaSlicer with GUI components (OpenGL, wxWidgets)" 1)
 option(SLIC3R_FHS               "Assume OrcaSlicer is to be installed in a FHS directory structure" 0)
+option(SLIC3R_WX_STABLE         "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
 option(SLIC3R_PROFILE 			"Compile OrcaSlicer with an invasive Shiny profiler" 0)
 option(SLIC3R_PCH               "Use precompiled headers" 1)
 option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
@@ -218,8 +224,8 @@ if (MSVC)
     endif ()
     # /bigobj (Increase Number of Sections in .Obj file)
     # error C3859: virtual memory range for PCH exceeded; please recompile with a command line option of '-Zm90' or greater
-    add_compile_options(-bigobj -Zm520)
-    add_compile_options($<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:/Zi>)
+    # Generate symbols at every build target, even for the release.
+    add_compile_options(-bigobj -Zm520 /Zi)
     # Disable STL4007: Many result_type typedefs and all argument_type, first_argument_type, and second_argument_type typedefs are deprecated in C++17.
     #FIXME Remove this line after eigen library adapts to the new C++17 adaptor rules.
     add_compile_options(-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING)
@@ -322,44 +328,43 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # WIN10SDK_PATH is used to point CMake to the WIN10 SDK installation directory.
 # We pick it from environment if it is not defined in another way
-# ORCA: Removed Netfabb STL fixing service support in favor of CGAL.
-# if(WIN32)
-#     if(NOT DEFINED WIN10SDK_PATH)
-#         if(DEFINED ENV{WIN10SDK_PATH})
-#                 set(WIN10SDK_PATH "$ENV{WIN10SDK_PATH}")
-#         endif()
-#     endif()
-#     if(DEFINED WIN10SDK_PATH)
-#         #BBS: modify win10sdk_path
-#         if (EXISTS "${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h")
-#             set(WIN10SDK_INCLUDE_PATH "${WIN10SDK_PATH}")
-#         else()
-#             message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}")
-#             message("${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h was not found")
-#             message("STL fixing by the Netfabb service will not be compiled")
-#             unset(WIN10SDK_PATH)
-#         endif()
-#     else()
-#         # Try to use the default Windows 10 SDK path.
-#         if (DEFINED ENV{WindowsSdkDir} AND DEFINED ENV{WindowsSDKVersion})
-#             set(WIN10SDK_INCLUDE_PATH "$ENV{WindowsSdkDir}/Include/$ENV{WindowsSDKVersion}")
-#         else ()
-#             set(WIN10SDK_INCLUDE_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0")
-#         endif ()
-#         if (NOT EXISTS "${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h")
-#             message("${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h was not found")
-#             message("STL fixing by the Netfabb service will not be compiled")
-#             unset(WIN10SDK_INCLUDE_PATH)
-#         endif()
-#     endif()
-#     if(WIN10SDK_INCLUDE_PATH)
-#         message("Building with Win10 Netfabb STL fixing service support")
-#         add_definitions(-DHAS_WIN10SDK)
-#         include_directories(SYSTEM "${WIN10SDK_INCLUDE_PATH}")
-#     else()
-#         message("Building without Win10 Netfabb STL fixing service support")
-#     endif()
-# endif()
+if(WIN32)
+    if(NOT DEFINED WIN10SDK_PATH)
+        if(DEFINED ENV{WIN10SDK_PATH})
+                set(WIN10SDK_PATH "$ENV{WIN10SDK_PATH}")
+        endif()
+    endif()
+    if(DEFINED WIN10SDK_PATH)
+        #BBS: modify win10sdk_path
+        if (EXISTS "${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h")
+            set(WIN10SDK_INCLUDE_PATH "${WIN10SDK_PATH}")
+        else()
+            message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}")
+            message("${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h was not found")
+            message("STL fixing by the Netfabb service will not be compiled")
+            unset(WIN10SDK_PATH)
+        endif()
+    else()
+        # Try to use the default Windows 10 SDK path.
+        if (DEFINED ENV{WindowsSdkDir} AND DEFINED ENV{WindowsSDKVersion})
+            set(WIN10SDK_INCLUDE_PATH "$ENV{WindowsSdkDir}/Include/$ENV{WindowsSDKVersion}")
+        else ()
+            set(WIN10SDK_INCLUDE_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0")
+        endif ()
+        if (NOT EXISTS "${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h")
+            message("${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h was not found")
+            message("STL fixing by the Netfabb service will not be compiled")
+            unset(WIN10SDK_INCLUDE_PATH)
+        endif()
+    endif()
+    if(WIN10SDK_INCLUDE_PATH)
+        message("Building with Win10 Netfabb STL fixing service support")
+        add_definitions(-DHAS_WIN10SDK)
+        include_directories(SYSTEM "${WIN10SDK_INCLUDE_PATH}")
+    else()
+        message("Building without Win10 Netfabb STL fixing service support")
+    endif()
+endif()
 
 if (APPLE)
     message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
@@ -373,6 +378,11 @@ endif ()
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     find_package(PkgConfig REQUIRED)
 
+    if (CMAKE_VERSION VERSION_LESS "3.1")
+        # Workaround for an old CMake, which does not understand CMAKE_CXX_STANDARD.
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    endif()
+
     # Boost on Raspberry-Pi does not link to pthreads.
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
@@ -426,8 +436,8 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
 
     if((${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
         include(CheckCXXCompilerFlag)
-        check_cxx_compiler_flag("-Werror=unknown-warning-option -Wno-error=enum-constexpr-conversion" HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV_STRICT)
-        if(HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV_STRICT)
+        check_cxx_compiler_flag(-Wno-error=enum-constexpr-conversion HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV)
+        if(HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV)
             add_compile_options(-Wno-error=enum-constexpr-conversion)
         endif()
     endif()
@@ -502,10 +512,10 @@ include_directories(SYSTEM ${LIBDIR_BIN}/dev-utils/platform)
 include_directories(SYSTEM ${LIBDIR}/libigl)
 
 if(WIN32)
-    add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DNOMINMAX)
+    add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
     if(MSVC)
         # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
-        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 -DBOOST_REGEX_NO_WIN32_LOCALE)
+        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 )
         # Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
         add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
         add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@@ -570,7 +580,7 @@ endif()
 # boost::process was introduced first in version 1.64.0,
 # boost::beast::detail::base64 was introduced first in version 1.66.0
 if(POLICY CMP0167)
-  cmake_policy(SET CMP0167 OLD)
+  cmake_policy(SET CMP0167 NEW)
 endif()
 set(Boost_NO_SYSTEM_PATHS TRUE)
 find_package(Boost 1.83.0 REQUIRED COMPONENTS system filesystem thread log log_setup locale regex chrono atomic date_time iostreams program_options nowide)
@@ -694,6 +704,16 @@ if(APPLE AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
     set(OPENGL_LIBRARIES "-framework OpenGL" CACHE STRING "OpenGL framework" FORCE)
 endif()
 
+set(GLEW_ROOT "${CMAKE_PREFIX_PATH}")
+message("GLEW_ROOT: ${GLEW_ROOT}")
+# Find glew or use bundled version
+if (SLIC3R_STATIC AND NOT SLIC3R_STATIC_EXCLUDE_GLEW)
+    set(GLEW_USE_STATIC_LIBS ON)
+    set(GLEW_VERBOSE ON)
+endif()
+
+find_package(GLEW REQUIRED)
+
 find_package(glfw3 REQUIRED)
 
 # Find the Cereal serialization library
@@ -876,13 +896,6 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
 endfunction()
 
 
-# Ensure Eigen3::Eigen IMPORTED target exists before deps_src subdirectories
-# are configured. In static builds find_package(Eigen3) is skipped above, so
-# admesh/clipper (which link Eigen3::Eigen) would fail without this call.
-if(NOT TARGET Eigen3::Eigen)
-    find_package(Eigen3 CONFIG QUIET)
-endif()
-
 # libslic3r, OrcaSlicer GUI and the OrcaSlicer executable.
 add_subdirectory(deps_src)
 add_subdirectory(src)
@@ -938,7 +951,7 @@ set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
 set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
 set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
 set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}")
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer ImageMap is an open source slicer for FDM printers")
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers")
 set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/OrcaSlicer/OrcaSlicer")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
 set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\OrcaSlicer.ico")
@@ -946,14 +959,14 @@ set (CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}")
 set (CPACK_NSIS_MUI_UNIICON "${CPACK_PACKAGE_ICON}")
 set (CPACK_NSIS_INSTALLED_ICON_NAME  "$INSTDIR\\\\orca-slicer.exe")
 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-    CreateShortCut \\\"$DESKTOP\\\\OrcaSlicer-ImageMap.lnk\\\" \\\"$INSTDIR\\\\orca-slicer.exe\\\"
+    CreateShortCut \\\"$DESKTOP\\\\OrcaSlicer.lnk\\\" \\\"$INSTDIR\\\\orca-slicer.exe\\\"
 ")
 set (CPACK_PACKAGE_CHECKSUM SHA256)
 set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OrcaSlicer")
 set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
 # set (CPACK_NSIS_MODIFY_PATH "ON")
-set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer-ImageMap")
+set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer")
 set(CPACK_CREATE_DESKTOP_LINKS "orca-slicer")
 set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also include in install command
 

README.md

@@ -1,121 +1,97 @@
 <div align="center">
 
 <picture>
-  <img alt="OrcaSlicer-ImageMap logo" src="resources/images/OrcaSlicer.png" width="15%" height="15%">
+  <img alt="OrcaSlicer logo" src="resources/images/OrcaSlicer.png" width="15%" height="15%">
 </picture>
 
-<h1>
-    <p "font-size:200px;">OrcaSlicer-ImageMap</p>
-</h1>
+<a href="https://trendshift.io/repositories/15552" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15552" alt="OrcaSlicer%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-### An OrcaSlicer Fork with Image Printing Support (via overhang modulation)
-
-[![Build all](https://github.com/sentientstardust-dev/OrcaSlicer-ImageMap/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/sentientstardust-dev/OrcaSlicer-ImageMap/releases)
-
-Test print with white, beige, light and dark blue PLA:
-![The Great Wave off Kanagawa - Katsushika Hokusai](https://gradients.garden/gitlab_images/the_great_wave2.jpeg)
-(image: The Great Wave off Kanagawa - Katsushika Hokusai)
-
-This color sheet was printed with CMYW PLA:
-![CMYW Test Sheet](https://gradients.garden/gitlab_images/cmyw_test_sheet.jpeg)
-(test sheet image Designed by Freepik)
-
-<details>
-<summary>More example prints</summary>
-
-Grayscale:
-![Grayscale test](https://gradients.garden/gitlab_images/grayscale_test_1.jpeg)
-
-CMYK:
-![Van Gogh Art Cube](https://gradients.garden/gitlab_images/artcube2.jpeg)
-
-</details>
+[![GitHub Repo stars](https://img.shields.io/github/stars/OrcaSlicer/OrcaSlicer)](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [![Build all](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml)
 
+OrcaSlicer: an open source Next-Gen Slicing Software for Precision 3D Prints.  
+Optimize your prints with ultra-fast slicing, intelligent support generation, and seamless printer compatibility—engineered for perfection.
 <h3>
 
-# Official links
+# Official links and community
 
-#### Github Repository: <a href="https://github.com/sentientstardust-dev/OrcaSlicer-ImageMap"><img src="https://img.shields.io/badge/OrcaSlicer--ImageMap-181717?style=flat&logo=github&logoColor=white" width="300" alt="GitHub Logo"/> </a>
-#### Gitlab Repository: <a href="https://gitlab.com/sentient_stardust/OrcaSlicer-ImageMap"><img src="https://img.shields.io/badge/OrcaSlicer--ImageMap-181717?style=flat&logo=gitlab&logoColor=white" width="200" alt="GitLab Logo"/> </a>
-#### Downloads: <a href="https://github.com/sentientstardust-dev/OrcaSlicer-ImageMap/releases"><img src="https://img.shields.io/badge/Releases-gray" alt="Releases"/> </a>
+#### Official Website:
+<a href="https://www.orcaslicer.com/" style="font-size:2em;">OrcaSlicer.com</a>
 
-## ⚠️ **IMPORTANT DISCLAIMER** ⚠️
+#### Github Repository:
+<a href="https://github.com/OrcaSlicer/OrcaSlicer"><img src="https://img.shields.io/badge/OrcaSlicer-181717?style=flat&logo=github&logoColor=white" width="200" alt="GitHub Logo"/> </a>
 
-**This fork is currently in active development and has been tested on actual hardware.**
+#### Follow us:
+<a href="https://twitter.com/real_OrcaSlicer"><img src="https://img.shields.io/badge/real__OrcaSlicer-000000?style=flat&logo=x&logoColor=white" width="200" alt="X Logo"/> </a>
 
-- **Use at Your Own Risk**: As with any slicer fork, please review critical prints and generated G-code before production use
+#### Join our Discord community:
+<a href="https://discord.gg/P4VE9UY9gJ"><img src="https://img.shields.io/badge/-Discord-5865F2?style=flat&logo=discord&logoColor=fff" width="200" alt="discord logo"/> </a>
+
+<table border="2" style="border-color: #ffa500; background-color:rgb(232, 220, 180); color: #856404;">
+<tr>
+<td>
+<strong>⚠️ CAUTION:</strong><br>
+Several clickbait and malicious websites, such as <b>orca-slicer[.]com</b> and <b>orcaslicer[.]net</b>, are pretending to be the official OrcaSlicer site. These sites may redirect you to dangerous downloads or contain misleading information.<br>
+<b>Our only official website is <a href="https://www.orcaslicer.com/">www.orcaslicer.com</a>.</b><br><br>
+If you come across any of these in search results, please <b>report them</b> as unsafe or phishing to help keep the community secure with:<br>
+ - <a href="https://safebrowsing.google.com/safebrowsing/report_phish/">Google Safe Browsing</a><br>
+ - <a href="https://www.microsoft.com/en-us/wdsi/support/report-unsafe-site">Microsoft Security Intelligence</a><br>
+ - <a href="https://ipthreat.net/tools/reportphishing">IPThreat</a>
+</td>
+</tr>
+</table>
 
 </div>
 
-# OrcaSlicer-ImageMap Features
+# Main features
 
-### Texture Mapping
-- **Create Images on the side surfaces of your 3D prints** - each layer alternates through a fixed CMYK (or other) pattern, only varying the amount of overhang around the edge of your print. This creates a smooth surface, printing your image texture on the model with no additional seams.
+- **[Advanced Calibration Tools](https://www.orcaslicer.com/wiki/Calibration)**  
+  Comprehensive suite: temperature towers, flow rate, retraction & more for optimal performance.
+- **[Precise Wall](https://www.orcaslicer.com/wiki/quality_settings_precision#precise-wall) and [Seam Control](https://www.orcaslicer.com/wiki/quality_settings_seam)**  
+  Adjust outer wall spacing and apply scarf seams to enhance print accuracy.
+- **[Sandwich Mode](https://www.orcaslicer.com/wiki/quality_settings_wall_and_surfaces#innerouterinner) and [Polyholes](https://www.orcaslicer.com/wiki/quality_settings_precision#polyholes) Support**  
+  Use varied infill [patterns](https://www.orcaslicer.com/wiki/strength_settings_patterns) and accurate hole shapes for improved clarity.
+- **[Overhang](https://www.orcaslicer.com/wiki/quality_settings_overhangs) and [Support Optimization](https://www.orcaslicer.com/wiki#support-settings)**  
+  Modify geometry for printable overhangs with precise support placement.
+- **[Granular Controls and Customization](https://www.orcaslicer.com/wiki#process-settings)**  
+  Fine-tune print speed, layer height, pressure, and temperature with precision.
+- **Network Printer Support**  
+  Seamless integration with Klipper, PrusaLink, and OctoPrint for remote control.
+- **[Mouse Ear Brims](https://www.orcaslicer.com/wiki/others_settings_brim) & [Adaptive Bed Mesh](https://www.orcaslicer.com/wiki/printer_basic_information_adaptive_bed_mesh)**  
+  Automatic brims and adaptive mesh calibration ensure consistent adhesion.
+- **User-Friendly Interface**  
+  Intuitive drag-and-drop design with pre-made profiles for popular printers.
+- **[Open-Source](https://github.com/OrcaSlicer/OrcaSlicer) & [Community Driven](https://discord.gg/P4VE9UY9gJ)**  
+  Regular updates fueled by continuous community contributions.
+- **Wide Printer Compatibility**  
+  Supports a broad range of printers: Bambu Lab, Prusa, Creality, Voron, and more.
+- Additional features can be found in the [change notes](https://github.com/OrcaSlicer/OrcaSlicer/releases/).
 
-![Layer Lines in Slicer Screenshot](https://gradients.garden/gitlab_images/slicer_layer_lines.jpeg)
+# Wiki
 
-Zoomed-out G-code preview:
+The [wiki](https://www.orcaslicer.com/wiki) aims to provide a detailed explanation of the slicer settings, including how to maximize their use and how to calibrate and set up your printer.
 
-![Slicer Screenshot](https://gradients.garden/gitlab_images/sliced3.jpeg)
-
-### 3D Model Image Texture Import
-
-- **Load OBJ, glTF and GLB files with image textures or vertex colors** - slice in full image resolution, no need to subdivide your model or bake vertex colors first
-
-### Image Projection
-- Import images and project them onto your 3D model. Or use text mode and select a font to project writing
-
-![Image Projection Panel](https://gradients.garden/gitlab_images/image_projection_sphere_1.jpeg)
-![Image Projection Result](https://gradients.garden/gitlab_images/image_projection_sphere_2.jpeg)
-
-### Simplify/Repair/Cut Textured Models
-- When using these model utilities, image textures are remapped to the resulting mesh, allowing you to keep your textures.
-
-![Color Cut Tool 1](https://gradients.garden/gitlab_images/color_cut_tool_1.jpeg)
-![Color Cut Tool 1](https://gradients.garden/gitlab_images/color_cut_tool_2.jpeg)
-([Lizard 3D Scan](https://sketchfab.com/3d-models/lizard-e60fb42493fa47389195350fcf216ee7) by Rene-L211979, CC BY 4.0)
-
-### Print images on your prime towers
-- Turn your prime towers into ornaments (requires no extra tool changes, and typically <1g additional filament)
-
-![Prime Tower Image Printing (The Great Wave off Kanagawa)](https://gradients.garden/gitlab_images/the_great_wave_prime_tower.jpeg)
-
-### Print with only one tool change per layer
-- When printing image textures with this technique, only a single filament color is used per layer (not dependent on texture color). You can print many different models at once without increasing the number of tool changes or prime tower size. This can print faster than other multicolor techniques at the same layer height.
-
-![More Test Prints](https://gradients.garden/gitlab_images/test_prints.jpeg)
-
-([3D model](https://sketchfab.com/3d-models/snakchameleon-f0e3c872f1984cf7a467645d9e0d3abd) by Pedram Ashoori, CC BY 4.0)
-(Himalayan Monal photo from https://en.wikipedia.org/wiki/Himalayan_monal#/media/File:Himalayan_Monal_at_Sagarmatha_National_Park,_Nepal.jpg - CC BY-SA 4.0)
-
-### 2D Gradient Generation
-- **Create 2D Gradients** on your object by changing a texture mapping zone's pattern to "2D Gradient"
-
-![2D Gradients](https://gradients.garden/gitlab_images/slicergradients.jpeg)
-
-### Other features/improvements implemented in OrcaSlicer-ImageMap:
-- Paint filament regions by slope
-- Convert between all supported color data types (image texture, vertex colors, 3mf filament painting regions, RGBA data)
-    - For example you could import a 3mf with region painting and convert it to a texture (with autogenerated UV map)
-- Triangulate 3D models on import (before only OBJs with triangles or quads could be imported)
-- Halftone image dithering (for stylized effect)
-- Integrates with Filament Painting
-    - Texture mapping and 2D gradients work with OrcaSlicer filament region painting, so you can have texture mapping on one part of the model, and a solid filament color or gradient somewhere else.
+- **[Access the wiki here](https://www.orcaslicer.com/wiki)**
+- **[Contribute to the wiki](https://www.orcaslicer.com/wiki/How-to-wiki)**
 
 # Download
 
-## Beta Release Builds
+## Stable Release
 
-📥 **[Download the Latest Build](https://github.com/sentientstardust-dev/OrcaSlicer-ImageMap/releases)**  
-Explore the latest developments in OrcaSlicer-ImageMap with our builds for MacOS and Windows. Feedback is highly appreciated.
+📥 **[Download the Latest Stable Release](https://github.com/OrcaSlicer/OrcaSlicer/releases/latest)**  
+Visit our GitHub Releases page for the latest stable version of OrcaSlicer, recommended for most users.
+
+## Nightly Builds
+
+🌙 **[Download the Latest Nightly Build](https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/nightly-builds)**  
+Explore the latest developments in OrcaSlicer with our nightly builds. Feedback on these versions is highly appreciated.
 
 # How to install
 
 ## Windows
 
-Download the **Windows Portable build**  for your preferred version from the [releases page](https://github.com/sentientstardust-dev/OrcaSlicer-ImageMap/releases).
+Download the **Windows Installer exe**  for your preferred version from the [releases page](https://github.com/OrcaSlicer/OrcaSlicer/releases).
 
- - 
+ - *For convenience there is also a portable build available.*
     <details>
     <summary>Troubleshooting</summary>
 
@@ -128,11 +104,17 @@ Download the **Windows Portable build**  for your preferred version from the [re
         -  This file may already be available on your computer if you've installed visual studio.  Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
     </details>
 
+Windows Package Manager
+
+```shell
+winget install --id=SoftFever.OrcaSlicer -e
+```
+
 ## Mac
 
-1. Download the DMG for your computer from the [Releases](https://github.com/sentientstardust-dev/OrcaSlicer-ImageMap/releases)
+1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.
 2. Drag OrcaSlicer.app to Application folder.
-3. The macos builds in this repository are not signed, so to run you also need to follow the instructions below:
+3. *If you want to run a build from a PR, you also need to follow the instructions below:*
 
     <details>
     <summary>Quarantine</summary>
@@ -155,59 +137,14 @@ Download the **Windows Portable build**  for your preferred version from the [re
             ![mac_security_setting](./SoftFever_doc/mac_security_setting.png)
     </details>
 
-## Linux
+## Linux (Ubuntu)
 
-Currently builds are not available for linux, you must build this yourself
-
-# Tips and advice for printing with image textures:
-### Filament
-- In my test prints shown above I used PLA with transmission distances of around 2-4
-    - Avoid using filament with higher TD values with line width modulation mode, such as filaments labelled 'translucent' or 'transparent', as they are likely to lead to washed out/pale colors (this technique works by overhanging filament sagging and blocking the layer below, so if you use filament that is too translucent the color below will still be visible).
-    - On the other hand, filament that is very opaque can cause horizontal lines to be too visible, so I recommend filaments with middle ground TD values
-    - If you don’t have a TD measurement device you can look up community sourced filament TD values on filamentcolors.xyz or 3dfilamentprofiles.com
-- If you're using translucent filament I recommend using perimeter path modulation mode v2 (you can set it in the options panel for each texture zone, in the modulation mode tab)
-    - To use top-surface texturing (still WIP), translucent filaments will likely be required otherwise color depth will be reduced
-### Overhang amount
-- The range between the minimum and maximum outer wall line width in Multimaterial settings determines the maximum overhang amount, which will affect the strength of your colors (essentially, larger range -> stronger colors). 
-    - The default min/max values are 0.32-0.95 for a 0.4mm nozzle, if you use a different size nozzle you should change these values accordingly.
-    - With smaller nozzles than 0.4mm you won't be able to achieve as much overhang, so might have to use opaque filament to avoid faded colors.
-    - When adjusting these limits keep in mind that they are bounded by what is physically possible with your nozzle. Setting them too large or small could cause print instability, bad results, or even damage your printer. Change at your own risk - if you don't know what you're doing, leave them at their defaults.
-### Color mode
-- If you want to print with custom colors and not just preset modes (CMYK, RGBW, etc.), select the Generic Solver option. This mode attempts to recreate the colors in your object’s image texture using whatever filaments you assign.
-    - If you want to make sure a filament is used on a certain part of your image, set it to a hex color code picked from of that area. Keep in mind if you set your filament color too far from the actual filament, it can affect colors on other parts of your print
-
-# Converting textured models to obj in blender
-<details>
-<summary>How to convert other 3d model formats to obj (so they can be loaded in ImageMap):</summary>
-
-- Step 1: Import your model in blender using File -> Import (and selecting the file type that corresponds to your model)
-- Step 2 (optional): Change the viewport shading mode to 'Material Preview'  in the top right of the viewport, to check that your model textures are loaded properly.
-    - If your model has vertex colors doing this won't show them (this is fine). In this case you can skip past step 3 as there won't be any textures to unpack.
-- Step 3A: Unpack the image textures from your model using File -> External Data -> Unpack Resources. This should work, but often runs into errors when I try to use it, so if it doesn't work go to step 3B. Otherwise skip to step 4.
-- <details>
-    <summary>Step 3B: If you couldn't automatically unpack the model textures, expand this and follow these instructions instead of 3A</summary>
-
-    - Change the editor type to "Image Editor" by clicking the dropdown in the top left of the viewport.
-    - Next click the small picture icon dropdown in the top middle of the screen. It should show a list of image filenames, i.e. Image_0, Image_1, etc.
-    - For each image file that looks like it could be a model texture (has similar colors to your model), repeat this step:
-        - Select the image from the dropdown and then go to "Image -> Save As" in the top bar. Save the image in the folder you are going to export your obj model to
-        - There will often be other kinds of image data here you don't need to unpack (specular maps, etc.). if you're not sure which ones you need it doesn't do any harm to export all of them
-    </details>
-- Step 4 (optional): Triangulate your mesh.
-  - If your model contains large n-gons, the slicer won't be able to import it. This step converts all faces into triangles to solve the issue
-  - 4.1 - Click on your object, then go to the Modifiers tab on the right panel (blue spanner icon).
-  - 4.2 - Click 'Add Modifier', and add a Generate -> Triangulate modifier.
-  - 4.3 - Click the down arrow to the right of the new Triangulate modifier, and click 'Apply'
-- Step 5: After unpacking your model images and/or triangulating the model, you can now export the obj. Go to File -> Export and select "Wavefront (.obj)"
-    - Set Materials -> Path Mode in the export dialog to "Copy"
-    - If your model uses vertex colors instead of textures, make sure "Colors" is enabled in the Geometry tab
-    - You can also check that the Up Axis is set to "Y" and UV Coordinates are enabled in this export dialog (but these should be already set by default)
-- Step 6: Your model is now converted to obj. You can now open ImageMap and use File -> Import -> "Import 3MF/STL/STEP/SVG/OBJ/AMF..." to load this obj file with its color image texture.
-</details>
+ 1. If you run into trouble executing it, try this command in the terminal:
+    `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage`
 
 # How to Compile
 
-All updated build instructions for Windows, macOS, and Linux are now available on the official [OrcaSlicer Wiki - How to build](https://www.orcaslicer.com/wiki/how_to_build) page.
+All updated build instructions for Windows, macOS, and Linux are now available on the official [OrcaSlicer Wiki - How to build](https://www.orcaslicer.com/wiki/How-to-build) page.
 
 Please refer to the wiki to ensure you're following the latest and most accurate steps for your platform.
 
@@ -224,30 +161,49 @@ If you're running Klipper, it's recommended to add the following configuration t
 resolution: 0.1
 ```
 
+# Supports
+
+**OrcaSlicer** is an open-source project and I'm deeply grateful to all my sponsors and backers.  
+Their generous support enables me to purchase filaments and other essential 3D printing materials for the project.  
+Thank you! :)
+
+## Sponsors:
+
+<table>
+<tr>
+<td>
+<a href="https://qidi3d.com/" style="display:inline-block; border-radius:8px; background:#fff;">
+  <img src="SoftFever_doc\sponsor_logos\QIDI.png" alt="QIDI" width="100" height="100">
+</a>
+</td>
+<td>
+<a href="https://bigtree-tech.com/" style="display:inline-block; border-radius:8px; background:#222;">
+    <img src="SoftFever_doc\sponsor_logos\BigTreeTech.png" alt="BIGTREE TECH" width="100" height="100">
+</a>
+</td>
+</tr>
+</table>
+
+## Backers:
+
+**Ko-fi supporters** ☕: [Backers list](https://github.com/user-attachments/files/16147016/Supporters_638561417699952499.csv)
+
+## Support me
+
+<a href="https://github.com/sponsors/SoftFever"><img src="https://img.shields.io/badge/GitHub%20Sponsors-30363D?style=flat&logo=GitHub-Sponsors&logoColor=EA4AAA" height="50"></a>
+<a href="https://ko-fi.com/G2G5IP3CP"><img src="https://img.shields.io/badge/Support_me_on_Ko--fi-FF5E5B?style=flat&logo=ko-fi&logoColor=white" height="50"></a>
+<a href="https://paypal.me/softfever3d"><img src="https://img.shields.io/badge/PayPal-003087?style=flat&logo=paypal&logoColor=fff" height="50"></a>
+
 ## Some Background
 
 Open-source slicing has always been built on a tradition of collaboration and attribution. [Slic3r](https://github.com/Slic3r/Slic3r), created by Alessandro Ranellucci and the RepRap community, laid the foundation. [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research built on Slic3r and acknowledged that heritage. [Bambu Studio](https://github.com/bambulab/BambuStudio) in turn forked from PrusaSlicer, and [SuperSlicer](https://github.com/supermerill/SuperSlicer) by @supermerill extended PrusaSlicer with community-driven enhancements. Each project carried the work of its predecessors forward, crediting those who came before.
 
 OrcaSlicer began in that same spirit, drawing from BambuStudio, PrusaSlicer, and ideas inspired by CuraSlicer and SuperSlicer. But it has since grown far beyond its origins. Through relentless innovation — introducing advanced calibration tools, precise wall and seam control, tree supports, adaptive slicing, and hundreds of other features — OrcaSlicer has become the most widely used and actively developed open-source slicer in the 3D printing community. Many of its innovations have been adopted by other slicers, making it a driving force for the entire industry.
 
-OrcaSlicer-ImageMap is a fork of OrcaSlicer made by sentientstardust, to add image printing support using overhang and alternating CMYK (or other color) layers.
-
 The OrcaSlicer logo was designed by community member Justin Levine (@freejstnalxndr).
 
-## Acknowledgements
-Use of filament overhang to create the appearance of continuous side-surface imagery based on [Kuipers, et. al 2018](https://arxiv.org/pdf/1805.01375)
-
-Top surface color blending inspired by [V. Babaei et. al, 2017](https://cdfg.mit.edu/assets/files/Color3DP_compressed.pdf)
-
-Thanks to neotko for suggesting I experiment with variable line width
-
-Thanks to everyone who has beta tested and given feedback
-
 # License
-- **OrcaSlicer-ImageMap** is licensed under the GNU Affero General Public License, version 3. OrcaSlicer-ImageMap is forked from OrcaSlicer.
 - **OrcaSlicer** is licensed under the GNU Affero General Public License, version 3.
 - The **GNU Affero General Public License**, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
 - OrcaSlicer includes a **pressure advance calibration pattern test** adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
 - The **Bambu networking plugin** is based on non-free libraries from BambuLab. It is optional to the OrcaSlicer and provides extended functionalities for Bambulab printer users.
-- This repository uses Pigment Painter in order to predict how filament colors will mix. Pigment Painter is licensed under the GNU General Public License, version 3.
-- ColorSolver is used for fast RGB -> filament ratio conversion. ColorSolver is licensed under the GNU Affero General Public License, version 3

build_flatpak.sh

@@ -199,22 +199,22 @@ echo -e "${GREEN}All required dependencies found${NC}"
 # Install runtime and SDK if requested
 if [[ "$INSTALL_RUNTIME" == true ]]; then
     echo -e "${YELLOW}Installing GNOME runtime and SDK...${NC}"
-    flatpak install --user -y flathub org.gnome.Platform//50
-    flatpak install --user -y flathub org.gnome.Sdk//50
+    flatpak install --user -y flathub org.gnome.Platform//49
+    flatpak install --user -y flathub org.gnome.Sdk//49
 fi
 
 # Check if required runtime is available
-if ! flatpak info --user org.gnome.Platform//50 &> /dev/null; then
-    echo -e "${RED}Error: GNOME Platform 50 runtime is not installed.${NC}"
+if ! flatpak info --user org.gnome.Platform//49 &> /dev/null; then
+    echo -e "${RED}Error: GNOME Platform 49 runtime is not installed.${NC}"
     echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Platform//50"
+    echo "flatpak install --user flathub org.gnome.Platform//49"
     exit 1
 fi
 
-if ! flatpak info --user org.gnome.Sdk//50 &> /dev/null; then
-    echo -e "${RED}Error: GNOME SDK 50 is not installed.${NC}"
+if ! flatpak info --user org.gnome.Sdk//49 &> /dev/null; then
+    echo -e "${RED}Error: GNOME SDK 49 is not installed.${NC}"
     echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Sdk//50"
+    echo "flatpak install --user flathub org.gnome.Sdk//49"
     exit 1
 fi
 

build_linux.sh

@@ -343,6 +343,7 @@ function run_in_docker() {
         -e "CI=true"
         -e "GITHUB_ACTIONS=true"
         -e "GITHUB_WORKSPACE=${container_workspace}"
+        -e "GIT_CEILING_DIRECTORIES=${container_workspace}/deps/build"
         -e "RUNNER_OS=Linux"
         -e "RUNNER_TEMP=/tmp"
         -e "HOST_UID=${host_uid}"
@@ -422,6 +423,7 @@ fi
 sudo -H -u "${HOST_USER}" env \
     CMAKE_BUILD_PARALLEL_LEVEL="${CMAKE_BUILD_PARALLEL_LEVEL-}" \
     GITHUB_WORKSPACE="${GITHUB_WORKSPACE}" \
+    GIT_CEILING_DIRECTORIES="${GIT_CEILING_DIRECTORIES-}" \
     ORCA_UPDATER_SIG_KEY="${ORCA_UPDATER_SIG_KEY-}" \
     bash -c '
         set -e
@@ -454,8 +456,6 @@ elif [[ "${DISTRIBUTION_LIKE}" == *"debian"* ]] || [[ "${DISTRIBUTION_LIKE}" ==
     DISTRIBUTION="debian"
 elif [[ "${DISTRIBUTION_LIKE}" == *"arch"* ]] ; then
     DISTRIBUTION="arch"
-elif [[ "${DISTRIBUTION_LIKE}" == *"suse"* ]] ; then
-    DISTRIBUTION="suse"
 fi
 
 if [ ! -f "./scripts/linux.d/${DISTRIBUTION}" ] ; then
@@ -504,26 +504,6 @@ if [[ -n "${USE_LLD}" ]] ; then
     fi
 fi
 
-export CMAKE_CCACHE_ARGS=()
-CMAKE_CCACHE=${CMAKE_CCACHE:-}
-if [ -n "$CMAKE_CCACHE" ]; then
-        echo "Checking ${CMAKE_CCACHE} environment variable for compiler cache program..."
-        CMAKE_CCACHE=$(command -v "${CMAKE_CCACHE}") || {
-            echo "CMAKE_CCACHE environment variable is set to '${CMAKE_CCACHE}' but it was not found in PATH."
-            CMAKE_CCACHE=""
-        }
-elif command -v sccache >/dev/null 2>&1 ; then
-        CMAKE_CCACHE=$(command -v sccache)
-elif command -v ccache >/dev/null 2>&1 ; then
-        CMAKE_CCACHE=$(command -v ccache)
-fi
-if [ -n "${CMAKE_CCACHE}" ] ; then
-    echo "${CMAKE_CCACHE} found, enabling compiler caching..."
-    export CMAKE_CCACHE_ARGS=(-DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_CCACHE}" -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CCACHE}")
-else
-    echo "Note: ccache or sccache are not found. Install either of them for faster rebuilds."
-fi
-
 if [[ -n "${BUILD_DEPS}" ]] ; then
     echo "Configuring dependencies..."
     read -r -a BUILD_ARGS <<< "${DEPS_EXTRA_BUILD_ARGS}"
@@ -536,8 +516,8 @@ if [[ -n "${BUILD_DEPS}" ]] ; then
         BUILD_ARGS+=(-DCMAKE_BUILD_TYPE="${BUILD_CONFIG}")
     fi
 
-    print_and_run cmake -S deps -B deps/$BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" "${CMAKE_CCACHE_ARGS[@]}" -G Ninja "${COLORED_OUTPUT}" "${BUILD_ARGS[@]}"
-    print_and_run cmake --build deps/$BUILD_DIR -j1
+    print_and_run cmake -S deps -B deps/$BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G Ninja "${COLORED_OUTPUT}" "${BUILD_ARGS[@]}"
+    print_and_run cmake --build deps/$BUILD_DIR
 fi
 
 if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then
@@ -556,7 +536,7 @@ if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then
         BUILD_ARGS+=(-DORCA_UPDATER_SIG_KEY="${ORCA_UPDATER_SIG_KEY}")
     fi
 
-    print_and_run cmake -S . -B $BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" "${CMAKE_CCACHE_ARGS[@]}" -G "Ninja Multi-Config" \
+    print_and_run cmake -S . -B $BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G "Ninja Multi-Config" \
 -DSLIC3R_PCH=${SLIC3R_PRECOMPILED_HEADERS} \
 -DORCA_TOOLS=ON \
 "${COLORED_OUTPUT}" \

build_release_macos.sh

@@ -237,7 +237,6 @@ function build_slicer() {
             resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
             rm ./OrcaSlicer.app/Contents/Resources
             cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
-            plutil -replace CFBundleIconFile -string "images/OrcaSlicer.icns" ./OrcaSlicer.app/Contents/Info.plist
             # delete .DS_Store file
             find ./OrcaSlicer.app/ -name '.DS_Store' -delete
             

build_release_vs.bat

@@ -9,11 +9,6 @@ for %%a in (%*) do (
     if "%%a"=="-x" set USE_NINJA=1
 )
 
-set "SLIC3R_PRECOMPILED_HEADERS="
-for %%a in (%*) do (
-    if "%%a"=="-p" set SLIC3R_PRECOMPILED_HEADERS=OFF
-)
-
 if "%USE_NINJA%"=="1" (
     echo Using Ninja Multi-Config generator
     set CMAKE_GENERATOR="Ninja Multi-Config"
@@ -119,14 +114,10 @@ REM Set minimum CMake policy to avoid <3.5 errors
 set CMAKE_POLICY_VERSION_MINIMUM=3.5
 if "%USE_NINJA%"=="1" (
     cmake ../ -G %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=%build_type%
-    if errorlevel 1 exit /b 1
     cmake --build . --config %build_type% --target deps
-    if errorlevel 1 exit /b 1
 ) else (
     cmake ../ -G %CMAKE_GENERATOR% -A x64 -DCMAKE_BUILD_TYPE=%build_type%
-    if errorlevel 1 exit /b 1
     cmake --build . --config %build_type% --target deps -- -m
-    if errorlevel 1 exit /b 1
 )
 @echo off
 
@@ -140,28 +131,18 @@ cd %build_dir%
 
 echo on
 set CMAKE_POLICY_VERSION_MINIMUM=3.5
-set "CMAKE_CONFIGURE_FLAGS="
-if defined CMAKE_C_COMPILER_LAUNCHER set "CMAKE_CONFIGURE_FLAGS=%CMAKE_CONFIGURE_FLAGS% -DCMAKE_C_COMPILER_LAUNCHER=%CMAKE_C_COMPILER_LAUNCHER%"
-if defined CMAKE_CXX_COMPILER_LAUNCHER set "CMAKE_CONFIGURE_FLAGS=%CMAKE_CONFIGURE_FLAGS% -DCMAKE_CXX_COMPILER_LAUNCHER=%CMAKE_CXX_COMPILER_LAUNCHER%"
-if defined SLIC3R_PRECOMPILED_HEADERS set "CMAKE_CONFIGURE_FLAGS=%CMAKE_CONFIGURE_FLAGS% -DSLIC3R_PCH=%SLIC3R_PRECOMPILED_HEADERS%"
 if "%USE_NINJA%"=="1" (
-    cmake .. -G %CMAKE_GENERATOR% -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_BUILD_TYPE=%build_type% %CMAKE_CONFIGURE_FLAGS%
-    if errorlevel 1 exit /b 1
-    cmake --build . --config %build_type%
-    if errorlevel 1 exit /b 1
+    cmake .. -G %CMAKE_GENERATOR% -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_BUILD_TYPE=%build_type%
+    cmake --build . --config %build_type% --target ALL_BUILD
 ) else (
-    cmake .. -G %CMAKE_GENERATOR% -A x64 -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_BUILD_TYPE=%build_type% %CMAKE_CONFIGURE_FLAGS%
-    if errorlevel 1 exit /b 1
+    cmake .. -G %CMAKE_GENERATOR% -A x64 -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_BUILD_TYPE=%build_type%
     cmake --build . --config %build_type% --target ALL_BUILD -- -m
-    if errorlevel 1 exit /b 1
 )
 @echo off
 cd ..
 call scripts/run_gettext.bat
-if errorlevel 1 exit /b 1
 cd %build_dir%
 cmake --build . --target install --config %build_type%
-if errorlevel 1 exit /b 1
 
 :done
 @echo off

build_release_vs2022.bat

@@ -15,18 +15,10 @@ if "%1"=="pack" (
 
 set debug=OFF
 set debuginfo=OFF
-@REM Default target architecture to the host CPU arch; override with x64/arm64 arg.
-set arch=x64
-if /I "%PROCESSOR_ARCHITECTURE%"=="ARM64" set arch=ARM64
-if /I "%PROCESSOR_ARCHITEW6432%"=="ARM64" set arch=ARM64
 if "%1"=="debug" set debug=ON
 if "%2"=="debug" set debug=ON
 if "%1"=="debuginfo" set debuginfo=ON
 if "%2"=="debuginfo" set debuginfo=ON
-if /I "%1"=="arm64" set arch=ARM64
-if /I "%2"=="arm64" set arch=ARM64
-if /I "%1"=="x64" set arch=x64
-if /I "%2"=="x64" set arch=x64
 if "%debug%"=="ON" (
     set build_type=Debug
     set build_dir=build-dbg
@@ -39,12 +31,11 @@ if "%debug%"=="ON" (
         set build_dir=build
     )
 )
-if "%arch%"=="ARM64" set build_dir=%build_dir%-arm64
-echo build type set to %build_type%, arch=%arch%
+echo build type set to %build_type%
 
 setlocal DISABLEDELAYEDEXPANSION 
 cd deps
-mkdir %build_dir%
+if not exist %build_dir% mkdir %build_dir%
 cd %build_dir%
 set "SIG_FLAG="
 if defined ORCA_UPDATER_SIG_KEY set "SIG_FLAG=-DORCA_UPDATER_SIG_KEY=%ORCA_UPDATER_SIG_KEY%"
@@ -57,7 +48,7 @@ echo "building deps.."
 echo on
 REM Set minimum CMake policy to avoid <3.5 errors
 set CMAKE_POLICY_VERSION_MINIMUM=3.5
-cmake ../ -G "Visual Studio 17 2022" -A %arch% -DCMAKE_BUILD_TYPE=%build_type%
+cmake ../ -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=%build_type%
 cmake --build . --config %build_type% --target deps -- -m
 @echo off
 
@@ -66,12 +57,14 @@ if "%1"=="deps" exit /b 0
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir %build_dir%
+if not exist %build_dir% mkdir %build_dir%
 cd %build_dir%
 
 echo on
 set CMAKE_POLICY_VERSION_MINIMUM=3.5
-cmake .. -G "Visual Studio 17 2022" -A %arch% -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_BUILD_TYPE=%build_type%
+set "WX_FLAG="
+if exist "%WP%\deps\%build_dir%\OrcaSlicer_dep\usr\local\lib\cmake\wxWidgets-3.3" set "WX_FLAG=-DwxWidgets_DIR=%WP%\deps\%build_dir%\OrcaSlicer_dep\usr\local\lib\cmake\wxWidgets-3.3"
+cmake .. -G "Visual Studio 17 2022" -A x64 -DORCA_TOOLS=ON %SIG_FLAG% %WX_FLAG% -DCMAKE_BUILD_TYPE=%build_type%
 cmake --build . --config %build_type% --target ALL_BUILD -- -m
 @echo off
 cd ..

cmake/GenerateSoftFeverVersion.cmake

@@ -1,34 +0,0 @@
-if(NOT DEFINED INPUT)
-    message(FATAL_ERROR "INPUT is required")
-endif()
-
-if(NOT DEFINED OUTPUT)
-    message(FATAL_ERROR "OUTPUT is required")
-endif()
-
-if(NOT DEFINED GIT_COMMIT_HASH)
-    set(GIT_COMMIT_HASH "0000000")
-endif()
-
-file(STRINGS "${INPUT}" SOFTFEVER_VERSION LIMIT_COUNT 1)
-string(STRIP "${SOFTFEVER_VERSION}" SOFTFEVER_VERSION)
-
-set(CONTENT [=[
-#include "libslic3r_version.h"
-
-namespace Slic3r {
-
-const char* softfever_version()
-{
-    return "@SOFTFEVER_VERSION@";
-}
-
-const char* git_commit_hash()
-{
-    return "@GIT_COMMIT_HASH@";
-}
-
-} // namespace Slic3r
-]=])
-string(CONFIGURE "${CONTENT}" CONTENT @ONLY)
-file(WRITE "${OUTPUT}" "${CONTENT}")

cmake/modules/FindEigen3.cmake

@@ -0,0 +1,86 @@
+# - Try to find Eigen3 lib
+#
+# This module supports requiring a minimum version, e.g. you can do
+#   find_package(Eigen3 3.1.2)
+# to require version 3.1.2 or newer of Eigen3.
+#
+# Once done this will define
+#
+#  EIGEN3_FOUND - system has eigen lib with correct version
+#  EIGEN3_INCLUDE_DIR - the eigen include directory
+#  EIGEN3_VERSION - eigen version
+
+# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
+# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
+# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
+# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
+
+if(NOT Eigen3_FIND_VERSION)
+  if(NOT Eigen3_FIND_VERSION_MAJOR)
+    set(Eigen3_FIND_VERSION_MAJOR 2)
+  endif(NOT Eigen3_FIND_VERSION_MAJOR)
+  if(NOT Eigen3_FIND_VERSION_MINOR)
+    set(Eigen3_FIND_VERSION_MINOR 91)
+  endif(NOT Eigen3_FIND_VERSION_MINOR)
+  if(NOT Eigen3_FIND_VERSION_PATCH)
+    set(Eigen3_FIND_VERSION_PATCH 0)
+  endif(NOT Eigen3_FIND_VERSION_PATCH)
+
+  set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
+endif(NOT Eigen3_FIND_VERSION)
+
+macro(_eigen3_check_version)
+  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
+
+  string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
+  set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
+
+  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
+  if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+    set(EIGEN3_VERSION_OK FALSE)
+  else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+    set(EIGEN3_VERSION_OK TRUE)
+  endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+
+  if(NOT EIGEN3_VERSION_OK)
+
+    message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
+                   "but at least version ${Eigen3_FIND_VERSION} is required")
+  endif(NOT EIGEN3_VERSION_OK)
+endmacro(_eigen3_check_version)
+
+if (EIGEN3_INCLUDE_DIR)
+
+  # in cache already
+  _eigen3_check_version()
+  set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
+
+else (EIGEN3_INCLUDE_DIR)
+
+  # specific additional paths for some OS
+  if (WIN32)
+    set(EIGEN_ADDITIONAL_SEARCH_PATHS ${EIGEN_ADDITIONAL_SEARCH_PATHS} "C:/Program Files/Eigen/include" "C:/Program Files (x86)/Eigen/include")
+  endif(WIN32)
+
+  find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
+      PATHS
+      ${CMAKE_INSTALL_PREFIX}/include
+      ${EIGEN_ADDITIONAL_SEARCH_PATHS}
+      ${KDE4_INCLUDE_DIR}
+      PATH_SUFFIXES eigen3 eigen
+    )
+
+  if(EIGEN3_INCLUDE_DIR)
+    _eigen3_check_version()
+  endif(EIGEN3_INCLUDE_DIR)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
+
+  mark_as_advanced(EIGEN3_INCLUDE_DIR)
+
+endif(EIGEN3_INCLUDE_DIR)

cmake/modules/FindGLEW.cmake

@@ -124,8 +124,6 @@ endif()
 
 if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64" OR "${CMAKE_GENERATOR}" MATCHES "Win64")
   set(_arch "x64")
-elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64")
-  set(_arch "x64")  # GLEW ships one header set; ARM64 uses the x64 import path
 else()
   set(_arch "Win32")
 endif()

deps/Boost/Boost.cmake

@@ -10,20 +10,6 @@ if (APPLE AND CMAKE_OSX_ARCHITECTURES)
     set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
 endif ()
 
-# Windows ARM64: Boost.Context's default fcontext implementation assembles .asm
-# via armasm64, which trips a CMake ASM_ARMASM linker-module bug under the VS
-# generator. The winfib implementation (Windows Fiber API) avoids assembly while
-# keeping the Boost::context target that Boost.Asio's stackful coroutines need.
-set(_context_impl_line "")
-if (MSVC AND "${DEPS_ARCH}" STREQUAL "arm64")
-    set(_context_impl_line "-DBOOST_CONTEXT_IMPLEMENTATION:STRING=winfib")
-endif ()
-
-set(_options "")
-if (MSVC AND DEP_DEBUG)
-    set(_options "FORWARD_CONFIG")
-endif ()
-
 orcaslicer_add_cmake_project(Boost
     URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
     URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
@@ -36,7 +22,6 @@ orcaslicer_add_cmake_project(Boost
         -DBOOST_IOSTREAMS_ENABLE_ZSTD:BOOL=OFF
         "${_context_abi_line}"
         "${_context_arch_line}"
-        "${_context_impl_line}"
 )
 
 set(DEP_Boost_DEPENDS ZLIB)

deps/CGAL/CGAL.cmake

@@ -9,7 +9,7 @@ orcaslicer_add_cmake_project(
     # For whatever reason, this keeps downloading forever (repeats downloads if finished)
     URL      https://github.com/CGAL/cgal/releases/download/v5.6.3/CGAL-5.6.3.zip
     URL_HASH SHA256=5d577acb4a9918ccb960491482da7a3838f8d363aff47e14d703f19fd84733d4
-    DEPENDS dep_Boost dep_Eigen dep_GMP dep_MPFR
+    DEPENDS dep_Boost dep_GMP dep_MPFR
 )
 
 include(GNUInstallDirs)

deps/CMakeLists.txt

@@ -134,7 +134,7 @@ if (APPLE)
 endif ()
 
 
-# On developer machines, it can be enabled to speed up compilation and suppress warnings coming from IGL.
+# On developer machines, it can be enabled to speed up compilation and suppress warnings coming from IGL. 
 # FIXME:
 # Enabling this option is not safe. IGL will compile itself with its own version of Eigen while
 # Slic3r compiles with a different version which will cause runtime errors.
@@ -146,7 +146,7 @@ message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}")
 
 find_package(Git REQUIRED)
 
-# The default command line for patching. Only works for newer
+# The default command line for patching. Only works for newer 
 set(PATCH_CMD ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix)
 
 if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
@@ -166,18 +166,11 @@ function(orcaslicer_add_cmake_project projectname)
         endif ()
     endif ()
 
+    set(_gen "")
+    set(_build_j "-j${NPROC}")
     if (MSVC)
-      set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}")
-    else()
-      set(_gen "")
-    endif()
-
-    if ($ENV{CMAKE_BUILD_PARALLEL_LEVEL})
-      set(_build_j "")  # assume environment will control --build parallel setting
-    elseif(MSVC)
-      set(_build_j "/m")
-    else()
-      set(_build_j "-j${NPROC}")
+        set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}")
+        set(_build_j "/m")
     endif ()
 
 if (NOT IS_CROSS_COMPILE OR NOT APPLE)
@@ -196,8 +189,6 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
             -DCMAKE_DEBUG_POSTFIX:STRING=d
             -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
             -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-            -DCMAKE_C_COMPILER_LAUNCHER:STRING=${CMAKE_C_COMPILER_LAUNCHER}
-            -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=${CMAKE_CXX_COMPILER_LAUNCHER}
             -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
             -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
             -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
@@ -243,8 +234,6 @@ else()
             -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
             -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
             -DCMAKE_IGNORE_PREFIX_PATH:STRING=${CMAKE_IGNORE_PREFIX_PATH}
-            -DCMAKE_C_COMPILER_LAUNCHER:STRING=${CMAKE_C_COMPILER_LAUNCHER}
-            -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=${CMAKE_CXX_COMPILER_LAUNCHER}
             -DBUILD_SHARED_LIBS:BOOL=OFF
             ${_cmake_osx_arch}
             "${_configs_line}"
@@ -252,7 +241,7 @@ else()
             ${P_ARGS_CMAKE_ARGS}
        ${P_ARGS_UNPARSED_ARGUMENTS}
        BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
-       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release 
     )
 
 endif()
@@ -269,12 +258,8 @@ if (MSVC)
         message(STATUS "\nDetected X86 compiler => building X86 deps bundle\n")
         set(DEPS_ARCH "x86")
         include("deps-windows.cmake")
-    elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
-        message(STATUS "\nDetected ARM64 compiler => building ARM64 deps bundle\n")
-        set(DEPS_ARCH "arm64")
-        include("deps-windows.cmake")
     else ()
-        message(FATAL_ERROR "Unable to detect architecture: ${CMAKE_SYSTEM_PROCESSOR}")
+        message(FATAL_ERROR "Unable to detect architecture")
     endif ()
 elseif (APPLE)
     message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
@@ -316,26 +301,26 @@ if(FLATPAK)
 endif()
 
 set(ZLIB_PKG "")
-if (NOT ZLIB_FOUND)
+if (NOT ZLIB_FOUND) 
     include(ZLIB/ZLIB.cmake)
     set(ZLIB_PKG dep_ZLIB)
 endif ()
 set(PNG_PKG "")
-if (NOT PNG_FOUND)
+if (NOT PNG_FOUND) 
     include(PNG/PNG.cmake)
     set(PNG_PKG dep_PNG)
 endif ()
 set(EXPAT_PKG "")
 find_package(EXPAT)
-if (NOT EXPAT_FOUND)
+if (NOT EXPAT_FOUND) 
     include(EXPAT/EXPAT.cmake)
     set(EXPAT_PKG dep_EXPAT)
 endif ()
 
-# The order of includes respects the dependencies between libraries
 set(DEP_Boost_COMPONENTS system iostreams filesystem thread log locale regex date_time)
 include(Boost/Boost.cmake)
 
+# The order of includes respects the dependencies between libraries
 include(Cereal/Cereal.cmake)
 include(Qhull/Qhull.cmake)
 include(GLEW/GLEW.cmake)
@@ -351,7 +336,6 @@ include(OpenVDB/OpenVDB.cmake)
 
 include(GMP/GMP.cmake)
 include(MPFR/MPFR.cmake)
-include(Eigen/Eigen.cmake)
 include(CGAL/CGAL.cmake)
 
 include(NLopt/NLopt.cmake)
@@ -363,7 +347,7 @@ include(Draco/Draco.cmake)
 # I *think* 1.1 is used for *just* md5 hashing?
 # 3.1 has everything in the right place, but the md5 funcs used are deprecated
 # a grep across the repo shows it is used for other things
-# TODO: update openssl and everything that uses <openssl/md5.h>
+# TODO: update openssl and everything that uses <openssl/md5.h> 
 set(OPENSSL_PKG "")
 if(NOT OPENSSL_FOUND)
     include(OpenSSL/OpenSSL.cmake)
@@ -371,7 +355,7 @@ if(NOT OPENSSL_FOUND)
 endif()
 
 # we don't want to load a "wrong" openssl when loading curl
-# so, just don't even bother
+# so, just don't even bother 
 # ...i think this is how it works? change if wrong
 set(CURL_PKG "")
 if (NOT OPENSSL_FOUND OR NOT CURL_FOUND)
@@ -395,7 +379,7 @@ endif()
 set(FREETYPE_PKG "")
 if(NOT FREETYPE_FOUND)
     include(FREETYPE/FREETYPE.cmake)
-    set(FREETYPE_PKG "dep_FREETYPE")
+    set(FREETYPE_PKG "dep_FREETYPE") 
 endif()
 
 execute_process(
@@ -427,7 +411,6 @@ set(_dep_list
     dep_OpenVDB
     dep_OpenCSG
     dep_OpenCV
-    dep_Eigen
     dep_CGAL
     dep_GLFW
     dep_OCCT

deps/Eigen/Eigen.cmake

@@ -1,11 +0,0 @@
-set(_eigen_extra_flags "")
-if (MSVC)
-    set(_eigen_extra_flags "-DCMAKE_CXX_FLAGS:STRING=/bigobj")
-endif ()
-
-orcaslicer_add_cmake_project(Eigen
-    URL https://gitlab.com/libeigen/eigen/-/archive/5.0.1/eigen-5.0.1.zip
-    URL_HASH SHA256=0dbb1f9e3aaad66f352c03227d8c983f6f0b49e0b07e71a7300f4abcc01aee12
-    CMAKE_ARGS "${_eigen_extra_flags}"
-    DEPENDS dep_Boost dep_GMP dep_MPFR
-)

deps/GLFW/GLFW.cmake

@@ -6,20 +6,22 @@ else()
     set(_build_static ON)
 endif()
 
-set(_glfw_platform_args "")
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(_glfw_platform_args -DGLFW_BUILD_WAYLAND=ON -DGLFW_BUILD_X11=ON)
+    set(_glfw_use_wayland "-DGLFW_USE_WAYLAND=OFF")
+else()
+    set(_glfw_use_wayland "-DGLFW_USE_WAYLAND=OFF")
 endif()
 
 orcaslicer_add_cmake_project(GLFW
-    URL https://github.com/glfw/glfw/archive/refs/tags/3.4.zip
-    URL_HASH SHA256=a133ddc3d3c66143eba9035621db8e0bcf34dba1ee9514a9e23e96afd39fd57a
+    URL https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip
+    URL_HASH SHA256=e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0
+    #DEPENDS dep_Boost
     CMAKE_ARGS
-        -DBUILD_SHARED_LIBS=${_build_shared}
+        -DBUILD_SHARED_LIBS=${_build_shared} 
         -DGLFW_BUILD_DOCS=OFF
         -DGLFW_BUILD_EXAMPLES=OFF
-        -DGLFW_BUILD_TESTS=OFF
-        ${_glfw_platform_args}
+	-DGLFW_BUILD_TESTS=OFF
+	${_glfw_use_wayland}
 )
 
 if (MSVC)

deps/OpenCV/OpenCV.cmake

@@ -1,6 +1,4 @@
-# Intel IPP / IPP-ICV is x86/x64 only — there is no ARM64 build, so enabling it
-# leaves ~200 unresolved ippicv* externals at link time on Windows ARM64.
-if (MSVC AND NOT "${DEPS_ARCH}" STREQUAL "arm64")
+if (MSVC)
     set(_use_IPP "-DWITH_IPP=ON")
 else ()
     set(_use_IPP "-DWITH_IPP=OFF")
@@ -57,8 +55,6 @@ orcaslicer_add_cmake_project(OpenCV
        -DWITH_VTK=OFF
        -DWITH_JPEG=OFF
        -DWITH_WEBP=OFF
-       -DWITH_TIFF=OFF
-       -DBUILD_TIFF=OFF
        -DENABLE_PRECOMPILED_HEADERS=OFF
        -DINSTALL_TESTS=OFF
        -DINSTALL_C_EXAMPLES=OFF

deps/OpenEXR/OpenEXR.cmake

@@ -32,17 +32,6 @@ else()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OpenEXR-GCC13.patch)
-elseif (MSVC AND "${DEPS_ARCH}" STREQUAL "arm64")
-    # Windows ARM64: OpenEXR 2.5.5 hard-codes IMF_HAVE_SSE2 for any MSVC
-    # (ImfSimd.h: `_MSC_VER >= 1300`), pulling in <emmintrin.h> (x86-only) -> C1189.
-    # Patch the header to require an x86 target, and force the SSE cache vars off.
-    set(_patch_cmd ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_LIST_DIR}/patch_openexr_arm64.cmake)
-    set(_openexr_arm64_args
-        -DOPENEXR_IMF_HAVE_SSE2:BOOL=OFF
-        -DOPENEXR_IMF_HAVE_SSSE3:BOOL=OFF
-        -DILMBASE_HAVE_SSE:BOOL=OFF
-        -DILMBASE_FORCE_DISABLE_INTEL_SSE:BOOL=ON
-    )
 else ()
     set(_patch_cmd "")
 endif ()
@@ -60,7 +49,6 @@ orcaslicer_add_cmake_project(OpenEXR
         -DPYILMBASE_ENABLE:BOOL=OFF
         -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
         -DOPENEXR_BUILD_UTILS:BOOL=OFF
-        ${_openexr_arm64_args}
 )
 endif()
 

deps/OpenEXR/patch_openexr_arm64.cmake

@@ -1,29 +0,0 @@
-# Applied as PATCH_COMMAND for OpenEXR 2.5.5 on Windows ARM64.
-#
-# Root cause of the ARM64 build failure: OpenEXR/IlmImf/ImfSimd.h hard-codes
-#     #if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE)
-#         #define IMF_HAVE_SSE2 1
-#     #endif
-# The `_MSC_VER >= 1300` arm is true for *every* MSVC, including ARM64, so
-# IMF_HAVE_SSE2 gets defined and <emmintrin.h> (an x86-only header) is pulled
-# in -> error C1189. This is a pure-preprocessor decision, so no CMake cache
-# variable can suppress it. Patch the header to also require an x86 target.
-
-set(_simd "OpenEXR/IlmImf/ImfSimd.h")
-if(EXISTS "${_simd}")
-    file(READ "${_simd}" _content)
-    set(_old "#if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE)")
-    set(_new "#if (defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE)) && (defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__x86_64__))")
-    if(_content MATCHES "_M_IX86")
-        message(STATUS "[ARM64 patch] ImfSimd.h already guarded")
-    else()
-        string(REPLACE "${_old}" "${_new}" _patched "${_content}")
-        if(_patched STREQUAL _content)
-            message(FATAL_ERROR "[ARM64 patch] Failed to match SSE2 guard in ${_simd}")
-        endif()
-        file(WRITE "${_simd}" "${_patched}")
-        message(STATUS "[ARM64 patch] Guarded IMF_HAVE_SSE2 with x86 arch check in ${_simd}")
-    endif()
-else()
-    message(FATAL_ERROR "[ARM64 patch] Not found: ${_simd}")
-endif()

deps/OpenSSL/OpenSSL.cmake

@@ -6,11 +6,7 @@ if(DEFINED OPENSSL_ARCH)
     set(_cross_arch ${OPENSSL_ARCH})
 else()
     if(WIN32)
-        if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
-            set(_cross_arch "VC-WIN64-ARM")
-        else()
-            set(_cross_arch "VC-WIN64A")
-        endif()
+        set(_cross_arch "VC-WIN64A")
     elseif(APPLE)
         set(_cross_arch "darwin64-${CMAKE_OSX_ARCHITECTURES}-cc")
 	endif()

deps/deps-windows.cmake

@@ -36,10 +36,8 @@ if ("${DEPS_ARCH}" STREQUAL "x86")
     set(DEP_PLATFORM "Win32")
 elseif ("${DEPS_ARCH}" STREQUAL "x64")
     set(DEP_PLATFORM "x64")
-elseif ("${DEPS_ARCH}" STREQUAL "arm64")
-    set(DEP_PLATFORM "ARM64")
 else ()
-    message(FATAL_ERROR "Unsupported OS architecture: ${DEPS_ARCH}")
+    message(FATAL_ERROR "Unsupported OS architecture")
 endif ()
 
 if (${DEP_DEBUG})
@@ -66,11 +64,8 @@ if ("${DEPS_ARCH}" STREQUAL "x86")
 elseif ("${DEPS_ARCH}" STREQUAL "x64")
     set(DEP_WXWIDGETS_TARGET "TARGET_CPU=X64")
     set(DEP_WXWIDGETS_LIBDIR "vc_x64_lib")
-elseif ("${DEPS_ARCH}" STREQUAL "arm64")
-    set(DEP_WXWIDGETS_TARGET "TARGET_CPU=ARM64")
-    set(DEP_WXWIDGETS_LIBDIR "vc_arm64_lib")
 else ()
-    message(FATAL_ERROR "Unsupported OS architecture: ${DEPS_ARCH}")
+    message(FATAL_ERROR "Unsupported OS architecture")
 endif ()
 
 find_package(Git REQUIRED)

deps/wxWidgets/wxWidgets.cmake

@@ -21,13 +21,25 @@ else ()
     set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF")
 endif ()
 
+set(_wx_opengl_override "")
+if(APPLE AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
+    set(_wx_opengl_override
+        -DOPENGL_gl_LIBRARY="-framework OpenGL"
+        -DOPENGL_glu_LIBRARY="-framework OpenGL"
+    )
+endif()
+
 orcaslicer_add_cmake_project(
     wxWidgets
     GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
+    # KX/stable: pin to v3.3.2 (provides wxWebRequest used by 2.3.2 code).
+    # Upstream 2.3.2 left this untagged, so a shallow clone of the moving
+    # default branch broke the build over time.
     GIT_TAG v3.3.2
     GIT_SHALLOW ON
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG}
     CMAKE_ARGS
+        ${_wx_opengl_override}
         -DwxBUILD_PRECOMP=ON
         ${_wx_toolkit}
         "-DCMAKE_DEBUG_POSTFIX:STRING=${_wx_debug_postfix}"
@@ -36,9 +48,10 @@ orcaslicer_add_cmake_project(
         ${_wx_shared}
         -DwxUSE_MEDIACTRL=ON
         -DwxUSE_DETECT_SM=OFF
+        -DwxUSE_UNICODE=ON
         -DwxUSE_PRIVATE_FONTS=ON
         -DwxUSE_OPENGL=ON
-        -DwxUSE_GLCANVAS_EGL=ON
+        -DwxUSE_GLCANVAS_EGL=OFF
         -DwxUSE_WEBREQUEST=ON
         -DwxUSE_WEBVIEW=ON
         ${_wx_edge}
@@ -52,14 +65,15 @@ orcaslicer_add_cmake_project(
         -DwxUSE_ZLIB=sys
         -DwxUSE_LIBJPEG=sys
         -DwxUSE_LIBTIFF=OFF
-        -DwxUSE_LIBWEBP=builtin
         -DwxUSE_EXPAT=sys
+        # wx 3.3 bundles nanosvg; OrcaSlicer's BitmapCache also defines nsvg
+        # symbols -> ODR/LNK2005 on MSVC. Disable wx's copy (as in 2.4).
         -DwxUSE_NANOSVG=OFF
 )
 
 # wxWidgets 3.3 cmake install doesn't include private headers.
-# OrcaSlicer uses some of the private headers (for accessibility support).
-# Copy the private headers directory after install.
+# OrcaSlicer uses some of the private headers (markuptext, jsscriptwrapper,
+# accessibility support). Copy the private headers directory after install.
 if(MSVC)
     set(_wx_inc_dest ${DESTDIR}/include/wx)
 else()

deps_src/CMakeLists.txt

@@ -29,13 +29,9 @@ add_subdirectory(mcut)
 add_subdirectory(md4c)
 add_subdirectory(miniz)
 add_subdirectory(minilzo)
-add_subdirectory(pigment-painter)
-add_subdirectory(prusa-fdm-mixer)
-add_subdirectory(colorsolver)
 add_subdirectory(qhull)
 add_subdirectory(qoi)
 add_subdirectory(semver)      # Semver static library
-add_subdirectory(tinygltf)
 
 # Eigen header-only library
 add_subdirectory(eigen)

deps_src/admesh/CMakeLists.txt

@@ -18,6 +18,6 @@ target_include_directories(admesh SYSTEM
 )
 
 target_link_libraries(admesh 
-    PUBLIC Eigen3::Eigen
     PRIVATE boost_headeronly
+    PUBLIC eigen
 )

deps_src/clipper/CMakeLists.txt

@@ -15,6 +15,6 @@ target_include_directories(clipper SYSTEM
 )
 
 target_link_libraries(clipper 
-    PUBLIC Eigen3::Eigen
+    PUBLIC eigen
     PRIVATE TBB::tbb TBB::tbbmalloc
 )

deps_src/clipper2/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(Clipper2 VERSION 2.0.1 LANGUAGES C CXX)
+project(Clipper2 VERSION 1.5.2 LANGUAGES C CXX)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_STANDARD 17)
@@ -19,7 +19,6 @@ set(CLIPPER2_INC
   Clipper2Lib/include/clipper2/clipper.minkowski.h
   Clipper2Lib/include/clipper2/clipper.offset.h
   Clipper2Lib/include/clipper2/clipper.rectclip.h
-  Clipper2Lib/include/clipper2/clipper.triangulation.h
   Clipper2Lib/include/clipper2/clipper2_z.hpp
 )
 
@@ -27,7 +26,6 @@ set(CLIPPER2_SRC
   Clipper2Lib/src/clipper.engine.cpp
   Clipper2Lib/src/clipper.offset.cpp
   Clipper2Lib/src/clipper.rectclip.cpp
-  Clipper2Lib/src/clipper.triangulation.cpp
   Clipper2Lib/src/clipper2_z.cpp
 )
 
@@ -53,3 +51,4 @@ set_target_properties(Clipper2 PROPERTIES FOLDER Libraries
                                          SOVERSION ${PROJECT_VERSION_MAJOR}
                                          PUBLIC_HEADER "${CLIPPER2_INC}"
 )
+

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h

@@ -1,8 +1,8 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  12 October 2025                                                 *
+* Date      :  12 May 2024                                                     *
 * Website   :  https://www.angusj.com                                          *
-* Copyright :  Angus Johnson 2010-2025                                         *
+* Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  Core Clipper Library structures and functions                   *
 * License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
@@ -141,7 +141,7 @@ namespace Clipper2Lib {
       }
     }
 
-    explicit Point() : x(0), y(0), z(0) {}
+    explicit Point() : x(0), y(0), z(0) {};
 
     template <typename T2>
     Point(const T2 x_, const T2 y_, const z_type z_ = 0)
@@ -193,7 +193,7 @@ namespace Clipper2Lib {
       }
     }
 
-    explicit Point() : x(0), y(0) {}
+    explicit Point() : x(0), y(0) {};
 
     template <typename T2>
     Point(const T2 x_, const T2 y_) { Init(x_, y_); }
@@ -251,20 +251,6 @@ namespace Clipper2Lib {
   template <typename T>
   using Paths = std::vector<Path<T>>;
 
-  template <typename T, typename T2=T>
-  Path<T>& operator<<(Path<T>& poly, const Point<T2>& p)
-  {
-    poly.emplace_back(p);
-    return poly;
-  }
-
-  template <typename T>
-  Paths<T>& operator<<(Paths<T>& polys, const Path<T>& p)
-  {
-    polys.emplace_back(p);
-    return polys;
-  }
-
   using Path64 = Path<int64_t>;
   using PathD = Path<double>;
   using Paths64 = std::vector< Path64>;
@@ -370,13 +356,13 @@ namespace Clipper2Lib {
       bottom *= scale;
     }
 
-    bool IsEmpty() const { return bottom <= top || right <= left; }
+    bool IsEmpty() const { return bottom <= top || right <= left; };
 
     bool Intersects(const Rect<T>& rec) const
     {
       return ((std::max)(left, rec.left) <= (std::min)(right, rec.right)) &&
         ((std::max)(top, rec.top) <= (std::min)(bottom, rec.bottom));
-    }
+    };
 
     bool operator==(const Rect<T>& other) const {
       return left == other.left && right == other.right &&
@@ -702,28 +688,29 @@ namespace Clipper2Lib {
     return (x > 0) - (x < 0);
   }
 
-  struct UInt128Struct
+  struct MultiplyUInt64Result
   {
-    const uint64_t lo = 0;
-    const uint64_t hi = 0;
+    const uint64_t result = 0;
+    const uint64_t carry = 0;
 
-    bool operator==(const UInt128Struct& other) const
+    bool operator==(const MultiplyUInt64Result& other) const
     {
-      return lo == other.lo && hi == other.hi;
-    }
-
+      return result == other.result && carry == other.carry;
+    };
   };
 
-  inline UInt128Struct MultiplyUInt64(uint64_t a, uint64_t b) // #834, #835
+  inline MultiplyUInt64Result Multiply(uint64_t a, uint64_t b) // #834, #835
   {
-    // note to self - lamba expressions follow
     const auto lo = [](uint64_t x) { return x & 0xFFFFFFFF; };
     const auto hi = [](uint64_t x) { return x >> 32; };
 
     const uint64_t x1 = lo(a) * lo(b);
     const uint64_t x2 = hi(a) * lo(b) + hi(x1);
     const uint64_t x3 = lo(a) * hi(b) + lo(x2);
-    return { uint64_t(lo(x3) << 32 | lo(x1)), uint64_t(hi(a) * hi(b) + hi(x2) + hi(x3)) };
+    const uint64_t result = lo(x3) << 32 | lo(x1);
+    const uint64_t carry = hi(a) * hi(b) + hi(x2) + hi(x3);
+
+    return { result, carry };
   }
 
   // returns true if (and only if) a * b == c * d
@@ -740,50 +727,14 @@ namespace Clipper2Lib {
     const auto abs_c = static_cast<uint64_t>(std::abs(c));
     const auto abs_d = static_cast<uint64_t>(std::abs(d));
 
-    const auto ab = MultiplyUInt64(abs_a, abs_b);
-    const auto cd = MultiplyUInt64(abs_c, abs_d);
+    const auto abs_ab = Multiply(abs_a, abs_b);
+    const auto abs_cd = Multiply(abs_c, abs_d);
 
     // nb: it's important to differentiate 0 values here from other values
     const auto sign_ab = TriSign(a) * TriSign(b);
     const auto sign_cd = TriSign(c) * TriSign(d);
 
-    return ab == cd && sign_ab == sign_cd;
-#endif
-  }
-
-  template <typename T>
-  inline int CrossProductSign(const Point<T>& pt1, const Point<T>& pt2, const Point<T>& pt3)
-  {
-    const auto a = pt2.x - pt1.x;
-    const auto b = pt3.y - pt2.y;
-    const auto c = pt2.y - pt1.y;
-    const auto d = pt3.x - pt2.x;
-
-#if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX
-    const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b);
-    const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d);
-    if (ab > cd) return 1;
-    else if (ab < cd) return -1;
-    else return 0;
-#else
-    const auto ab = MultiplyUInt64(std::abs(a), std::abs(b));
-    const auto cd = MultiplyUInt64(std::abs(c), std::abs(d));
-
-    const auto sign_ab = TriSign(a) * TriSign(b);
-    const auto sign_cd = TriSign(c) * TriSign(d);
-
-    if (sign_ab == sign_cd)
-    {
-      int result;
-      if (ab.hi == cd.hi)
-      {
-        if (ab.lo == cd.lo) return 0;
-        result = (ab.lo > cd.lo) ? 1 : -1;
-      }
-      else result = (ab.hi > cd.hi) ? 1 : -1;
-      return (sign_ab > 0) ? result : -result;
-    }
-    return (sign_ab > sign_cd) ? 1 : -1;
+    return abs_ab == abs_cd && sign_ab == sign_cd;
 #endif
   }
 
@@ -887,18 +838,14 @@ namespace Clipper2Lib {
     return Area<T>(poly) >= 0;
   }
 
-  // GetLineIntersectPt - a 'true' result is non-parallel. The 'ip' will also
-  // be constrained to seg1. However, it's possible that 'ip' won't be inside
-  // seg2, even when 'ip' hasn't been constrained (ie 'ip' is inside seg1).
-
-#if defined(CLIPPER2_HI_PRECISION) && CLIPPER2_HI_PRECISION
+#if CLIPPER2_HI_PRECISION
   // caution: this will compromise performance
   // https://github.com/AngusJohnson/Clipper2/issues/317#issuecomment-1314023253
   // See also CPP/BenchMark/GetIntersectPtBenchmark.cpp
   #define CC_MIN(x,y) ((x)>(y)?(y):(x))
   #define CC_MAX(x,y) ((x)<(y)?(y):(x))
   template<typename T>
-  inline bool GetLineIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
+  inline bool GetSegmentIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
     const Point<T>& ln2a, const Point<T>& ln2b, Point<T>& ip)
   {
     double ln1dy = static_cast<double>(ln1b.y - ln1a.y);
@@ -944,14 +891,11 @@ namespace Clipper2Lib {
       ip.x = originx + static_cast<T>(hitx);
       ip.y = originy + static_cast<T>(hity);
     }
-#ifdef USINGZ
-    ip.z = 0;
-#endif
     return true;
 }
 #else
   template<typename T>
-  inline bool GetLineIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
+  inline bool GetSegmentIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
     const Point<T>& ln2a, const Point<T>& ln2b, Point<T>& ip)
   {
     // https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection
@@ -969,10 +913,7 @@ namespace Clipper2Lib {
     {
       ip.x = static_cast<T>(ln1a.x + t * dx1);
       ip.y = static_cast<T>(ln1a.y + t * dy1);
-#ifdef USINGZ
-      ip.z = 0;
-#endif
-    }
+  }
     return true;
   }
 #endif
@@ -1008,44 +949,21 @@ namespace Clipper2Lib {
   inline bool SegmentsIntersect(const Point64& seg1a, const Point64& seg1b,
     const Point64& seg2a, const Point64& seg2b, bool inclusive = false)
   {
-    double dy1 = static_cast<double>(seg1b.y - seg1a.y);
-    double dx1 = static_cast<double>(seg1b.x - seg1a.x);
-    double dy2 = static_cast<double>(seg2b.y - seg2a.y);
-    double dx2 = static_cast<double>(seg2b.x - seg2a.x);
-    double cp = dy1 * dx2 - dy2 * dx1;
-    if (cp == 0) return false; // ie parallel segments
-
     if (inclusive)
     {
-      //result **includes** segments that touch at an end point
-      double t = ((seg1a.x - seg2a.x) * dy2 - (seg1a.y - seg2a.y) * dx2);
-      if (t == 0) return true;
-      if (t > 0)
-      {
-        if (cp < 0 || t > cp) return false;
-      }
-      else if (cp > 0 || t < cp) return false; // false when t more neg. than cp
-
-      t = ((seg1a.x - seg2a.x) * dy1 - (seg1a.y - seg2a.y) * dx1);
-      if (t == 0) return true;
-      if (t > 0)  return (cp > 0 && t <= cp);
-      else return (cp < 0 && t >= cp);        // true when t less neg. than cp
+      double res1 = CrossProduct(seg1a, seg2a, seg2b);
+      double res2 = CrossProduct(seg1b, seg2a, seg2b);
+      if (res1 * res2 > 0) return false;
+      double res3 = CrossProduct(seg2a, seg1a, seg1b);
+      double res4 = CrossProduct(seg2b, seg1a, seg1b);
+      if (res3 * res4 > 0) return false;
+      return (res1 || res2 || res3 || res4); // ensures not collinear
     }
-    else
-    {
-      //result **excludes** segments that touch at an end point
-      double t = ((seg1a.x - seg2a.x) * dy2 - (seg1a.y - seg2a.y) * dx2);
-      if (t == 0) return false;
-      if (t > 0)
-      {
-        if (cp < 0 || t >= cp) return false;
-      }
-      else if (cp > 0 || t <= cp ) return false; // false when t more neg. than cp
-
-      t = ((seg1a.x - seg2a.x) * dy1 - (seg1a.y - seg2a.y) * dx1);
-      if (t == 0) return false;
-      if (t > 0)  return (cp > 0 && t < cp);
-      else return (cp < 0 && t > cp); // true when t less neg. than cp
+    else {
+      return (GetSign(CrossProduct(seg1a, seg2a, seg2b)) *
+        GetSign(CrossProduct(seg1b, seg2a, seg2b)) < 0) &&
+        (GetSign(CrossProduct(seg2a, seg1a, seg1b)) *
+          GetSign(CrossProduct(seg2b, seg1a, seg1b)) < 0);
     }
   }
 
@@ -1133,7 +1051,7 @@ namespace Clipper2Lib {
         val = 1 - val; // toggle val
       else
       {
-        int d = CrossProductSign(*prev, *curr, pt);
+        double d = CrossProduct(*prev, *curr, pt);
         if (d == 0) return PointInPolygonResult::IsOn;
         if ((d < 0) == is_above) val = 1 - val;
       }
@@ -1147,7 +1065,7 @@ namespace Clipper2Lib {
       if (curr == cend) curr = cbegin;
       if (curr == cbegin) prev = cend - 1;
       else prev = curr - 1;
-      int d = CrossProductSign(*prev, *curr, pt);
+      double d = CrossProduct(*prev, *curr, pt);
       if (d == 0) return PointInPolygonResult::IsOn;
       if ((d < 0) == is_above) val = 1 - val;
     }

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h

@@ -97,7 +97,7 @@ namespace Clipper2Lib {
 			if (splits) delete splits;
 			// nb: don't delete the split pointers
 			// as these are owned by ClipperBase's outrec_list_
-		}
+		};
 	};
 
 	///////////////////////////////////////////////////////////////////
@@ -160,7 +160,7 @@ namespace Clipper2Lib {
 	struct HorzJoin {
 		OutPt* op1 = nullptr;
 		OutPt* op2 = nullptr;
-		HorzJoin() {}
+		HorzJoin() {};
 		explicit HorzJoin(OutPt* ltr, OutPt* rtl) : op1(ltr), op2(rtl) { }
 	};
 
@@ -280,11 +280,11 @@ namespace Clipper2Lib {
 		void AddPaths(const Paths64& paths, PathType polytype, bool is_open);
 	public:
 		virtual ~ClipperBase();
-		int ErrorCode() const { return error_code_; }
-		void PreserveCollinear(bool val) { preserve_collinear_ = val; }
-		bool PreserveCollinear() const { return preserve_collinear_;}
-		void ReverseSolution(bool val) { reverse_solution_ = val; }
-		bool ReverseSolution() const { return reverse_solution_; }
+		int ErrorCode() const { return error_code_; };
+		void PreserveCollinear(bool val) { preserve_collinear_ = val; };
+		bool PreserveCollinear() const { return preserve_collinear_;};
+		void ReverseSolution(bool val) { reverse_solution_ = val; };
+		bool ReverseSolution() const { return reverse_solution_; };
 		void Clear();
 		void AddReuseableData(const ReuseableDataContainer64& reuseable_data);
 #ifdef USINGZ
@@ -304,7 +304,7 @@ namespace Clipper2Lib {
 		PolyPath* parent_;
 	public:
 		PolyPath(PolyPath* parent = nullptr): parent_(parent){}
-		virtual ~PolyPath() {}
+		virtual ~PolyPath() {};
 		//https://en.cppreference.com/w/cpp/language/rule_of_three
 		PolyPath(const PolyPath&) = delete;
 		PolyPath& operator=(const PolyPath&) = delete;
@@ -352,7 +352,7 @@ namespace Clipper2Lib {
 		explicit PolyPath64(PolyPath64* parent = nullptr) : PolyPath(parent) {}
 		explicit PolyPath64(PolyPath64* parent, const Path64& path) : PolyPath(parent) { polygon_ = path; }
 
-		~PolyPath64() override {
+		~PolyPath64() {
 			childs_.resize(0);
 		}
 
@@ -384,7 +384,7 @@ namespace Clipper2Lib {
 			return childs_.size();
 		}
 
-		const Path64& Polygon() const { return polygon_; }
+		const Path64& Polygon() const { return polygon_; };
 
 		double Area() const
 		{
@@ -418,7 +418,7 @@ namespace Clipper2Lib {
 			polygon_ = path;
 		}
 
-		~PolyPathD() override {
+		~PolyPathD() {
 			childs_.resize(0);
 		}
 
@@ -458,7 +458,7 @@ namespace Clipper2Lib {
 			return childs_.size();
 		}
 
-		const PathD& Polygon() const { return polygon_; }
+		const PathD& Polygon() const { return polygon_; };
 
 		double Area() const
 		{
@@ -548,7 +548,7 @@ namespace Clipper2Lib {
 		}
 
 #ifdef USINGZ
-		void SetZCallback(ZCallbackD cb) { zCallbackD_ = cb; }
+		void SetZCallback(ZCallbackD cb) { zCallbackD_ = cb; };
 
 		void ZCB(const Point64& e1bot, const Point64& e1top,
 			const Point64& e2bot, const Point64& e2top, Point64& pt)
@@ -564,7 +564,7 @@ namespace Clipper2Lib {
 			PointD e2t = PointD(e2top) * invScale_;
 			zCallbackD_(e1b,e1t, e2b, e2t, tmp);
 			pt.z = tmp.z; // only update 'z'
-		}
+		};
 
 		void CheckCallback()
 		{

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h

@@ -116,7 +116,6 @@ the four vertices that define the two segments that are intersecting.
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.offset.h"
 #include "clipper2/clipper.rectclip.h"
-#include "clipper2/clipper.triangulation.h"
 #include <cstdlib>
 
 #ifdef USINGZ
@@ -817,24 +816,6 @@ EXTERN_DLL_EXPORT CPaths64 MinkowskiDiff64(const CPath64& cpattern, const CPath6
   return CreateCPathsFromPathsT(solution);
 }
 
-EXTERN_DLL_EXPORT CPaths64 Triangulate64(const CPaths64 paths, bool use_delaunay)
-{
-  Paths64 pp = ConvertCPathsToPathsT(paths);
-  Paths64 sol;
-  if (Triangulate(pp, sol, use_delaunay) != TriangulateResult::success) return nullptr;
-  return CreateCPathsFromPathsT(sol);
-}
-
-EXTERN_DLL_EXPORT CPathsD TriangulateD(const CPathsD paths, int decimal_precison, bool use_delaunay)
-{
-  if (decimal_precison < -8 || decimal_precison > 8) return nullptr;
-  const double scale = std::pow(10, decimal_precison);
-  Paths64 pp = ConvertCPathsDToPaths64(paths, scale);
-  Paths64 sol;
-  if (Triangulate(pp, sol, use_delaunay) != TriangulateResult::success) return nullptr;
-  return CreateCPathsDFromPaths64(sol, 1 / scale);
-}
-
 #ifdef USINGZ
 typedef void (*DLLZCallback64)(const Point64& e1bot, const Point64& e1top, const Point64& e2bot, const Point64& e2top, Point64& pt);
 typedef void (*DLLZCallbackD)(const PointD& e1bot, const PointD& e1top, const PointD& e2bot, const PointD& e2top, PointD& pt);

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h

@@ -1,8 +1,8 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  5 March 2025                                                    *
+* Date      :  27 April 2024                                                   *
 * Website   :  https://www.angusj.com                                          *
-* Copyright :  Angus Johnson 2010-2025                                         *
+* Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  This module provides a simple interface to the Clipper Library  *
 * License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
@@ -13,9 +13,8 @@
 #include "clipper2/clipper.core.h"
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.offset.h"
-#include "clipper2/clipper.rectclip.h"
 #include "clipper2/clipper.minkowski.h"
-#include "clipper2/clipper.triangulation.h"
+#include "clipper2/clipper.rectclip.h"
 #include <type_traits>
 
 #ifdef USINGZ
@@ -138,7 +137,7 @@
     JoinType jt, EndType et, double miter_limit = 2.0,
     double arc_tolerance = 0.0)
   {
-    if (delta==0.0) return paths;
+    if (!delta) return paths;
     ClipperOffset clip_offset(miter_limit, arc_tolerance);
     clip_offset.AddPaths(paths, jt, et);
     Paths64 solution;
@@ -152,10 +151,10 @@
   {
     int error_code = 0;
     CheckPrecisionRange(precision, error_code);
-    if (delta==0.0) return paths;
+    if (!delta) return paths;
     if (error_code) return PathsD();
     const double scale = std::pow(10, precision);
-    ClipperOffset clip_offset(miter_limit, arc_tolerance * scale);
+    ClipperOffset clip_offset(miter_limit, arc_tolerance);
     clip_offset.AddPaths(ScalePaths<int64_t,double>(paths, scale, error_code), jt, et);
     if (error_code) return PathsD();
     Paths64 solution;
@@ -356,29 +355,6 @@
 #endif
     }
 
-    inline size_t GetNext(size_t current, size_t high,
-      const std::vector<bool>& flags)
-    {
-      ++current;
-      while (current <= high && flags[current]) ++current;
-      if (current <= high) return current;
-      current = 0;
-      while (flags[current]) ++current;
-      return current;
-    }
-
-    inline size_t GetPrior(size_t current, size_t high,
-      const std::vector<bool>& flags)
-    {
-      if (current == 0) current = high;
-      else --current;
-      while (current > 0 && flags[current]) --current;
-      if (!flags[current]) return current;
-      current = high;
-      while (flags[current]) --current;
-      return current;
-    }
-
   } // end details namespace
 
   inline std::ostream& operator<< (std::ostream& os, const PolyTree64& pp)
@@ -639,6 +615,29 @@
     return result;
   }
 
+  inline size_t GetNext(size_t current, size_t high,
+    const std::vector<bool>& flags)
+  {
+    ++current;
+    while (current <= high && flags[current]) ++current;
+    if (current <= high) return current;
+    current = 0;
+    while (flags[current]) ++current;
+    return current;
+  }
+
+  inline size_t GetPrior(size_t current, size_t high,
+    const std::vector<bool>& flags)
+  {
+    if (current == 0) current = high;
+    else --current;
+    while (current > 0 && flags[current]) --current;
+    if (!flags[current]) return current;
+    current = high;
+    while (flags[current]) --current;
+    return current;
+  }
+
   template <typename T>
   inline Path<T> SimplifyPath(const Path<T> &path,
     double epsilon, bool isClosedPath = true)
@@ -670,13 +669,13 @@
         start = curr;
         do
         {
-          curr = details::GetNext(curr, high, flags);
+          curr = GetNext(curr, high, flags);
         } while (curr != start && distSqr[curr] > epsSqr);
         if (curr == start) break;
       }
 
-      prior = details::GetPrior(curr, high, flags);
-      next = details::GetNext(curr, high, flags);
+      prior = GetPrior(curr, high, flags);
+      next = GetNext(curr, high, flags);
       if (next == prior) break;
 
       // flag for removal the smaller of adjacent 'distances'
@@ -685,14 +684,14 @@
         prior2 = prior;
         prior = curr;
         curr = next;
-        next = details::GetNext(next, high, flags);
+        next = GetNext(next, high, flags);
       }
       else
-        prior2 = details::GetPrior(prior, high, flags);
+        prior2 = GetPrior(prior, high, flags);
 
       flags[curr] = true;
       curr = next;
-      next = details::GetNext(next, high, flags);
+      next = GetNext(next, high, flags);
 
       if (isClosedPath || ((curr != high) && (curr != 0)))
         distSqr[curr] = PerpendicDistFromLineSqrd(path[curr], path[prior], path[next]);
@@ -717,35 +716,6 @@
     return result;
   }
 
-
-  template <typename T>
-  inline bool Path2ContainsPath1(const Path<T>& path1, const Path<T>& path2)
-  {
-    // precondition: paths must not intersect, except for
-    // transient (and presumed 'micro') path intersections
-    PointInPolygonResult pip = PointInPolygonResult::IsOn;
-    for (const Point<T>& pt : path1)
-    {
-      switch (PointInPolygon(pt, path2))
-      {
-      case PointInPolygonResult::IsOutside:
-        if (pip == PointInPolygonResult::IsOutside) return false;
-        pip = PointInPolygonResult::IsOutside;
-        break;
-      case PointInPolygonResult::IsInside:
-        if (pip == PointInPolygonResult::IsInside) return true;
-        pip = PointInPolygonResult::IsInside;
-        break;
-      default:
-        break;
-      }
-    }
-    if (pip != PointInPolygonResult::IsInside) return false;
-    // result is likely true but check midpoint
-    Point<T> mp1 = GetBounds(path1).MidPoint();
-    return PointInPolygon(mp1, path2) == PointInPolygonResult::IsInside;
-  }
-
   template <typename T>
   inline void RDP(const Path<T> path, std::size_t begin,
     std::size_t end, double epsSqrd, std::vector<bool>& flags)

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h

@@ -63,7 +63,7 @@ namespace Clipper2Lib {
             quad.emplace_back(tmp[i][h]);
             quad.emplace_back(tmp[i][j]);
             quad.emplace_back(tmp[g][j]);
-          }
+          };
           if (!IsPositive(quad))
             std::reverse(quad.begin(), quad.end());
           result.emplace_back(std::move(quad));

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h

@@ -39,7 +39,7 @@ private:
 	class Group {
 	public:
 		Paths64 paths_in;
-    std::optional<size_t> lowest_path_idx{};
+        std::optional<size_t> lowest_path_idx{};
 		bool is_reversed = false;
 		JoinType join_type;
 		EndType end_type;
@@ -92,14 +92,14 @@ public:
 		bool reverse_solution = false) :
 		miter_limit_(miter_limit), arc_tolerance_(arc_tolerance),
 		preserve_collinear_(preserve_collinear),
-		reverse_solution_(reverse_solution) { }
+		reverse_solution_(reverse_solution) { };
 
-	~ClipperOffset() { Clear(); }
+	~ClipperOffset() { Clear(); };
 
-	int ErrorCode() const { return error_code_; }
+	int ErrorCode() const { return error_code_; };
 	void AddPath(const Path64& path, JoinType jt_, EndType et_);
 	void AddPaths(const Paths64& paths, JoinType jt_, EndType et_);
-	void Clear() { groups_.clear(); norms.clear(); }
+	void Clear() { groups_.clear(); norms.clear(); };
 
 	void Execute(double delta, Paths64& sols_64);
 	void Execute(double delta, PolyTree64& polytree);

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h

@@ -75,7 +75,7 @@ namespace Clipper2Lib {
     void ExecuteInternal(const Path64& path);
     Path64 GetPath(OutPt2*& op);
   public:
-    explicit RectClipLines64(const Rect64& rect) : RectClip64(rect) {}
+    explicit RectClipLines64(const Rect64& rect) : RectClip64(rect) {};
     Paths64 Execute(const Paths64& paths);
   };
 

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.triangulation.h

@@ -1,30 +0,0 @@
-/*******************************************************************************
-* Author    :  Angus Johnson                                                   *
-* Date      :  6 December 2025                                                 *
-* Release   :  BETA RELEASE                                                    *
-* Website   :  https://www.angusj.com                                          *
-* Copyright :  Angus Johnson 2010-2025                                         *
-* Purpose   :  Delaunay Triangulation                                          *
-* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
-*******************************************************************************/
-
-#ifndef CLIPPER_TRIANGULATION_H
-#define CLIPPER_TRIANGULATION_H
-
-#include <stack>
-#include "clipper2/clipper.core.h"
-
-#ifdef USINGZ
-namespace Clipper2Lib_Z {
-#else
-namespace Clipper2Lib {
-#endif
-
-  enum class TriangulateResult { success, fail, no_polygons, paths_intersect };
-
-  // Triangulate - this function will not accept intesecting paths
-  TriangulateResult Triangulate(const Paths64& pp, Paths64& solution, bool useDelaunay = true);
-  TriangulateResult Triangulate(const PathsD& pp, int decPlaces, PathsD& solution, bool useDelaunay = true);
-
-} // Clipper2Lib namespace
-#endif  // CLIPPER_TRIANGULATION_H

deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h

@@ -1,6 +1,6 @@
 #ifndef CLIPPER_VERSION_H
 #define CLIPPER_VERSION_H
 
-constexpr auto CLIPPER2_VERSION = "2.0.1";
+constexpr auto CLIPPER2_VERSION = "1.5.2";
 
 #endif  // CLIPPER_VERSION_H

deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp

@@ -1,8 +1,8 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  21 February 2026                                                *
+* Date      :  17 September 2024                                               *
 * Website   :  https://www.angusj.com                                          *
-* Copyright :  Angus Johnson 2010-2026                                         *
+* Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  This is the main polygon clipping module                        *
 * License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
@@ -482,7 +482,8 @@ namespace Clipper2Lib {
   inline void SetOwner(OutRec* outrec, OutRec* new_owner)
   {
     //precondition1: new_owner is never null
-    new_owner->owner = GetRealOutRec(new_owner->owner);
+    while (new_owner->owner && !new_owner->owner->pts)
+      new_owner->owner = new_owner->owner->owner;
     OutRec* tmp = new_owner;
     while (tmp && tmp != outrec) tmp = tmp->owner;
     if (tmp) new_owner->owner = outrec->owner;
@@ -535,9 +536,9 @@ namespace Clipper2Lib {
         val = 1 - val; // toggle val
       else
       {
-        int i = CrossProductSign(op2->prev->pt, op2->pt, pt);
-        if (i == 0) return PointInPolygonResult::IsOn;
-        if ((i < 0) == is_above) val = 1 - val;
+        double d = CrossProduct(op2->prev->pt, op2->pt, pt);
+        if (d == 0) return PointInPolygonResult::IsOn;
+        if ((d < 0) == is_above) val = 1 - val;
       }
       is_above = !is_above;
       op2 = op2->next;
@@ -545,9 +546,9 @@ namespace Clipper2Lib {
 
     if (is_above != starting_above)
     {
-      int i = CrossProductSign(op2->prev->pt, op2->pt, pt);
-      if (i == 0) return PointInPolygonResult::IsOn;
-      if ((i < 0) == is_above) val = 1 - val;
+      double d = CrossProduct(op2->prev->pt, op2->pt, pt);
+      if (d == 0) return PointInPolygonResult::IsOn;
+      if ((d < 0) == is_above) val = 1 - val;
     }
 
     if (val == 0) return PointInPolygonResult::IsOutside;
@@ -577,31 +578,30 @@ namespace Clipper2Lib {
     return result;
   }
 
-  inline bool Path2ContainsPath1(OutPt* op1, OutPt* op2)
+  inline bool Path1InsidePath2(OutPt* op1, OutPt* op2)
   {
-    // this function accommodates rounding errors that
-    // can cause path micro intersections
-    PointInPolygonResult pip = PointInPolygonResult::IsOn;
+    // we need to make some accommodation for rounding errors
+    // so we won't jump if the first vertex is found outside
+    PointInPolygonResult result;
+    int outside_cnt = 0;
     OutPt* op = op1;
-    do {
-      switch (PointInOpPolygon(op->pt, op2))
-      {
-      case PointInPolygonResult::IsOutside:
-        if (pip == PointInPolygonResult::IsOutside) return false;
-        pip = PointInPolygonResult::IsOutside;
-        break;
-      case PointInPolygonResult::IsInside:
-        if (pip == PointInPolygonResult::IsInside) return true;
-        pip = PointInPolygonResult::IsInside;
-        break;
-      default: break;
-      }
+    do
+    {
+      result = PointInOpPolygon(op->pt, op2);
+      if (result == PointInPolygonResult::IsOutside) ++outside_cnt;
+      else if (result == PointInPolygonResult::IsInside) --outside_cnt;
       op = op->next;
-    } while (op != op1);
-    // result unclear, so try again using cleaned paths
-    return Path2ContainsPath1(GetCleanPath(op1), GetCleanPath(op2)); // (#973)
+    } while (op != op1 && std::abs(outside_cnt) < 2);
+    if (std::abs(outside_cnt) > 1) return (outside_cnt < 0);
+    // since path1's location is still equivocal, check its midpoint
+    Point64 mp = GetBounds(GetCleanPath(op1)).MidPoint();
+    Path64 path2 = GetCleanPath(op2);
+    return PointInPolygon(mp, path2) != PointInPolygonResult::IsOutside;
   }
 
+  //------------------------------------------------------------------------------
+  //------------------------------------------------------------------------------
+
   void AddLocMin(LocalMinimaList& list,
     Vertex& vert, PathType polytype, bool is_open)
   {
@@ -621,7 +621,7 @@ namespace Clipper2Lib {
         {return a + path.size(); });
     if (total_vertex_count == 0) return;
 
-    Vertex* allVertices = new Vertex[total_vertex_count], * v = allVertices;
+    Vertex* vertices = new Vertex[total_vertex_count], * v = vertices;
     for (const Path64& path : paths)
     {
       //for each path create a circular double linked list of vertices
@@ -713,7 +713,7 @@ namespace Clipper2Lib {
       }
     } // end processing current path
 
-    vertexLists.emplace_back(allVertices);
+    vertexLists.emplace_back(vertices);
   }
 
   //------------------------------------------------------------------------------
@@ -1126,19 +1126,21 @@ namespace Clipper2Lib {
         return newcomer.curr_x > resident.curr_x;
 
     //get the turning direction  a1.top, a2.bot, a2.top
-    int i = CrossProductSign(resident.top, newcomer.bot, newcomer.top);
-    if (i != 0) return i < 0;
+    double d = CrossProduct(resident.top, newcomer.bot, newcomer.top);
+    if (d != 0) return d < 0;
 
     //edges must be collinear to get here
     //for starting open paths, place them according to
     //the direction they're about to turn
     if (!IsMaxima(resident) && (resident.top.y > newcomer.top.y))
     {
-      return (CrossProductSign(newcomer.bot, resident.top, NextVertex(resident)->pt) <= 0);
+      return CrossProduct(newcomer.bot,
+        resident.top, NextVertex(resident)->pt) <= 0;
     }
     else if (!IsMaxima(newcomer) && (newcomer.top.y > resident.top.y))
     {
-      return (CrossProductSign(newcomer.bot, newcomer.top, NextVertex(newcomer)->pt) >= 0);
+      return CrossProduct(newcomer.bot,
+        newcomer.top, NextVertex(newcomer)->pt) >= 0;
     }
 
     int64_t y = newcomer.bot.y;
@@ -1153,7 +1155,7 @@ namespace Clipper2Lib {
       resident.bot, resident.top)) return true;
     else
       //compare turning direction of the alternate bound
-      return (CrossProductSign(PrevPrevVertex(resident)->pt,
+      return (CrossProduct(PrevPrevVertex(resident)->pt,
         newcomer.bot, PrevPrevVertex(newcomer)->pt) > 0) == newcomerIsLeft;
   }
 
@@ -1563,7 +1565,7 @@ namespace Clipper2Lib {
     FixSelfIntersects(outrec);
   }
 
-  void ClipperBase::DoSplitOp (OutRec* outrec, OutPt* splitOp)
+  void ClipperBase::DoSplitOp(OutRec* outrec, OutPt* splitOp)
   {
     // splitOp.prev -> splitOp &&
     // splitOp.next -> splitOp.next.next are intersecting
@@ -1572,7 +1574,7 @@ namespace Clipper2Lib {
     outrec->pts = prevOp;
 
     Point64 ip;
-    GetLineIntersectPt(prevOp->pt, splitOp->pt,
+    GetSegmentIntersectPt(prevOp->pt, splitOp->pt,
       splitOp->next->pt, nextNextOp->pt, ip);
 
 #ifdef USINGZ
@@ -1628,7 +1630,7 @@ namespace Clipper2Lib {
 
       if (using_polytree_)
       {
-        if (Path2ContainsPath1(prevOp, newOp))
+        if (Path1InsidePath2(prevOp, newOp))
         {
           newOr->splits = new OutRecList();
           newOr->splits->emplace_back(outrec);
@@ -1650,10 +1652,10 @@ namespace Clipper2Lib {
   void ClipperBase::FixSelfIntersects(OutRec* outrec)
   {
     OutPt* op2 = outrec->pts;
-    if (op2->prev == op2->next->next)
-      return; // because triangles can't self-intersect
     for (; ; )
     {
+      // triangles can't self-intersect
+      if (op2->prev == op2->next->next) break;
       if (SegmentsIntersect(op2->prev->pt,
         op2->pt, op2->next->pt, op2->next->next->pt))
       {
@@ -1662,8 +1664,6 @@ namespace Clipper2Lib {
         DoSplitOp(outrec, op2);
         if (!outrec->pts) break;
         op2 = outrec->pts;
-        if (op2->prev == op2->next->next)
-          break; // again, because triangles can't self-intersect
         continue;
       }
       else
@@ -2112,9 +2112,10 @@ namespace Clipper2Lib {
       e->prev_in_sel = e->prev_in_ael;
       e->next_in_sel = e->next_in_ael;
       e->jump = e->next_in_sel;
-      // it is safe to ignore 'joined' edges here because
-      // if necessary they will be split in IntersectEdges()
-      e->curr_x = TopX(*e, top_y);
+      if (e->join_with == JoinWith::Left)
+        e->curr_x = e->prev_in_ael->curr_x; // also avoids complications
+      else
+        e->curr_x = TopX(*e, top_y);
       e = e->next_in_ael;
     }
   }
@@ -2261,14 +2262,15 @@ namespace Clipper2Lib {
 
   void MoveSplits(OutRec* fromOr, OutRec* toOr)
   {
+    if (!fromOr->splits) return;
     if (!toOr->splits) toOr->splits = new OutRecList();
     OutRecList::iterator orIter = fromOr->splits->begin();
     for (; orIter != fromOr->splits->end(); ++orIter)
-      if (toOr != *orIter) // #987
-        toOr->splits->emplace_back(*orIter);
+      toOr->splits->emplace_back(*orIter);
     fromOr->splits->clear();
   }
 
+
   void ClipperBase::ProcessHorzJoins()
   {
     for (const HorzJoin& j : horz_join_list_)
@@ -2298,7 +2300,7 @@ namespace Clipper2Lib {
 
         if (using_polytree_) //#498, #520, #584, D#576, #618
         {
-          if (Path2ContainsPath1(or1->pts, or2->pts))
+          if (Path1InsidePath2(or1->pts, or2->pts))
           {
             //swap or1's & or2's pts
             OutPt* tmp = or1->pts;
@@ -2309,7 +2311,7 @@ namespace Clipper2Lib {
             //or2 is now inside or1
             or2->owner = or1;
           }
-          else if (Path2ContainsPath1(or2->pts, or1->pts))
+          else if (Path1InsidePath2(or2->pts, or1->pts))
           {
             or2->owner = or1;
           }
@@ -2322,14 +2324,13 @@ namespace Clipper2Lib {
         else
           or2->owner = or1;
       }
-      else // joining, not splitting
+      else
       {
         or2->pts = nullptr;
         if (using_polytree_)
         {
           SetOwner(or2, or1);
-          if (or2->splits)
-            MoveSplits(or2, or1); //#618
+          MoveSplits(or2, or1); //#618
         }
         else
           or2->owner = or1;
@@ -2349,7 +2350,7 @@ namespace Clipper2Lib {
   void ClipperBase::AddNewIntersectNode(Active& e1, Active& e2, int64_t top_y)
   {
     Point64 ip;
-    if (!GetLineIntersectPt(e1.bot, e1.top, e2.bot, e2.top, ip))
+    if (!GetSegmentIntersectPt(e1.bot, e1.top, e2.bot, e2.top, ip))
       ip = Point64(e1.curr_x, top_y); //parallel edges
 
     //rounding errors can occasionally place the calculated intersection
@@ -2933,28 +2934,22 @@ namespace Clipper2Lib {
 
   bool ClipperBase::CheckSplitOwner(OutRec* outrec, OutRecList* splits)
   {
-    // nb: use indexing (not an iterator) in case 'splits' is modified inside this loop (#1029)
-    for (size_t idx = 0; idx < splits->size(); ++idx)
+    for (auto split : *splits)
     {
-      OutRec* split = (*splits)[idx];
-      if (!split->pts && split->splits &&
-        CheckSplitOwner(outrec, split->splits)) return true; //#942
       split = GetRealOutRec(split);
-      if (!split || split == outrec || split->recursive_split == outrec) continue;
+      if(!split || split == outrec || split->recursive_split == outrec) continue;
       split->recursive_split = outrec; // prevent infinite loops
 
       if (split->splits && CheckSplitOwner(outrec, split->splits))
+          return true;
+      else if (CheckBounds(split) &&
+        IsValidOwner(outrec, split) &&
+        split->bounds.Contains(outrec->bounds) &&
+        Path1InsidePath2(outrec->pts, split->pts))
+      {
+        outrec->owner = split; //found in split
         return true;
-
-      if (!CheckBounds(split) || !split->bounds.Contains(outrec->bounds) ||
-        !Path2ContainsPath1(outrec->pts, split->pts)) continue;
-
-      if (!IsValidOwner(outrec, split)) // split is owned by outrec! (#957)
-          split->owner = outrec->owner;
-
-      outrec->owner = split;
-      return true;
-
+      }
     }
     return false;
   }
@@ -2965,12 +2960,13 @@ namespace Clipper2Lib {
     // post-condition: if a valid path, outrec will have a polypath
 
     if (outrec->polypath || outrec->bounds.IsEmpty()) return;
+
     while (outrec->owner)
     {
       if (outrec->owner->splits && CheckSplitOwner(outrec, outrec->owner->splits)) break;
       if (outrec->owner->pts && CheckBounds(outrec->owner) &&
         outrec->owner->bounds.Contains(outrec->bounds) &&
-        Path2ContainsPath1(outrec->pts, outrec->owner->pts)) break;
+        Path1InsidePath2(outrec->pts, outrec->owner->pts)) break;
       outrec->owner = outrec->owner->owner;
     }
 
@@ -3033,7 +3029,6 @@ namespace Clipper2Lib {
     {
       OutRec* outrec = outrec_list_[i];
       if (!outrec || !outrec->pts) continue;
-
       if (outrec->is_open)
       {
         Path64 path;

deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp

@@ -1,6 +1,6 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  11 October 2025                                                 *
+* Date      :  22 January 2025                                                 *
 * Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2025                                         *
 * Purpose   :  Path Offset (Inflate/Shrink)                                    *
@@ -37,28 +37,22 @@ const double arc_const = 0.002; // <-- 1/500
 // Miscellaneous methods
 //------------------------------------------------------------------------------
 
-void GetLowestClosedPathInfo(const Paths64& paths, std::optional<size_t>& idx, bool& is_neg_area)
+std::optional<size_t> GetLowestClosedPathIdx(const Paths64& paths)
 {
-	idx.reset();
+    std::optional<size_t> result;
 	Point64 botPt = Point64(INT64_MAX, INT64_MIN);
 	for (size_t i = 0; i < paths.size(); ++i)
 	{
-		double a = MAX_DBL;
 		for (const Point64& pt : paths[i])
 		{
 			if ((pt.y < botPt.y) ||
 				((pt.y == botPt.y) && (pt.x >= botPt.x))) continue;
-			if (a == MAX_DBL)
-			{
-				a = Area(paths[i]);
-				if (a == 0) break; // invalid closed path, so break from inner loop
-				is_neg_area = a < 0;
-			}
-      idx = i;
+            result = i;
 			botPt.x = pt.x;
 			botPt.y = pt.y;
 		}
 	}
+	return result;
 }
 
 inline double Hypot(double x, double y)
@@ -151,16 +145,15 @@ ClipperOffset::Group::Group(const Paths64& _paths, JoinType _join_type, EndType
 
 	if (end_type == EndType::Polygon)
 	{
-		bool is_neg_area;
-		GetLowestClosedPathInfo(paths_in, lowest_path_idx, is_neg_area);
+		lowest_path_idx = GetLowestClosedPathIdx(paths_in);
 		// the lowermost path must be an outer path, so if its orientation is negative,
 		// then flag the whole group is 'reversed' (will negate delta etc.)
 		// as this is much more efficient than reversing every path.
-    is_reversed = lowest_path_idx.has_value() && is_neg_area;
+    is_reversed = (lowest_path_idx.has_value()) && Area(paths_in[lowest_path_idx.value()]) < 0;
 	}
 	else
 	{
-    lowest_path_idx.reset();
+    lowest_path_idx = std::nullopt;
 		is_reversed = false;
 	}
 }
@@ -243,7 +236,7 @@ void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k)
 	{
 		PointD pt4 = PointD(pt3.x + vec.x * group_delta_, pt3.y + vec.y * group_delta_);
 		PointD pt = ptQ;
-		GetLineIntersectPt(pt1, pt2, pt3, pt4, pt);
+		GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt);
 		//get the second intersect point through reflecion
         path_out.emplace_back(ReflectPoint(pt, ptQ));
         path_out.emplace_back(pt);
@@ -252,7 +245,7 @@ void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k)
 	{
 		PointD pt4 = GetPerpendicD(path[j], norms[k], group_delta_);
 		PointD pt = ptQ;
-		GetLineIntersectPt(pt1, pt2, pt3, pt4, pt);
+		GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt);
         path_out.emplace_back(pt);
 		//get the second intersect point through reflecion
         path_out.emplace_back(ReflectPoint(pt, ptQ));
@@ -608,10 +601,10 @@ void ClipperOffset::ExecuteInternal(double delta)
 
 	if (!solution->size()) return;
 
-	bool paths_reversed = CheckReverseOrientation();
+		bool paths_reversed = CheckReverseOrientation();
 	//clean up self-intersections ...
 	Clipper64 c;
-	c.PreserveCollinear(preserve_collinear_);
+	c.PreserveCollinear(false);
 	//the solution should retain the orientation of the input
 	c.ReverseSolution(reverse_solution_ != paths_reversed);
 #ifdef USINGZ

deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp

@@ -1,8 +1,8 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  11 October 2025                                                 *
+* Date      :  5 July 2024                                                     *
 * Website   :  https://www.angusj.com                                          *
-* Copyright :  Angus Johnson 2010-2025                                         *
+* Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  FAST rectangular clipping                                       *
 * License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
@@ -77,8 +77,8 @@ namespace Clipper2Lib {
   bool GetSegmentIntersection(const Point64& p1,
     const Point64& p2, const Point64& p3, const Point64& p4, Point64& ip)
   {
-    int res1 = CrossProductSign(p1, p3, p4);
-    int res2 = CrossProductSign(p2, p3, p4);
+    double res1 = CrossProduct(p1, p3, p4);
+    double res2 = CrossProduct(p2, p3, p4);
     if (res1 == 0)
     {
       ip = p1;
@@ -97,8 +97,8 @@ namespace Clipper2Lib {
     }
     if ((res1 > 0) == (res2 > 0)) return false;
 
-    int res3 = CrossProductSign(p3, p1, p2);
-    int res4 = CrossProductSign(p4, p1, p2);
+    double res3 = CrossProduct(p3, p1, p2);
+    double res4 = CrossProduct(p4, p1, p2);
     if (res3 == 0)
     {
       ip = p3;
@@ -116,7 +116,7 @@ namespace Clipper2Lib {
     if ((res3 > 0) == (res4 > 0)) return false;
 
     // segments must intersect to get here
-    return GetLineIntersectPt(p1, p2, p3, p4, ip);
+    return GetSegmentIntersectPt(p1, p2, p3, p4, ip);
   }
 
   inline bool GetIntersection(const Path64& rectPath,
@@ -227,7 +227,7 @@ namespace Clipper2Lib {
     const Point64& prev_pt, const Point64& curr_pt, const Point64& rect_mp)
   {
     if (AreOpposites(prev, curr))
-      return CrossProductSign(prev_pt, rect_mp, curr_pt) < 0;
+      return CrossProduct(prev_pt, rect_mp, curr_pt) < 0;
     else
       return HeadingClockwise(prev, curr);
   }

deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp

@@ -6,4 +6,3 @@
 #include "clipper.engine.cpp"
 #include "clipper.offset.cpp"
 #include "clipper.rectclip.cpp"
-#include "clipper.triangulation.cpp"

deps_src/colorsolver/CMakeLists.txt

@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-project(colorsolver)
-
-add_library(colorsolver STATIC
-    ColorSolver.cpp
-    ColorSolver.hpp
-)
-
-target_include_directories(colorsolver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_features(colorsolver PUBLIC cxx_std_17)
-target_link_libraries(colorsolver PUBLIC pigment_painter prusa_fdm_mixer)

deps_src/colorsolver/ColorSolver.hpp

@@ -1,243 +0,0 @@
-// ColorSolver
-// Copyright (C) 2026 sentientstardust
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef slic3r_ColorSolver_hpp_
-#define slic3r_ColorSolver_hpp_
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <vector>
-
-namespace Slic3r {
-
-enum class ColorSolverMixModel : int
-{
-    PigmentPainter = 0,
-    PrusaFdmMixer = 1
-};
-
-enum class ColorSolverLookupMode : int
-{
-    ClosestMix = 0,
-    BlendClosestTwo = 1
-};
-
-enum class ColorSolverMode : int
-{
-    RGB = 0,
-    Oklab = 1,
-    OklabSoftCap4Dark4 = 2
-};
-
-enum class ColorSolverStackComponentRole : uint8_t
-{
-    Generic = 0,
-    Cyan = 1,
-    Magenta = 2,
-    Yellow = 3,
-    Black = 4,
-    White = 5
-};
-
-enum class ColorSolverCalibratedStackModelKind : uint8_t
-{
-    None = 0,
-    CurrentLinearAffine = 1,
-    AlphaEffective = 2,
-    DepthKernelLinear = 3,
-    NearestMeasuredSample = 4
-};
-
-struct ColorSolverCalibratedStackModel {
-    ColorSolverCalibratedStackModelKind kind { ColorSolverCalibratedStackModelKind::None };
-    size_t component_count { 0 };
-    int measured_stack_depth { 0 };
-    std::vector<float> measured_layer_heights_mm;
-    std::vector<float> alphas;
-    std::vector<float> taus;
-    std::vector<float> coefficients_linear_rgb;
-    std::vector<float> measured_sample_rgbs;
-    std::vector<uint16_t> measured_sample_stacks;
-    mutable std::string cached_key;
-
-    bool valid() const;
-    std::string cache_key() const;
-};
-
-struct ColorSolverCandidateSet {
-    struct KdNode {
-        uint32_t candidate_idx { 0 };
-        int      left { -1 };
-        int      right { -1 };
-        uint8_t  axis { 0 };
-    };
-
-    size_t component_count { 0 };
-    std::vector<float> rgbs;
-    std::vector<float> perceptual_coords;
-    std::vector<float> weights;
-    std::vector<KdNode> kd_nodes;
-    std::vector<KdNode> perceptual_kd_nodes;
-    int kd_root { -1 };
-    int perceptual_kd_root { -1 };
-
-    bool empty() const
-    {
-        return component_count == 0 || rgbs.empty() || rgbs.size() % 3 != 0 ||
-               weights.size() != (rgbs.size() / 3) * component_count;
-    }
-};
-
-using ColorSolverCandidateCache = std::map<std::string, ColorSolverCandidateSet>;
-
-struct ColorSolverOrderedStackCandidateSet {
-    using KdNode = ColorSolverCandidateSet::KdNode;
-
-    size_t component_count { 0 };
-    int stack_depth { 0 };
-    int simulated_stack_depth { 0 };
-    std::vector<float> rgbs;
-    std::vector<float> perceptual_coords;
-    std::vector<uint16_t> stacks;
-    std::vector<KdNode> kd_nodes;
-    std::vector<KdNode> perceptual_kd_nodes;
-    int kd_root { -1 };
-    int perceptual_kd_root { -1 };
-
-    bool empty() const
-    {
-        return component_count == 0 || stack_depth <= 0 || rgbs.empty() || rgbs.size() % 3 != 0 ||
-               stacks.size() != (rgbs.size() / 3) * size_t(stack_depth);
-    }
-};
-
-struct ColorSolverOrderedStackResult {
-    std::vector<uint16_t> surface_to_deep;
-    std::array<float, 3> rgb { { 0.f, 0.f, 0.f } };
-    bool has_rgb { false };
-};
-
-using ColorSolverOrderedStackCandidateCache = std::map<std::string, ColorSolverOrderedStackCandidateSet>;
-
-ColorSolverMixModel color_solver_mix_model_from_index(int model);
-ColorSolverLookupMode color_solver_lookup_mode_from_index(int mode);
-ColorSolverMode color_solver_mode_from_index(int mode);
-
-int color_solver_total_units_for_component_count(size_t component_count);
-size_t color_solver_candidate_count(size_t component_count, int total_units);
-
-std::array<float, 3> mix_color_solver_components(const std::vector<std::array<float, 3>> &component_colors,
-                                                 const std::vector<int>                  &weights,
-                                                 ColorSolverMixModel                       mix_model);
-std::array<float, 3> mix_color_solver_components(const std::vector<std::array<float, 3>> &component_colors,
-                                                 const std::vector<float>                &weights,
-                                                 ColorSolverMixModel                       mix_model);
-std::array<float, 3> mix_color_solver_ordered_stack(const std::vector<std::array<float, 3>> &component_colors,
-                                                    const std::vector<uint16_t>             &surface_to_deep,
-                                                    const std::vector<float>                &layer_opacities,
-                                                    const std::array<float, 3>              &background_rgb,
-                                                    ColorSolverMixModel                       mix_model,
-                                                    float                                     surface_scatter = 0.f,
-                                                    bool                                      beer_lambert_rgb_correction = false,
-                                                    bool                                      td_effective_alpha_correction = false,
-                                                    const std::vector<ColorSolverStackComponentRole> &component_roles = {},
-                                                    const std::vector<float>                &layer_opacities_by_depth = {},
-                                                    const ColorSolverCalibratedStackModel   *calibrated_stack_model = nullptr,
-                                                    bool                                      adaptive_spectral_correction = false);
-std::array<float, 3> color_solver_oklab_from_srgb(const std::array<float, 3> &rgb);
-std::array<float, 3> color_solver_srgb_from_oklab(const std::array<float, 3> &oklab);
-
-std::string color_solver_candidate_cache_key(const std::vector<std::array<float, 3>> &component_colors,
-                                             ColorSolverMixModel                       mix_model,
-                                             int                                       total_units = 0);
-ColorSolverCandidateSet build_color_solver_candidates(const std::vector<std::array<float, 3>> &component_colors,
-                                                      ColorSolverMixModel                       mix_model,
-                                                      int                                       total_units = 0);
-void build_color_solver_candidate_kd_trees(ColorSolverCandidateSet &candidates);
-const ColorSolverCandidateSet &color_solver_candidates(ColorSolverCandidateCache                &cache,
-                                                       const std::vector<std::array<float, 3>> &component_colors,
-                                                       ColorSolverMixModel                       mix_model,
-                                                       int                                       total_units = 0);
-std::vector<float> solve_color_solver_weights_for_target(const ColorSolverCandidateSet &candidates,
-                                                         const std::array<float, 3>     &target_rgb,
-                                                         ColorSolverLookupMode           lookup_mode,
-                                                         ColorSolverMode                 solver_mode);
-std::string color_solver_ordered_stack_candidate_cache_key(const std::vector<std::array<float, 3>> &component_colors,
-                                                           const std::vector<float>                &layer_opacities,
-                                                           const std::array<float, 3>              &background_rgb,
-                                                           ColorSolverMixModel                       mix_model,
-                                                           int                                       stack_depth,
-                                                           int                                       simulated_stack_depth = 0,
-                                                           size_t                                    candidate_limit = 0,
-                                                           size_t                                    stack_item_limit = 0,
-                                                           float                                     surface_scatter = 0.f,
-                                                           bool                                      beer_lambert_rgb_correction = false,
-                                                           bool                                      td_effective_alpha_correction = false,
-                                                           const std::vector<ColorSolverStackComponentRole> &component_roles = {},
-                                                           bool                                      beam_search_stack_expansion = false,
-                                                           const std::vector<float>                  &layer_opacities_by_depth = {},
-                                                           const ColorSolverCalibratedStackModel     *calibrated_stack_model = nullptr,
-                                                           bool                                      adaptive_spectral_correction = false);
-ColorSolverOrderedStackCandidateSet build_color_solver_ordered_stack_candidates(
-    const std::vector<std::array<float, 3>> &component_colors,
-    const std::vector<float>                &layer_opacities,
-    const std::array<float, 3>              &background_rgb,
-    ColorSolverMixModel                       mix_model,
-    int                                       stack_depth,
-    int                                       simulated_stack_depth = 0,
-    size_t                                    candidate_limit = 0,
-    size_t                                    stack_item_limit = 0,
-    float                                     surface_scatter = 0.f,
-    bool                                      beer_lambert_rgb_correction = false,
-    bool                                      td_effective_alpha_correction = false,
-    const std::vector<ColorSolverStackComponentRole> &component_roles = {},
-    bool                                      beam_search_stack_expansion = false,
-    const std::vector<float>                 &layer_opacities_by_depth = {},
-    const ColorSolverCalibratedStackModel    *calibrated_stack_model = nullptr,
-    bool                                      adaptive_spectral_correction = false);
-const ColorSolverOrderedStackCandidateSet &color_solver_ordered_stack_candidates(
-    ColorSolverOrderedStackCandidateCache        &cache,
-    const std::vector<std::array<float, 3>>      &component_colors,
-    const std::vector<float>                     &layer_opacities,
-    const std::array<float, 3>                   &background_rgb,
-    ColorSolverMixModel                            mix_model,
-    int                                            stack_depth,
-    int                                            simulated_stack_depth = 0,
-    size_t                                         candidate_limit = 0,
-    size_t                                         stack_item_limit = 0,
-    float                                          surface_scatter = 0.f,
-    bool                                           beer_lambert_rgb_correction = false,
-    bool                                           td_effective_alpha_correction = false,
-    const std::vector<ColorSolverStackComponentRole> &component_roles = {},
-    bool                                           beam_search_stack_expansion = false,
-    const std::vector<float>                      &layer_opacities_by_depth = {},
-    const ColorSolverCalibratedStackModel         *calibrated_stack_model = nullptr,
-    bool                                           adaptive_spectral_correction = false);
-ColorSolverOrderedStackResult solve_color_solver_ordered_stack_result_for_target(
-    const ColorSolverOrderedStackCandidateSet &candidates,
-    const std::array<float, 3>                &target_rgb,
-    ColorSolverMode                            solver_mode);
-std::vector<uint16_t> solve_color_solver_ordered_stack_for_target(
-    const ColorSolverOrderedStackCandidateSet &candidates,
-    const std::array<float, 3>                &target_rgb,
-    ColorSolverMode                            solver_mode);
-
-} // namespace Slic3r
-
-#endif

deps_src/eigen/CMakeLists.txt

@@ -1,14 +1,12 @@
 cmake_minimum_required(VERSION 3.13)
 project(eigen)
 
-# Eigen3::Eigen is resolved in the parent CMakeLists before add_subdirectory(deps_src)
-# via find_package(Eigen3 CONFIG). This file only creates the unnamespaced "eigen" alias.
-if(NOT TARGET Eigen3::Eigen)
-    message(FATAL_ERROR "Eigen3::Eigen target not found. "
-        "Ensure find_package(Eigen3 CONFIG) is called before add_subdirectory(deps_src).")
-endif()
+add_library(eigen INTERFACE)
 
-if(NOT TARGET eigen)
-    add_library(eigen INTERFACE)
-    target_link_libraries(eigen INTERFACE Eigen3::Eigen)
-endif()
+target_include_directories(eigen SYSTEM
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# Eigen is header-only, so we only need to specify the include directory
+# The headers are in the Eigen/ subdirectory structure

deps_src/imgui/imgui_widgets.cpp

@@ -267,7 +267,7 @@ void ImGui::Text(const char* fmt, ...)
 void ImGui::TextCentered(const char* text, ...)
 {
     va_list vaList;
-    va_start(vaList, text);
+    va_start(vaList,&text);
 
     float font_size = ImGui::GetFontSize() * strlen(text) / 2;
     ImGui::SameLine(ImGui::GetCursorPos().x / 2 - font_size + (font_size / 2));

deps_src/libigl/CMakeLists.txt

@@ -15,8 +15,3 @@ else()
         INTERFACE
             ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
-
-if(MSVC)
-    # disable min() and max() macros that break std::numeric_limits<>::max()
-    target_compile_definitions(libigl INTERFACE -DNOMINMAX)
-endif()

deps_src/libigl/README-OrcaSlicer.md

@@ -1,16 +0,0 @@
-# libigl in OrcaSlicer.
-
-> [!NOTE]
-> This is not the complete libigl distribution! Only the files needed for
-> compiling libigl into OrcaSlicer are included in the OrcaSlicer source
-> distribution. The full libigl distribution can be found at;
->
-> https://github.com/libigl/libigl
-
-This directory contains parts of the libigl v2.6.0 (40e7900) source
-distribution together with a minimal custom `CMakeLists.txt` file. In
-particular only the following files from the full libigl distribution are
-included;
-
-* README.md
-* include/igl/* -> igl/*

deps_src/libigl/README.md

@@ -1,13 +0,0 @@
-# libigl - A simple C++ geometry processing library
-
-[![](https://github.com/libigl/libigl/workflows/Build/badge.svg?event=push)](https://github.com/libigl/libigl/actions?query=workflow%3ABuild+branch%3Amain+event%3Apush)
-[![](https://anaconda.org/conda-forge/igl/badges/installer/conda.svg)](https://anaconda.org/conda-forge/igl)
-
-![](https://libigl.github.io/libigl-teaser.png)
-
-Documentation, tutorial, and instructions at <https://libigl.github.io>.
-
-
-| 🆕 Doxygen Documentation |
-|:---|
-| The latest version of libigl (v2.5.0) introduces [doxygen generated detailed documentation](https://libigl.github.io/dox/index.html) |

deps_src/libigl/igl/ARAPEnergyType.h

@@ -9,24 +9,27 @@
 #define IGL_ARAPENERGYTYPE_H
 namespace igl
 {
-  /// Enum for choosing ARAP energy type
+  //     ARAP_ENERGY_TYPE_SPOKES  "As-rigid-as-possible Surface Modeling" by [Sorkine and
+  //       Alexa 2007], rotations defined at vertices affecting incident edges,
+  //       default
+  //     ARAP_ENERGY_TYPE_SPOKES-AND-RIMS  Adapted version of "As-rigid-as-possible Surface
+  //       Modeling" by [Sorkine and Alexa 2007] presented in section 4.2 of or
+  //       "A simple geometric model for elastic deformation" by [Chao et al.
+  //       2010], rotations defined at vertices affecting incident edges and
+  //       opposite edges
+  //     ARAP_ENERGY_TYPE_ELEMENTS  "A local-global approach to mesh parameterization" by
+  //       [Liu et al.  2010] or "A simple geometric model for elastic
+  //       deformation" by [Chao et al.  2010], rotations defined at elements
+  //       (triangles or tets) 
+  //     ARAP_ENERGY_TYPE_DEFAULT  Choose one automatically: spokes and rims
+  //       for surfaces, elements for planar meshes and tets (not fully
+  //       supported)
   enum ARAPEnergyType
   {
-    /// "As-rigid-as-possible Surface Modeling" by [Sorkine and Alexa 2007],
-    /// rotations defined at vertices affecting incident edges, default
     ARAP_ENERGY_TYPE_SPOKES = 0,
-    /// Adapted version of "As-rigid-as-possible Surface Modeling" by [Sorkine
-    /// and Alexa 2007] presented in section 4.2 of or "A simple geometric model
-    /// for elastic deformation" by [Chao et al.\ 2010], rotations defined at
-    /// vertices affecting incident edges and opposite edges
     ARAP_ENERGY_TYPE_SPOKES_AND_RIMS = 1,
-    /// "A local-global approach to mesh parameterization" by [Liu et al.\ 2010]
-    /// or "A simple geometric model for elastic deformation" by [Chao et al.\ 2010], rotations defined at elements (triangles or tets) 
     ARAP_ENERGY_TYPE_ELEMENTS = 2,
-    /// Choose one automatically: spokes and rims for surfaces, elements for
-    /// planar meshes and tets (not fully supported)
     ARAP_ENERGY_TYPE_DEFAULT = 3,
-    /// Total number of types
     NUM_ARAP_ENERGY_TYPES = 4
   };
 }

deps_src/libigl/igl/AtA_cached.cpp

@@ -6,7 +6,6 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
 #include "AtA_cached.h"
-#include "IGL_ASSERT.h"
 
 #include <iostream>
 #include <vector>
@@ -35,12 +34,12 @@ IGL_INLINE void igl::AtA_cached_precompute(
       int col = k;
       int row = *(A.innerIndexPtr()+l);
       int value_index = l;
-      IGL_ASSERT(col < A.cols());
-      IGL_ASSERT(col >= 0);
-      IGL_ASSERT(row < A.rows());
-      IGL_ASSERT(row >= 0);
-      IGL_ASSERT(value_index >= 0);
-      IGL_ASSERT(value_index < A.nonZeros());
+      assert(col < A.cols());
+      assert(col >= 0);
+      assert(row < A.rows());
+      assert(row >= 0);
+      assert(value_index >= 0);
+      assert(value_index < A.nonZeros());
 
       Col_RowPtr[col].push_back(row);
       Col_IndexPtr[col].push_back(value_index);
@@ -75,12 +74,12 @@ IGL_INLINE void igl::AtA_cached_precompute(
       int col = k;
       int row = *(AtA.innerIndexPtr()+l);
       int value_index = l;
-      IGL_ASSERT(col < AtA.cols());
-      IGL_ASSERT(col >= 0);
-      IGL_ASSERT(row < AtA.rows());
-      IGL_ASSERT(row >= 0);
-      IGL_ASSERT(value_index >= 0);
-      IGL_ASSERT(value_index < AtA.nonZeros());
+      assert(col < AtA.cols());
+      assert(col >= 0);
+      assert(row < AtA.rows());
+      assert(row >= 0);
+      assert(value_index >= 0);
+      assert(value_index < AtA.nonZeros());
 
       data.I_outer.push_back(data.I_row.size());
 

deps_src/libigl/igl/AtA_cached.h

@@ -13,47 +13,40 @@
 #include <Eigen/Sparse>
 namespace igl
 {  
-  /// Hold precomputed data for AtA_cached
   struct AtA_cached_data
   {
-    /// Weights (diagonal of W)
+    // Weights
     Eigen::VectorXd W;
 
     // Flatten composition rules
-    /// @private
     std::vector<int> I_row;
-    /// @private
     std::vector<int> I_col;
-    /// @private
     std::vector<int> I_w;
 
     // For each entry of AtA, points to the beginning
     // of the composition rules
-    /// @private
     std::vector<int> I_outer;
   };
 
-  /// Computes At * W * A, where A is sparse and W is diagonal.
-  ///
-  /// Divides the construction in two phases, one for fixing the sparsity
-  /// pattern, and one to populate it with values. Compared to evaluating it
-  /// directly, this version is slower for the first time (since it requires a
-  /// precomputation), but faster to the subsequent evaluations.
-  ///
-  /// @param[in] A m x n sparse matrix
-  /// @param[in,out] data stores the precomputed sparsity pattern, data.W contains the optional diagonal weights (stored as a dense vector). If W is not provided, it is replaced by the identity.
-  /// @param[out] AtA  m by m matrix computed as AtA * W * A
-  ///
-  /// #### Example:
-  ///
-  /// \code{cpp}
-  /// AtA_data = igl::AtA_cached_data();
-  /// AtA_data.W = W;
-  /// if (s.AtA.rows() == 0)
-  ///   igl::AtA_cached_precompute(s.A,s.AtA_data,s.AtA);
-  /// else
-  ///   igl::AtA_cached(s.A,s.AtA_data,s.AtA);
-  /// \endcode
+  // Computes At * W * A, where A is sparse and W is diagonal. Divides the 
+  // construction in two phases, one
+  // for fixing the sparsity pattern, and one to populate it with values. Compared to
+  // evaluating it directly, this version is slower for the first time (since it requires a
+  // precomputation), but faster to the subsequent evaluations.
+  //
+  // Input:
+  //   A m x n sparse matrix
+  //   data stores the precomputed sparsity pattern, data.W contains the optional diagonal weights (stored as a dense vector). If W is not provided, it is replaced by the identity.
+  // Outputs:
+  //   AtA  m by m matrix computed as AtA * W * A
+  //
+  // Example:
+  // AtA_data = igl::AtA_cached_data();
+  // AtA_data.W = W;
+  // if (s.AtA.rows() == 0)
+  //   igl::AtA_cached_precompute(s.A,s.AtA_data,s.AtA);
+  // else
+  //   igl::AtA_cached(s.A,s.AtA_data,s.AtA);
   template <typename Scalar>
   IGL_INLINE void AtA_cached_precompute(
     const Eigen::SparseMatrix<Scalar>& A,
@@ -61,11 +54,6 @@ namespace igl
     Eigen::SparseMatrix<Scalar>& AtA
     );
 
-  /// Computes At * W * A, where A is sparse and W is diagonal precomputed into data.
-  ///
-  /// @param[in] A m x n sparse matrix
-  /// @param[in]  data stores the precomputed sparsity pattern, data.W contains the optional diagonal weights (stored as a dense vector). If W is not provided, it is replaced by the identity.
-  /// @param[out] AtA  m by m matrix computed as AtA * W * A
   template <typename Scalar>
   IGL_INLINE void AtA_cached(
     const Eigen::SparseMatrix<Scalar>& A,

deps_src/libigl/igl/COLLAPSE_EDGE_NULL.h

@@ -1,19 +0,0 @@
-// This file is part of libigl, a simple c++ geometry processing library.
-// 
-// Copyright (C) 2025 Alec Jacobson <alecjacobson@gmail.com>
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public License 
-// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
-// obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef IGL_COLLAPSE_EDGE_NULL_H
-#define IGL_COLLAPSE_EDGE_NULL_H
-namespace igl
-{
-#ifndef IGL_COLLAPSE_EDGE_NULL
-  /// Special value for indicating a null vertex index as the result of a
-  /// collapsed edge.
-  #define IGL_COLLAPSE_EDGE_NULL 0
-#endif
-}
-#endif

deps_src/libigl/igl/C_STR.h

@@ -7,23 +7,12 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 #ifndef IGL_C_STR_H
 #define IGL_C_STR_H
+// http://stackoverflow.com/a/2433143/148668
+// Suppose you have a function:
+//   void func(const char * c);
+// Then you can write:
+//   func(C_STR("foo"<<1<<"bar"));
 #include <sstream>
 #include <string>
-/// Convert a stream of things to a const char *.
-///
-/// Suppose you have a function:
-/// \code{cpp}
-/// void func(const char * c);
-/// \endcode
-/// Then you can write:
-/// \code{cpp}
-///   func(C_STR("foo"<<1<<"bar"));
-/// \endcode
-/// which is equivalent to:
-/// \code{cpp}
-///   func("foo1bar");
-/// \endcode
-///
-// http://stackoverflow.com/a/2433143/148668
 #define C_STR(X) static_cast<std::ostringstream&>(std::ostringstream().flush() << X).str().c_str()
 #endif

deps_src/libigl/igl/Camera.h

@@ -0,0 +1,359 @@
+// This file is part of libigl, a simple c++ geometry processing library.
+// 
+// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public License 
+// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+// obtain one at http://mozilla.org/MPL/2.0/.
+#ifndef IGL_CAMERA_H
+#define IGL_CAMERA_H
+
+// you're idiot, M$!
+#if defined(_WIN32)
+#undef far
+#undef near
+#endif
+
+#include <Eigen/Geometry>
+#include <Eigen/Core>
+#include <PI.h>
+
+#define IGL_CAMERA_MIN_ANGLE 5.0
+namespace igl
+{
+
+  // A simple camera class. The camera stores projection parameters (field of
+  // view angle, aspect ratio, near and far clips) as well as a rigid
+  // transformation *of the camera as if it were also a scene object*. Thus, the
+  // **inverse** of this rigid transformation is the modelview transformation.
+  class Camera
+  {
+    public:
+      // On windows you might need: -fno-delayed-template-parsing
+      //static constexpr double IGL_CAMERA_MIN_ANGLE = 5.;
+      //  m_angle  Field of view angle in degrees {45}
+      //  m_aspect  Aspect ratio {1}
+      //  m_near  near clipping plane {1e-2}
+      //  m_far  far clipping plane {100}
+      //  m_at_dist  distance of looking at point {1}
+      //  m_orthographic  whether to use othrographic projection {false}
+      //  m_rotation_conj  Conjugate of rotation part of rigid transformation of
+      //    camera {identity}. Note: we purposefully store the conjugate because
+      //    this is what TW_TYPE_QUAT4D is expecting.
+      //  m_translation  Translation part of rigid transformation of camera
+      //    {(0,0,1)}
+      double m_angle, m_aspect, m_near, m_far, m_at_dist;
+      bool m_orthographic;
+      Eigen::Quaterniond m_rotation_conj;
+      Eigen::Vector3d m_translation;
+    public:
+      inline Camera();
+      inline virtual ~Camera(){}
+      // Return projection matrix that takes relative camera coordinates and
+      // transforms it to viewport coordinates
+      //
+      // Note:
+      //
+      //     if(m_angle > 0)
+      //     {
+      //       gluPerspective(m_angle,m_aspect,m_near,m_at_dist+m_far);
+      //     }else
+      //     {
+      //       gluOrtho(-0.5*aspect,0.5*aspect,-0.5,0.5,m_at_dist+m_near,m_far);
+      //     }
+      //
+      // Is equivalent to
+      //
+      //     glMultMatrixd(projection().data());
+      //
+      inline Eigen::Matrix4d projection() const;
+      // Return an Affine transformation (rigid actually) that 
+      // takes relative coordinates and tramsforms them into world 3d
+      // coordinates: moves the camera into the scene.
+      inline Eigen::Affine3d affine() const;
+      // Return an Affine transformation (rigid actually) that puts the takes a
+      // world 3d coordinate and transforms it into the relative camera
+      // coordinates: moves the scene in front of the camera.
+      //
+      // Note:
+      //
+      //     gluLookAt(
+      //       eye()(0), eye()(1), eye()(2),
+      //       at()(0), at()(1), at()(2),
+      //       up()(0), up()(1), up()(2));
+      //
+      // Is equivalent to
+      //
+      //     glMultMatrixd(camera.inverse().matrix().data());
+      //
+      // See also: affine, eye, at, up
+      inline Eigen::Affine3d inverse() const;
+      // Returns world coordinates position of center or "eye" of camera.
+      inline Eigen::Vector3d eye() const;
+      // Returns world coordinate position of a point "eye" is looking at.
+      inline Eigen::Vector3d at() const;
+      // Returns world coordinate unit vector of "up" vector
+      inline Eigen::Vector3d up() const;
+      // Return top right corner of unit plane in relative coordinates, that is
+      // (w/2,h/2,1)
+      inline Eigen::Vector3d unit_plane() const;
+      // Move dv in the relative coordinate frame of the camera (move the FPS)
+      //
+      // Inputs:
+      //   dv  (x,y,z) displacement vector
+      //
+      inline void dolly(const Eigen::Vector3d & dv);
+      // "Scale zoom": Move `eye`, but leave `at`
+      //
+      // Input:
+      //   s  amount to scale distance to at
+      inline void push_away(const double s);
+      // Aka "Hitchcock", "Vertigo", "Spielberg" or "Trombone" zoom:
+      // simultaneously dolly while changing angle so that `at` not only stays
+      // put in relative coordinates but also projected coordinates. That is
+      //
+      // Inputs:
+      //   da  change in angle in degrees
+      inline void dolly_zoom(const double da);
+      // Turn around eye so that rotation is now q
+      //
+      // Inputs:
+      //   q  new rotation as quaternion
+      inline void turn_eye(const Eigen::Quaterniond & q);
+      // Orbit around at so that rotation is now q
+      //
+      // Inputs:
+      //   q  new rotation as quaternion
+      inline void orbit(const Eigen::Quaterniond & q);
+      // Rotate and translate so that camera is situated at "eye" looking at "at"
+      // with "up" pointing up.
+      //
+      // Inputs:
+      //   eye  (x,y,z) coordinates of eye position
+      //   at   (x,y,z) coordinates of at position
+      //   up   (x,y,z) coordinates of up vector
+      inline void look_at(
+        const Eigen::Vector3d & eye,
+        const Eigen::Vector3d & at,
+        const Eigen::Vector3d & up);
+    // Needed any time Eigen Structures are used as class members
+    // http://eigen.tuxfamily.org/dox-devel/group__TopicStructHavingEigenMembers.html
+    public:
+        EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+  };
+}
+
+// Implementation
+#include "PI.h"
+#include "EPS.h"
+#include <cmath>
+#include <iostream>
+#include <cassert>
+
+inline igl::Camera::Camera():
+  m_angle(45.0),m_aspect(1),m_near(1e-2),m_far(100),m_at_dist(1),
+  m_orthographic(false),
+  m_rotation_conj(1,0,0,0),
+  m_translation(0,0,1)
+{
+}
+
+inline Eigen::Matrix4d igl::Camera::projection() const
+{
+  Eigen::Matrix4d P;
+  using namespace std;
+  const double far = m_at_dist + m_far;
+  const double near = m_near;
+  // http://stackoverflow.com/a/3738696/148668
+  if(m_orthographic)
+  {
+    const double f = 0.5;
+    const double left = -f*m_aspect;
+    const double right = f*m_aspect;
+    const double bottom = -f;
+    const double top = f;
+    const double tx = (right+left)/(right-left);
+    const double ty = (top+bottom)/(top-bottom);
+    const double tz = (far+near)/(far-near);
+    const double z_fix = 0.5 /m_at_dist / tan(m_angle*0.5 * (igl::PI/180.) );
+    P<<
+      z_fix*2./(right-left), 0, 0, -tx,
+      0, z_fix*2./(top-bottom), 0, -ty,
+      0, 0, -z_fix*2./(far-near),  -tz,
+      0, 0, 0, 1;
+  }else
+  {
+    const double yScale = tan(PI*0.5 - 0.5*m_angle*PI/180.);
+    // http://stackoverflow.com/a/14975139/148668
+    const double xScale = yScale/m_aspect;
+    P<< 
+      xScale, 0, 0, 0,
+      0, yScale, 0, 0,
+      0, 0, -(far+near)/(far-near), -1,
+      0, 0, -2.*near*far/(far-near), 0;
+    P = P.transpose().eval();
+  }
+  return P;
+}
+
+inline Eigen::Affine3d igl::Camera::affine() const
+{
+  using namespace Eigen;
+  Affine3d t = Affine3d::Identity();
+  t.rotate(m_rotation_conj.conjugate());
+  t.translate(m_translation);
+  return t;
+}
+
+inline Eigen::Affine3d igl::Camera::inverse() const
+{
+  using namespace Eigen;
+  Affine3d t = Affine3d::Identity();
+  t.translate(-m_translation);
+  t.rotate(m_rotation_conj);
+  return t;
+}
+
+inline Eigen::Vector3d igl::Camera::eye() const
+{
+  using namespace Eigen;
+  return affine() * Vector3d(0,0,0);
+}
+
+inline Eigen::Vector3d igl::Camera::at() const
+{
+  using namespace Eigen;
+  return affine() * (Vector3d(0,0,-1)*m_at_dist);
+}
+
+inline Eigen::Vector3d igl::Camera::up() const
+{
+  using namespace Eigen;
+  Affine3d t = Affine3d::Identity();
+  t.rotate(m_rotation_conj.conjugate());
+  return t * Vector3d(0,1,0);
+}
+
+inline Eigen::Vector3d igl::Camera::unit_plane() const
+{
+  // Distance of center pixel to eye
+  const double d = 1.0;
+  const double a = m_aspect;
+  const double theta = m_angle*PI/180.;
+  const double w =
+    2.*sqrt(-d*d/(a*a*pow(tan(0.5*theta),2.)-1.))*a*tan(0.5*theta);
+  const double h = w/a;
+  return Eigen::Vector3d(w*0.5,h*0.5,-d);
+}
+
+inline void igl::Camera::dolly(const Eigen::Vector3d & dv)
+{
+  m_translation += dv;
+}
+
+inline void igl::Camera::push_away(const double s)
+{
+  using namespace Eigen;
+#ifndef NDEBUG
+  Vector3d old_at = at();
+#endif
+  const double old_at_dist = m_at_dist;
+  m_at_dist = old_at_dist * s;
+  dolly(Vector3d(0,0,1)*(m_at_dist - old_at_dist));
+  assert((old_at-at()).squaredNorm() < DOUBLE_EPS);
+}
+
+inline void igl::Camera::dolly_zoom(const double da)
+{
+  using namespace std;
+  using namespace Eigen;
+#ifndef NDEBUG
+  Vector3d old_at = at();
+#endif
+  const double old_angle = m_angle;
+  if(old_angle + da < IGL_CAMERA_MIN_ANGLE)
+  {
+    m_orthographic = true;
+  }else if(old_angle + da > IGL_CAMERA_MIN_ANGLE)
+  {
+    m_orthographic = false;
+  }
+  if(!m_orthographic)
+  {
+    m_angle += da;
+    m_angle = min(89.,max(IGL_CAMERA_MIN_ANGLE,m_angle));
+    // change in distance
+    const double s = 
+      (2.*tan(old_angle/2./180.*igl::PI)) /
+      (2.*tan(m_angle/2./180.*igl::PI)) ;
+    const double old_at_dist = m_at_dist;
+    m_at_dist = old_at_dist * s;
+    dolly(Vector3d(0,0,1)*(m_at_dist - old_at_dist));
+    assert((old_at-at()).squaredNorm() < DOUBLE_EPS);
+  }
+}
+
+inline void igl::Camera::turn_eye(const Eigen::Quaterniond & q)
+{
+  using namespace Eigen;
+  Vector3d old_eye = eye();
+  // eye should be fixed
+  //
+  // eye_1 = R_1 * t_1 = eye_0
+  // t_1 = R_1' * eye_0
+  m_rotation_conj = q.conjugate();
+  m_translation = m_rotation_conj * old_eye;
+  assert((old_eye - eye()).squaredNorm() < DOUBLE_EPS);
+}
+
+inline void igl::Camera::orbit(const Eigen::Quaterniond & q)
+{
+  using namespace Eigen;
+  Vector3d old_at = at();
+  // at should be fixed
+  //
+  // at_1 = R_1 * t_1 - R_1 * z = at_0
+  // t_1 = R_1' * (at_0 + R_1 * z)
+  m_rotation_conj = q.conjugate();
+  m_translation = 
+    m_rotation_conj * 
+      (old_at + 
+         m_rotation_conj.conjugate() * Vector3d(0,0,1) * m_at_dist);
+  assert((old_at - at()).squaredNorm() < DOUBLE_EPS);
+}
+
+inline void igl::Camera::look_at(
+  const Eigen::Vector3d & eye,
+  const Eigen::Vector3d & at,
+  const Eigen::Vector3d & up)
+{
+  using namespace Eigen;
+  using namespace std;
+  // http://www.opengl.org/sdk/docs/man2/xhtml/gluLookAt.xml
+  // Normalize vector from at to eye
+  Vector3d F = eye-at;
+  m_at_dist = F.norm();
+  F.normalize();
+  // Project up onto plane orthogonal to F and normalize
+  assert(up.cross(F).norm() > DOUBLE_EPS && "(eye-at) x up ≈ 0");
+  const Vector3d proj_up = (up-(up.dot(F))*F).normalized();
+  Quaterniond a,b;
+  a.setFromTwoVectors(Vector3d(0,0,-1),-F);
+  b.setFromTwoVectors(a*Vector3d(0,1,0),proj_up);
+  m_rotation_conj = (b*a).conjugate();
+  m_translation = m_rotation_conj * eye;
+  //cout<<"m_at_dist: "<<m_at_dist<<endl;
+  //cout<<"proj_up: "<<proj_up.transpose()<<endl;
+  //cout<<"F: "<<F.transpose()<<endl;
+  //cout<<"eye(): "<<this->eye().transpose()<<endl;
+  //cout<<"at(): "<<this->at().transpose()<<endl;
+  //cout<<"eye()-at(): "<<(this->eye()-this->at()).normalized().transpose()<<endl;
+  //cout<<"eye-this->eye(): "<<(eye-this->eye()).squaredNorm()<<endl;
+  assert(           (eye-this->eye()).squaredNorm() < DOUBLE_EPS);
+  //assert((F-(this->eye()-this->at()).normalized()).squaredNorm() < 
+  //  DOUBLE_EPS);
+  assert(           (at-this->at()).squaredNorm() < DOUBLE_EPS);
+  //assert(        (proj_up-this->up()).squaredNorm() < DOUBLE_EPS);
+}
+
+#endif

deps_src/libigl/igl/EPS.h

@@ -10,17 +10,13 @@
 #include "igl_inline.h"
 namespace igl
 {
-  /// Standard value for double epsilon
+  // Define a standard value for double epsilon
   const double DOUBLE_EPS    = 1.0e-14;
-  /// Standard value for double epsilon²
   const double DOUBLE_EPS_SQ = 1.0e-28;
-  /// Standard value for single epsilon
   const float FLOAT_EPS    = 1.0e-7f;
-  /// Standard value for single epsilon²
   const float FLOAT_EPS_SQ = 1.0e-14f;
-  /// Function returning EPS for corresponding type
+  // Function returning EPS for corresponding type
   template <typename S_type> IGL_INLINE S_type EPS();
-  /// Function returning EPS_SQ for corresponding type
   template <typename S_type> IGL_INLINE S_type EPS_SQ();
   // Template specializations for float and double
   template <> IGL_INLINE float EPS<float>();

deps_src/libigl/igl/FileEncoding.h

@@ -1,21 +0,0 @@
-// This file is part of libigl, a simple c++ geometry processing library.
-//
-// Copyright (C) 2020 Jérémie Dumas <jeremie.dumas@ens-lyon.org>
-//
-// This Source Code Form is subject to the terms of the Mozilla Public License
-// v. 2.0. If a copy of the MPL was not distributed with this file, You can
-// obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_FILEENCODING_H
-#define IGL_FILEENCODING_H
-
-namespace igl
-{
-  /// File encoding types for writing files.
-enum class FileEncoding {
-  Binary,
-  Ascii
-};
-
-}
-
-#endif

deps_src/libigl/igl/FileMemoryStream.h

@@ -1,64 +0,0 @@
-// This file is part of libigl, a simple c++ geometry processing library.
-//
-// Copyright (C) 2020 Jérémie Dumas <jeremie.dumas@ens-lyon.org>
-// Copyright (C) 2021 Alec Jacobson <alecjacobson@gmail.com>
-//
-// This Source Code Form is subject to the terms of the Mozilla Public License
-// v. 2.0. If a copy of the MPL was not distributed with this file, You can
-// obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_FILEMEMORYSTREAM_H
-#define IGL_FILEMEMORYSTREAM_H
-
-#include "igl_inline.h"
-
-#include <streambuf>
-#include <istream>
-#include <string>
-
-namespace igl {
-  struct FileMemoryBuffer : public std::streambuf 
-  {
-    char *p_start{nullptr};
-    char *p_end{nullptr};
-    size_t size;
-  
-    FileMemoryBuffer(char const *first_elem, size_t size)
-      : p_start(const_cast<char *>(first_elem)), p_end(p_start + size),
-        size(size) 
-    {
-      setg(p_start, p_start, p_end);
-    }
-  
-    pos_type seekoff(
-      off_type off, 
-      std::ios_base::seekdir dir,
-      std::ios_base::openmode /*which*/) override 
-    {
-      if (dir == std::ios_base::cur) 
-      {
-        gbump(static_cast<int>(off));
-      }else
-      {
-        setg(p_start,(dir==std::ios_base::beg ? p_start : p_end) + off,p_end);
-      }
-      return gptr() - p_start;
-    }
-  
-    pos_type seekpos(pos_type pos, std::ios_base::openmode which) override 
-    {
-      return seekoff(pos, std::ios_base::beg, which);
-    }
-  };
-  
-  /// Class to convert a FILE * to an std::istream
-  struct FileMemoryStream : virtual FileMemoryBuffer, public std::istream 
-  {
-    FileMemoryStream( char const *first_elem, size_t size)
-      : FileMemoryBuffer(first_elem, size), 
-        std::istream( static_cast<std::streambuf *>(this))
-    {}
-  };
-} 
-
-#endif
-

deps_src/libigl/igl/HalfEdgeIterator.cpp

@@ -10,9 +10,9 @@
 
 template <typename DerivedF, typename DerivedFF, typename DerivedFFi>
 IGL_INLINE igl::HalfEdgeIterator<DerivedF,DerivedFF,DerivedFFi>::HalfEdgeIterator(
-    const Eigen::MatrixBase<DerivedF>& _F,
-    const Eigen::MatrixBase<DerivedFF>& _FF,
-    const Eigen::MatrixBase<DerivedFFi>& _FFi,
+    const Eigen::PlainObjectBase<DerivedF>& _F,
+    const Eigen::PlainObjectBase<DerivedFF>& _FF,
+    const Eigen::PlainObjectBase<DerivedFFi>& _FFi,
     int _fi,
     int _ei,
     bool _reverse
@@ -63,10 +63,10 @@ IGL_INLINE bool igl::HalfEdgeIterator<DerivedF,DerivedFF,DerivedFFi>::isBorder()
 /*!
  * Returns the next edge skipping the border
  *      _________
- *     ╱╲ c | b ╱╲
- *    ╱  ╲  |  ╱  ╲
- *   ╱ d  ╲ | ╱ a  ╲
- *  ╱______╲|╱______╲
+ *     /\ c | b /\
+ *    /  \  |  /  \
+ *   / d  \ | / a  \
+ *  /______\|/______\
  *          v
  * In this example, if a and d are of-border and the pos is iterating counterclockwise, this method iterate through the faces incident on vertex v,
  * producing the sequence a, b, c, d, a, b, c, ...
@@ -138,8 +138,8 @@ IGL_INLINE bool igl::HalfEdgeIterator<DerivedF,DerivedFF,DerivedFFi>::operator==
 
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template instantiation
-template      igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>   >::HalfEdgeIterator(Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, int, int, bool);
-template igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >::HalfEdgeIterator(Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, int, int, bool);
+template      igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>   >::HalfEdgeIterator(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, int, int, bool);
+template igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >::HalfEdgeIterator(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 3, 0, -1, 3> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, int, int, bool);
 template bool igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::NextFE();
 template int  igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::Ei();
 template int  igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::Ei();
@@ -147,16 +147,12 @@ template int  igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen:
 template int  igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>   >::Fi();
 template bool igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>  ,Eigen::Matrix<int, -1, 3, 0, -1, 3>   >::NextFE();
 template int  igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::Vi();
-template      igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::HalfEdgeIterator(Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, int, int, bool);
+template      igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::HalfEdgeIterator(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, int, int, bool);
 template int  igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::Fi();
 template void igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::flipE();
-template void igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 3, 0, -1, 3> >::flipE();
 template void igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::flipF();
-template void igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 3, 0, -1, 3> >::flipF();
 template void igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::flipV();
 template bool igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >::operator==(igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1>,Eigen::Matrix<int, -1, -1, 0, -1, -1> >&);
 template int igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >::Fi();
 template bool igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >::NextFE();
-template bool igl::HalfEdgeIterator<Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 3, 0, -1, 3> >::isBorder();
-template bool igl::HalfEdgeIterator<Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >::isBorder();
 #endif

deps_src/libigl/igl/HalfEdgeIterator.h

@@ -11,24 +11,35 @@
 #include <Eigen/Core>
 
 #include <vector>
-#include "igl_inline.h"
+#include <igl/igl_inline.h>
 
+// This file violates many of the libigl style guidelines.
 
 namespace igl
 {
-  /// Fake halfedge for fast and easy navigation
-  /// on triangle meshes with vertex_triangle_adjacency and
-  /// triangle_triangle adjacency
-  ///
-  /// Note: this is different to classical Half Edge data structure.
-  ///    Instead, it follows cell-tuple in [Brisson, 1989]
-  ///    "Representing geometric structures in d dimensions: topology and order."
-  ///    This class can achieve local navigation similar to half edge in OpenMesh
-  ///    But the logic behind each atom operation is different.
-  ///    So this should be more properly called TriangleTupleIterator.
-  ///
-  /// Each tuple contains information on (face, edge, vertex)
-  ///    and encoded by (face, edge \in {0,1,2}, bool reverse)
+  // HalfEdgeIterator - Fake halfedge for fast and easy navigation
+  // on triangle meshes with vertex_triangle_adjacency and
+  // triangle_triangle adjacency
+  //
+  // Note: this is different to classical Half Edge data structure.
+  //    Instead, it follows cell-tuple in [Brisson, 1989]
+  //    "Representing geometric structures in d dimensions: topology and order."
+  //    This class can achieve local navigation similar to half edge in OpenMesh
+  //    But the logic behind each atom operation is different.
+  //    So this should be more properly called TriangleTupleIterator.
+  //
+  // Each tuple contains information on (face, edge, vertex)
+  //    and encoded by (face, edge \in {0,1,2}, bool reverse)
+  //
+  // Inputs:
+  //    F #F by 3 list of "faces"
+  //    FF #F by 3 list of triangle-triangle adjacency.
+  //    FFi #F by 3 list of FF inverse. For FF and FFi, refer to
+  //        "triangle_triangle_adjacency.h"
+  // Usages:
+  //    FlipF/E/V changes solely one actual face/edge/vertex resp.
+  //    NextFE iterates through one-ring of a vertex robustly.
+  //
   template <
     typename DerivedF,
     typename DerivedFF,
@@ -36,66 +47,51 @@ namespace igl
   class HalfEdgeIterator
   {
   public:
-    /// Init the HalfEdgeIterator by specifying Face,Edge Index and Orientation
-    ///
-    /// @param[in] F #F by 3 list of "faces"
-    /// @param[in] FF #F by 3 list of triangle-triangle adjacency.
-    /// @param[in] FFi #F by 3 list of FF inverse. For FF and FFi, refer to
-    ///        "triangle_triangle_adjacency.h"
-    /// @param[in] _fi index of the selected face
-    /// @param[in] _ii index of the selected face
-    /// @param[in] _reverse orientation of the selected face
+    // Init the HalfEdgeIterator by specifying Face,Edge Index and Orientation
     IGL_INLINE HalfEdgeIterator(
-        const Eigen::MatrixBase<DerivedF>& _F,
-        const Eigen::MatrixBase<DerivedFF>& _FF,
-        const Eigen::MatrixBase<DerivedFFi>& _FFi,
+        const Eigen::PlainObjectBase<DerivedF>& _F,
+        const Eigen::PlainObjectBase<DerivedFF>& _FF,
+        const Eigen::PlainObjectBase<DerivedFFi>& _FFi,
         int _fi,
         int _ei,
         bool _reverse = false
         );
 
-    /// Change Face
+    // Change Face
     IGL_INLINE void flipF();
 
-    /// Change Edge
+    // Change Edge
     IGL_INLINE void flipE();
 
-    /// Change Vertex
+    // Change Vertex
     IGL_INLINE void flipV();
 
-    /// Determine if on border.
-    /// @returns true if the current edge is on the border
     IGL_INLINE bool isBorder();
 
-    /// Change to next edge skipping the border
-    ///      _________
-    ///     ╱╲ c | b ╱╲
-    ///    ╱  ╲  |  ╱  ╲
-    ///   ╱ d  ╲ | ╱ a  ╲
-    ///  ╱______╲|╱______╲
-    ///          v
-    /// In this example, if a and d are of-border and the pos is iterating
-    /// counterclockwise, this method iterate through the faces incident on vertex
-    /// v,
-    /// producing the sequence a, b, c, d, a, b, c, ...
-    ///
-    /// @returns true if the next edge is not on the border
+    /*!
+     * Returns the next edge skipping the border
+     *      _________
+     *     /\ c | b /\
+     *    /  \  |  /  \
+     *   / d  \ | / a  \
+     *  /______\|/______\
+     *          v
+     * In this example, if a and d are of-border and the pos is iterating
+     counterclockwise, this method iterate through the faces incident on vertex
+     v,
+     * producing the sequence a, b, c, d, a, b, c, ...
+     */
     IGL_INLINE bool NextFE();
 
-    /// Get vertex index
-    /// @return vertex index
+    // Get vertex index
     IGL_INLINE int Vi();
 
-    /// Get face index
-    /// @return face index
+    // Get face index
     IGL_INLINE int Fi();
 
-    /// Get edge index
-    /// @return edge index
+    // Get edge index
     IGL_INLINE int Ei();
 
-    /// Check if two HalfEdgeIterator are the same
-    /// @return true if two HalfEdgeIterator are the same
     IGL_INLINE bool operator==(HalfEdgeIterator& p2);
 
   private:
@@ -104,9 +100,9 @@ namespace igl
     bool reverse;
 
     // All the same type? This is likely to break.
-    const Eigen::MatrixBase<DerivedF> & F;
-    const Eigen::MatrixBase<DerivedFF> & FF;
-    const Eigen::MatrixBase<DerivedFFi> & FFi;
+    const Eigen::PlainObjectBase<DerivedF> & F;
+    const Eigen::PlainObjectBase<DerivedFF> & FF;
+    const Eigen::PlainObjectBase<DerivedFFi> & FFi;
   };
 
 }

deps_src/libigl/igl/Hit.h

@@ -11,21 +11,15 @@
 
 namespace igl
 {
-  /// Reimplementation of the embree::Hit struct from embree1.0
-  /// 
-  template <typename Scalar>
+  // Reimplementation of the embree::Hit struct from embree1.0
+  // 
+  // TODO: template on floating point type
   struct Hit
   {
-    /// primitive id
-    int id; 
-    /// geometry id (not used)
-    int gid; 
-    /// barycentric coordinates so that 
-    ///   pos = V.row(F(id,0))*(1-u-v)+V.row(F(id,1))*u+V.row(F(id,2))*v;
-    Scalar u,v; 
-    /// parametric distance so that
-    ///   pos = origin + t * dir
-    Scalar t; 
+    int id; // primitive id
+    int gid; // geometry id
+    float u,v; // barycentric coordinates
+    float t; // distance = direction*t to intersection
   };
 }
 #endif 

deps_src/libigl/igl/IGL_ASSERT.h

@@ -1,9 +0,0 @@
-// https://stackoverflow.com/a/985807/148668
-#include <cassert>
-#ifndef IGL_ASSERT
-#ifdef NDEBUG
-#define IGL_ASSERT(x) do { (void)sizeof(x);} while (0)
-#else
-#define IGL_ASSERT(x) assert(x)
-#endif
-#endif

deps_src/libigl/igl/IndexComparison.h

@@ -7,9 +7,12 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 #ifndef IGL_INDEXCOMPARISON_H
 #define IGL_INDEXCOMPARISON_H
+#include <iostream>
 namespace igl{
-  /// Comparison struct used by sort
-  /// http://bytes.com/topic/c/answers/132045-sort-get-index
+  // Comparison struct used by sort
+  // http://bytes.com/topic/c/answers/132045-sort-get-index
+
+  // For use with functions like std::sort
   template<class T> struct IndexLessThan
   {
     IndexLessThan(const T arr) : arr(arr) {}
@@ -20,7 +23,7 @@ namespace igl{
     const T arr;
   };
 
-  /// Comparison struct used by unique
+  // For use with functions like std::unique
   template<class T> struct IndexEquals
   {
     IndexEquals(const T arr) : arr(arr) {}
@@ -31,7 +34,7 @@ namespace igl{
     const T arr;
   };
 
-  /// Comparison struct for vectors for use with functions like std::sort
+  // For use with functions like std::sort
   template<class T> struct IndexVectorLessThan
   {
     IndexVectorLessThan(const T & vec) : vec ( vec) {}
@@ -42,7 +45,7 @@ namespace igl{
     const T & vec;
   };
 
-  /// Comparison struct for use with functions like std::sort
+  // For use with functions like std::sort
   template<class T> struct IndexDimLessThan
   {
     IndexDimLessThan(const T & mat,const int & dim, const int & j) : 
@@ -65,7 +68,7 @@ namespace igl{
     const int & j;
   };
 
-  /// Comparison struct For use with functions like std::sort
+  // For use with functions like std::sort
   template<class T> struct IndexRowLessThan
   {
     IndexRowLessThan(const T & mat) : mat ( mat) {}
@@ -89,7 +92,7 @@ namespace igl{
     const T & mat;
   };
 
-  /// Comparison struct for use with functions like std::sort
+  // For use with functions like std::sort
   template<class T> struct IndexRowEquals
   {
     IndexRowEquals(const T & mat) : mat ( mat) {}

deps_src/libigl/igl/LinSpaced.h

@@ -1,42 +1,33 @@
 #ifndef IGL_LINSPACED_H
 #define IGL_LINSPACED_H
 #include <Eigen/Core>
-/// @file LinSpaced.h
-///
-/// This function is not intended to be a permanent function of libigl. Rather
-/// it is a "drop-in" workaround for documented bug in Eigen:
-/// http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1383
-///
-/// Replace: 
-///
-///     Eigen::VectorXi::LinSpaced(size,low,high);
-///
-/// With:
-///
-///     igl::LinSpaced<Eigen::VectorXi>(size,low,high);
-///
-/// Specifcally, this version will _always_ return an empty vector if size==0,
-/// regardless of the values for low and high. If size != 0, then this simply
-/// returns the result of Eigen::Derived::LinSpaced.
-///
-/// Until this bug is fixed, we should also avoid calls to the member function
-/// `.setLinSpaced`. This means replacing:
-///
-///     a.setLinSpaced(size,low,high);
-///
-/// with
-///
-///     a = igl::LinSpaced<decltype(a) >(size,low,high);
-///
+// This function is not intended to be a permanent function of libigl. Rather
+// it is a "drop-in" workaround for documented bug in Eigen:
+// http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1383
+//
+// Replace: 
+//
+//     Eigen::VectorXi::LinSpaced(size,low,high);
+//
+// With:
+//
+//     igl::LinSpaced<Eigen::VectorXi>(size,low,high);
+//
+// Specifcally, this version will _always_ return an empty vector if size==0,
+// regardless of the values for low and high. If size != 0, then this simply
+// returns the result of Eigen::Derived::LinSpaced.
+//
+// Until this bug is fixed, we should also avoid calls to the member function
+// `.setLinSpaced`. This means replacing:
+//
+//     a.setLinSpaced(size,low,high);
+//
+// with
+//
+//     a = igl::LinSpaced<decltype(a) >(size,low,high);
+//
 namespace igl
 {
-  /// Replacement for Eigen::DenseBase::LinSpaced
-  /// @param[in] size  number of elements
-  /// @param[in] low   first element
-  /// @param[in] high  last element
-  /// @return          vector of size elements linearly spaced between low and
-  ///
-  /// \fileinfo
   template <typename Derived>
   //inline typename Eigen::DenseBase< Derived >::RandomAccessLinSpacedReturnType 
   inline Derived LinSpaced(

deps_src/libigl/igl/MappingEnergyType.h

@@ -1,26 +0,0 @@
-// This file is part of libigl, a simple c++ geometry processing library.
-// 
-// Copyright (C) 2018 Zhongshi Jiang <jiangzs@nyu.edu>
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public License 
-// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
-// obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MAPPINGENERGYTYPE_H
-#define IGL_MAPPINGENERGYTYPE_H
-namespace igl
-{
-  /// Energy Types used for Parameterization/Mapping. 
-  /// Refer to SLIM [Rabinovich et al. 2017] for more details
-  // Todo: Integrate with ARAPEnergyType
-  enum MappingEnergyType
-  {
-    ARAP = 0,
-    LOG_ARAP = 1,
-    SYMMETRIC_DIRICHLET = 2,
-    CONFORMAL = 3,
-    EXP_CONFORMAL = 4,
-    EXP_SYMMETRIC_DIRICHLET = 5,
-    NUM_SLIM_ENERGY_TYPES = 6
-  };
-}
-#endif

deps_src/libigl/igl/MeshBooleanType.h

@@ -9,20 +9,13 @@
 #define IGL_MESH_BOOLEAN_TYPE_H
 namespace igl
 {
-  /// Boolean operation types
   enum MeshBooleanType
   {
-    /// A ∪ B
     MESH_BOOLEAN_TYPE_UNION = 0,
-    /// A ∩ B
     MESH_BOOLEAN_TYPE_INTERSECT = 1,
-    /// A \ B
     MESH_BOOLEAN_TYPE_MINUS = 2,
-    /// A ⊕ B
     MESH_BOOLEAN_TYPE_XOR = 3,
-    /// Resolve intersections without removing any non-coplanar faces
     MESH_BOOLEAN_TYPE_RESOLVE = 4,
-    /// Total number of Boolean options
     NUM_MESH_BOOLEAN_TYPES = 5
   };
 };

deps_src/libigl/igl/MshLoader.cpp

@@ -1,497 +0,0 @@
-// based on MSH reader from PyMesh 
-
-// Copyright (c) 2015 Qingnan Zhou <qzhou@adobe.com>           
-// Copyright (C) 2020 Vladimir Fonov <vladimir.fonov@gmail.com> 
-//
-// This Source Code Form is subject to the terms of the Mozilla 
-// Public License v. 2.0. If a copy of the MPL was not distributed 
-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. 
-
-#include "MshLoader.h"
-
-#include <cassert>
-#include <iostream>
-#include <sstream>
-#include <vector>
-
-#include <string.h>
-
-namespace igl {
-    // helper function
-    void inline _msh_eat_white_space(std::ifstream& fin) {
-        char next = fin.peek();
-        while (next == '\n' || next == ' ' || next == '\t' || next == '\r') {
-            fin.get();
-            next = fin.peek();
-        }
-    }
-}
-
-IGL_INLINE igl::MshLoader::MshLoader(const std::string &filename) {
-    std::ifstream fin(filename, std::ios::in | std::ios::binary);
-
-    if (!fin.is_open()) {
-        std::stringstream err_msg;
-        err_msg << "failed to open file \"" << filename << "\"";
-        throw std::ios_base::failure(err_msg.str());
-    }
-    // Parse header
-    std::string buf;
-    double version;
-    int type;
-    fin >> buf;
-    if (buf != "$MeshFormat") { throw std::runtime_error("Unexpected .msh format"); }
-
-    fin >> version >> type >> m_data_size;
-    m_binary = (type == 1);
-    if(version>2.2 || version<2.0)
-    {
-        // probably unsupported version
-        std::stringstream err_msg;
-        err_msg << "Error: Unsupported file version:" << version << std::endl;
-        throw std::runtime_error(err_msg.str());
-
-    }
-    // Some sanity check.
-    if (m_data_size != 8) {
-        std::stringstream err_msg;
-        err_msg << "Error: data size must be 8 bytes." << std::endl;
-        throw std::runtime_error(err_msg.str());
-    }
-    if (sizeof(int) != 4) {
-        std::stringstream err_msg;
-        err_msg << "Error: code must be compiled with int size 4 bytes." << std::endl;
-        throw std::runtime_error(err_msg.str());
-    }
-
-    // Read in extra info from binary header.
-    if (m_binary) {
-        int one;
-        igl::_msh_eat_white_space(fin);
-        fin.read(reinterpret_cast<char*>(&one), sizeof(int));
-        if (one != 1) {
-            std::stringstream err_msg;
-                err_msg << "Binary msh file " << filename
-                << " is saved with different endianness than this machine."
-                << std::endl;
-            throw std::runtime_error(err_msg.str());
-        }
-    }
-
-    fin >> buf;
-    if (buf != "$EndMeshFormat") 
-    { 
-        std::stringstream err_msg;
-        err_msg << "Unexpected contents in the file header." << std::endl;
-        throw std::runtime_error(err_msg.str());
-    }
-
-    while (!fin.eof()) {
-        buf.clear();
-        fin >> buf;
-        if (buf == "$Nodes") {
-            parse_nodes(fin);
-            fin >> buf;
-            if (buf != "$EndNodes") { throw std::runtime_error("Unexpected tag"); }
-        } else if (buf == "$Elements") {
-            parse_elements(fin);
-            fin >> buf;
-            if (buf != "$EndElements") { throw std::runtime_error("Unexpected tag"); }
-        } else if (buf == "$NodeData") {
-            parse_node_field(fin);
-            fin >> buf;
-            if (buf != "$EndNodeData") { throw std::runtime_error("Unexpected tag"); }
-        } else if (buf == "$ElementData") {
-            parse_element_field(fin);
-            fin >> buf;
-            if (buf != "$EndElementData") { throw std::runtime_error("Unexpected tag"); }
-        } else if (fin.eof()) {
-            break;
-        } else {
-            parse_unknown_field(fin, buf);
-        }
-    }
-    fin.close();
-}
-
-IGL_INLINE void igl::MshLoader::parse_nodes(std::ifstream& fin) {
-    size_t num_nodes;
-    fin >> num_nodes;
-    m_nodes.resize(num_nodes*3);
-
-    if (m_binary) {
-		size_t stride = (4+3*m_data_size);
-        size_t num_bytes = stride * num_nodes;
-        char* data = new char[num_bytes];
-        igl::_msh_eat_white_space(fin);
-        fin.read(data, num_bytes);
-
-        for (size_t i=0; i<num_nodes; i++) {
-            int node_idx;
-			memcpy(&node_idx, data+i*stride, sizeof(int));
-			node_idx-=1;
-			// directly move into vector storage
-			// this works only when m_data_size==sizeof(Float)==sizeof(double)
-			memcpy(&m_nodes[node_idx*3], data+i*stride + 4, m_data_size*3);
-        }
-        delete [] data;
-    } else {
-        int node_idx;
-        for (size_t i=0; i<num_nodes; i++) {
-            fin >> node_idx;
-            node_idx -= 1;
-            // here it's 3D node explicitly
-            fin >> m_nodes[node_idx*3]
-                >> m_nodes[node_idx*3+1]
-                >> m_nodes[node_idx*3+2];
-        }
-    }
-}
-
-IGL_INLINE void igl::MshLoader::parse_elements(std::ifstream& fin) {
-    m_elements_tags.resize(2); //hardcoded to have 2 tags
-    size_t num_elements;
-    fin >> num_elements;
-
-    size_t nodes_per_element;
-
-    if (m_binary) {
-        igl::_msh_eat_white_space(fin);
-        int elem_read = 0;
-        while (elem_read < num_elements) {
-            // Parse element header.
-            int elem_type, num_elems, num_tags;
-            fin.read((char*)&elem_type, sizeof(int));
-            fin.read((char*)&num_elems, sizeof(int));
-            fin.read((char*)&num_tags,  sizeof(int));
-            nodes_per_element = num_nodes_per_elem_type(elem_type);
-
-            // store node info
-            for (size_t i=0; i<num_elems; i++) {
-                int elem_idx;
-
-                // all elements in the segment share the same elem_type and number of nodes per element
-                m_elements_types.push_back(elem_type);
-                m_elements_lengths.push_back(nodes_per_element);
-
-                fin.read((char*)&elem_idx, sizeof(int));
-                elem_idx -= 1;
-                m_elements_ids.push_back(elem_idx);
-
-                // read first two tags
-                for (size_t j=0; j<num_tags; j++) {
-                    int tag;
-                    fin.read((char*)&tag, sizeof(int));
-                    if(j<2) m_elements_tags[j].push_back(tag);
-                }
-
-                for (size_t j=num_tags; j<2; j++) 
-                    m_elements_tags[j].push_back(-1); // fill up tags if less then 2
-
-                m_elements_nodes_idx.push_back(m_elements.size());
-                // Element values.
-                for (size_t j=0; j<nodes_per_element; j++) {
-                    int idx;
-                    fin.read((char*)&idx, sizeof(int));
-                    
-                    m_elements.push_back(idx-1);
-                }
-            }
-            elem_read += num_elems;
-        }
-    } else {
-        for (size_t i=0; i<num_elements; i++) {
-            // Parse per element header
-            int elem_num, elem_type, num_tags;
-            fin >> elem_num >> elem_type >> num_tags;
-
-            // read tags.
-            for (size_t j=0; j<num_tags; j++) {
-                int tag;
-                fin >> tag;
-                if(j<2) m_elements_tags[j].push_back(tag);
-            }
-            for (size_t j=num_tags; j<2; j++) 
-                m_elements_tags[j].push_back(-1); // fill up tags if less then 2
-            
-            nodes_per_element = num_nodes_per_elem_type(elem_type);
-            m_elements_types.push_back(elem_type);
-            m_elements_lengths.push_back(nodes_per_element);
-
-            elem_num -= 1;
-            m_elements_ids.push_back(elem_num);
-            m_elements_nodes_idx.push_back(m_elements.size());
-            // Parse node idx.
-            for (size_t j=0; j<nodes_per_element; j++) {
-                int idx;
-                fin >> idx;
-                m_elements.push_back(idx-1); // msh index starts from 1.
-            }
-        }
-    }
-    // debug
-    assert(m_elements_types.size()   == m_elements_ids.size());
-    assert(m_elements_tags[0].size() == m_elements_ids.size());
-    assert(m_elements_tags[1].size() == m_elements_ids.size());
-    assert(m_elements_lengths.size() == m_elements_ids.size());
-}
-
-IGL_INLINE void igl::MshLoader::parse_node_field( std::ifstream& fin ) {
-    size_t num_string_tags;
-    size_t num_real_tags;
-    size_t num_int_tags;
-
-    fin >> num_string_tags;
-    std::vector<std::string> str_tags(num_string_tags);
-
-    for (size_t i=0; i<num_string_tags; i++) {
-        igl::_msh_eat_white_space(fin);
-        if (fin.peek() == '\"') {
-            // Handle field name between quotes.
-            char buf[128];
-            fin.get(); // remove the quote at the beginning.
-            fin.getline(buf, 128, '\"');
-            str_tags[i] = std::string(buf);
-        } else {
-            fin >> str_tags[i];
-        }
-    }
-
-    fin >> num_real_tags;
-    std::vector<Float> real_tags(num_real_tags);
-    for (size_t i=0; i<num_real_tags; i++)
-        fin >> real_tags[i];
-
-    fin >> num_int_tags;
-    std::vector<int> int_tags(num_int_tags);
-    for (size_t i=0; i<num_int_tags; i++)
-        fin >> int_tags[i];
-
-    if (num_string_tags <= 0 || num_int_tags <= 2) {
-        throw std::runtime_error("Unexpected number of field tags");
-    }
-    std::string fieldname = str_tags[0];
-    int num_components    = int_tags[1];
-    int num_entries       = int_tags[2];
-
-    std::vector<Float> field( num_entries*num_components );
-
-    if (m_binary) {
-        size_t num_bytes = (num_components * m_data_size + 4) * num_entries;
-        char* data = new char[num_bytes];
-        igl::_msh_eat_white_space(fin);
-        fin.read(data, num_bytes);
-        for (size_t i=0; i<num_entries; i++) {
-			int node_idx;
-			memcpy(&node_idx,&data[i*(4+num_components*m_data_size)],4);
-			
-            if(node_idx<1) throw std::runtime_error("Negative or zero index");
-            node_idx -= 1;
-			
-            if(node_idx>=num_entries) throw std::runtime_error("Index too big");
-            size_t base_idx = i*(4+num_components*m_data_size) + 4;
-            // TODO: make this work when m_data_size != sizeof(double) ?
-			memcpy(&field[node_idx*num_components], &data[base_idx], num_components*m_data_size);
-        }
-        delete [] data;
-    } else {
-        int node_idx;
-        for (size_t i=0; i<num_entries; i++) {
-            fin >> node_idx;
-            node_idx -= 1;
-            for (size_t j=0; j<num_components; j++) {
-                fin >> field[node_idx*num_components+j];
-            }
-        }
-    }
-    
-    m_node_fields_names.push_back(fieldname);
-    m_node_fields.push_back(field);
-    m_node_fields_components.push_back(num_components);
-}
-
-IGL_INLINE void igl::MshLoader::parse_element_field(std::ifstream& fin) {
-    size_t num_string_tags;
-    size_t num_real_tags;
-    size_t num_int_tags;
-
-    fin >> num_string_tags;
-    std::vector<std::string> str_tags(num_string_tags);
-    for (size_t i=0; i<num_string_tags; i++) {
-        igl::_msh_eat_white_space(fin);
-        if (fin.peek() == '\"') {
-            // Handle field name between quoates.
-            char buf[128];
-            fin.get(); // remove the quote at the beginning.
-            fin.getline(buf, 128, '\"');
-            str_tags[i] = buf;
-        } else {
-            fin >> str_tags[i];
-        }
-    }
-
-    fin >> num_real_tags;
-    std::vector<Float> real_tags(num_real_tags);
-    for (size_t i=0; i<num_real_tags; i++)
-        fin >> real_tags[i];
-
-    fin >> num_int_tags;
-    std::vector<int> int_tags(num_int_tags);
-    for (size_t i=0; i<num_int_tags; i++)
-        fin >> int_tags[i];
-
-    if (num_string_tags <= 0 || num_int_tags <= 2) {
-        throw std::runtime_error("Invalid file format");
-    }
-    std::string fieldname = str_tags[0];
-    int num_components = int_tags[1];
-    int num_entries = int_tags[2];
-    std::vector<Float> field(num_entries*num_components);
-
-    if (m_binary) {
-        size_t num_bytes = (num_components * m_data_size + 4) * num_entries;
-        char* data = new char[num_bytes];
-        igl::_msh_eat_white_space(fin);
-        fin.read(data, num_bytes);
-        for (int i=0; i<num_entries; i++) {
-			int elem_idx;
-			// works with sizeof(int)==4
-			memcpy(&elem_idx, &data[i*(4+num_components*m_data_size)],4);
-            elem_idx -= 1;
-			
-			// directly copy data into vector storage space
-			memcpy(&field[elem_idx*num_components], &data[i*(4+num_components*m_data_size) + 4], m_data_size*num_components);
-        }
-        delete [] data;
-    } else {
-        int elem_idx;
-        for (size_t i=0; i<num_entries; i++) {
-            fin >> elem_idx;
-            elem_idx -= 1;
-            for (size_t j=0; j<num_components; j++) {
-                fin >> field[elem_idx*num_components+j];
-            }
-        }
-    }
-    m_element_fields_names.push_back(fieldname);
-    m_element_fields.push_back(field);
-    m_element_fields_components.push_back(num_components);
-}
-
-IGL_INLINE void igl::MshLoader::parse_unknown_field(std::ifstream& fin,
-        const std::string& fieldname) {
-    std::cerr << "Warning: \"" << fieldname << "\" not supported yet.  Ignored." << std::endl;
-    std::string endmark = fieldname.substr(0,1) + "End"
-        + fieldname.substr(1,fieldname.size()-1);
-
-    std::string buf("");
-    while (buf != endmark && !fin.eof()) {
-        fin >> buf;
-    }
-}
-
-IGL_INLINE int igl::MshLoader::num_nodes_per_elem_type(int elem_type) {
-    int nodes_per_element = 0;
-    switch (elem_type) {
-        case ELEMENT_LINE:         // 2-node line
-            nodes_per_element = 2; 
-            break;
-        case ELEMENT_TRI:
-            nodes_per_element = 3; // 3-node triangle
-            break;
-        case ELEMENT_QUAD:
-            nodes_per_element = 4; // 5-node quad
-            break;
-        case ELEMENT_TET:
-            nodes_per_element = 4; // 4-node tetrahedra
-            break;
-        case ELEMENT_HEX:          // 8-node hexahedron
-            nodes_per_element = 8; 
-            break;
-        case ELEMENT_PRISM:        // 6-node prism
-            nodes_per_element = 6; 
-            break;
-        case ELEMENT_LINE_2ND_ORDER: 
-            nodes_per_element = 3;
-            break;
-        case ELEMENT_TRI_2ND_ORDER: 
-            nodes_per_element = 6;
-            break;
-        case ELEMENT_QUAD_2ND_ORDER: 
-            nodes_per_element = 9;
-            break;
-        case ELEMENT_TET_2ND_ORDER: 
-            nodes_per_element = 10;
-            break;
-        case ELEMENT_HEX_2ND_ORDER: 
-            nodes_per_element = 27;
-            break;
-        case ELEMENT_PRISM_2ND_ORDER: 
-            nodes_per_element = 18;
-            break;
-        case ELEMENT_PYRAMID_2ND_ORDER: 
-            nodes_per_element = 14;
-            break;
-        case ELEMENT_POINT:        // 1-node point
-            nodes_per_element = 1; 
-            break;
-        default:
-            std::stringstream err_msg;
-                err_msg << "Element type (" << elem_type << ") is not supported yet."
-                << std::endl;
-            throw std::runtime_error(err_msg.str());
-    }
-    return nodes_per_element;
-}
-
-
-IGL_INLINE bool igl::MshLoader::is_element_map_identity() const
-{
-    for(int i=0;i<m_elements_ids.size();i++) {
-        int id=m_elements_ids[i];
-        if (id!=i) return false;
-    }
-    return true;
-}
-
-
-IGL_INLINE void igl::MshLoader::index_structures(int tag_column)
-{
-    //cleanup
-    m_structure_index.clear();
-    m_structures.clear();
-    m_structure_length.clear();
-
-    //index structure tags
-    for(auto i=0; i != m_elements_tags[tag_column].size(); ++i )
-    {
-        m_structure_index.insert(
-            std::pair<msh_struct,int>(
-                msh_struct( m_elements_tags[tag_column][i], 
-                            m_elements_types[i]), i)
-            );
-    }
-
-    // identify unique structures 
-    std::vector<StructIndex::value_type> _unique_structs;
-    std::unique_copy(std::begin(m_structure_index), 
-                     std::end(m_structure_index), 
-                     std::back_inserter(_unique_structs),
-                     [](const StructIndex::value_type &c1, const StructIndex::value_type &c2)
-                     { return c1.first == c2.first; });
-
-    std::for_each( _unique_structs.begin(), _unique_structs.end(), 
-        [this](const StructIndex::value_type &n){ this->m_structures.push_back(n.first); });
-
-    for(auto t = m_structures.begin(); t != m_structures.end(); ++t)
-    {
-        // identify all elements corresponding to this tag
-        auto structure_range = m_structure_index.equal_range( *t );
-        int cnt=0;
-
-        for(auto i=structure_range.first; i!=structure_range.second; i++)
-            cnt++;
-
-        m_structure_length.insert( std::pair<msh_struct,int>( *t, cnt));
-    }
-}

deps_src/libigl/igl/MshLoader.h

@@ -1,192 +0,0 @@
-// based on MSH reader from PyMesh 
-
-// Copyright (c) 2015 Qingnan Zhou <qzhou@adobe.com>           
-// Copyright (C) 2020 Vladimir Fonov <vladimir.fonov@gmail.com> 
-//
-// This Source Code Form is subject to the terms of the Mozilla 
-// Public License v. 2.0. If a copy of the MPL was not distributed 
-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. 
-#ifndef IGL_MSH_LOADER_H
-#define IGL_MSH_LOADER_H
-#include "igl_inline.h"
-
-#include <fstream>
-#include <map>
-#include <string>
-#include <vector>
-#include <algorithm>
-
-namespace igl {
-
-/// Class for loading information from .msh file
-/// depends only on c++stl library
-class MshLoader {
-    public:
-
-        struct msh_struct {
-            int tag,el_type;
-            msh_struct(int _tag=0,int _type=0):
-                tag(_tag),el_type(_type){}
-            bool operator== (const msh_struct& a) const {
-                return this->tag==a.tag && 
-                       this->el_type==a.el_type;
-            }
-
-            bool operator< (const msh_struct& a) const {
-                return (this->tag*100+this->el_type) < 
-                       (a.tag*100+a.el_type);
-            }
-        };
-
-        typedef double Float;
-        
-        typedef std::vector<int>      IndexVector;
-        typedef std::vector<int>      IntVector;
-        typedef std::vector<Float>    FloatVector;
-        typedef std::vector<FloatVector> FloatField;
-        typedef std::vector<IntVector> IntField;
-        typedef std::vector<std::string> FieldNames;
-        typedef std::multimap<msh_struct,int> StructIndex;
-        typedef std::vector<msh_struct> StructVector;
-
-        enum {ELEMENT_LINE=1, ELEMENT_TRI=2, ELEMENT_QUAD=3, 
-              ELEMENT_TET=4,  ELEMENT_HEX=5, ELEMENT_PRISM=6,
-              ELEMENT_PYRAMID=7,
-              // 2nd order elements
-              ELEMENT_LINE_2ND_ORDER=8, ELEMENT_TRI_2ND_ORDER=9, 
-              ELEMENT_QUAD_2ND_ORDER=10,ELEMENT_TET_2ND_ORDER=11, 
-              ELEMENT_HEX_2ND_ORDER=12, ELEMENT_PRISM_2ND_ORDER=13, 
-              ELEMENT_PYRAMID_2ND_ORDER=14,
-              // other elements
-              ELEMENT_POINT=15 };
-    public:
-        /// Load a .msh file from a given path
-        /// @param[in] filename  path to .msh
-        MshLoader(const std::string &filename);
-
-    public:
-
-        // get nodes , x,y,z sequentially
-        const FloatVector& get_nodes()    const { return m_nodes; } 
-        // get elements , identifying nodes that create an element
-        // variable length per element
-        const IndexVector& get_elements() const { return m_elements; }
-
-        // get element types 
-        const IntVector& get_elements_types() const { return m_elements_types; }
-        // get element lengths
-        const IntVector& get_elements_lengths() const { return m_elements_lengths; }
-        // get element tags ( physical (0) and elementary (1) )
-        const IntField&  get_elements_tags() const { return m_elements_tags; }
-        // get element IDs
-        const IntVector& get_elements_ids() const { return m_elements_ids; }
-
-        // get reverse index from node to element
-        const IndexVector& get_elements_nodes_idx() const { return m_elements_nodes_idx; }
-
-        // get fields assigned per node, all fields and components sequentially
-        const FloatField& get_node_fields() const { return m_node_fields;}
-        // get node field names, 
-        const FieldNames& get_node_fields_names() const { return m_node_fields_names;}
-        // get number of node field components
-        const IntVector&  get_node_fields_components() const {return m_node_fields_components;}
-
-        int get_node_field_components(size_t c)  const 
-        {
-            return m_node_fields_components[c];
-        }
-
-        // get fields assigned per element, all fields and components sequentially
-        const FloatField& get_element_fields() const { return m_element_fields;}
-        // get element field names
-        const FieldNames& get_element_fields_names() const { return m_element_fields_names;}
-        // get number of element field components
-        const IntVector&  get_element_fields_components() const {return m_element_fields_components;}
-
-        int get_element_field_components(size_t c)  const {
-            return m_element_fields_components[c];
-        }
-        // check if field is present at node level
-        bool is_node_field(const std::string& fieldname)  const {
-            return (std::find(std::begin(m_node_fields_names),
-                              std::end(m_node_fields_names),
-                              fieldname) != std::end(m_node_fields_names) );
-        }
-        // check if field is present at element level
-        bool is_element_field(const std::string& fieldname) const {
-            return (std::find(std::begin(m_element_fields_names),
-                              std::end(m_element_fields_names),
-                              fieldname) != std::end(m_node_fields_names) );
-        }
-
-        // check if all elements have ids assigned sequentially
-        bool is_element_map_identity() const ;
-
-        // create tag index
-        // tag_column: ( physical (0) or elementary (1) ) specifying which tag to use
-        void index_structures(int tag_column); 
-
-        // get tag index, call index_structure_tags first
-        const StructIndex& get_structure_index() const 
-        {
-            return m_structure_index;
-        }
-
-        // get size of a structure identified by tag and element type
-        const StructIndex& get_structure_length() const 
-        {
-            return m_structure_length;
-        }
-
-        //! get list of structures
-        const StructVector& get_structures() const 
-        {
-            return m_structures;
-        }
-        
-    public:
-        // helper function, calculate number of nodes associated with an element
-        static int num_nodes_per_elem_type(int elem_type);
-
-    private:
-        void parse_nodes(std::ifstream& fin);
-        void parse_elements(std::ifstream& fin);
-        void parse_node_field(std::ifstream& fin);
-        void parse_element_field(std::ifstream& fin);
-        void parse_unknown_field(std::ifstream& fin,
-                const std::string& fieldname);
-
-    private:
-        bool   m_binary;
-        size_t m_data_size;
-        
-        FloatVector m_nodes;    // len x 3 vector 
-
-        IndexVector m_elements; // linear array for nodes corresponding to each element 
-        IndexVector m_elements_nodes_idx; // element indexes  
-
-        IntVector   m_elements_ids;     // element id's 
-        IntVector   m_elements_types;   // Element types 
-        IntVector   m_elements_lengths; // Element lengths 
-        IntField    m_elements_tags;    // Element tags, currently 2xtags per element 
-
-        FloatField  m_node_fields;      // Float field defined at each node 
-        IntVector   m_node_fields_components; // Number of components for node field 
-        FieldNames  m_node_fields_names; // Node field name 
-
-        FloatField  m_element_fields;    // Float field defined at each element 
-        IntVector   m_element_fields_components; // Number of components for element field 
-        FieldNames  m_element_fields_names; // Element field name 
-
-        StructIndex  m_structure_index; // index tag ids  
-        StructVector m_structures;  // unique structures
-        StructIndex  m_structure_length; // length of structures with consistent element type
-};
-
-} //igl
-
-#ifndef IGL_STATIC_LIBRARY
-#  include "MshLoader.cpp"
-#endif
-
-#endif //IGL_MSH_LOADER_H

deps_src/libigl/igl/MshSaver.cpp

@@ -1,343 +0,0 @@
-// based on MSH writer from PyMesh 
-
-// Copyright (c) 2015 Qingnan Zhou <qzhou@adobe.com>           
-// Copyright (C) 2020 Vladimir Fonov <vladimir.fonov@gmail.com> 
-//
-// This Source Code Form is subject to the terms of the Mozilla 
-// Public License v. 2.0. If a copy of the MPL was not distributed 
-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. 
-
-#include "MshSaver.h"
-
-#include <cassert>
-#include <iostream>
-#include <sstream>
-#include <exception>
-
-
-IGL_INLINE igl::MshSaver::MshSaver(const std::string& filename, bool binary) :
-    m_binary(binary), m_num_nodes(0), m_num_elements(0) {
-        if (!m_binary) {
-            fout.open(filename.c_str(), std::fstream::out);
-        } else {
-            fout.open(filename.c_str(), std::fstream::binary);
-        }
-        if (!fout) {
-            std::stringstream err_msg;
-            err_msg << "Error opening " << filename << " to write msh file." << std::endl;
-            throw std::ios_base::failure(err_msg.str());
-        }
-}
-
-IGL_INLINE igl::MshSaver::~MshSaver() {
-    fout.close();
-}
-
-IGL_INLINE void igl::MshSaver::save_mesh(
-    const FloatVector& nodes, 
-    const IndexVector& elements, 
-    const IntVector& element_lengths,
-    const IntVector& element_types,
-    const IntVector& element_tags
-     ) {
-
-    save_header();
-
-    save_nodes(nodes);
-
-    save_elements(elements, element_lengths, element_types, element_tags );
-}
-
-IGL_INLINE void igl::MshSaver::save_header() {
-    if (!m_binary) {
-        fout << "$MeshFormat" << std::endl;
-        fout << "2.2 0 " << sizeof(double) << std::endl;
-        fout << "$EndMeshFormat" << std::endl;
-        fout.precision(17);
-    } else {
-        fout << "$MeshFormat" << std::endl;
-        fout << "2.2 1 " << sizeof(double) << std::endl;
-        int one = 1;
-        fout.write((char*)&one, sizeof(int));
-        fout << "\n$EndMeshFormat" << std::endl;
-    }
-    fout.flush();
-}
-
-IGL_INLINE void igl::MshSaver::save_nodes(const FloatVector& nodes) {
-    // Save nodes.
-    // 3D hadrcoded
-    m_num_nodes = nodes.size() / 3;
-    fout << "$Nodes" << std::endl;
-    fout << m_num_nodes << std::endl;
-    if (!m_binary) {
-        for (size_t i=0; i<nodes.size(); i+=3) {
-            //const VectorF& v = nodes.segment(i,m_dim);
-            int node_idx = i/3 + 1;
-            fout << node_idx << " " << nodes[i] << " " << nodes[i+1] << " " << nodes[i+2] << std::endl;
-        }
-    } else {
-        for (size_t i=0; i<nodes.size(); i+=3) {
-            //const VectorF& v = nodes.segment(i,m_dim);
-            int node_idx = i/3 + 1;
-            fout.write((const char*)&node_idx, sizeof(int));
-            fout.write((const char*)&nodes[i], sizeof(Float)*3);
-        }
-    }
-    fout << "$EndNodes" << std::endl;
-    fout.flush();
-}
-
-IGL_INLINE void igl::MshSaver::save_elements(const IndexVector& elements, 
-            const IntVector& element_lengths,
-            const IntVector& element_types,
-            const IntVector& element_tags) 
-    {
-
-    m_num_elements = element_tags.size();
-    assert(element_lengths.size() == element_types.size() );
-    assert(element_lengths.size() == element_tags.size() );
-    // TODO: sum up all lengths
-    // Save elements.
-    // node inxes are 1-based
-    fout << "$Elements" << std::endl;
-    fout << m_num_elements << std::endl;
-
-    if (m_num_elements > 0) {
-        //int elem_type = el_type;
-        //int tags = 0;
-        if (!m_binary) {
-            size_t el_ptr=0;
-            for (size_t i=0;i<m_num_elements;++i) {
-                
-                int elem_num = (int) i + 1;
-                ///VectorI elem = elements.segment(i, nodes_per_element) + VectorI::Ones(nodes_per_element);
-                // hardcoded: duplicate tags (I don't know why)
-                fout << elem_num << " " << element_types[i] << " " << 2 << " "<< element_tags[i] << " "<< element_tags[i] << " ";
-                for (size_t j=0; j<element_lengths[i]; j++) {
-                    fout << elements[el_ptr + j] + 1 << " ";
-                }
-                fout << std::endl;
-                el_ptr+=element_lengths[i];
-            }
-        } else {
-            size_t el_ptr=0,i=0;
-            while(i<m_num_elements) {
-
-                // write elements in consistent chunks
-                // TODO: refactor this code to be able to specify different elements
-                // more effeciently 
-
-                int elem_type=-1;
-                int elem_len=-1;
-                size_t j=i;
-                for(;j<m_num_elements;++j)
-                {
-                    if( elem_type==-1 ) 
-                    {
-                        elem_type=element_types[j];
-                        elem_len=element_lengths[j];
-                    } else if( elem_type!=element_types[j] || 
-                               elem_len!=element_lengths[j]) {
-                        break; // found the edge of the segment
-                    }
-                }
-
-                //hardcoded: 2 tags
-                int num_elems=j-i, num_tags=2;
-
-                fout.write((const char*)& elem_type, sizeof(int));
-                fout.write((const char*)& num_elems, sizeof(int));
-                fout.write((const char*)& num_tags,  sizeof(int));
-
-                for(int k=0;k<num_elems; ++k,++i){
-                    int elem_num = (int )i + 1;
-                    fout.write((const char*)&elem_num, sizeof(int));
-
-                    // HACK: hardcoded 2 tags
-                    fout.write((const char*)& element_tags[i], sizeof(int));
-                    fout.write((const char*)& element_tags[i], sizeof(int));
-
-                    for (size_t e=0; e<elem_len; e++) {
-                        int _elem = static_cast<int>( elements[el_ptr + e] )+1;
-                        fout.write((const char*)&_elem, sizeof(int));
-                    }
-                    el_ptr+=elem_len;
-                }
-            }
-        }
-    }
-    fout << "$EndElements" << std::endl;
-    fout.flush();
-}
-
-IGL_INLINE void igl::MshSaver::save_scalar_field(const std::string& fieldname, const FloatVector& field) {
-    assert(field.size() == m_num_nodes);
-    fout << "$NodeData" << std::endl;
-    fout << "1" << std::endl; // num string tags.
-    fout << "\"" << fieldname << "\"" << std::endl;
-    fout << "1" << std::endl; // num real tags.
-    fout << "0.0" << std::endl; // time value.
-    fout << "3" << std::endl; // num int tags.
-    fout << "0" << std::endl; // the time step
-    fout << "1" << std::endl; // 1-component scalar field.
-    fout << m_num_nodes << std::endl; // number of nodes
-
-    if (m_binary) {
-        for (size_t i=0; i<m_num_nodes; i++) {
-            int node_idx = i+1;
-            fout.write((char*)&node_idx, sizeof(int));
-            fout.write((char*)&field[i], sizeof(Float));
-        }
-    } else {
-        for (size_t i=0; i<m_num_nodes; i++) {
-            int node_idx = i+1;
-            fout << node_idx << " " << field[i] << std::endl;
-        }
-    }
-    fout << "$EndNodeData" << std::endl;
-    fout.flush();
-}
-
-IGL_INLINE void igl::MshSaver::save_vector_field(const std::string& fieldname, const FloatVector& field) {
-    assert(field.size() == 3 * m_num_nodes);
-
-    fout << "$NodeData" << std::endl;
-    fout << "1" << std::endl; // num string tags.
-    fout << "\"" << fieldname << "\"" << std::endl;
-    fout << "1" << std::endl; // num real tags.
-    fout << "0.0" << std::endl; // time value.
-    fout << "3" << std::endl; // num int tags.
-    fout << "0" << std::endl; // the time step
-    fout << "3" << std::endl; // 3-component vector field.
-    fout << m_num_nodes << std::endl; // number of nodes
-
-    if (m_binary) {
-        for (size_t i=0; i<m_num_nodes; i++) {
-            int node_idx = i+1;
-            fout.write((const char*)&node_idx, sizeof(int));
-            fout.write((const char*)&field[i*3], sizeof(Float)*3);
-        }
-    } else {
-        for (size_t i=0; i<m_num_nodes; i++) {
-            int node_idx = i+1;
-                fout << node_idx
-                    << " " << field[i*3]
-                    << " " << field[i*3+1]
-                    << " " << field[i*3+2]
-                    << std::endl;
-        }
-    }
-    fout << "$EndNodeData" << std::endl;
-    fout.flush();
-}
-
-IGL_INLINE void igl::MshSaver::save_elem_scalar_field(const std::string& fieldname, const FloatVector& field) {
-    assert(field.size() == m_num_elements);
-    fout << "$ElementData" << std::endl;
-    fout << 1 << std::endl; // num string tags.
-    fout << "\"" << fieldname << "\"" << std::endl;
-    fout << "1" << std::endl; // num real tags.
-    fout << "0.0" << std::endl; // time value.
-    fout << "3" << std::endl; // num int tags.
-    fout << "0" << std::endl; // the time step
-    fout << "1" << std::endl; // 1-component scalar field.
-    fout << m_num_elements << std::endl; // number of elements
-
-    if (m_binary) {
-        for (size_t i=0; i<m_num_elements; i++) {
-            int elem_idx = i+1;
-            fout.write((const char*)&elem_idx, sizeof(int));
-            fout.write((const char*)&field[i], sizeof(Float));
-        }
-    } else {
-        for (size_t i=0; i<m_num_elements; i++) {
-            int elem_idx = i+1;
-            fout << elem_idx << " " << field[i] << std::endl;
-        }
-    }
-
-    fout << "$EndElementData" << std::endl;
-    fout.flush();
-}
-
-IGL_INLINE void igl::MshSaver::save_elem_vector_field(const std::string& fieldname, const FloatVector& field) {
-    assert(field.size() == m_num_elements * 3);
-    fout << "$ElementData" << std::endl;
-    fout << 1 << std::endl; // num string tags.
-    fout << "\"" << fieldname << "\"" << std::endl;
-    fout << "1" << std::endl; // num real tags.
-    fout << "0.0" << std::endl; // time value.
-    fout << "3" << std::endl; // num int tags.
-    fout << "0" << std::endl; // the time step
-    fout << "3" << std::endl; // 3-component vector field.
-    fout << m_num_elements << std::endl; // number of elements
-
-    if (m_binary) {
-        for (size_t i=0; i<m_num_elements; ++i) {
-            int elem_idx = i+1;
-            fout.write((const char*)&elem_idx, sizeof(int));
-            fout.write((const char*)&field[i*3], sizeof(Float) * 3);
-        }
-    } else {
-        for (size_t i=0; i<m_num_elements; ++i) {
-            int elem_idx = i+1;
-            fout << elem_idx
-                << " " << field[i*3]
-                << " " << field[i*3+1]
-                << " " << field[i*3+2]
-                << std::endl;
-        }
-    }
-
-    fout << "$EndElementData" << std::endl;
-    fout.flush();
-}
-
-
-IGL_INLINE void igl::MshSaver::save_elem_tensor_field(const std::string& fieldname, const FloatVector& field) {
-    assert(field.size() == m_num_elements * 3 * (3 + 1) / 2);
-    fout << "$ElementData" << std::endl;
-    fout << 1 << std::endl; // num string tags.
-    fout << "\"" << fieldname << "\"" << std::endl;
-    fout << "1" << std::endl; // num real tags.
-    fout << "0.0" << std::endl; // time value.
-    fout << "3" << std::endl; // num int tags.
-    fout << "0" << std::endl; // the time step
-    fout << "9" << std::endl; // 9-component tensor field.
-    fout << m_num_elements << std::endl; // number of elements
-
-    
-    if (m_binary) {
-        for (size_t i=0; i<m_num_elements; i++) {
-            int elem_idx = i+1;
-            fout.write((char*)&elem_idx, sizeof(int));
-            //const VectorF& val = field.segment(i*6, 6);
-            const Float* val = &field[i*6];
-            Float tensor[9] = {
-                val[0], val[5], val[4],
-                val[5], val[1], val[3],
-                val[4], val[3], val[2] };
-            fout.write((char*)tensor, sizeof(Float) * 9);
-        }
-    } else {
-        for (size_t i=0; i<m_num_elements; i++) {
-            int elem_idx = i+1;
-            const Float* val = &field[i*6];
-            fout << elem_idx
-                << " " << val[0]
-                << " " << val[5]
-                << " " << val[4]
-                << " " << val[5]
-                << " " << val[1]
-                << " " << val[3]
-                << " " << val[4]
-                << " " << val[3]
-                << " " << val[2]
-                << std::endl;
-        }
-    }
-
-    fout << "$EndElementData" << std::endl;
-    fout.flush();
-}

deps_src/libigl/igl/MshSaver.h

@@ -1,87 +0,0 @@
-// based on MSH writer from PyMesh 
-
-// Copyright (c) 2015 Qingnan Zhou <qzhou@adobe.com>           
-// Copyright (C) 2020 Vladimir Fonov <vladimir.fonov@gmail.com> 
-//
-// This Source Code Form is subject to the terms of the Mozilla 
-// Public License v. 2.0. If a copy of the MPL was not distributed 
-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. 
-#ifndef IGL_MSH_SAVER_H
-#define IGL_MSH_SAVER_H
-#include "igl_inline.h"
-
-#include <fstream>
-#include <string>
-#include <vector>
-
-namespace igl {
-
-/// Class for dumping information to .msh file
-/// depends only on c++stl library
-/// current implementation works only with 3D information
-class MshSaver {
-    public:
-        typedef double Float;
-
-        typedef std::vector<int>         IndexVector;
-        typedef std::vector<int>         IntVector;
-        typedef std::vector<Float>       FloatVector;
-        typedef std::vector<FloatVector> FloatField;
-        typedef std::vector<IntVector>   IntField;
-        typedef std::vector<std::string> FieldNames;
-
-        /// Write a .msh to a given path
-        /// @param[in] filename  path to output file
-        /// @param[in] binary    whether to write in binary format
-        MshSaver(const std::string& filename, bool binary=true);
-        ~MshSaver();
-
-    public:
-        // Only these element types are supported right now
-        enum {ELEMENT_LINE=1, ELEMENT_TRI=2, ELEMENT_QUAD=3, 
-              ELEMENT_TET=4,  ELEMENT_HEX=5, ELEMENT_PRISM=6 };
-
-    public:
-        // save mesh geometry
-        void save_mesh(
-            const FloatVector& nodes, 
-            const IndexVector& elements, 
-            const IntVector& element_lengths,
-            const IntVector& element_type,
-            const IntVector& element_tags );
-        
-        // save additional fields associated with the mesh
-
-        // add node scalar field
-        void save_scalar_field(const std::string& fieldname, const FloatVector& field);
-        // add node vectot field
-        void save_vector_field(const std::string& fieldname, const FloatVector& field);
-        // add element scalar field
-        void save_elem_scalar_field(const std::string& fieldname, const FloatVector& field);
-        // add element vector field
-        void save_elem_vector_field(const std::string& fieldname, const FloatVector& field);
-        // add element tensor field
-        void save_elem_tensor_field(const std::string& fieldname, const FloatVector& field);
-
-    protected:
-        void save_header();
-        void save_nodes(const FloatVector& nodes);
-        void save_elements(const IndexVector& elements, 
-            const IntVector& element_lengths,
-            const IntVector& element_type,
-            const IntVector& element_tags);
-
-    private:
-        bool m_binary;
-        size_t m_num_nodes;
-        size_t m_num_elements;
-
-        std::ofstream fout;
-};
-} //igl
-
-#ifndef IGL_STATIC_LIBRARY
-#  include "MshSaver.cpp"
-#endif
-
-#endif //MSH_SAVER_H

deps_src/libigl/igl/NormalType.h

@@ -10,15 +10,14 @@
 
 namespace igl
 {
-  /// Type of mesh normal computation method
+  // PER_VERTEX_NORMALS  Normals computed per vertex based on incident faces
+  // PER_FACE_NORMALS  Normals computed per face
+  // PER_CORNER_NORMALS  Normals computed per corner (aka wedge) based on
+  //   incident faces without sharp edge
   enum NormalType
   {
-    /// Normals computed per vertex based on incident faces
     PER_VERTEX_NORMALS,
-    /// Normals computed per face
     PER_FACE_NORMALS,
-    /// Normals computed per corner (aka wedge) based on incident faces without
-    /// sharp edge
     PER_CORNER_NORMALS
   };
 #  define NUM_NORMAL_TYPE 3

deps_src/libigl/igl/ONE.h

@@ -9,9 +9,9 @@
 #define IGL_ONE_H
 namespace igl
 {
-  /// Often one needs a reference to a dummy variable containing one as its
-  /// value, for example when using AntTweakBar's
-  /// TwSetParam( "3D View", "opened", TW_PARAM_INT32, 1, &INT_ONE);
+  // Often one needs a reference to a dummy variable containing one as its
+  // value, for example when using AntTweakBar's
+  // TwSetParam( "3D View", "opened", TW_PARAM_INT32, 1, &INT_ONE);
   const char CHAR_ONE = 1;
   const int INT_ONE = 1;
   const unsigned int UNSIGNED_INT_ONE = 1;

deps_src/libigl/igl/PI.h

@@ -11,11 +11,9 @@ namespace igl
 {
   // Use standard mathematical constants' M_PI if available
 #ifdef M_PI
-  /// π
-  constexpr double PI = M_PI;
+  const double PI = M_PI;
 #else
-  /// π
-  constexpr double PI = 3.1415926535897932384626433832795;
+  const double PI = 3.1415926535897932384626433832795;
 #endif
 }
 #endif