fixed teleport
This commit is contained in:
parent
cb7340d209
commit
0e87d76153
4 changed files with 40 additions and 24 deletions
16
dist/xrfragment.aframe.js
vendored
16
dist/xrfragment.aframe.js
vendored
|
|
@ -1096,6 +1096,14 @@ xrf.frag.href = function(v, opts){
|
|||
}else mesh.material = mesh.material.clone()
|
||||
|
||||
let click = mesh.userData.XRF.href.exec = (e) => {
|
||||
|
||||
let teleport = () => {
|
||||
console.log("teleport")
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
|
||||
if( v.string[0] == '#' ){
|
||||
let frag = xrf.URI.parse(v.string)
|
||||
if( frag.q ){ // show/hider
|
||||
|
|
@ -1122,12 +1130,8 @@ xrf.frag.href = function(v, opts){
|
|||
}
|
||||
})
|
||||
|
||||
}else{ // teleport
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
}
|
||||
}else teleport()
|
||||
}else teleport()
|
||||
}
|
||||
|
||||
let selected = (state) => () => {
|
||||
|
|
|
|||
16
dist/xrfragment.three.js
vendored
16
dist/xrfragment.three.js
vendored
|
|
@ -1096,6 +1096,14 @@ xrf.frag.href = function(v, opts){
|
|||
}else mesh.material = mesh.material.clone()
|
||||
|
||||
let click = mesh.userData.XRF.href.exec = (e) => {
|
||||
|
||||
let teleport = () => {
|
||||
console.log("teleport")
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
|
||||
if( v.string[0] == '#' ){
|
||||
let frag = xrf.URI.parse(v.string)
|
||||
if( frag.q ){ // show/hider
|
||||
|
|
@ -1122,12 +1130,8 @@ xrf.frag.href = function(v, opts){
|
|||
}
|
||||
})
|
||||
|
||||
}else{ // teleport
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
}
|
||||
}else teleport()
|
||||
}else teleport()
|
||||
}
|
||||
|
||||
let selected = (state) => () => {
|
||||
|
|
|
|||
16
dist/xrfragment.three.module.js
vendored
16
dist/xrfragment.three.module.js
vendored
|
|
@ -1096,6 +1096,14 @@ xrf.frag.href = function(v, opts){
|
|||
}else mesh.material = mesh.material.clone()
|
||||
|
||||
let click = mesh.userData.XRF.href.exec = (e) => {
|
||||
|
||||
let teleport = () => {
|
||||
console.log("teleport")
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
|
||||
if( v.string[0] == '#' ){
|
||||
let frag = xrf.URI.parse(v.string)
|
||||
if( frag.q ){ // show/hider
|
||||
|
|
@ -1122,12 +1130,8 @@ xrf.frag.href = function(v, opts){
|
|||
}
|
||||
})
|
||||
|
||||
}else{ // teleport
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
}
|
||||
}else teleport()
|
||||
}else teleport()
|
||||
}
|
||||
|
||||
let selected = (state) => () => {
|
||||
|
|
|
|||
|
|
@ -87,6 +87,14 @@ xrf.frag.href = function(v, opts){
|
|||
}else mesh.material = mesh.material.clone()
|
||||
|
||||
let click = mesh.userData.XRF.href.exec = (e) => {
|
||||
|
||||
let teleport = () => {
|
||||
console.log("teleport")
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
|
||||
if( v.string[0] == '#' ){
|
||||
let frag = xrf.URI.parse(v.string)
|
||||
if( frag.q ){ // show/hider
|
||||
|
|
@ -113,12 +121,8 @@ xrf.frag.href = function(v, opts){
|
|||
}
|
||||
})
|
||||
|
||||
}else{ // teleport
|
||||
xrf
|
||||
.emit('href',{click:true,mesh,xrf:v}) // let all listeners agree
|
||||
.then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF!
|
||||
}
|
||||
}
|
||||
}else teleport()
|
||||
}else teleport()
|
||||
}
|
||||
|
||||
let selected = (state) => () => {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue