Deploying to gh-pages from @ 519edac 🚀

f3d-app · Jan 8, 2024 · 7c394b1 · 7c394b1
1 parent febd3ab
commit 7c394b1
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 13 deletions.
diff --git a/assets/js/search-data.json b/assets/js/search-data.json
diff --git a/doc/CHANGELOG.html b/doc/CHANGELOG.html
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -11,7 +11,7 @@ For F3D users:
  - Reading EXR files is now multi-threaded and much faster.
  - Translucency support is now enabled by default.
  - A small margin is added between the model and the grid to avoid potential z-fighting.
- - Add X files support (part of `assimp` plugin)
+ - Add 3MF and X files support (part of `assimp` plugin)
  - Fix potential crashes when reading `assimp` plugin file format
 
 For libf3d users:

diff --git a/doc/dev/BUILD.html b/doc/dev/BUILD.html
diff --git a/doc/dev/BUILD.md b/doc/dev/BUILD.md
@@ -44,7 +44,7 @@ Some modules, plugins and bindings depending on external libraries can be option
 * `F3D_MODULE_EXR`: Support for OpenEXR images. Requires `OpenEXR`. Disabled by default.
 * `F3D_PLUGIN_BUILD_EXODUS`: Support for ExodusII (.ex2) file format. Requires that VTK has been built with `IOExodus` module (and `hdf5`). Enabled by default.
 * `F3D_PLUGIN_BUILD_OCCT`: Support for STEP, IGES and BREP file formats. Requires `OpenCASCADE`. Disabled by default.
-* `F3D_PLUGIN_BUILD_ASSIMP`: Support for FBX, DAE, OFF, DXF and X file formats. Requires `Assimp`. Disabled by default.
+* `F3D_PLUGIN_BUILD_ASSIMP`: Support for FBX, DAE, OFF, DXF, X and 3MF file formats. Requires `Assimp`. Disabled by default.
 * `F3D_PLUGIN_BUILD_ALEMBIC`: Support for ABC file format. Requires `Alembic`. Disabled by default.
 * `F3D_PLUGIN_BUILD_DRACO`: Support for DRC file format. Requires `Draco`. Disabled by default.
 * `F3D_PLUGIN_BUILD_USD`: Support for USD file format. Requires `OpenUSD`. Disabled by default.

diff --git a/doc/user/LIMITATIONS_AND_TROUBLESHOOTING.html b/doc/user/LIMITATIONS_AND_TROUBLESHOOTING.html
diff --git a/doc/user/LIMITATIONS_AND_TROUBLESHOOTING.md b/doc/user/LIMITATIONS_AND_TROUBLESHOOTING.md
@@ -11,12 +11,14 @@ Here is a non exhaustive list of F3D limitations:
 * The `--camera-zoom-factor` option require VTK >= 9.3.0
 
 ## Assimp
-FBX, DAE, OFF, DXF and X file formats rely on [Assimp](https://github.com/assimp/assimp) library. It comes with some known limitations:
+FBX, DAE, OFF, DXF, X and 3MF file formats rely on [Assimp](https://github.com/assimp/assimp) library. It comes with some known limitations:
 - PBR materials are not supported for FBX file format.
 - Complex animations are not working very well with Assimp 5.1, it's recommended to use Assimp 5.0 for this use case.
 - Only one animation can be shown at a time, showing all animations is not supported yet.
 - Some files can be empty, crash, or show artifacts.
 - DXF support is very limited: only files with polylines and 3D faces are displayed.
+- 3MF files may crash at exit (issue in Assimp: https://github.com/assimp/assimp/issues/5328)
+- Only support RBGA 8-bits embedded textures
 
 ## Alembic
 ABC file formats rely on [Alembic](https://github.com/alembic/alembic) library. It comes with some known limitations:

diff --git a/doc/user/USAGE.html b/doc/user/USAGE.html
diff --git a/doc/user/USAGE.md b/doc/user/USAGE.md
@@ -36,10 +36,11 @@ Here is the list of supported file formats:
 * **.off** : Object File Format (full scene)
 * **.dxf** : Drawing Exchange Format (full scene)
 * **.x** : DirectX Format (full scene)
+* **.3mf** : 3D Manufacturing Format (full scene)
 
 ## Scene construction
 
-The **full scene** formats (.gltf/.glb, .3ds, .wrl, .obj, .fbx, .dae, .off) contain not only *geometry*, 
+The **full scene** formats (.gltf/.glb, .3ds, .wrl, .obj, .fbx, .dae, .off, .x, .3mf) contain not only *geometry*, 
 but also some scene information like *lights*, *cameras*, *actors* in the scene, as well as *texture* properties.
 By default, all this information will be loaded from the file and displayed. Use the `--geometry-only` [options](OPTIONS.md)
 to modify this behavior. For file formats that do not support it, **a default scene** is created.
@@ -58,7 +59,7 @@ In this case, in order to open a file that requires a plugin, you will have to m
 Here is the list of plugins provided officially by F3D:
 
 - **alembic**: ABC support
-- **assimp**: FBX, DAE, OFF, DXF and X support
+- **assimp**: FBX, DAE, OFF, DXF, X and 3MF support
 - **draco**: DRC support
 - **exodus**: EX2 support
 - **occt**: STEP and IGES support

diff --git a/resources/BundleInfo.plist.in b/resources/BundleInfo.plist.in
@@ -339,6 +339,19 @@
 					<string>x</string>
 				</array>
 			</dict>
+			<!-- 3MF -->
+			<dict>
+				<key>CFBundleTypeName</key>
+				<string>3D Manufacturing Format</string>
+				<key>CFBundleTypeRole</key>
+				<string>Viewer</string>
+				<key>LSIsAppleDefaultForType</key>
+				<true/>
+				<key>CFBundleTypeExtensions</key>
+				<array>
+					<string>3mf</string>
+				</array>
+			</dict>
 			<!-- OFF -->
 			<dict>
 				<key>CFBundleTypeName</key>