Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

minor bone bugs. webgl_animation_skinning_morph.html works.

Ben Houston 10 years ago
parent
08f03bbc52
commit
9947cdcc0e
3 changed files with 20 additions and 360 deletions
Unified View Show Diff Stats
  1. 12 54
      examples/webgl_animation_skinning_morph.html
  2. 0 298
      examples/webgl_animation_skinning_morph_mixer.html
  3. 8 8
      src/animation/PropertyBinding.js

+ 12 - 54
examples/webgl_animation_skinning_morph.html
View File 

@@ -38,7 +38,7 @@
 
 		<div id="container"></div>
 
 		<div id="container"></div>
 
 
 
 		<div id="info">
 
 		<div id="info">
 
-		<a href="http://threejs.org" target="_blank">three.js</a> webgl - skinning + morphing
 
+		<a href="http://threejs.org" target="_blank">three.js</a> webgl - clip system
 
 		- knight by <a href="http://vimeo.com/36113323">apendua</a>
 
 		- knight by <a href="http://vimeo.com/36113323">apendua</a>
 
 		</div>
 
 		</div>
 
 
 
@@ -46,7 +46,6 @@
 
 
 
 		<script src="js/Detector.js"></script>
 
 		<script src="js/Detector.js"></script>
 
 		<script src="js/libs/stats.min.js"></script>
 
 		<script src="js/libs/stats.min.js"></script>
 
-
 
 		<script src="js/libs/dat.gui.min.js"></script>
 
 		<script src="js/libs/dat.gui.min.js"></script>
 
 
 
 		<script>
 
 		<script>
 
@@ -62,6 +61,8 @@
 
 
 
 			var mesh, helper;
 
 			var mesh, helper;
 
 
 
+			var mixer;
 
+		
 			var mouseX = 0, mouseY = 0;
 
 			var mouseX = 0, mouseY = 0;
 
 
 
 			var windowHalfX = window.innerWidth / 2;
 
 			var windowHalfX = window.innerWidth / 2;
 
@@ -183,26 +184,9 @@
 
 
 
 			}
 
 			}
 
 
 
-			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 );
 
 
 
 				geometry.computeBoundingBox();
 
 				geometry.computeBoundingBox();
 
 				var bb = geometry.boundingBox;
 
 				var bb = geometry.boundingBox;
 
@@ -215,14 +199,6 @@
 
 						path + 'posz' + format, path + 'negz' + format
 
 						path + 'posz' + format, path + 'negz' + format
 
 					];
 
 					];
 
 
 
-
 
-				//var envMap = THREE.ImageUtils.loadTextureCube( urls );
 
-
 
-				//var map = THREE.ImageUtils.loadTexture( "textures/UV_Grid_Sm.jpg" );
 
-
 
-				//var bumpMap = THREE.ImageUtils.generateDataTexture( 1, 1, new THREE.Color() );
 
-				//var bumpMap = THREE.ImageUtils.loadTexture( "textures/water.jpg" );
 
-
 
 				for ( var i = 0; i < materials.length; i ++ ) {
 
 				for ( var i = 0; i < materials.length; i ++ ) {
 
 
 
 					var m = materials[ i ];
 
 					var m = materials[ i ];
 
@@ -256,9 +232,13 @@
 
 				helper.visible = false;
 
 				helper.visible = false;
 
 				scene.add( helper );
 
 				scene.add( helper );
 
 
 
-				var animation = new THREE.Animation( mesh, geometry.animation );
 
-				animation.play();
 
+				mixer = new THREE.AnimationMixer( mesh );
 
+		
+				var clipMorpher = THREE.AnimationClip.CreateMorphAnimation( mesh.geometry.morphTargets, 3 );
 
+				mixer.addAction( new THREE.AnimationAction( clipMorpher, 0, 1, 1, true ) );
 
 
 
+				var clipBones = THREE.AnimationClip.FromJSONLoaderAnimation( geometry );
 
+				mixer.addAction( new THREE.AnimationAction( clipBones, 0, 1, 1, true ) );
 
 			}
 
 			}
 
 
 
 			function initGUI() {
 
 			function initGUI() {
 
@@ -303,30 +283,8 @@
 
 
 
 				camera.lookAt( scene.position );
 
 				camera.lookAt( scene.position );
 
 
 
-				// update skinning
 
-
 
-				THREE.AnimationHandler.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;
 
-
 
+				if( mixer ) {
 
+					mixer.update( delta );
 
 				}
 
 				}
 
 
 
 				renderer.render( scene, camera );
 
 				renderer.render( scene, camera );

+ 0 - 298
examples/webgl_animation_skinning_morph_mixer.html
View File 

@@ -1,298 +0,0 @@
 
-<!doctype html>
 
-<html lang="en">
 
-	<head>
 
-		<title>three.js webgl - skinning + morphing [knight]</title>
 
-		<meta charset="utf-8">
 
-		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
-		<style>
 
-			body {
 
-				color: #000;
 
-				font-family:Monospace;
 
-				font-size:13px;
 
-				text-align:center;
 
-
 
-				background-color: #fff;
 
-				margin: 0px;
 
-				overflow: hidden;
 
-			}
 
-
 
-			#info {
 
-				position: absolute;
 
-				top: 0px; width: 100%;
 
-				padding: 5px;
 
-			}
 
-
 
-			a {
 
-				color: #0af;
 
-			}
 
-
 
-			#stats { position: absolute; top:0; left: 0 }
 
-			#stats #fps { background: transparent !important }
 
-			#stats #fps #fpsText { color: #777 !important }
 
-			#stats #fps #fpsGraph { display: none }
 
-		</style>
 
-	</head>
 
-
 
-	<body>
 
-
 
-		<div id="container"></div>
 
-
 
-		<div id="info">
 
-		<a href="http://threejs.org" target="_blank">three.js</a> webgl - clip system
 
-		- knight by <a href="http://vimeo.com/36113323">apendua</a>
 
-		</div>
 
-
 
-		<script src="../build/three.min.js"></script>
 
-
 
-		<script src="js/Detector.js"></script>
 
-		<script src="js/libs/stats.min.js"></script>
 
-		<script src="js/libs/dat.gui.min.js"></script>
 
-		<script src="js/AnimationClipCreator.js"></script>
 
-
 
-		<script>
 
-
 
-			var SCREEN_WIDTH = window.innerWidth;
 
-			var SCREEN_HEIGHT = window.innerHeight;
 
-			var FLOOR = -250;
 
-
 
-			var container,stats;
 
-
 
-			var camera, scene;
 
-			var renderer;
 
-
 
-			var mesh, helper;
 
-
 
-			var mixer;
 
-		
-			var mouseX = 0, mouseY = 0;
 
-
 
-			var windowHalfX = window.innerWidth / 2;
 
-			var windowHalfY = window.innerHeight / 2;
 
-
 
-			var clock = new THREE.Clock();
 
-
 
-			document.addEventListener( 'mousemove', onDocumentMouseMove, false );
 
-
 
-			init();
 
-			animate();
 
-
 
-			function init() {
 
-
 
-				container = document.getElementById( 'container' );
 
-
 
-				camera = new THREE.PerspectiveCamera( 30, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 );
 
-				camera.position.z = 2200;
 
-
 
-				scene = new THREE.Scene();
 
-
 
-				scene.fog = new THREE.Fog( 0xffffff, 2000, 10000 );
 
-
 
-				scene.add( camera );
 
-
 
-				// GROUND
 
-
 
-				var geometry = new THREE.PlaneBufferGeometry( 16000, 16000 );
 
-				var material = new THREE.MeshPhongMaterial( { emissive: 0xbbbbbb } );
 
-
 
-				var ground = new THREE.Mesh( geometry, material );
 
-				ground.position.set( 0, FLOOR, 0 );
 
-				ground.rotation.x = -Math.PI/2;
 
-				scene.add( ground );
 
-
 
-				ground.receiveShadow = true;
 
-
 
-
 
-				// LIGHTS
 
-
 
-				var ambient = new THREE.AmbientLight( 0x222222 );
 
-				scene.add( ambient );
 
-
 
-
 
-				var light = new THREE.DirectionalLight( 0xebf3ff, 1.6 );
 
-				light.position.set( 0, 140, 500 ).multiplyScalar( 1.1 );
 
-				scene.add( light );
 
-
 
-				light.castShadow = true;
 
-
 
-				light.shadowMapWidth = 1024;
 
-				light.shadowMapHeight = 2048;
 
-
 
-				var d = 390;
 
-
 
-				light.shadowCameraLeft = -d;
 
-				light.shadowCameraRight = d;
 
-				light.shadowCameraTop = d * 1.5;
 
-				light.shadowCameraBottom = -d;
 
-
 
-				light.shadowCameraFar = 3500;
 
-				//light.shadowCameraVisible = true;
 
-
 
-				//
 
-
 
-				var light = new THREE.DirectionalLight( 0x493f13, 1 );
 
-				light.position.set( 0, -1, 0 );
 
-				scene.add( light );
 
-
 
-				// RENDERER
 
-
 
-				renderer = new THREE.WebGLRenderer( { antialias: true } );
 
-				renderer.setClearColor( scene.fog.color );
 
-				renderer.setPixelRatio( window.devicePixelRatio );
 
-				renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
 
-				renderer.domElement.style.position = "relative";
 
-
 
-				container.appendChild( renderer.domElement );
 
-
 
-				renderer.gammaInput = true;
 
-				renderer.gammaOutput = true;
 
-
 
-				renderer.shadowMap.enabled = true;
 
-
 
-
 
-				// STATS
 
-
 
-				stats = new Stats();
 
-				container.appendChild( stats.domElement );
 
-
 
-				//
 
-
 
-				var loader = new THREE.JSONLoader();
 
-				loader.load( "models/skinned/knight.js", function ( geometry, materials ) {
 
-
 
-					createScene( geometry, materials, 0, FLOOR, -300, 60 )
 
-
 
-				} );
 
-
 
-				// GUI
 
-
 
-				initGUI();
 
-
 
-				//
 
-
 
-				window.addEventListener( 'resize', onWindowResize, false );
 
-
 
-			}
 
-
 
-			function onWindowResize() {
 
-
 
-				windowHalfX = window.innerWidth / 2;
 
-				windowHalfY = window.innerHeight / 2;
 
-
 
-				camera.aspect = window.innerWidth / window.innerHeight;
 
-				camera.updateProjectionMatrix();
 
-
 
-				renderer.setSize( window.innerWidth, window.innerHeight );
 
-
 
-			}
 
-
 
-			function createScene( geometry, materials, x, y, z, s ) {
 
-
 
-				//ensureLoop( geometry.animation );
 
-
 
-				geometry.computeBoundingBox();
 
-				var bb = geometry.boundingBox;
 
-
 
-				var path = "textures/cube/Park2/";
 
-				var format = '.jpg';
 
-				var urls = [
 
-						path + 'posx' + format, path + 'negx' + format,
 
-						path + 'posy' + format, path + 'negy' + format,
 
-						path + 'posz' + format, path + 'negz' + format
 
-					];
 
-
 
-				for ( var i = 0; i < materials.length; i ++ ) {
 
-
 
-					var m = materials[ i ];
 
-					m.skinning = true;
 
-					m.morphTargets = true;
 
-
 
-					m.specular.setHSL( 0, 0, 0.1 );
 
-
 
-					m.color.setHSL( 0.6, 0, 0.6 );
 
-
 
-					//m.map = map;
 
-					//m.envMap = envMap;
 
-					//m.bumpMap = bumpMap;
 
-					//m.bumpScale = 2;
 
-
 
-					//m.combine = THREE.MixOperation;
 
-					//m.reflectivity = 0.75;
 
-
 
-				}
 
-
 
-				mesh = new THREE.SkinnedMesh( geometry, new THREE.MeshFaceMaterial( materials ) );
 
-				mesh.position.set( x, y - bb.min.y * s, z );
 
-				mesh.scale.set( s, s, s );
 
-				scene.add( mesh );
 
-
 
-				mesh.castShadow = true;
 
-				mesh.receiveShadow = true;
 
-
 
-				helper = new THREE.SkeletonHelper( mesh );
 
-				helper.material.linewidth = 3;
 
-				helper.visible = false;
 
-				scene.add( helper );
 
-
 
-				mixer = new THREE.AnimationMixer( mesh );
 
-		
-				var clipMorpher = THREE.AnimationClip.CreateMorphAnimation( mesh.geometry.morphTargets, 3 );
 
-				mixer.addAction( new THREE.AnimationAction( clipMorpher, 0, 1, 1, true ) );
 
-
 
-				var clipBones = THREE.AnimationClip.FromJSONLoaderAnimation( geometry );
 
-				mixer.addAction( new THREE.AnimationAction( clipBones, 0, 1, 1, true ) );
 
-			}
 
-
 
-			function initGUI() {
 
-
 
-				var API = {
 
-					'show model'    : true,
 
-					'show skeleton' : false
 
-				};
 
-
 
-				var gui = new dat.GUI();
 
-
 
-				gui.add( API, 'show model' ).onChange( function() { mesh.visible = API[ 'show model' ]; } );
 
-
 
-				gui.add( API, 'show skeleton' ).onChange( function() { helper.visible = API[ 'show skeleton' ]; } );
 
-
 
-			}
 
-
 
-			function onDocumentMouseMove( event ) {
 
-
 
-				mouseX = ( event.clientX - windowHalfX );
 
-				mouseY = ( event.clientY - windowHalfY );
 
-
 
-			}
 
-
 
-			//
 
-
 
-			function animate() {
 
-
 
-				requestAnimationFrame( animate );
 
-
 
-				render();
 
-				stats.update();
 
-
 
-			}
 
-
 
-			function render() {
 
-
 
-				var delta = 0.75 * clock.getDelta();
 
-
 
-				camera.position.x += ( mouseX - camera.position.x ) * .05;
 
-				camera.position.y = THREE.Math.clamp( camera.position.y + ( - mouseY - camera.position.y ) * .05, 0, 1000 );
 
-
 
-				camera.lookAt( scene.position );
 
-
 
-				if( mixer ) {
 
-					mixer.update( delta );
 
-				}
 
-
 
-				renderer.render( scene, camera );
 
-
 
-			}
 
-
 
-		</script>
 
-
 
-	</body>
 
-</html>

+ 8 - 8
src/animation/PropertyBinding.js
View File 

@@ -90,7 +90,7 @@ THREE.PropertyBinding.prototype = {
 
 		
 		
 		//console.log( "PropertyBinding", this );
 
 		//console.log( "PropertyBinding", this );
 
 
 
-		var targetObject = this.node;
 
+		var targetObject = this.rootNode;
 
 
 
  		// ensure there is a value node
 
  		// ensure there is a value node
 
 		if( ! targetObject ) {
 
 		if( ! targetObject ) {
 
@@ -115,14 +115,14 @@ THREE.PropertyBinding.prototype = {
 
 				if( ! targetObject.skeleton ) {
 
 				if( ! targetObject.skeleton ) {
 
 					console.error( '  can not bind to bones as node does not have a skeleton', this );
 
 					console.error( '  can not bind to bones as node does not have a skeleton', this );
 
 				}
 
 				}
 
-				targetObject = targetObject.skeleton.bones;
 
-
 
 				// TODO/OPTIMIZE, skip this if propertyIndex is already an integer, and convert the integer string to a true integer.
 
 				// TODO/OPTIMIZE, skip this if propertyIndex is already an integer, and convert the integer string to a true integer.
 
 				
 				
+				targetObject = targetObject.skeleton.bones;
 
+
 
 				// support resolving morphTarget names into indices.
 
 				// support resolving morphTarget names into indices.
 
 				//console.log( "  resolving bone name: ", this.objectIndex );
 
 				//console.log( "  resolving bone name: ", this.objectIndex );
 
-				for( var i = 0; i < this.node.skeleton.bones.length; i ++ ) {
 
-					if( this.node.skeleton.bones[i].name === this.objectIndex ) {
 
+				for( var i = 0; i < targetObject.length; i ++ ) {
 
+					if( targetObject[i].name === this.objectIndex ) {
 
 						//console.log( "  resolved to index: ", i );
 
 						//console.log( "  resolved to index: ", i );
 
 						this.objectIndex = i;
 
 						this.objectIndex = i;
 
 						break;
 
 						break;
 
@@ -164,15 +164,15 @@ THREE.PropertyBinding.prototype = {
 
 				
 				
 				// support resolving morphTarget names into indices.
 
 				// support resolving morphTarget names into indices.
 
 				//console.log( "  resolving morphTargetInfluence name: ", this.propertyIndex );
 
 				//console.log( "  resolving morphTargetInfluence name: ", this.propertyIndex );
 
-				if( ! this.node.geometry ) {
 
+				if( ! targetObject.geometry ) {
 
 					console.error( '  can not bind to morphTargetInfluences becasuse node does not have a geometry', this );				
 					console.error( '  can not bind to morphTargetInfluences becasuse node does not have a geometry', this );				
 				}
 
 				}
 
-				if( ! this.node.geometry.morphTargets ) {
 
+				if( ! targetObject.geometry.morphTargets ) {
 
 					console.error( '  can not bind to morphTargetInfluences becasuse node does not have a geometry.morphTargets', this );				
 					console.error( '  can not bind to morphTargetInfluences becasuse node does not have a geometry.morphTargets', this );				
 				}
 
 				}
 
 				
 				
 				for( var i = 0; i < this.node.geometry.morphTargets.length; i ++ ) {
 
 				for( var i = 0; i < this.node.geometry.morphTargets.length; i ++ ) {
 
-					if( this.node.geometry.morphTargets[i].name === this.propertyIndex ) {
 
+					if( targetObject.geometry.morphTargets[i].name === this.propertyIndex ) {
 
 						//console.log( "  resolved to index: ", i );
 
 						//console.log( "  resolved to index: ", i );
 
 						this.propertyIndex = i;
 
 						this.propertyIndex = i;
 
 						break;
 
 						break;