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

THREE.js fixes

Browse source
This commit is contained in:
Leon van Kammen 2024-06-12 08:51:42 +00:00
parent f5167f4d3f
commit 0649163c41
10 changed files with 14228 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dist/xrfragment.aframe.all.js vendored
View file

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Tue Jun 11 05:22:22 PM UTC 2024 * v0.5.1 generated at Wed Jun 12 08:50:44 AM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2311,7 +2311,7 @@ xrf.addEventListener('audioInited', function(opts){
let audio = xrf.frag.href.audio = {} let audio = xrf.frag.href.audio = {}
actions = ['click','hover','teleport'] const actions = ['click','hover','teleport']
actions.map( (action) => { actions.map( (action) => {
const audioLoader = new THREE.AudioLoader(); const audioLoader = new THREE.AudioLoader();
audio[action] = new THREE.Audio( xrf.camera.listener ) audio[action] = new THREE.Audio( xrf.camera.listener )
@ -2528,7 +2528,7 @@ xrf.frag.src.addModel = (model,url,frag,opts) => {
xrf.frag.src.scale( scene, opts, url ) // scale scene xrf.frag.src.scale( scene, opts, url ) // scale scene
mesh.add(scene) mesh.add(scene)
} }
xrf.frag.src.enableSourcePortation({scene,mesh,url,model}) xrf.frag.src.enableSourcePortation({...opts, scene,mesh,url,model})
// flag everything isSRC & isXRF // flag everything isSRC & isXRF
mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true }) mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true })
@ -2542,7 +2542,7 @@ xrf.frag.src.renderAsPortal = (mesh) => {
} }
xrf.frag.src.enableSourcePortation = (opts) => { xrf.frag.src.enableSourcePortation = (opts) => {
let {scene,mesh,url,model} = opts let {scene,mesh,url,model,THREE} = opts
if( url[0] == '#' ) return if( url[0] == '#' ) return
url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene
@ -3376,8 +3376,9 @@ xrf.addEventListener('parseModel', (opts) => {
xrf.URI.vars = new Proxy({},{ xrf.URI.vars = new Proxy({},{
set(me,k,v){ set(me,k,v){
if( k.match(/^(name)$/) ) return if( k.match(/^(name)$/) ) return true
me[k] = v me[k] = v
return true
}, },
get(me,k ){ get(me,k ){
if( k == '__object' ){ if( k == '__object' ){
@ -3605,7 +3606,7 @@ xrf.init.audio = (opts) => {
let camera = xrf.camera let camera = xrf.camera
/* WebAudio: setup context via THREEjs */ /* WebAudio: setup context via THREEjs */
if( !camera.listener ){ if( !camera.listener ){
camera.listener = new THREE.AudioListener(); camera.listener = new xrf.THREE.AudioListener();
// *FIXME* camera vs camerarig conflict // *FIXME* camera vs camerarig conflict
(camera.getCam ? camera.getCam() : camera).add( camera.listener ); (camera.getCam ? camera.getCam() : camera).add( camera.listener );
xrf.emit('audioInited',{listener:camera.listener, ...opts}) xrf.emit('audioInited',{listener:camera.listener, ...opts})
@ -4993,7 +4994,6 @@ AFRAME.registerSystem('xrf-hands',{
if( bones[j].name == "index-finger-tip" ){ if( bones[j].name == "index-finger-tip" ){
indexFinger = j indexFinger = j
me.indexFinger.push(bones[j]) me.indexFinger.push(bones[j])
// addColliderToFingerTip(handEl,indexFinger)
const els = [...document.querySelectorAll('[xrf-pressable]')] const els = [...document.querySelectorAll('[xrf-pressable]')]
els.map( (el) => el.emit('indexFingerReady', {index: j} ) ) els.map( (el) => el.emit('indexFingerReady', {index: j} ) )
break break

14
dist/xrfragment.aframe.js vendored
View file

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Tue Jun 11 05:22:22 PM UTC 2024 * v0.5.1 generated at Wed Jun 12 08:50:44 AM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2309,7 +2309,7 @@ xrf.addEventListener('audioInited', function(opts){
let audio = xrf.frag.href.audio = {} let audio = xrf.frag.href.audio = {}
actions = ['click','hover','teleport'] const actions = ['click','hover','teleport']
actions.map( (action) => { actions.map( (action) => {
const audioLoader = new THREE.AudioLoader(); const audioLoader = new THREE.AudioLoader();
audio[action] = new THREE.Audio( xrf.camera.listener ) audio[action] = new THREE.Audio( xrf.camera.listener )
@ -2526,7 +2526,7 @@ xrf.frag.src.addModel = (model,url,frag,opts) => {
xrf.frag.src.scale( scene, opts, url ) // scale scene xrf.frag.src.scale( scene, opts, url ) // scale scene
mesh.add(scene) mesh.add(scene)
} }
xrf.frag.src.enableSourcePortation({scene,mesh,url,model}) xrf.frag.src.enableSourcePortation({...opts, scene,mesh,url,model})
// flag everything isSRC & isXRF // flag everything isSRC & isXRF
mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true }) mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true })
@ -2540,7 +2540,7 @@ xrf.frag.src.renderAsPortal = (mesh) => {
} }
xrf.frag.src.enableSourcePortation = (opts) => { xrf.frag.src.enableSourcePortation = (opts) => {
let {scene,mesh,url,model} = opts let {scene,mesh,url,model,THREE} = opts
if( url[0] == '#' ) return if( url[0] == '#' ) return
url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene
@ -3374,8 +3374,9 @@ xrf.addEventListener('parseModel', (opts) => {
xrf.URI.vars = new Proxy({},{ xrf.URI.vars = new Proxy({},{
set(me,k,v){ set(me,k,v){
if( k.match(/^(name)$/) ) return if( k.match(/^(name)$/) ) return true
me[k] = v me[k] = v
return true
}, },
get(me,k ){ get(me,k ){
if( k == '__object' ){ if( k == '__object' ){
@ -3603,7 +3604,7 @@ xrf.init.audio = (opts) => {
let camera = xrf.camera let camera = xrf.camera
/* WebAudio: setup context via THREEjs */ /* WebAudio: setup context via THREEjs */
if( !camera.listener ){ if( !camera.listener ){
camera.listener = new THREE.AudioListener(); camera.listener = new xrf.THREE.AudioListener();
// *FIXME* camera vs camerarig conflict // *FIXME* camera vs camerarig conflict
(camera.getCam ? camera.getCam() : camera).add( camera.listener ); (camera.getCam ? camera.getCam() : camera).add( camera.listener );
xrf.emit('audioInited',{listener:camera.listener, ...opts}) xrf.emit('audioInited',{listener:camera.listener, ...opts})
@ -4991,7 +4992,6 @@ AFRAME.registerSystem('xrf-hands',{
if( bones[j].name == "index-finger-tip" ){ if( bones[j].name == "index-finger-tip" ){
indexFinger = j indexFinger = j
me.indexFinger.push(bones[j]) me.indexFinger.push(bones[j])
// addColliderToFingerTip(handEl,indexFinger)
const els = [...document.querySelectorAll('[xrf-pressable]')] const els = [...document.querySelectorAll('[xrf-pressable]')]
els.map( (el) => el.emit('indexFingerReady', {index: j} ) ) els.map( (el) => el.emit('indexFingerReady', {index: j} ) )
break break

14193
dist/xrfragment.module.js vendored
View file

File diff suppressed because it is too large Load diff

13
dist/xrfragment.three.js vendored
View file

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Tue Jun 11 05:22:22 PM UTC 2024 * v0.5.1 generated at Wed Jun 12 08:50:44 AM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2309,7 +2309,7 @@ xrf.addEventListener('audioInited', function(opts){
let audio = xrf.frag.href.audio = {} let audio = xrf.frag.href.audio = {}
actions = ['click','hover','teleport'] const actions = ['click','hover','teleport']
actions.map( (action) => { actions.map( (action) => {
const audioLoader = new THREE.AudioLoader(); const audioLoader = new THREE.AudioLoader();
audio[action] = new THREE.Audio( xrf.camera.listener ) audio[action] = new THREE.Audio( xrf.camera.listener )
@ -2526,7 +2526,7 @@ xrf.frag.src.addModel = (model,url,frag,opts) => {
xrf.frag.src.scale( scene, opts, url ) // scale scene xrf.frag.src.scale( scene, opts, url ) // scale scene
mesh.add(scene) mesh.add(scene)
} }
xrf.frag.src.enableSourcePortation({scene,mesh,url,model}) xrf.frag.src.enableSourcePortation({...opts, scene,mesh,url,model})
// flag everything isSRC & isXRF // flag everything isSRC & isXRF
mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true }) mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true })
@ -2540,7 +2540,7 @@ xrf.frag.src.renderAsPortal = (mesh) => {
} }
xrf.frag.src.enableSourcePortation = (opts) => { xrf.frag.src.enableSourcePortation = (opts) => {
let {scene,mesh,url,model} = opts let {scene,mesh,url,model,THREE} = opts
if( url[0] == '#' ) return if( url[0] == '#' ) return
url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene
@ -3374,8 +3374,9 @@ xrf.addEventListener('parseModel', (opts) => {
xrf.URI.vars = new Proxy({},{ xrf.URI.vars = new Proxy({},{
set(me,k,v){ set(me,k,v){
if( k.match(/^(name)$/) ) return if( k.match(/^(name)$/) ) return true
me[k] = v me[k] = v
return true
}, },
get(me,k ){ get(me,k ){
if( k == '__object' ){ if( k == '__object' ){
@ -3603,7 +3604,7 @@ xrf.init.audio = (opts) => {
let camera = xrf.camera let camera = xrf.camera
/* WebAudio: setup context via THREEjs */ /* WebAudio: setup context via THREEjs */
if( !camera.listener ){ if( !camera.listener ){
camera.listener = new THREE.AudioListener(); camera.listener = new xrf.THREE.AudioListener();
// *FIXME* camera vs camerarig conflict // *FIXME* camera vs camerarig conflict
(camera.getCam ? camera.getCam() : camera).add( camera.listener ); (camera.getCam ? camera.getCam() : camera).add( camera.listener );
xrf.emit('audioInited',{listener:camera.listener, ...opts}) xrf.emit('audioInited',{listener:camera.listener, ...opts})

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

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Tue Jun 11 05:22:22 PM UTC 2024 * v0.5.1 generated at Wed Jun 12 08:50:44 AM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2309,7 +2309,7 @@ xrf.addEventListener('audioInited', function(opts){
let audio = xrf.frag.href.audio = {} let audio = xrf.frag.href.audio = {}
actions = ['click','hover','teleport'] const actions = ['click','hover','teleport']
actions.map( (action) => { actions.map( (action) => {
const audioLoader = new THREE.AudioLoader(); const audioLoader = new THREE.AudioLoader();
audio[action] = new THREE.Audio( xrf.camera.listener ) audio[action] = new THREE.Audio( xrf.camera.listener )
@ -2526,7 +2526,7 @@ xrf.frag.src.addModel = (model,url,frag,opts) => {
xrf.frag.src.scale( scene, opts, url ) // scale scene xrf.frag.src.scale( scene, opts, url ) // scale scene
mesh.add(scene) mesh.add(scene)
} }
xrf.frag.src.enableSourcePortation({scene,mesh,url,model}) xrf.frag.src.enableSourcePortation({...opts, scene,mesh,url,model})
// flag everything isSRC & isXRF // flag everything isSRC & isXRF
mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true }) mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true })
@ -2540,7 +2540,7 @@ xrf.frag.src.renderAsPortal = (mesh) => {
} }
xrf.frag.src.enableSourcePortation = (opts) => { xrf.frag.src.enableSourcePortation = (opts) => {
let {scene,mesh,url,model} = opts let {scene,mesh,url,model,THREE} = opts
if( url[0] == '#' ) return if( url[0] == '#' ) return
url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene
@ -3374,8 +3374,9 @@ xrf.addEventListener('parseModel', (opts) => {
xrf.URI.vars = new Proxy({},{ xrf.URI.vars = new Proxy({},{
set(me,k,v){ set(me,k,v){
if( k.match(/^(name)$/) ) return if( k.match(/^(name)$/) ) return true
me[k] = v me[k] = v
return true
}, },
get(me,k ){ get(me,k ){
if( k == '__object' ){ if( k == '__object' ){
@ -3603,7 +3604,7 @@ xrf.init.audio = (opts) => {
let camera = xrf.camera let camera = xrf.camera
/* WebAudio: setup context via THREEjs */ /* WebAudio: setup context via THREEjs */
if( !camera.listener ){ if( !camera.listener ){
camera.listener = new THREE.AudioListener(); camera.listener = new xrf.THREE.AudioListener();
// *FIXME* camera vs camerarig conflict // *FIXME* camera vs camerarig conflict
(camera.getCam ? camera.getCam() : camera).add( camera.listener ); (camera.getCam ? camera.getCam() : camera).add( camera.listener );
xrf.emit('audioInited',{listener:camera.listener, ...opts}) xrf.emit('audioInited',{listener:camera.listener, ...opts})

1
example/three/sandbox/index.html
View file

@ -247,5 +247,6 @@
animate(); animate();
</script> </script>
</body> </body>
</html> </html>

3
src/3rd/js/three/xrf/dynamic/URIvars.js
View file

@ -7,8 +7,9 @@ xrf.addEventListener('parseModel', (opts) => {
xrf.URI.vars = new Proxy({},{ xrf.URI.vars = new Proxy({},{
set(me,k,v){ set(me,k,v){
if( k.match(/^(name)$/) ) return if( k.match(/^(name)$/) ) return true
me[k] = v me[k] = v
return true
}, },
get(me,k ){ get(me,k ){
if( k == '__object' ){ if( k == '__object' ){

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

@ -111,7 +111,7 @@ xrf.addEventListener('audioInited', function(opts){
let audio = xrf.frag.href.audio = {} let audio = xrf.frag.href.audio = {}
actions = ['click','hover','teleport'] const actions = ['click','hover','teleport']
actions.map( (action) => { actions.map( (action) => {
const audioLoader = new THREE.AudioLoader(); const audioLoader = new THREE.AudioLoader();
audio[action] = new THREE.Audio( xrf.camera.listener ) audio[action] = new THREE.Audio( xrf.camera.listener )

4
src/3rd/js/three/xrf/src.js
View file

@ -42,7 +42,7 @@ xrf.frag.src.addModel = (model,url,frag,opts) => {
xrf.frag.src.scale( scene, opts, url ) // scale scene xrf.frag.src.scale( scene, opts, url ) // scale scene
mesh.add(scene) mesh.add(scene)
} }
xrf.frag.src.enableSourcePortation({scene,mesh,url,model}) xrf.frag.src.enableSourcePortation({...opts, scene,mesh,url,model})
// flag everything isSRC & isXRF // flag everything isSRC & isXRF
mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true }) mesh.traverse( (n) => { n.isSRC = n.isXRF = n[ opts.isLocal ? 'isSRCLocal' : 'isSRCExternal' ] = true })
@ -56,7 +56,7 @@ xrf.frag.src.renderAsPortal = (mesh) => {
} }
xrf.frag.src.enableSourcePortation = (opts) => { xrf.frag.src.enableSourcePortation = (opts) => {
let {scene,mesh,url,model} = opts let {scene,mesh,url,model,THREE} = opts
if( url[0] == '#' ) return if( url[0] == '#' ) return
url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene url = url.replace(/(&)?[-][\w-+\.]+(&)?/g,'&') // remove negative selectors to refer to original scene

2
src/3rd/js/three/xrf/src/audio.js
View file

@ -94,7 +94,7 @@ xrf.init.audio = (opts) => {
let camera = xrf.camera let camera = xrf.camera
/* WebAudio: setup context via THREEjs */ /* WebAudio: setup context via THREEjs */
if( !camera.listener ){ if( !camera.listener ){
camera.listener = new THREE.AudioListener(); camera.listener = new xrf.THREE.AudioListener();
// *FIXME* camera vs camerarig conflict // *FIXME* camera vs camerarig conflict
(camera.getCam ? camera.getCam() : camera).add( camera.listener ); (camera.getCam ? camera.getCam() : camera).add( camera.listener );
xrf.emit('audioInited',{listener:camera.listener, ...opts}) xrf.emit('audioInited',{listener:camera.listener, ...opts})