Skip to content

Commit 8565db0

Browse files
[IMPROVEMENT] Build-in model-viewer (kitodo#1750)
Co-authored-by: Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>
1 parent c706498 commit 8565db0

File tree

3 files changed

+1086
-1094
lines changed

3 files changed

+1086
-1094
lines changed

Classes/Middleware/Embedded3dViewer.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
8686
}
8787

8888
if (empty($viewer)) {
89+
if (!in_array(strtolower($modelFormat), array('glb','gltf'))) {
90+
return $this->warningResponse('The build-in model-viewer does not support the model format "' . $modelFormat . '"', $request);
91+
}
8992
return $this->renderDefaultViewer($parameters['model']);
9093
}
9194

@@ -212,7 +215,7 @@ public function renderDefaultViewer($model): HtmlResponse
212215
/** @var ResourceFactory $resourceFactory */
213216
$resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
214217
$html = $resourceFactory->retrieveFileOrFolderObject('EXT:dlf/Resources/Public/Html/Embedded3dViewerStandalone.html')->getContents();
215-
$file = $resourceFactory->retrieveFileOrFolderObject('EXT:dlf/Resources/Public/JavaScript/Embedded3dViewer/model-viewer-3.5.0.min.js');
218+
$file = $resourceFactory->retrieveFileOrFolderObject('EXT:dlf/Resources/Public/JavaScript/Embedded3dViewer/model-viewer-4.1.0.min.js');
216219
$html = str_replace('{{modelViewerJS}}', $file->getPublicUrl(), $html);
217220
$html = str_replace("{{modelUrl}}", $model, $html);
218221
return new HtmlResponse($html);

Resources/Public/JavaScript/Embedded3dViewer/model-viewer-3.5.0.min.js

Lines changed: 0 additions & 1093 deletions
This file was deleted.

Resources/Public/JavaScript/Embedded3dViewer/model-viewer-4.1.0.min.js

Lines changed: 1082 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)