Browse Source

fix two broken examples.

Ben Houston 10 years ago
parent
commit
e9d593b78a
2 changed files with 6 additions and 3 deletions
  1. 1 0
      examples/webgl_loader_scene.html
  2. 5 3
      examples/webgl_shadowmap_performance.html

+ 1 - 0
examples/webgl_loader_scene.html

@@ -92,6 +92,7 @@
 		</div>
 
 		<script src="../build/three.min.js"></script>
+		<script src="js/MorphAnimMesh.js"></script>
 		<script src="js/loaders/collada/Animation.js"></script>
 		<script src="js/loaders/collada/AnimationHandler.js"></script>
 		<script src="js/loaders/collada/KeyFrameAnimation.js"></script>

+ 5 - 3
examples/webgl_shadowmap_performance.html

@@ -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;