Deploying to gh-pages from @ bb18f04 🚀

f3d-app · Aug 23, 2024 · a09f084 · a09f084
1 parent a3ca119
commit a09f084
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/web/f3d.js b/web/f3d.js
diff --git a/web/f3d.wasm b/web/f3d.wasm
diff --git a/web/index.html b/web/index.html
@@ -37,7 +37,7 @@ <h1 class="title">F3D Web</h1>
       <aside class="menu">
         <div class="file has-name">
           <label class="file-label">
-            <input class="file-input" type="file" id="file-selector" accept=".gml,.gltf,.glb,.obj,.ply,.pts,.stl,.vtk,.vtp,.vtu,.3ds,.wrl,.vrml" />
+            <input class="file-input" type="file" id="file-selector" accept=".gml,.gltf,.glb,.obj,.ply,.pts,.stl,.vtk,.vtp,.vtu,.3ds,.wrl,.vrml,.fbx,.off,.x,.dae" />
             <span class="file-cta">
               <span class="file-label">Open a file...</span>
             </span>

diff --git a/webassembly/CMakeLists.txt b/webassembly/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_options(f3djs PRIVATE
   "SHELL:-sEMULATE_FUNCTION_POINTER_CASTS=0"
   "SHELL:-sMODULARIZE=1"
   "SHELL:-sUSE_PTHREADS=0"
+  "SHELL:-sSTACK_SIZE=1048576"
   "SHELL:-sWASM=1"
   "SHELL:-sFORCE_FILESYSTEM"
   "SHELL:-sEXPORTED_RUNTIME_METHODS=FS"

diff --git a/webassembly/app.html b/webassembly/app.html
@@ -37,7 +37,7 @@ <h1 class="title">F3D Web</h1>
       <aside class="menu">
         <div class="file has-name">
           <label class="file-label">
-            <input class="file-input" type="file" id="file-selector" accept=".gml,.gltf,.glb,.obj,.ply,.pts,.stl,.vtk,.vtp,.vtu,.3ds,.wrl,.vrml" />
+            <input class="file-input" type="file" id="file-selector" accept=".gml,.gltf,.glb,.obj,.ply,.pts,.stl,.vtk,.vtp,.vtu,.3ds,.wrl,.vrml,.fbx,.off,.x,.dae" />
             <span class="file-cta">
               <span class="file-label">Open a file...</span>
             </span>

diff --git a/webassembly/build.sh b/webassembly/build.sh
@@ -3,10 +3,11 @@
 cmake -S /src -B /build \
     -DBUILD_SHARED_LIBS=OFF \
     -DF3D_STRICT_BUILD=ON \
+    -DF3D_PLUGIN_BUILD_ASSIMP=ON \
     -DF3D_PLUGIN_BUILD_EXODUS=OFF \
     -DF3D_WASM_COPY_APP=ON \
     -DCMAKE_BUILD_TYPE=$1 \
-    -DVTK_DIR:PATH=/depends/lib/cmake/vtk
+    -DCMAKE_FIND_ROOT_PATH:PATH=/depends/
 
 cmake --build /build