Merge remote branch 'remotes/upstream/master'

examples/geometry_vr.html

@@ -71,37 +71,37 @@
 				mesh = new THREE.Mesh( new Plane( 1000, 1000, 5, 5 ), loadTexture( 'textures/skymap_front1024.jpg' ) );
 				mesh.position.z = -500;
 				mesh.overdraw = true;
-				scene.add( mesh );
+				scene.addObject( mesh );
 
 				mesh = new THREE.Mesh( new Plane( 1000, 1000, 5, 5 ), loadTexture( 'textures/skymap_back1024.jpg' ) );
 				mesh.position.z = 500;
 				mesh.rotation.y = 180 * Math.PI / 180;
 				mesh.overdraw = true;
-				scene.add( mesh );
+				scene.addObject( mesh );
 
 				mesh = new THREE.Mesh( new Plane( 1000, 1000, 5, 5 ), loadTexture( 'textures/skymap_left1024.jpg' ) );
 				mesh.position.x = -500;
 				mesh.rotation.y = 90 * Math.PI / 180;
 				mesh.overdraw = true;
-				scene.add( mesh );
+				scene.addObject( mesh );
 
 				mesh = new THREE.Mesh( new Plane( 1000, 1000, 5, 5 ), loadTexture( 'textures/skymap_right1024.jpg' ) );
 				mesh.position.x = 500;
 				mesh.rotation.y = -90 * Math.PI / 180;
 				mesh.overdraw = true;
-				scene.add( mesh );
+				scene.addObject( mesh );
 
 				mesh = new THREE.Mesh( new Plane( 1000, 1000, 5, 5 ), loadTexture( 'textures/skymap_top1024.jpg' ) );
 				mesh.position.y = 500;
 				mesh.rotation.x = 90 * Math.PI / 180;
 				mesh.overdraw = true;
-				scene.add( mesh );
+				scene.addObject( mesh );
 
 				mesh = new THREE.Mesh( new Plane( 1000, 1000, 5, 5 ), loadTexture( 'textures/skymap_bottom1024.jpg' ) );
 				mesh.position.y = -500;
 				mesh.rotation.x = -90 * Math.PI / 180;
 				mesh.overdraw = true;
-				scene.add( mesh );
+				scene.addObject( mesh );
 
 
 				renderer = new THREE.CanvasRenderer();

examples/lines_sphere.html

@@ -70,7 +70,7 @@
 					particle.position.z = Math.random() * 2 - 1;
 					particle.position.normalize();
 					particle.position.multiplyScalar(Math.random() * 10 + 450);
-					scene.add( particle );
+					scene.addObject( particle );
 
 				}
 
@@ -92,7 +92,7 @@
 					geometry.vertices.push(new THREE.Vertex(vector2));
 
 					var line = new THREE.Line( geometry, new THREE.LineColorMaterial( 0xffffff, Math.random() ) );
-					scene.add(line);
+					scene.addObject(line);
 				}
 
 				/*

examples/lines_test.html

@@ -72,7 +72,7 @@
 					particle.position.normalize();
 					particle.position.multiplyScalar(Math.random() * 10 + 450);
 					particle.scale.x = particle.scale.y = 5;
-					scene.add( particle );
+					scene.addObject( particle );
 
 					geometry.vertices.push( new THREE.Vertex( particle.position ) );
 
@@ -81,7 +81,7 @@
 				// lines
 
 				var line = new THREE.Line( geometry, new THREE.LineColorMaterial( 0xffffff, Math.random(), 1 ) );
-				scene.add(line);
+				scene.addObject(line);
 
 				/*
 				stats = new Stats();

examples/materials_video.html

@@ -106,7 +106,7 @@
 				mesh = new THREE.Mesh( plane, material );
 				mesh.scale.x = mesh.scale.y = mesh.scale.z = 1.5;
 				mesh.overdraw = true;
-				scene.add(mesh);
+				scene.addObject(mesh);
 
 				mesh = new THREE.Mesh( plane, materialReflection );
 				mesh.position.y = -306;
@@ -114,7 +114,7 @@
 				mesh.rotation.x = 180 * Math.PI / 180;
 				mesh.doubleSided = true;
 				mesh.overdraw = true;
-				scene.add(mesh);
+				scene.addObject(mesh);
 
 				//
 
@@ -132,7 +132,7 @@
 						particle.position.x = ix * separation - ((amountx * separation) / 2);
 						particle.position.y = -153
 						particle.position.z = iy * separation - ((amounty * separation) / 2);
-						scene.add( particle );
+						scene.addObject( particle );
 					}
 				}
 

examples/particles_floor.html

@@ -70,7 +70,7 @@
 						particle = new THREE.Particle( material );
 						particle.position.x = ix * SEPARATION - ((AMOUNTX * SEPARATION) / 2);
 						particle.position.z = iy * SEPARATION - ((AMOUNTY * SEPARATION) / 2);
-						scene.add( particle );
+						scene.addObject( particle );
 					}
 				}
 

examples/particles_random.html

@@ -66,7 +66,7 @@
 					particle.position.y = Math.random() * 2000 - 1000;
 					particle.position.z = Math.random() * 2000 - 1000;
 					particle.scale.x = particle.scale.y = Math.random() * 10 + 5;
-					scene.add( particle );
+					scene.addObject( particle );
 				}
 
 				container.appendChild( renderer.domElement );

examples/particles_waves.html

@@ -73,7 +73,7 @@
 						particle = particles[ i ++ ] = new THREE.Particle( material );
 						particle.position.x = ix * SEPARATION - ( ( AMOUNTX * SEPARATION ) / 2 );
 						particle.position.z = iy * SEPARATION - ( ( AMOUNTY * SEPARATION ) / 2 );
-						scene.add( particle );
+						scene.addObject( particle );
 					}
 				}