coderofsalvation/xrfragment-haxe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

href: always commit last position first

Browse source
This commit is contained in:
Leon van Kammen 2023-06-22 12:05:36 +02:00
parent 631d2bdc9e
commit c675748edb
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dist/xrfragment.aframe.js vendored
View file

@ -1107,11 +1107,13 @@ xrf.frag.href = function(v, opts){
}else if( mesh.material){ mesh.material = mesh.material.clone() } }else if( mesh.material){ mesh.material = mesh.material.clone() }
let click = mesh.userData.XRF.href.exec = (e) => { let click = mesh.userData.XRF.href.exec = (e) => {
let lastPos = `#pos=${camera.position.x},${camera.position.y},${camera.position.z}`
xrf xrf
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
.then( () => { .then( () => {
xrf.navigator.to(lastPos) // commit last position
const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined
xrf.navigator.to(v.string,flags) // or let's surf to HREF! xrf.navigator.to(v.string,flags) // let's surf to HREF!
}) })
} }

6
dist/xrfragment.three.js vendored
View file

@ -1107,11 +1107,13 @@ xrf.frag.href = function(v, opts){
}else if( mesh.material){ mesh.material = mesh.material.clone() } }else if( mesh.material){ mesh.material = mesh.material.clone() }
let click = mesh.userData.XRF.href.exec = (e) => { let click = mesh.userData.XRF.href.exec = (e) => {
let lastPos = `#pos=${camera.position.x},${camera.position.y},${camera.position.z}`
xrf xrf
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
.then( () => { .then( () => {
xrf.navigator.to(lastPos) // commit last position
const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined
xrf.navigator.to(v.string,flags) // or let's surf to HREF! xrf.navigator.to(v.string,flags) // let's surf to HREF!
}) })
} }

6
dist/xrfragment.three.module.js vendored
View file

@ -1107,11 +1107,13 @@ xrf.frag.href = function(v, opts){
}else if( mesh.material){ mesh.material = mesh.material.clone() } }else if( mesh.material){ mesh.material = mesh.material.clone() }
let click = mesh.userData.XRF.href.exec = (e) => { let click = mesh.userData.XRF.href.exec = (e) => {
let lastPos = `#pos=${camera.position.x},${camera.position.y},${camera.position.z}`
xrf xrf
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
.then( () => { .then( () => {
xrf.navigator.to(lastPos) // commit last position
const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined
xrf.navigator.to(v.string,flags) // or let's surf to HREF! xrf.navigator.to(v.string,flags) // let's surf to HREF!
}) })
} }

6
src/3rd/js/three/xrf/href.js
View file

@ -90,11 +90,13 @@ xrf.frag.href = function(v, opts){
}else if( mesh.material){ mesh.material = mesh.material.clone() } }else if( mesh.material){ mesh.material = mesh.material.clone() }
let click = mesh.userData.XRF.href.exec = (e) => { let click = mesh.userData.XRF.href.exec = (e) => {
let lastPos = `#pos=${camera.position.x},${camera.position.y},${camera.position.z}`
xrf xrf
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
.then( () => { .then( () => {
xrf.navigator.to(lastPos) // commit last position
const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined const flags = v.string[0] == '#' && v.string.match(/(\||#q)/) ? xrf.XRF.PV_OVERRIDE : undefined
xrf.navigator.to(v.string,flags) // or let's surf to HREF! xrf.navigator.to(v.string,flags) // let's surf to HREF!
}) })
} }