Merge pull request #7155 from WestLangley/dev-cleanup

Clean Up

examples/webgl_loader_collada_kinematics.html

@@ -120,14 +120,10 @@
 
 				// Lights
 
-				var directionalLight = new THREE.HemisphereLight( 0xffeeee, 0x111122 );
-				directionalLight.position.x = Math.random() - 0.5;
-				directionalLight.position.y = Math.random() - 0.5;
-				directionalLight.position.z = Math.random() - 0.5;
-				directionalLight.position.normalize();
-				scene.add( directionalLight );
-
-				var pointLight = new THREE.PointLight( 0xffffff, 0.5 );
+				var light = new THREE.HemisphereLight( 0xffeeee, 0x111122 );
+				scene.add( light );
+
+				var pointLight = new THREE.PointLight( 0xffffff, 0.3 );
 				particleLight.add( pointLight );
 
 				renderer = new THREE.WebGLRenderer();
@@ -149,29 +145,29 @@
 
 			function setupTween() {
 
-				var duration = getRandomInt(1000, 5000);
+				var duration = getRandomInt( 1000, 5000 );
 
 				var target = {};
 
-				for ( var i = 0; i < kinematics.joints.length; i++ ) {
+				for ( var i = 0; i < kinematics.joints.length; i ++ ) {
 
-						var joint = kinematics.joints[ i ];
+					var joint = kinematics.joints[ i ];
 
-						var old = tweenParameters[ i ];
+					var old = tweenParameters[ i ];
 
-						var position = old ? old : joint.zeroPosition;
+					var position = old ? old : joint.zeroPosition;
 
-						tweenParameters[ i ] = position;
+					tweenParameters[ i ] = position;
 
-						target[ i ] = getRandomInt(joint.limits.min, joint.limits.max)
+					target[ i ] = getRandomInt( joint.limits.min, joint.limits.max )
 
 				}
 
 				kinematicsTween = new TWEEN.Tween( tweenParameters ).to( target, duration ).easing( TWEEN.Easing.Quadratic.Out );
 
-				kinematicsTween.onUpdate(function() {
+				kinematicsTween.onUpdate( function() {
 
-					for ( var i = 0; i < kinematics.joints.length; i++ ) {
+					for ( var i = 0; i < kinematics.joints.length; i ++ ) {
 
 						kinematics.setJointValue( i, this[ i ] );
 
@@ -229,7 +225,7 @@
 
 			function getRandomInt( min, max ) {
 
-					return Math.floor( Math.random() * ( max - min + 1 ) ) + min;
+				return Math.floor( Math.random() * ( max - min + 1 ) ) + min;
 
 			}
 

examples/webgl_loader_pdb.html

@@ -73,6 +73,7 @@
 		<div id="menu"></div>
 
 		<script>
+
 			var camera, scene, renderer, labelsRenderer;
 			var controls;
 
@@ -108,16 +109,16 @@
 
 			function init() {
 
-				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 5000 );
-				camera.position.z = 1500;
-
 				scene = new THREE.Scene();
 
-				var light = new THREE.HemisphereLight( 0xffffff, 0x000000 );
-				light.position.set( 1, 1, 1 );
-				scene.add( light );
+				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 5000 );
+				camera.position.z = 1000;
+				scene.add( camera );
+
+				var light = new THREE.PointLight( 0xffffff, 0.8 );
+				camera.add( light );
 
-				root = new THREE.Object3D();
+				root = new THREE.Group();
 				scene.add( root );
 
 				//
@@ -138,8 +139,8 @@
 				//
 
 				controls = new THREE.TrackballControls( camera, renderer.domElement );
-				controls.rotateSpeed = 0.5;
-				controls.addEventListener( 'change', render );
+				controls.minDistance = 500;
+				controls.maxDistance = 2000;
 
 				//
 
@@ -184,7 +185,7 @@
 
 			function loadMolecule( url ) {
 
-				while( root.children.length > 0 ) {
+				while ( root.children.length > 0 ) {
 
 					var object = root.children[ 0 ];
 					object.parent.remove( object );
@@ -205,7 +206,7 @@
 						var color = geometry.colors[ i ];
 						var element = geometry.elements[ i ];
 
-						var material = new THREE.MeshLambertMaterial( { color: color } );
+						var material = new THREE.MeshPhongMaterial( { color: color } );
 
 						var object = new THREE.Mesh( sphereGeometry, material );
 						object.position.copy( position );
@@ -234,7 +235,7 @@
 						start.multiplyScalar( 75 );
 						end.multiplyScalar( 75 );
 
-						var object = new THREE.Mesh( boxGeometry, new THREE.MeshLambertMaterial( 0xffffff ) );
+						var object = new THREE.Mesh( boxGeometry, new THREE.MeshPhongMaterial( 0xffffff ) );
 						object.position.copy( start );
 						object.position.lerp( end, 0.5 );
 						object.scale.set( 5, 5, start.distanceTo( end ) );
@@ -250,7 +251,7 @@
 					if ( xhr.lengthComputable ) {
 
 						var percentComplete = xhr.loaded / xhr.total * 100;
-						console.log( Math.round(percentComplete, 2) + '% downloaded' );
+						console.log( Math.round( percentComplete, 2 ) + '% downloaded' );
 
 					}
 
@@ -295,7 +296,6 @@
 
 			}
 
-    </script>
-  </body>
-
+		</script>
+	</body>
 </html>

examples/webgl_shaders_ocean.html

@@ -84,13 +84,15 @@
 				camera.position.set( 2000, 750, 2000 );
 
 				controls = new THREE.OrbitControls( camera, renderer.domElement );
-				controls.userPan = false;
-				controls.userPanSpeed = 0.0;
+				controls.enablePan = false;
+				controls.minDistance = 1000.0;
 				controls.maxDistance = 5000.0;
 				controls.maxPolarAngle = Math.PI * 0.495;
 				controls.center.set( 0, 500, 0 );
 
-				var light = new THREE.HemisphereLight( 0xffffbb, 0x080820, 1 );
+				scene.add( new THREE.AmbientLight( 0x444444 ) );
+
+				var light = new THREE.DirectionalLight( 0xffffbb, 1 );
 				light.position.set( - 1, 1, - 1 );
 				scene.add( light );
 
@@ -153,8 +155,8 @@
 
 				} );
 
-				var cubeShader = THREE.ShaderLib['cube'];
-				cubeShader.uniforms['tCube'].value = cubeMap;
+				var cubeShader = THREE.ShaderLib[ 'cube' ];
+				cubeShader.uniforms[ 'tCube' ].value = cubeMap;
 
 				var skyBoxMaterial = new THREE.ShaderMaterial( {
 					fragmentShader: cubeShader.fragmentShader,
@@ -162,7 +164,7 @@
 					uniforms: cubeShader.uniforms,
 					depthWrite: false,
 					side: THREE.BackSide
-				});
+				} );
 
 				var skyBox = new THREE.Mesh(
 					new THREE.BoxGeometry( 1000000, 1000000, 1000000 ),