Post-release updates.

e8720bfa · Mr.doob · 70c58958 · e8720bfa · e8720bfa · e8720bfa
9 changed file
--- a/build/three.js
+++ b/build/three.js
--- a/build/three.min.js
+++ b/build/three.min.js
--- a/build/three.module.js
+++ b/build/three.module.js
--- a/examples/files.js
+++ b/examples/files.js
 var files = {
 	"webgl": [
 		"webgl_animation_cloth",
+		"webgl_animation_keyframes_json",
 		"webgl_animation_scene",
 		"webgl_animation_skinning_blending",
 		"webgl_animation_skinning_morph",

--- a/examples/models/json/pump/pump.json
+++ b/examples/models/json/pump/pump.json
--- a/examples/models/json/pump/pump_body.jpg
+++ b/examples/models/json/pump/pump_body.jpg
--- a/examples/models/json/pump/pump_gears.jpg
+++ b/examples/models/json/pump/pump_gears.jpg
--- a/examples/models/json/pump/pump_metalreflect.jpg
+++ b/examples/models/json/pump/pump_metalreflect.jpg
--- a/examples/webgl_animation_keyframes_json.html
+++ b/examples/webgl_animation_keyframes_json.html
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>three.js webgl - animation - keyframes - json</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: #fff;
+				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: #2983ff;
+			}
+		</style>
+	</head>
+
+	<body>
+
+		<div id="container"></div>
+
+		<div id="info">
+		<a href="http://threejs.org" target="_blank">three.js</a> webgl - animation - keyframes<a href=""></a>
+		<br>(recreation of the <a href="https://threejs.org/examples/webgl_loader_collada_keyframe.html">collada keyframe example</a> - with much simpler code)</div>
+
+		<script src="../build/three.js"></script>
+
+		<script src="js/Detector.js"></script>
+		<script src="js/libs/stats.min.js"></script>
+
+		<script>
+
+			var scene, camera, pointLight, stats;
+			var renderer, mixer, animationClip;
+
+			var clock = new THREE.Clock();
+			var container = document.getElementById( 'container' );
+
+			stats = new Stats();
+			container.appendChild( stats.dom );
+
+			renderer = new THREE.WebGLRenderer( { antialias: true } );
+			renderer.setClearColor( 0x000000 );
+			renderer.setPixelRatio( window.devicePixelRatio );
+			renderer.setSize( window.innerWidth, window.innerHeight );
+			container.appendChild( renderer.domElement );
+
+			scene = new THREE.Scene();
+			scene.add( new THREE.GridHelper( 20, 20 ) );
+
+			camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 0.01, 1000 );
+			camera.position.set( - 5.00, 3.43, 11.31 );
+			camera.lookAt( new THREE.Vector3( - 1.22, 2.18, 4.58 ) );
+
+			pointLight = new THREE.PointLight( 0xffffff, 1.75 );
+			pointLight.position.copy( camera.position );
+			scene.add( pointLight );
+
+
+			new THREE.ObjectLoader().load( 'models/json/pump/pump.json', function ( model ) {
+
+				scene.add( model );
+
+				mixer = new THREE.AnimationMixer( model );
+				mixer.clipAction( model.animations[ 0 ] ).play();
+
+				animate();
+
+			} );
+
+
+			window.onresize = function () {
+
+				camera.aspect = window.innerWidth / window.innerHeight;
+				camera.updateProjectionMatrix();
+
+				renderer.setSize( window.innerWidth, window.innerHeight );
+
+			};
+
+
+			function animate() {
+
+				requestAnimationFrame( animate );
+
+				mixer.update( clock.getDelta() );
+				stats.update();
+
+				renderer.render( scene, camera );
+
+			}
+
+
+		</script>
+
+	</body>
+
+</html>