|
@@ -185,23 +185,6 @@
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- /*function ensureLoop( animation ) {
|
|
|
|
-
|
|
|
|
- for ( var i = 0; i < animation.hierarchy.length; i ++ ) {
|
|
|
|
-
|
|
|
|
- var bone = animation.hierarchy[ i ];
|
|
|
|
-
|
|
|
|
- var first = bone.keys[ 0 ];
|
|
|
|
- var last = bone.keys[ bone.keys.length - 1 ];
|
|
|
|
-
|
|
|
|
- last.pos = first.pos;
|
|
|
|
- last.rot = first.rot;
|
|
|
|
- last.scl = first.scl;
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
function createScene( geometry, materials, x, y, z, s ) {
|
|
function createScene( geometry, materials, x, y, z, s ) {
|
|
|
|
|
|
//ensureLoop( geometry.animation );
|
|
//ensureLoop( geometry.animation );
|
|
@@ -250,35 +233,13 @@
|
|
helper.visible = false;
|
|
helper.visible = false;
|
|
scene.add( helper );
|
|
scene.add( helper );
|
|
|
|
|
|
- console.log( 'geometry.animation', geometry.animation );
|
|
|
|
-
|
|
|
|
- var animation = new THREE.Animation( mesh, geometry.animation );
|
|
|
|
- //animation.play();
|
|
|
|
-
|
|
|
|
mixer = new THREE.AnimationMixer( mesh );
|
|
mixer = new THREE.AnimationMixer( mesh );
|
|
|
|
+
|
|
|
|
+ var clipMorpher = THREE.AnimationClipCreator.CreateMorphAnimation( mesh.geometry.morphTargets, 3 );
|
|
|
|
+ mixer.addAction( new THREE.AnimationAction( clipMorpher, 0, 1, 1, true ) );
|
|
|
|
|
|
- var clip1 = THREE.AnimationClipCreator.CreateShakeAnimation( 10, new THREE.Vector3( 10, 10, 10 ) );
|
|
|
|
- //mixer.addAction( new THREE.AnimationAction( clip1, 0, 1, 1, true ) );
|
|
|
|
- var clip2 = THREE.AnimationClipCreator.CreatePulsationAnimation( 10, 100 );
|
|
|
|
- //mixer.addAction( new THREE.AnimationAction( clip2, 0, 1, 1, true ) );
|
|
|
|
- var clip3 = THREE.AnimationClipCreator.CreateRotationAnimation( 100, 'y' );
|
|
|
|
- //mixer.addAction( new THREE.AnimationAction( clip3, 0, 1, 1, true ) );
|
|
|
|
- var clip4 = THREE.AnimationClipCreator.CreateScaleAxisAnimation( 10, 'x' );
|
|
|
|
- //mixer.addAction( new THREE.AnimationAction( clip4, 0, 1, 1, true ) );
|
|
|
|
- var clip5 = THREE.AnimationClipCreator.CreateMaterialColorAnimation( 10, [ new THREE.Color( 0xffffff ), new THREE.Color( 0xff0000 ), new THREE.Color( 0xff00ff ) ] );
|
|
|
|
- //mixer.addAction( new THREE.AnimationAction( clip5, 0, 1, 1, true ) );
|
|
|
|
-
|
|
|
|
- //var clip6 = THREE.AnimationClip.CreateVisibilityAnimation( 10 );
|
|
|
|
- //mixer.addAction( new THREE.AnimationAction( clip6, 0, 1, 1, true ) );
|
|
|
|
-
|
|
|
|
- var clip7 = THREE.AnimationClipCreator.CreateMorphAnimation( mesh.geometry.morphTargets, 3 );
|
|
|
|
- mixer.addAction( new THREE.AnimationAction( clip7, 0, 1, 1, true ) );
|
|
|
|
-
|
|
|
|
- var clip8 = THREE.AnimationClip.FromJSONLoaderAnimation( geometry );
|
|
|
|
- mixer.addAction( new THREE.AnimationAction( clip8, 0, 1, 1, true ) );
|
|
|
|
-
|
|
|
|
- console.log( clip8.getAt( 0 ) );
|
|
|
|
-
|
|
|
|
|
|
+ var clipBones = THREE.AnimationClip.FromJSONLoaderAnimation( geometry );
|
|
|
|
+ mixer.addAction( new THREE.AnimationAction( clipBones, 0, 1, 1, true ) );
|
|
}
|
|
}
|
|
|
|
|
|
function initGUI() {
|
|
function initGUI() {
|
|
@@ -323,35 +284,9 @@
|
|
|
|
|
|
camera.lookAt( scene.position );
|
|
camera.lookAt( scene.position );
|
|
|
|
|
|
- // update skinning
|
|
|
|
-
|
|
|
|
- //THREE.AnimationHandler.update( delta );
|
|
|
|
-
|
|
|
|
if( mixer ) {
|
|
if( mixer ) {
|
|
mixer.update( delta );
|
|
mixer.update( delta );
|
|
}
|
|
}
|
|
-
|
|
|
|
- //if ( helper !== undefined ) helper.update();
|
|
|
|
-
|
|
|
|
- // update morphs
|
|
|
|
-/*
|
|
|
|
- if ( mesh ) {
|
|
|
|
-
|
|
|
|
- var time = Date.now() * 0.001;
|
|
|
|
-
|
|
|
|
- // mouth
|
|
|
|
-
|
|
|
|
- mesh.morphTargetInfluences[ 1 ] = ( 1 + Math.sin( 4 * time ) ) / 2;
|
|
|
|
-
|
|
|
|
- // frown ?
|
|
|
|
-
|
|
|
|
- mesh.morphTargetInfluences[ 2 ] = ( 1 + Math.sin( 2 * time ) ) / 2;
|
|
|
|
-
|
|
|
|
- // eyes
|
|
|
|
-
|
|
|
|
- mesh.morphTargetInfluences[ 3 ] = ( 1 + Math.cos( 4 * time ) ) / 2;
|
|
|
|
-
|
|
|
|
- }*/
|
|
|
|
|
|
|
|
renderer.render( scene, camera );
|
|
renderer.render( scene, camera );
|
|
|
|
|