|
@@ -237,7 +237,7 @@
|
|
|
|
|
|
scene.add( mesh );
|
|
|
|
|
|
- mixer = new THREE.AnimationMixer( scene );
|
|
|
+ //mixer = new THREE.AnimationMixer( scene );
|
|
|
|
|
|
// MORPHS
|
|
|
|
|
@@ -254,8 +254,10 @@
|
|
|
var mesh = new THREE.Mesh( geometry, material );
|
|
|
mesh.speed = speed;
|
|
|
|
|
|
+ var mixer = new THREE.AnimationMixer( this.mesh );
|
|
|
mixer.addAction( new THREE.AnimationAction( geometry.clips[0], Math.random() ).warpToDuration( duration ).setLocalRoot( mesh ) );
|
|
|
|
|
|
+ mesh.mixer = mixer;
|
|
|
mesh.position.set( x, y, z );
|
|
|
mesh.rotation.y = Math.PI/2;
|
|
|
|
|
@@ -366,13 +368,13 @@
|
|
|
|
|
|
var delta = clock.getDelta();
|
|
|
|
|
|
- if( mixer ) mixer.update( delta );
|
|
|
+ //if( mixer ) mixer.update( delta );
|
|
|
|
|
|
for ( var i = 0; i < morphs.length; i ++ ) {
|
|
|
|
|
|
morph = morphs[ i ];
|
|
|
|
|
|
- // morph.mixer.update( delta );
|
|
|
+ morph.mixer.update( delta );
|
|
|
|
|
|
morph.position.x += morph.speed * delta;
|
|
|
|