WebGLMultipleRenderers: Use Geometry

- WebGLMultipleRenderers: Use Geometry instead of BufferGeometry
- index.html: add "webgl_multiple_renderers" again
- Misc. fixes to please closure compiler (unused var).

examples/index.html

@@ -316,6 +316,7 @@
 				"webgl_multiple_canvases_complex",
 				"webgl_multiple_canvases_grid",
 				"webgl_multiple_elements",
+				"webgl_multiple_renderers",
 				"webgl_multiple_views",
 				"webgl_nearestneighbour",
 				"webgl_objects_update",

examples/webgl_multiple_renderers.html

@@ -115,8 +115,8 @@
 
 				var container3 = document.getElementById( 'container3' );
 
-				container3.style.left = e.pageX - container3.clientWidth / 2 + "px"
-				container3.style.top = e.pageY - container3.clientHeight / 2 + "px"
+				container3.style.left = e.pageX - container3.clientWidth / 2 + "px";
+				container3.style.top = e.pageY - container3.clientHeight / 2 + "px";
 
 			}
 
@@ -225,9 +225,7 @@
 				group2.rotation.x = 0;
 				scene.add( group2 );
 
-				group3 = new THREE.Group();
-				group3.add( new THREE.Mesh( new THREE.BufferGeometry().fromGeometry( geometry3 ), materials[0] ) );
-				group3.add( new THREE.Mesh( geometry3, materials[1] ) );
+				group3 = THREE.SceneUtils.createMultiMaterialObject( geometry3, materials );
 				group3.name = 'rotating ball';
 				group3.position.x = 0;
 				group3.rotation.x = 0;
@@ -238,25 +236,31 @@
 
 			function updateScene () {
 
-				var group = scene.getObjectByName( 'rotating ball' )
+				var group = scene.getObjectByName( 'rotating ball' );
 				group.rotation.x += Math.PI / 600;
 
 				var geometry = group.children[0].geometry;
-				var array = geometry.attributes.color.array;
 
-				for (var i = 0; i < array.length; i ++) {
+				for (var i = 0; i < geometry.faces.length; i ++) {
 
-					array[i] = ( array[i] + 0.99 ) % 1.0;
+						var f = geometry.faces[ i ];
 
-				}
+						for( var j = 0; j < 3; j ++ ) {
+
+							var color = f.vertexColors[ j ];
+							color.setHex( ( color.getHex() + 0xfdfdfd ) % 0xffffff );
+
+						}
+
+					}
 
-				geometry.attributes.color.needsUpdate = true;
+				geometry.colorsNeedUpdate = true;
 
 			}
 
 			function App( container, fullWidth, fullHeight ) {
 
-				var container, stats;
+				var stats;
 
 				var camera, renderer;
 

src/core/BufferGeometry.js

@@ -153,7 +153,6 @@ THREE.BufferGeometry.prototype = {
 		console.log( 'THREE.BufferGeometry.setFromObject(). Converting', object, this );
 
 		var geometry = object.geometry;
-		var material = object.material;
 
 		if ( object instanceof THREE.PointCloud || object instanceof THREE.Line ) {
 

src/extras/geometries/ShapeGeometry.js

@@ -95,8 +95,6 @@ THREE.ShapeGeometry.prototype.addShape = function ( shape, options ) {
 
 	// Vertices
 
-	var contour = vertices;
-
 	for ( i = 0, l = holes.length; i < l; i ++ ) {
 
 		hole = holes[ i ];

src/loaders/JSONLoader.js

@@ -68,8 +68,7 @@ THREE.JSONLoader.prototype = {
 
 	parse: function ( json, texturePath ) {
 
-		var scope = this,
-		geometry = new THREE.Geometry(),
+		var geometry = new THREE.Geometry(),
 		scale = ( json.scale !== undefined ) ? 1.0 / json.scale : 1.0;
 
 		parseModel( scale );

src/math/Color.js

@@ -10,7 +10,7 @@ THREE.Color = function ( color ) {
 
 	}
 
-	return this.set( color )
+	return this.set( color );
 
 };
 
@@ -73,7 +73,7 @@ THREE.Color.prototype = {
 			if ( t < 2 / 3 ) return p + ( q - p ) * 6 * ( 2 / 3 - t );
 			return p;
 
-		};
+		}
 
 		return function ( h, s, l ) {
 

src/renderers/WebGLRenderer.js

@@ -1944,7 +1944,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 				uniforms: THREE.UniformsUtils.clone( shader.uniforms ),
 				vertexShader: shader.vertexShader,
 				fragmentShader: shader.fragmentShader
-			}
+			};
 
 		} else {
 
@@ -1953,7 +1953,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 				uniforms: material.uniforms,
 				vertexShader: material.vertexShader,
 				fragmentShader: material.fragmentShader
-			}
+			};
 
 		}
 

src/renderers/webgl/WebGLProgram.js

@@ -81,8 +81,6 @@ THREE.WebGLProgram = ( function () {
 		var gl = renderer.context;
 
 		var defines = material.defines;
-		var uniforms = material.__webglShader.uniforms;
-		var attributes = material.attributes;
 
 		var vertexShader = material.__webglShader.vertexShader;
 		var fragmentShader = material.__webglShader.fragmentShader;

src/renderers/webgl/WebGLShadowMap.js

@@ -13,8 +13,6 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) {
 	_min = new THREE.Vector3(),
 	_max = new THREE.Vector3(),
 
-	_webglObjects = _objects.objects,
-
 	_matrixPosition = new THREE.Vector3(),
 
 	_renderList = [];