Merge remote-tracking branch 'upstream/master'

Author: ArchiePayne

.clang-tidy

@@ -1,4 +1,4 @@
-Checks: '-*,performance-*,modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,-modernize-avoid-c-arrays,-modernize-use-auto,-modernize-avoid-bind,-performance-no-int-to-ptr'
+Checks: '-*,performance-*,modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,-modernize-avoid-c-arrays,-modernize-use-auto,-modernize-avoid-bind,-performance-no-int-to-ptr,-modernize-use-emplace'
 WarningsAsErrors: '*'
 UseColor: true
 FormatStyle: none

.cppcheck.supp

@@ -1,4 +1,6 @@
 // remove some checks
+duplInheritedMember  // VTK design
+missingIncludeSystem // cppcheck seems confused about this
 missingInclude
 unusedFunction
 unknownMacro
@@ -12,14 +14,27 @@ unknownMacro
 *:external/imgui/*.h
 *:external/imgui/*.cpp
 
+// generated files
+*:*vtkextTests.cxx
+*:*vtkextPrivateTests.cxx
+*:*vtkextNativeTests.cxx
+*:*VTKExtensionsPluginAlembic.cxx
+*:*VTKExtensionsPluginAssimp.cxx
+*:*vtkextDracoTests.cxx
+*:*vtkextOCCTTests.cxx
+*:*VTKExtensionsPluginUSD.cxx
+*:*libf3dSDKTests.cxx
+
 // specific checks
 knownConditionTrueFalse:library/testing/TestSDKImage.cxx
 knownConditionTrueFalse:library/testing/TestSDKImageDeprecated.cxx
 noExplicitConstructor:library/public/types.h
 preprocessorErrorDirective:library/src/engine.cxx
 preprocessorErrorDirective:plugins/draco/module/vtkF3DDracoReader.cxx
 unknownMacro:library/VTKExtensions/Applicative/vtkF3DObjectFactory.cxx
-unusedVariable:*factory.cxx*
 constParameter:library/src/image.cxx
 invalidPointerCast:plugins/native/module/vtkF3DSplatReader.cxx
 invalidPointerCast:plugins/draco/module/vtkF3DGLTFDocumentLoader.cxx
+unusedStructMember:plugins/native/module/vtkF3DQuakeMDLImporter.cxx
+unusedStructMember:plugins/native/module/vtkF3DSPZReader.cxx
+constParameterPointer:vtkext/private/module/vtkF3DMetaImporter.cxx

.gitattributes

@@ -2,5 +2,6 @@ testing/data/**/* filter=lfs diff=lfs merge=lfs -text
 testing/baselines/**/* filter=lfs diff=lfs merge=lfs -text
 testing/data/DATA_LICENSES.md !filter !diff !merge text
 examples/**/*/data/**/* filter=lfs diff=lfs merge=lfs -text
+examples/**/*/public/**/* filter=lfs diff=lfs merge=lfs -text
 examples/**/*/baselines/**/* filter=lfs diff=lfs merge=lfs -text
 .github/baselines/**/* filter=lfs diff=lfs merge=lfs -text

.github/FUNDING.yml

@@ -1,6 +1,4 @@
 github: f3d-app
-patreon: f3d_app_foundation
 ko_fi: f3d_app
 liberapay: f3d-app
-buy_me_a_coffee: f3d.app
-custom: [fr.tipeee.com/f3d-app, donorbox.org/support-f3d]
+custom: f3d.app/thanks

.github/ISSUE_TEMPLATE/new_release.md

@@ -15,14 +15,15 @@ Before release:
 
 - [ ] Force fetch origin remote tag with `git fetch origin --tags --force`
 - [ ] Write and format release notes from the pull requests since last release, including contributors and packagers
+- [ ] Create a new [NPM token](https://www.npmjs.com/package/f3d) and replace the existing `NPM_TOKEN` in https://github.com/f3d-app/f3d-superbuild/settings/secrets/actions
 
 Release Split :
 
 - [ ] Create, review and merge a MR from `master` branch into `release`: https://github.com/f3d-app/f3d/compare/release...master
 
 Release Candidates :
 
-- [ ] Commit, review and merge a `vX.Y.Z-RCN` version change in https://github.com/f3d-app/f3d `CMakeLists.txt` and `pyproject.toml` in the `release` branch
+- [ ] Commit, review and merge a `vX.Y.Z-RCN` version change in https://github.com/f3d-app/f3d `CMakeLists.txt`, `pyproject.toml` and `package.json` in the `release` branch
 - [ ] Tag and push to https://github.com/f3d-app/f3d: `git tag vX.Y.Z-RCN -m vX.Y.Z-RCN`
 - [ ] Trigger a release build using https://github.com/f3d-app/f3d-superbuild actions with `vX.Y.Z-RCN` F3D version, superbuild `main` branch and prerelease publish `true`
 - [ ] Download the prerelease from https://github.com/f3d-app/f3d/releases
@@ -33,6 +34,7 @@ Release Candidates :
 - [ ] Locally test the python wheels on Linux
 - [ ] Locally test the python wheels on macOS (Silicon)
 - [ ] Locally test the python wheels on Windows
+- [ ] Locally test the wasm package
 - If it fails,
   - [ ] Fix the issues in `release` branch,
   - [ ] Edit this issue and increment `N`
@@ -41,23 +43,27 @@ Release Candidates :
 
 Release :
 
-- [ ] Commit, review and merge `vX.Y.Z` version change in https://github.com/f3d-app/f3d `CMakeLists.txt`, `pyproject.toml`, `webassembly/package.json` and the multiple `doxygen\conf.py` in the `release` branch
+- [ ] Commit, review and merge `vX.Y.Z` version change in https://github.com/f3d-app/f3d `CMakeLists.txt`, `pyproject.toml` and `package.json` in the `release` branch
 - [ ] Tag `vX.Y.Z` and push it to https://github.com/f3d-app/f3d: `git tag vX.Y.Z -m vX.Y.Z`
 - [ ] Commit, review and merge adding `X.Y.Z` in https://github.com/f3d-app/f3d-superbuild `versions.cmake` in the `main` branch
 - [ ] Tag `vX.Y.Z` and push it to https://github.com/f3d-app/f3d-superbuild: `git tag vX.Y.Z -m vX.Y.Z`
 - [ ] Merge F3D release into master: https://github.com/f3d-app/f3d/compare/master...release
 - [ ] Trigger a release build using https://github.com/f3d-app/f3d-superbuild actions with `vX.Y.Z` F3D version, `vX.Y.Z` sb version and prerelease publish true
 - [ ] Finalize release note and add them to the release
+- [ ] Format the release note into a changelog and commit/review/merge them into https://github.com/f3d-app/f3d
+- [ ] Update dev and nightly docs as described [here](https://f3d.app/dev/TOOLING#how-to-update-the-doc-using-latest-master), commit/review/merge into https://github.com/f3d-app/f3d-website
+- [ ] Add a **new versioned doc** as described [here](https://f3d.app/dev/TOOLING#how-to-update-the-doc-for-a-new-release), commit/review/merge into https://github.com/f3d-app/f3d-website
+- [ ] Commit review and merge a bump of F3D version in `package.json` in https://github.com/f3d-app/f3d-website
+- [ ] Update **download links** using `GITHUB_TOKEN=$PAT npm run update-downloads`, commit/review/merge into https://github.com/f3d-app/f3d-website and then immediately
 - [ ] Release
-- [ ] Update **download links** and **changelog** in https://github.com/f3d-app/f3d `doc`
 - [ ] Communicate on discord
 - [ ] Communicate on reddit
 - [ ] Communicate on hackernews
 - [ ] Communicate on linkedin
 - [ ] Communicate on mastodon
 - [ ] Communicate on bluesky
 - [ ] Move all issue from current milestone to next milestone, close current roadmap issue and open a next roadmap issue
-- [ ] Update `doc/dev/ROADMAPS_AND_RELEASES.md` for next release
+- [ ] Update `dev/ROADMAPS_AND_RELEASES.md` for next release in https://github.com/f3d-app/f3d-website
 - [ ] Create an issue for updating dependencies in CI and superbuild
 - [ ] Update `.github/ISSUE_TEMPLATE/new_release.md` in https://github.com/f3d-app/f3d if needed
 
@@ -128,6 +134,18 @@ eng.interactor.start()
   - The name of the window is `f3d` at all time
   - Python provides suggestions whenever the "Tab" key is pressed
 
+Webassembly testing protocol:
+
+- Clone https://github.com/f3d-app/f3d-website
+- Replace the current `f3d` version by the last RC available and run the website locally to check the web viewer
+- Make sure to check for broken anchor in the npm output
+
+```bash
+npm uninstall f3d
+npm install f3d --tag next
+npm run start
+```
+
 Once a release cycle:
 
 - Check that completions are still working with `fish` and `zsh` when tab is pressed

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,24 +4,13 @@
 
 ### Checklist for finalizing the PR
 
-- [ ] I have performed a [self-review](https://f3d.app/doc/dev/CODING_STYLE.html) of my code
-- [ ] I have added [tests](https://f3d.app/doc/dev/TESTING.html) for new features and bugfixes
-- [ ] I have added [documentation](https://f3d.app/) for new features
+- [ ] I have performed a [self-review](https://f3d.app/dev/CODING_STYLE) of my code
+- [ ] I have added [tests](https://f3d.app/dev/TESTING) for new features and bugfixes
+- [ ] I have added [documentation](https://f3d.app/docs/next/user/QUICKSTART) for new features
 - [ ] If it is a modifying the libf3d API, I have updated bindings
-- [ ] If it is a modifying the `.github/workflows/versions.json`, I have updated `timestamp`
+- [ ] If it is a modifying the `.github/workflows/versions.json`, I have updated `docker_timestamp`
 
 ### Continuous integration
 
-Please check the checkbox of the CI you want to run, then push again on your branch.
-
-- [ ] Style checks
-- [ ] Fast CI
-- [ ] Coverage cached CI
-- [ ] Analysis cached CI
-- [ ] WASM docker CI
-- [ ] Android docker CI
-- [ ] macOS Intel cached CI
-- [ ] macOS ARM cached CI
-- [ ] Windows cached CI
-- [ ] Linux cached CI
-- [ ] Other cached CI
+Please write a comment to run CI, eg: `\ci fast`.
+See [here](https://f3d.app/dev/CONTRIBUTING#continuous-integration) for more info.

.github/actions/alembic-install-dep/action.yml

@@ -11,6 +11,9 @@ inputs:
   imath_version:
     description: "Version of imath to build against"
     required: true
+  global_cache_index:
+    description: "Global cache index"
+    required: true
 
 runs:
   using: "composite"
@@ -20,13 +23,14 @@ runs:
       run: |
         [[ "${{ inputs.version }}" ]] || { echo "version input is empty" ; exit 1; }
         [[ "${{ inputs.imath_version }}" ]] || { echo "imath_version input is empty" ; exit 1; }
+        [[ "${{ inputs.global_cache_index }}" ]] || { echo "global_cache_index input is empty" ; exit 1; }
 
     - name: Cache Alembic
       id: cache-alembic
       uses: actions/cache/restore@v4
       with:
         path: dependencies/alembic_install
-        key: alembic-${{inputs.version}}-${{inputs.imath_version}}-${{runner.os}}-${{inputs.cpu}}-0
+        key: alembic-${{inputs.version}}-${{inputs.imath_version}}-${{runner.os}}-${{inputs.cpu}}-${{inputs.global_cache_index}}-3
 
     - name: Checkout Alembic
       if: steps.cache-alembic.outputs.cache-hit != 'true'
@@ -36,6 +40,13 @@ runs:
         path: "./dependencies/alembic"
         ref: ${{inputs.version}}
 
+    # https://github.com/alembic/alembic/issues/476
+    - name: Patch Alembic rpath issue
+      if: steps.cache-alembic.outputs.cache-hit != 'true' && inputs.version == '1.8.9'
+      working-directory: ${{github.workspace}}/dependencies/alembic
+      shell: bash
+      run: patch -p1 < $GITHUB_ACTION_PATH/fix_cmake_rpath.patch
+
     - name: Setup Alembic
       if: steps.cache-alembic.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/dependencies

.github/actions/alembic-install-dep/fix_cmake_rpath.patch

@@ -0,0 +1,26 @@
+From 99caa8156fb65a1c0a97ef4b168ca720787e04b8 Mon Sep 17 00:00:00 2001
+From: Mathieu Westphal <mathieu.westphal@kitware.com>
+Date: Thu, 30 Oct 2025 08:49:47 +0100
+Subject: [PATCH] fix_cmake_rpath
+
+---
+ lib/Alembic/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+index 8cb8ddb9..b5a73a6d 100644
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -67,6 +67,9 @@ IF (ALEMBIC_SHARED_LIBS)
+     VERSION ${PROJECT_VERSION})
+ ENDIF()
+ 
++if (APPLE OR UNIX)
++  set_target_properties(Alembic PROPERTIES INSTALL_RPATH "$<TARGET_FILE_DIR:Imath::Imath>")
++endif ()
+ 
+ TARGET_LINK_LIBRARIES(Alembic
+     LINK_PUBLIC
+-- 
+2.51.1
+

.github/actions/assimp-install-dep/action.yml

@@ -8,6 +8,9 @@ inputs:
   version:
     description: "Version of assimp to build"
     required: true
+  global_cache_index:
+    description: "Global cache index"
+    required: true
 
 runs:
   using: "composite"
@@ -16,13 +19,14 @@ runs:
       shell: bash
       run: |
         [[ "${{ inputs.version }}" ]] || { echo "version input is empty" ; exit 1; }
+        [[ "${{ inputs.global_cache_index }}" ]] || { echo "global_cache_index input is empty" ; exit 1; }
 
     - name: Cache ASSIMP
       id: cache-assimp
       uses: actions/cache/restore@v4
       with:
         path: dependencies/assimp_install
-        key: assimp-${{inputs.version}}-${{runner.os}}-${{inputs.cpu}}-0
+        key: assimp-${{inputs.version}}-${{runner.os}}-${{inputs.cpu}}-${{inputs.global_cache_index}}-1
 
     - name: Checkout ASSIMP
       if: steps.cache-assimp.outputs.cache-hit != 'true'

.github/actions/blosc-install-dep/action.yml

@@ -11,6 +11,9 @@ inputs:
   zlib_version:
     description: "Version of zlib to build against"
     required: true
+  global_cache_index:
+    description: "Global cache index"
+    required: true
 
 runs:
   using: "composite"
@@ -20,13 +23,14 @@ runs:
       run: |
         [[ "${{ inputs.version }}" ]] || { echo "version input is empty" ; exit 1; }
         [[ "${{ inputs.zlib_version }}" ]] || { echo "zlib_version input is empty" ; exit 1; }
+        [[ "${{ inputs.global_cache_index }}" ]] || { echo "global_cache_index input is empty" ; exit 1; }
 
     - name: Cache blosc
       id: cache-blosc
       uses: actions/cache/restore@v4
       with:
         path: dependencies/blosc_install
-        key: blosc-${{inputs.version}}-${{inputs.zlib_version}}-${{runner.os}}-${{inputs.cpu}}-0
+        key: blosc-${{inputs.version}}-${{inputs.zlib_version}}-${{runner.os}}-${{inputs.cpu}}-${{inputs.global_cache_index}}-1
 
     # Dependents: openvdb vtk
     - name: Checkout blosc