From 88cd5e4727526303c3320e9062511145424396a6 Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Fri, 2 May 2025 21:03:41 -0700 Subject: [PATCH] Fix: set initial view for current selected view Signed-off-by: Justin Georgi --- modules/glmv-mvconfig.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/glmv-mvconfig.js b/modules/glmv-mvconfig.js index adda7b1..532308c 100644 --- a/modules/glmv-mvconfig.js +++ b/modules/glmv-mvconfig.js @@ -238,6 +238,7 @@ selectViewConfig = function(view) { mView.removeAttribute(s) } }) + mView.setAttribute('current-view',selectView) } /** @@ -246,6 +247,7 @@ selectViewConfig = function(view) { */ writeCameraOrbit = function() { const mView = $('model-viewer')[0] + const currentView = mView.getAttribute('current-view') ? mView.getAttribute('current-view') : 'default' const newOrbit = orb2degree(mView.getCameraOrbit().toString(),[2,2,5]) mView.setAttribute('camera-orbit', newOrbit) const targetObj = mView.getCameraTarget() @@ -254,9 +256,9 @@ writeCameraOrbit = function() { const newField = mView.getFieldOfView().toFixed(5) + 'deg' mView.setAttribute('field-of-view',newField) let [currentText, mvconfig] = extractMvconfig() - mvconfig.viewerConfig.default['camera-orbit'] = newOrbit - mvconfig.viewerConfig.default['camera-target'] = newTarget - mvconfig.viewerConfig.default['field-of-view'] = newField + mvconfig.viewerConfig[currentView]['camera-orbit'] = newOrbit + mvconfig.viewerConfig[currentView]['camera-target'] = newTarget + mvconfig.viewerConfig[currentView]['field-of-view'] = newField const textUpdate = currentText.replace(/(?<=)([\S\s]*?)(?=<\/mvconfig>)/gm,`\n${TOML.stringify(mvconfig, null, 2)}\n`) $('#wpTextbox1').val(textUpdate) }