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

fixed documentation & threejs disparities

Browse source
This commit is contained in:
Leon van Kammen 2023-06-08 18:53:11 +02:00
parent 0595d2e5b9
commit 68c24b9cea
11 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/xrfragment.aframe.js vendored
View file

@ -849,8 +849,8 @@ xrf.parseModel = function(model,url){
// eval embedded XR fragments // eval embedded XR fragments
model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) ) model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) )
// add animations // add animations
model.clock = new THREE.Clock(); model.clock = new xrf.THREE.Clock();
model.mixer = new THREE.AnimationMixer(model.scene) model.mixer = new xrf.THREE.AnimationMixer(model.scene)
model.animations.map( (anim) => model.mixer.clipAction( anim ).play() ) model.animations.map( (anim) => model.mixer.clipAction( anim ).play() )
model.render = function(){ model.render = function(){
model.mixer.update( model.clock.getDelta() ) model.mixer.update( model.clock.getDelta() )

4
dist/xrfragment.three.js vendored
View file

@ -849,8 +849,8 @@ xrf.parseModel = function(model,url){
// eval embedded XR fragments // eval embedded XR fragments
model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) ) model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) )
// add animations // add animations
model.clock = new THREE.Clock(); model.clock = new xrf.THREE.Clock();
model.mixer = new THREE.AnimationMixer(model.scene) model.mixer = new xrf.THREE.AnimationMixer(model.scene)
model.animations.map( (anim) => model.mixer.clipAction( anim ).play() ) model.animations.map( (anim) => model.mixer.clipAction( anim ).play() )
model.render = function(){ model.render = function(){
model.mixer.update( model.clock.getDelta() ) model.mixer.update( model.clock.getDelta() )

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

@ -849,8 +849,8 @@ xrf.parseModel = function(model,url){
// eval embedded XR fragments // eval embedded XR fragments
model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) ) model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) )
// add animations // add animations
model.clock = new THREE.Clock(); model.clock = new xrf.THREE.Clock();
model.mixer = new THREE.AnimationMixer(model.scene) model.mixer = new xrf.THREE.AnimationMixer(model.scene)
model.animations.map( (anim) => model.mixer.clipAction( anim ).play() ) model.animations.map( (anim) => model.mixer.clipAction( anim ).play() )
model.render = function(){ model.render = function(){
model.mixer.update( model.clock.getDelta() ) model.mixer.update( model.clock.getDelta() )

1
example/aframe/sandbox/example.gltf Symbolic link
View file

@ -0,0 +1 @@
../../assets/query.gltf

1
example/aframe/sandbox/example3.gltf
View file

@ -1 +0,0 @@
../../assets/example3.gltf

1
example/aframe/sandbox/href.gltf
View file

@ -1 +0,0 @@
../../assets/href.gltf

1
example/threejs/sandbox/example.gltf Symbolic link
View file

@ -0,0 +1 @@
../../assets/query.gltf

1
example/threejs/sandbox/example3.gltf
View file

@ -1 +0,0 @@
../../assets/example3.gltf

2
example/threejs/sandbox/index.html
View file

@ -167,7 +167,7 @@
setupConsole() setupConsole()
setupUrlBar( $('input#uri'), xrfragment ) setupUrlBar( $('input#uri'), XRF )
// GUI // GUI

12
index.html
View file

File diff suppressed because one or more lines are too long

8
src/3rd/js/three/index.js
View file

@ -43,8 +43,8 @@ xrf.parseModel = function(model,url){
// eval embedded XR fragments // eval embedded XR fragments
model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) ) model.scene.traverse( (mesh) => xrf.eval.mesh(mesh,model) )
// add animations // add animations
model.clock = new THREE.Clock(); model.clock = new xrf.THREE.Clock();
model.mixer = new THREE.AnimationMixer(model.scene) model.mixer = new xrf.THREE.AnimationMixer(model.scene)
model.animations.map( (anim) => model.mixer.clipAction( anim ).play() ) model.animations.map( (anim) => model.mixer.clipAction( anim ).play() )
model.render = function(){ model.render = function(){
model.mixer.update( model.clock.getDelta() ) model.mixer.update( model.clock.getDelta() )
@ -54,7 +54,7 @@ xrf.parseModel = function(model,url){
xrf.getLastModel = () => xrf.model.last xrf.getLastModel = () => xrf.model.last
xrf.eval = function( url, model, flags ){ // evaluate local toplevel url xrf.eval = function( url, model, flags ){ // evaluate fragments in url
let notice = false let notice = false
model = model || xrf.model model = model || xrf.model
let { THREE, camera } = xrf let { THREE, camera } = xrf
@ -79,7 +79,7 @@ xrf.eval.mesh = (mesh,model) => { // evaluate embedded fragments (metadata)
} }
} }
xrf.eval.fragment = (k, opts ) => { xrf.eval.fragment = (k, opts ) => { // evaluate one fragment
// call native function (xrf/env.js e.g.), or pass it to user decorator // call native function (xrf/env.js e.g.), or pass it to user decorator
let func = xrf.frag[k] || function(){} let func = xrf.frag[k] || function(){}
if( xrf[k] ) xrf[k]( func, opts.frag[k], opts) if( xrf[k] ) xrf[k]( func, opts.frag[k], opts)