From: Vincent Vanwaelscappel Date: Fri, 28 Feb 2025 16:32:14 +0000 (+0100) Subject: wip #7347 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a74ce5b54d8bc697f411fa40e67f017fb62a3420;p=fluidbook-toolbox.git wip #7347 @2 --- diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php index 16bfef22f..04bffdc84 100644 --- a/app/Fluidbook/Compiler/Compiler.php +++ b/app/Fluidbook/Compiler/Compiler.php @@ -633,6 +633,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError } } + protected function checkConfig() { if ($this->isMobileFirst() && $this->fluidbookSettings->mobilefirstFluidbookId) { @@ -1550,6 +1551,13 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError $this->config->content_lock = $this->content_lock; } + public function add3DViewer() + { + $this->addJsLib( + 'o3dv', ['js/libs/o3dv/o3dv.min.js'] + ); + } + public function addPDFJSPageRenderer() { $this->vdir->copyDirectory(resource_path('pdfjs/dist-min'), 'pdfjs'); diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php index 337f8849e..9f5b3533a 100644 --- a/app/SubForms/Link/Base.php +++ b/app/SubForms/Link/Base.php @@ -61,7 +61,7 @@ class Base extends Form protected static $_acceptLottie = ['.zip', '.html', '.json', '.lottie']; protected static $_acceptSlideshow = ['.jpg', '.jpeg', '.png', '.svg', '.gif', '.zip']; protected static $_acceptPDF = ['.pdf']; - protected static $_accept3D = ['.3ds', '.fbx']; + protected static $_accept3D = ['.3ds', '.fbx', '.3dm', '.3ds', '.3mf', '.amf', '.bim', '.brep', '.dae', '.fbx', '.fcstd', '.gltf', '.ifc', '.iges', '.step', '.stl', '.obj', '.off', '.ply', '.wrl']; /** * @return array[]