jgeorgi/GlModelViewer
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Make preview model view include changes

Browse Source 
Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
This commit is contained in:
Justin Georgi
2024-10-23 17:36:21 -07:00
parent 063cfbab5e
commit 4a9dab878f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
includes/GlModelViewer.php
View File

@@ -27,7 +27,7 @@ class GlModelViewer extends ImageHandler {
if ($file->getMimeType() !== 'model/gltf-binary') { if ($file->getMimeType() !== 'model/gltf-binary') {
return true; return true;
} }
$result = self::buildViewer($file,$frameParams); $result = self::buildViewer($file->getDescriptionText(), $file->getFullUrl(), $frameParams);
return false; return false;
} }
@@ -37,7 +37,7 @@ class GlModelViewer extends ImageHandler {
return; return;
} }
$out->addModules('ext.glmv'); $out->addModules('ext.glmv');
$viewer = self::buildViewer($file,['class' => 'view-default']); $viewer = self::buildViewer($file->getDescriptionText(), $file->getFullUrl(), ['class' => 'view-default']);
$out->addHtml(Html::rawElement('div',['id' => 'file', 'class' => 'fullModelView'],$viewer)); $out->addHtml(Html::rawElement('div',['id' => 'file', 'class' => 'fullModelView'],$viewer));
} }
@@ -48,13 +48,13 @@ class GlModelViewer extends ImageHandler {
} }
$out = $editor->getContext()->getOutput(); $out = $editor->getContext()->getOutput();
$out->addModules('ext.glmv'); $out->addModules('ext.glmv');
$previewHTML = self::buildViewer($file,['class' => 'view-default']); $previewHTML = self::buildViewer($content->getText(), $file->getFullUrl(), ['class' => 'view-default']);
return false; return false;
} }
private static function buildViewer($file, $frameParams) { private static function buildViewer($inText, $srcUrl, $frameParams) {
preg_match('/<pre>([\S\s]*?)<\/pre>/',$file->getDescriptionText(),$modelDescript); preg_match('/<pre>([\S\s]*?)<\/pre>/',$inText,$modelDescript);
$metadata = json_decode($modelDescript[1], true); $metadata = json_decode($modelDescript[1], true);
if (isset($frameParams['class'])) { if (isset($frameParams['class'])) {
preg_match('/view-(\S*)/',$frameParams['class'],$viewClassExtract); preg_match('/view-(\S*)/',$frameParams['class'],$viewClassExtract);
@@ -79,7 +79,7 @@ class GlModelViewer extends ImageHandler {
} }
} }
$attrModelView = $metadata['viewerConfig'][$viewClass]; $attrModelView = $metadata['viewerConfig'][$viewClass];
$attrModelView = array_merge(['src' => $file->getFullUrl(), 'class' => 'mv-model', 'interpolation-decay' => '100'], $attrModelView); $attrModelView = array_merge(['src' => $srcUrl, 'class' => 'mv-model', 'interpolation-decay' => '100'], $attrModelView);
$attrModelView['style'] = 'width: 100%; height: 100%; min-height: 400px;'; $attrModelView['style'] = 'width: 100%; height: 100%; min-height: 400px;';
$elModel = Html::rawElement('model-viewer', $attrModelView, implode($hotspots)); $elModel = Html::rawElement('model-viewer', $attrModelView, implode($hotspots));
$attrContainer = array( $attrContainer = array(