From b8a8cf08f35f33f034d234f33d2a9e77b383fb98 Mon Sep 17 00:00:00 2001
From: Justin Georgi <justin.georgi@gmail.com>
Date: Wed, 6 Nov 2024 10:03:04 -0700
Subject: [PATCH] Improve camera orbit value writing

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
---
 modules/glmv.js | 57 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/modules/glmv.js b/modules/glmv.js
index 90d4143..d9dee40 100644
--- a/modules/glmv.js
+++ b/modules/glmv.js
@@ -121,8 +121,7 @@ clickAddHotspot = function(e) {
         let hsOutput = {}
         hsOutput['data-position'] = hsPosition.position.toString().replaceAll(/(\d{5})(\d*?m)/g,"$1m")
         hsOutput['data-normal'] = hsPosition.normal.toString().replaceAll(/(\d{5})(\d*?m)/g,"$1m")
-        let orbitObj = targetModel.getCameraOrbit()
-        hsOutput['data-orbit'] = `${orbitObj.theta.toFixed(2)}rad ${orbitObj.phi.toFixed(2)}rad ${orbitObj.radius.toFixed(2)}m`
+        hsOutput['data-orbit'] = orb2degree(targetModel.getCameraOrbit().toString(),[2,2,5])
         let targetObj = targetModel.getCameraTarget()
         hsOutput['data-target'] = `${targetObj.x.toFixed(5)}m ${targetObj.y.toFixed(5)}m ${targetObj.z.toFixed(5)}m`
         metadata.annotations['Hotspot ' + (Object.keys(metadata.annotations).length + 1)] = hsOutput
@@ -337,8 +336,7 @@ releaseAnnotation = function(e) {
             position: newPos,
             normal: newNorm
         })
-        let orbitObj = mvEl.getCameraOrbit()
-        const newOrb = `${orbitObj.theta.toFixed(2)}rad ${orbitObj.phi.toFixed(2)}rad ${orbitObj.radius.toFixed(2)}m`
+        const newOrb = orb2degree(mvEl.getCameraOrbit().toString(),[2,2,5])
         e.target.setAttribute('data-orbit', newOrb)
         let targetObj = mvEl.getCameraTarget()
         const newTarg = `${targetObj.x.toFixed(5)}m ${targetObj.y.toFixed(5)}m ${targetObj.z.toFixed(5)}m`
@@ -433,8 +431,55 @@ toggleFullScreen = function(glCont) {
  */
 writeCameraOrbit = function() {
     const mView = $('model-viewer')[0]
-    let newOrbit = mView.getCameraOrbit().toString()
-    newOrbit = newOrbit.replaceAll(/(\d{2})(\d*?rad)/g,"$1rad")
+    let newOrbit = orb2degree(mView.getCameraOrbit().toString(),[2,2,5])
     const textUpdate = $('#wpTextbox1').val().replace(/([\S\s]*?default[\S\s]*?"camera-orbit": ")(.*?)(",$[\S\s]*)/gm,'$1' + newOrbit + '$3')
     $('#wpTextbox1').val(textUpdate)
+}
+
+/**
+ * Set new camera orbit limits and send values to the preview
+ * editor
+ * 
+ * @param {string} axis [yaw|pitch] orbit value to set
+ * @param {string} limit [max|min] limit value to set
+ */
+limitCameraOrbit = function(axis, limit) {
+    const mView = $('model-viewer')[0]
+    const newOrbit = orb2degree(mView.getCameraOrbit().toString(),[2,2,5])
+    const newOrbitVals = newOrbit.split(' ')
+    const valueIndex = (axis == 'yaw') ? 0 : 1
+    let [currentText, metadata] = extractMetadata()
+    let oldOrbitVals = metadata.viewerConfig.default[`${limit}-camera-orbit`].split(' ')
+    oldOrbitVals[valueIndex] = newOrbitVals[valueIndex]
+    metadata.viewerConfig.default[`${limit}-camera-orbit`] = oldOrbitVals.join(' ')
+    const newText = currentText.replace(/(.*?<pre>)[\S\s]*?(<\/pre>.*)/,`$1\n${JSON.stringify(metadata, null, 2)}\n$2`)
+    $('#wpTextbox1').val(newText)
+}
+
+/**
+ * Convert all radian values returned by model-viewer to degrees
+ * 
+ * @param {string} orbString string with any number of `(number)rad` sub strings
+ * @param {number|array} fix Optional: number of decimal places to return in converted numbers
+ * @return {string} string with all radian values and units converted to degrees
+ */
+orb2degree = function(orbString, fix = null) {
+    let degArray = orbString.split(' ').map(s => {
+        if (s.includes('rad')) {
+            return (Number.parseFloat(s) / Math.PI * 180) + 'deg'
+        } else {
+            return s
+        }
+    })
+    if (fix && !['number', 'object'].includes(typeof fix)) {
+        console.warn('orb2degree: fix parameter invalid type. Ignoring.')
+        fix = null
+    }
+    if (fix) {
+        degArray = degArray.map((v, idx) => {
+            let fixReg = new RegExp('(\\d*.\\d{' + (((typeof fix) == 'object') ? fix[idx] : fix) + '})(\\d*)([a-z]*)')
+            return v.replace(fixReg,'$1$3')
+        })
+    }
+    return degArray.join(' ')
 }
\ No newline at end of file