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

bugfix #t fragment, default nonloop

Browse source
This commit is contained in:
Leon van Kammen 2024-07-19 18:10:32 +02:00
parent 92c7660366
commit 2b1905d90f
7 changed files with 29813 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Wed Jul 17 01:53:27 PM UTC 2024 * v0.5.1 generated at Fri Jul 19 03:41:31 PM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2733,7 +2733,7 @@ xrf.addEventListener('parseModel', (opts) => {
let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene) let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene)
mixer.model = model mixer.model = model
mixer.loop = {timeStart:0,timeStop:0,speed:1.0} mixer.loop = {timeStart:0,timeStop:0,speed:1.0,enabled:false}
mixer.i = xrf.mixers.length mixer.i = xrf.mixers.length
mixer.actions = [] mixer.actions = []
@ -2789,7 +2789,11 @@ xrf.addEventListener('parseModel', (opts) => {
if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){ if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){
if( mixer.loop.enabled ){ if( mixer.loop.enabled ){
setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion
}else mixer.stop() }else{
mixer.setTime( mixer.time = mixer.loop.timeStop )
//mixer.update(mixer.time )
mixer.timeScale = 0
}
} }
return update.call( this, time ) return update.call( this, time )
} }

10
dist/xrfragment.aframe.js vendored
View file

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Wed Jul 17 01:53:27 PM UTC 2024 * v0.5.1 generated at Fri Jul 19 03:41:31 PM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2731,7 +2731,7 @@ xrf.addEventListener('parseModel', (opts) => {
let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene) let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene)
mixer.model = model mixer.model = model
mixer.loop = {timeStart:0,timeStop:0,speed:1.0} mixer.loop = {timeStart:0,timeStop:0,speed:1.0,enabled:false}
mixer.i = xrf.mixers.length mixer.i = xrf.mixers.length
mixer.actions = [] mixer.actions = []
@ -2787,7 +2787,11 @@ xrf.addEventListener('parseModel', (opts) => {
if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){ if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){
if( mixer.loop.enabled ){ if( mixer.loop.enabled ){
setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion
}else mixer.stop() }else{
mixer.setTime( mixer.time = mixer.loop.timeStop )
//mixer.update(mixer.time )
mixer.timeScale = 0
}
} }
return update.call( this, time ) return update.call( this, time )
} }

8
dist/xrfragment.model-viewer.js vendored
View file

@ -2728,7 +2728,7 @@ xrf.addEventListener('parseModel', (opts) => {
let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene) let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene)
mixer.model = model mixer.model = model
mixer.loop = {timeStart:0,timeStop:0,speed:1.0} mixer.loop = {timeStart:0,timeStop:0,speed:1.0,enabled:false}
mixer.i = xrf.mixers.length mixer.i = xrf.mixers.length
mixer.actions = [] mixer.actions = []
@ -2784,7 +2784,11 @@ xrf.addEventListener('parseModel', (opts) => {
if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){ if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){
if( mixer.loop.enabled ){ if( mixer.loop.enabled ){
setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion
}else mixer.stop() }else{
mixer.setTime( mixer.time = mixer.loop.timeStop )
//mixer.update(mixer.time )
mixer.timeScale = 0
}
} }
return update.call( this, time ) return update.call( this, time )
} }

29773
dist/xrfragment.module.js vendored
View file

File diff suppressed because it is too large Load diff

10
dist/xrfragment.three.js vendored
View file

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Wed Jul 17 01:53:27 PM UTC 2024 * v0.5.1 generated at Fri Jul 19 03:41:31 PM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2731,7 +2731,7 @@ xrf.addEventListener('parseModel', (opts) => {
let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene) let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene)
mixer.model = model mixer.model = model
mixer.loop = {timeStart:0,timeStop:0,speed:1.0} mixer.loop = {timeStart:0,timeStop:0,speed:1.0,enabled:false}
mixer.i = xrf.mixers.length mixer.i = xrf.mixers.length
mixer.actions = [] mixer.actions = []
@ -2787,7 +2787,11 @@ xrf.addEventListener('parseModel', (opts) => {
if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){ if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){
if( mixer.loop.enabled ){ if( mixer.loop.enabled ){
setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion
}else mixer.stop() }else{
mixer.setTime( mixer.time = mixer.loop.timeStop )
//mixer.update(mixer.time )
mixer.timeScale = 0
}
} }
return update.call( this, time ) return update.call( this, time )
} }

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

@ -1,5 +1,5 @@
/* /*
* v0.5.1 generated at Wed Jul 17 01:53:27 PM UTC 2024 * v0.5.1 generated at Fri Jul 19 03:41:31 PM UTC 2024
* https://xrfragment.org * https://xrfragment.org
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
*/ */
@ -2731,7 +2731,7 @@ xrf.addEventListener('parseModel', (opts) => {
let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene) let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene)
mixer.model = model mixer.model = model
mixer.loop = {timeStart:0,timeStop:0,speed:1.0} mixer.loop = {timeStart:0,timeStop:0,speed:1.0,enabled:false}
mixer.i = xrf.mixers.length mixer.i = xrf.mixers.length
mixer.actions = [] mixer.actions = []
@ -2787,7 +2787,11 @@ xrf.addEventListener('parseModel', (opts) => {
if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){ if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){
if( mixer.loop.enabled ){ if( mixer.loop.enabled ){
setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion
}else mixer.stop() }else{
mixer.setTime( mixer.time = mixer.loop.timeStop )
//mixer.update(mixer.time )
mixer.timeScale = 0
}
} }
return update.call( this, time ) return update.call( this, time )
} }

8
src/3rd/js/three/xrf/t.js
View file

@ -42,7 +42,7 @@ xrf.addEventListener('parseModel', (opts) => {
let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene) let mixer = model.mixer = new xrf.THREE.AnimationMixer(model.scene)
mixer.model = model mixer.model = model
mixer.loop = {timeStart:0,timeStop:0,speed:1.0} mixer.loop = {timeStart:0,timeStop:0,speed:1.0,enabled:false}
mixer.i = xrf.mixers.length mixer.i = xrf.mixers.length
mixer.actions = [] mixer.actions = []
@ -98,7 +98,11 @@ xrf.addEventListener('parseModel', (opts) => {
if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){ if( mixer.loop.timeStop > 0 && mixer.time > mixer.loop.timeStop ){
if( mixer.loop.enabled ){ if( mixer.loop.enabled ){
setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion setTimeout( () => mixer.updateLoop(), 0 ) // prevent recursion
}else mixer.stop() }else{
mixer.setTime( mixer.time = mixer.loop.timeStop )
//mixer.update(mixer.time )
mixer.timeScale = 0
}
} }
return update.call( this, time ) return update.call( this, time )
} }