From 4a9dab878f22f71d2ffd91f63fd11b8176ad1da1 Mon Sep 17 00:00:00 2001
From: Justin Georgi <justin.georgi@gmail.com>
Date: Wed, 23 Oct 2024 17:36:21 -0700
Subject: [PATCH] Make preview model view include changes

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
---
 includes/GlModelViewer.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/GlModelViewer.php b/includes/GlModelViewer.php
index cd832f5..375452d 100644
--- a/includes/GlModelViewer.php
+++ b/includes/GlModelViewer.php
@@ -27,7 +27,7 @@ class GlModelViewer extends ImageHandler {
     if ($file->getMimeType() !== 'model/gltf-binary') {
       return true;
     }
-    $result = self::buildViewer($file,$frameParams);
+    $result = self::buildViewer($file->getDescriptionText(), $file->getFullUrl(), $frameParams);
     return false;
   }
 
@@ -37,7 +37,7 @@ class GlModelViewer extends ImageHandler {
       return;
     }
     $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));
   }
 
@@ -48,13 +48,13 @@ class GlModelViewer extends ImageHandler {
     }
     $out = $editor->getContext()->getOutput();
     $out->addModules('ext.glmv');
-    $previewHTML = self::buildViewer($file,['class' => 'view-default']);
+    $previewHTML = self::buildViewer($content->getText(), $file->getFullUrl(), ['class' => 'view-default']);
 
     return false;
   }
 
-  private static function buildViewer($file, $frameParams) {
-    preg_match('/<pre>([\S\s]*?)<\/pre>/',$file->getDescriptionText(),$modelDescript);
+  private static function buildViewer($inText, $srcUrl, $frameParams) {
+    preg_match('/<pre>([\S\s]*?)<\/pre>/',$inText,$modelDescript);
     $metadata = json_decode($modelDescript[1], true);
     if (isset($frameParams['class'])) {
       preg_match('/view-(\S*)/',$frameParams['class'],$viewClassExtract);
@@ -79,7 +79,7 @@ class GlModelViewer extends ImageHandler {
       }
     }
     $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;';
     $elModel = Html::rawElement('model-viewer', $attrModelView, implode($hotspots));
     $attrContainer = array(