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

Include fiedl of view in annotation data

Browse Source 
Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
This commit is contained in:
Justin Georgi
2024-11-19 20:01:45 -07:00
parent e92b319a85
commit 7daaf81280
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/glmv-hs.js
View File

@@ -32,6 +32,7 @@ clickAddHotspot = function(e) {
hsOutput['data-orbit'] = orb2degree(targetModel.getCameraOrbit().toString(),[2,2,5]) hsOutput['data-orbit'] = orb2degree(targetModel.getCameraOrbit().toString(),[2,2,5])
let targetObj = targetModel.getCameraTarget() let targetObj = targetModel.getCameraTarget()
hsOutput['data-target'] = `${targetObj.x.toFixed(5)}m ${targetObj.y.toFixed(5)}m ${targetObj.z.toFixed(5)}m` hsOutput['data-target'] = `${targetObj.x.toFixed(5)}m ${targetObj.y.toFixed(5)}m ${targetObj.z.toFixed(5)}m`
hsOutput['field-of-view'] = Number.parseFloat(targetModel.getFieldOfView()).toFixed(5) + 'deg'
mvconfig.annotations['Hotspot ' + (Object.keys(mvconfig.annotations).length + 1)] = hsOutput mvconfig.annotations['Hotspot ' + (Object.keys(mvconfig.annotations).length + 1)] = hsOutput
let newText = currentText.replace(/(.*?<mvconfig>)[\S\s]*?(<\/mvconfig>.*)/,`$1\n${JSON.stringify(mvconfig, null, 2)}\n$2`) let newText = currentText.replace(/(.*?<mvconfig>)[\S\s]*?(<\/mvconfig>.*)/,`$1\n${JSON.stringify(mvconfig, null, 2)}\n$2`)
$('#wpTextbox1').val(newText) $('#wpTextbox1').val(newText)
@@ -135,13 +136,16 @@ releaseAnnotation = function(e) {
let targetObj = mvEl.getCameraTarget() let targetObj = mvEl.getCameraTarget()
const newTarg = `${targetObj.x.toFixed(5)}m ${targetObj.y.toFixed(5)}m ${targetObj.z.toFixed(5)}m` const newTarg = `${targetObj.x.toFixed(5)}m ${targetObj.y.toFixed(5)}m ${targetObj.z.toFixed(5)}m`
e.target.setAttribute('data-target', newTarg) e.target.setAttribute('data-target', newTarg)
const newFov = Number.parseFloat(mvEl.getFieldOfView()).toFixed(5) + 'deg'
e.target.setAttribute('field-of-view', newFov)
let currentText = $('#wpTextbox1').val() let currentText = $('#wpTextbox1').val()
let [_, mvconfig] = extractMvconfig(currentText) let [_, mvconfig] = extractMvconfig(currentText)
mvconfig.annotations[e.target.childNodes[0].innerText] = { mvconfig.annotations[e.target.childNodes[0].innerText] = {
"data-position": newPos, "data-position": newPos,
"data-normal": newNorm, "data-normal": newNorm,
"data-orbit": newOrb, "data-orbit": newOrb,
"data-target": newTarg "data-target": newTarg,
"field-of-view": newFov
} }
const newText = currentText.replace(/(.*?<mvconfig>)[\S\s]*?(<\/mvconfig>.*)/,`$1\n${JSON.stringify(mvconfig, null, 2)}\n$2`) const newText = currentText.replace(/(.*?<mvconfig>)[\S\s]*?(<\/mvconfig>.*)/,`$1\n${JSON.stringify(mvconfig, null, 2)}\n$2`)
$('#wpTextbox1').val(newText) $('#wpTextbox1').val(newText)

2
modules/glmv.js
View File

@@ -53,6 +53,8 @@ selectAnnotation = function(mView, annotId) {
an.classList.remove('HiddenAnnotation'); an.classList.remove('HiddenAnnotation');
if (an.parentElement.dataset.target) {mView.cameraTarget = an.parentElement.dataset.target} if (an.parentElement.dataset.target) {mView.cameraTarget = an.parentElement.dataset.target}
if (an.parentElement.dataset.orbit) {mView.cameraOrbit = an.parentElement.dataset.orbit} if (an.parentElement.dataset.orbit) {mView.cameraOrbit = an.parentElement.dataset.orbit}
const anFov = an.parentElement.getAttribute('field-of-view')
if (anFov) {mView.fieldOfView = anFov}
anSelected = true anSelected = true
} else { } else {
an.classList.add('HiddenAnnotation'); an.classList.add('HiddenAnnotation');