coderofsalvation
/
xrfragment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: work in progress [might break]

This commit is contained in:
Leon van Kammen 2024-06-25 13:58:12 +00:00
parent 3f37b634cb
commit 7fe1fa33b8
7 changed files with 126348 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dist/xrfragment.aframe.all.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Mon Jun 17 02:44:21 PM UTC 2024
* v0.5.1 generated at Tue Jun 25 01:51:16 PM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -2074,7 +2074,6 @@ xrf.navigator.to = (url,flags,loader,data) => {
if( URI.duplicatePos || (!URI.fragment && !URI.file && !URI.fileExt) ){
return resolve(xrf.model) // nothing we can do here
}
if( xrf.model && !URI.fileChange && URI.hashChange && !URI.hasPos ){
evalFragment()
return resolve(xrf.model) // eval non-positional fragments (no loader needed)
@ -2096,22 +2095,24 @@ xrf.navigator.to = (url,flags,loader,data) => {
// force relative path for files which dont include protocol or relative path
if( directory ) directory = directory[0] == '.' || directory.match("://") ? directory : `.${directory}`
loader = loader || new Loader().setPath( URI.URN )
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
if( loader || Loader ){
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
}
loader = loader || new Loader().setPath( URI.URN )
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
}
}
}else xrf.emit('navigateError',{url,URI})
})
})
})
@ -2412,7 +2413,6 @@ xrf.frag.pos = function(v, opts){
}
if( xrf.debug ) console.log(`#pos.js: setting camera to position ${pos.x},${pos.y},${pos.z}`)
xrf.frag.pos.last = v.string // remember
xrf.frag.pos.lastVector3 = camera.position.clone()
@ -4108,6 +4108,21 @@ let videoMimeTypes = [
'video/mp4'
]
videoMimeTypes.map( (mimetype) => xrf.frag.src.type[ mimetype ] = loadVideo(mimetype) )
window.AFRAME.registerComponent('href', {
schema: {
},
init: function () {
if( !this.data ) return
this.el.object3D.traverse( (m) => {
if( m.geometry ){
m.userData.href = this.data
}
})
}
});
window.AFRAME.registerComponent('xrf', {
schema: {
http: { type:'string'},
@ -4125,6 +4140,8 @@ window.AFRAME.registerComponent('xrf', {
}
}
if( !AFRAME.scenes[0] ) return // ignore if no scene yet
if( !AFRAME.XRF ){
let camera = document.querySelector('[camera]')
@ -4270,6 +4287,27 @@ window.AFRAME.registerComponent('xrf', {
let gets = [ ...document.querySelectorAll('[xrf-get]') ]
gets.map( (g) => g.emit('update') )
})
}else{
// load current AFRAME scene as model
let sceneEl = aScene.querySelector('[xrf]')
if( !sceneEl.object3D ) return console.error("please model your XR Fragments scene within <a-entity xrf> .... </a-entity>")
const scene = sceneEl.object3D
// name THREE objects according to AFRAME element ids
scene.traverse( (m) => {
if( !m.name && m.el && m.el.id ) m.name = m.el.id
})
// load current scene as model
xrf.model = {scene,animations:[]}
xrf.scene = scene
//xrf.loadModel( xrf.model, "#", true )
////if( sceneEl.components.xrf.data ){
//// xrf.navigator.to(sceneEl.components.xrf.data ) // eval default fragment
//// console.log("evaluating default fragments")
//// sceneEl.object3D.userData['#'] = sceneEl.components.xrf.data
////}
//if( document.location.hash ){
// xrf.hashbus.pub( document.location.hash, xrf.model) // eval url
AFRAME.fade.out()
}
aScene.emit('XRF',{})

74
dist/xrfragment.aframe.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Mon Jun 17 02:44:21 PM UTC 2024
* v0.5.1 generated at Tue Jun 25 01:51:16 PM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -2072,7 +2072,6 @@ xrf.navigator.to = (url,flags,loader,data) => {
if( URI.duplicatePos || (!URI.fragment && !URI.file && !URI.fileExt) ){
return resolve(xrf.model) // nothing we can do here
}
if( xrf.model && !URI.fileChange && URI.hashChange && !URI.hasPos ){
evalFragment()
return resolve(xrf.model) // eval non-positional fragments (no loader needed)
@ -2094,22 +2093,24 @@ xrf.navigator.to = (url,flags,loader,data) => {
// force relative path for files which dont include protocol or relative path
if( directory ) directory = directory[0] == '.' || directory.match("://") ? directory : `.${directory}`
loader = loader || new Loader().setPath( URI.URN )
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
if( loader || Loader ){
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
}
loader = loader || new Loader().setPath( URI.URN )
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
}
}
}else xrf.emit('navigateError',{url,URI})
})
})
})
@ -2410,7 +2411,6 @@ xrf.frag.pos = function(v, opts){
}
if( xrf.debug ) console.log(`#pos.js: setting camera to position ${pos.x},${pos.y},${pos.z}`)
xrf.frag.pos.last = v.string // remember
xrf.frag.pos.lastVector3 = camera.position.clone()
@ -4106,6 +4106,21 @@ let videoMimeTypes = [
'video/mp4'
]
videoMimeTypes.map( (mimetype) => xrf.frag.src.type[ mimetype ] = loadVideo(mimetype) )
window.AFRAME.registerComponent('href', {
schema: {
},
init: function () {
if( !this.data ) return
this.el.object3D.traverse( (m) => {
if( m.geometry ){
m.userData.href = this.data
}
})
}
});
window.AFRAME.registerComponent('xrf', {
schema: {
http: { type:'string'},
@ -4123,6 +4138,8 @@ window.AFRAME.registerComponent('xrf', {
}
}
if( !AFRAME.scenes[0] ) return // ignore if no scene yet
if( !AFRAME.XRF ){
let camera = document.querySelector('[camera]')
@ -4268,6 +4285,27 @@ window.AFRAME.registerComponent('xrf', {
let gets = [ ...document.querySelectorAll('[xrf-get]') ]
gets.map( (g) => g.emit('update') )
})
}else{
// load current AFRAME scene as model
let sceneEl = aScene.querySelector('[xrf]')
if( !sceneEl.object3D ) return console.error("please model your XR Fragments scene within <a-entity xrf> .... </a-entity>")
const scene = sceneEl.object3D
// name THREE objects according to AFRAME element ids
scene.traverse( (m) => {
if( !m.name && m.el && m.el.id ) m.name = m.el.id
})
// load current scene as model
xrf.model = {scene,animations:[]}
xrf.scene = scene
//xrf.loadModel( xrf.model, "#", true )
////if( sceneEl.components.xrf.data ){
//// xrf.navigator.to(sceneEl.components.xrf.data ) // eval default fragment
//// console.log("evaluating default fragments")
//// sceneEl.object3D.userData['#'] = sceneEl.components.xrf.data
////}
//if( document.location.hash ){
// xrf.hashbus.pub( document.location.hash, xrf.model) // eval url
AFRAME.fade.out()
}
aScene.emit('XRF',{})

126160
dist/xrfragment.module.js vendored
View File

File diff suppressed because it is too large Load Diff

36
dist/xrfragment.three.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Mon Jun 17 02:44:21 PM UTC 2024
* v0.5.1 generated at Tue Jun 25 01:51:16 PM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -2072,7 +2072,6 @@ xrf.navigator.to = (url,flags,loader,data) => {
if( URI.duplicatePos || (!URI.fragment && !URI.file && !URI.fileExt) ){
return resolve(xrf.model) // nothing we can do here
}
if( xrf.model && !URI.fileChange && URI.hashChange && !URI.hasPos ){
evalFragment()
return resolve(xrf.model) // eval non-positional fragments (no loader needed)
@ -2094,22 +2093,24 @@ xrf.navigator.to = (url,flags,loader,data) => {
// force relative path for files which dont include protocol or relative path
if( directory ) directory = directory[0] == '.' || directory.match("://") ? directory : `.${directory}`
loader = loader || new Loader().setPath( URI.URN )
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
if( loader || Loader ){
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
}
loader = loader || new Loader().setPath( URI.URN )
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
}
}
}else xrf.emit('navigateError',{url,URI})
})
})
})
@ -2410,7 +2411,6 @@ xrf.frag.pos = function(v, opts){
}
if( xrf.debug ) console.log(`#pos.js: setting camera to position ${pos.x},${pos.y},${pos.z}`)
xrf.frag.pos.last = v.string // remember
xrf.frag.pos.lastVector3 = camera.position.clone()

36
dist/xrfragment.three.module.js vendored
View File

@ -1,5 +1,5 @@
/*
* v0.5.1 generated at Mon Jun 17 02:44:21 PM UTC 2024
* v0.5.1 generated at Tue Jun 25 01:51:16 PM UTC 2024
* https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0
*/
@ -2072,7 +2072,6 @@ xrf.navigator.to = (url,flags,loader,data) => {
if( URI.duplicatePos || (!URI.fragment && !URI.file && !URI.fileExt) ){
return resolve(xrf.model) // nothing we can do here
}
if( xrf.model && !URI.fileChange && URI.hashChange && !URI.hasPos ){
evalFragment()
return resolve(xrf.model) // eval non-positional fragments (no loader needed)
@ -2094,22 +2093,24 @@ xrf.navigator.to = (url,flags,loader,data) => {
// force relative path for files which dont include protocol or relative path
if( directory ) directory = directory[0] == '.' || directory.match("://") ? directory : `.${directory}`
loader = loader || new Loader().setPath( URI.URN )
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
if( loader || Loader ){
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
}
loader = loader || new Loader().setPath( URI.URN )
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
}
}
}else xrf.emit('navigateError',{url,URI})
})
})
})
@ -2410,7 +2411,6 @@ xrf.frag.pos = function(v, opts){
}
if( xrf.debug ) console.log(`#pos.js: setting camera to position ${pos.x},${pos.y},${pos.z}`)
xrf.frag.pos.last = v.string // remember
xrf.frag.pos.lastVector3 = camera.position.clone()

23
src/3rd/js/aframe/index.js
View File

@ -15,6 +15,8 @@ window.AFRAME.registerComponent('xrf', {
}
}
if( !AFRAME.scenes[0] ) return // ignore if no scene yet
if( !AFRAME.XRF ){
let camera = document.querySelector('[camera]')
@ -160,6 +162,27 @@ window.AFRAME.registerComponent('xrf', {
let gets = [ ...document.querySelectorAll('[xrf-get]') ]
gets.map( (g) => g.emit('update') )
})
}else{
// load current AFRAME scene as model
let sceneEl = aScene.querySelector('[xrf]')
if( !sceneEl.object3D ) return console.error("please model your XR Fragments scene within <a-entity xrf> .... </a-entity>")
const scene = sceneEl.object3D
// name THREE objects according to AFRAME element ids
scene.traverse( (m) => {
if( !m.name && m.el && m.el.id ) m.name = m.el.id
})
// load current scene as model
xrf.model = {scene,animations:[]}
xrf.scene = scene
//xrf.loadModel( xrf.model, "#", true )
////if( sceneEl.components.xrf.data ){
//// xrf.navigator.to(sceneEl.components.xrf.data ) // eval default fragment
//// console.log("evaluating default fragments")
//// sceneEl.object3D.userData['#'] = sceneEl.components.xrf.data
////}
//if( document.location.hash ){
// xrf.hashbus.pub( document.location.hash, xrf.model) // eval url
AFRAME.fade.out()
}
aScene.emit('XRF',{})

33
src/3rd/js/three/navigator.js
View File

@ -46,7 +46,6 @@ xrf.navigator.to = (url,flags,loader,data) => {
if( URI.duplicatePos || (!URI.fragment && !URI.file && !URI.fileExt) ){
return resolve(xrf.model) // nothing we can do here
}
if( xrf.model && !URI.fileChange && URI.hashChange && !URI.hasPos ){
evalFragment()
return resolve(xrf.model) // eval non-positional fragments (no loader needed)
@ -68,22 +67,24 @@ xrf.navigator.to = (url,flags,loader,data) => {
// force relative path for files which dont include protocol or relative path
if( directory ) directory = directory[0] == '.' || directory.match("://") ? directory : `.${directory}`
loader = loader || new Loader().setPath( URI.URN )
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
if( loader || Loader ){
const onLoad = (model) => {
xrf.loadModel(model,url)
resolve(model)
}
}
loader = loader || new Loader().setPath( URI.URN )
if( data ){ // file upload
loader.parse(data, "", onLoad )
}else{
try{
loader.load(file, onLoad )
}catch(e){
console.error(e)
xrf.emit('navigateError',{url})
}
}
}else xrf.emit('navigateError',{url,URI})
})
})
})