Renamed all CubeGeometry instances.

editor/css/types.css

@@ -32,7 +32,7 @@
 	color: #88ff88;
 }
 
-.CubeGeometry {
+.BoxGeometry {
 	color: #bbeebb;
 }
 .TorusGeometry {

editor/index.html

@@ -61,8 +61,8 @@
 		<script src="js/Sidebar.Object3D.js"></script>
 		<script src="js/Sidebar.Geometry.js"></script>
 		<script src="js/Sidebar.Animation.js"></script>
+		<script src="js/Sidebar.Geometry.BoxGeometry.js"></script>
 		<script src="js/Sidebar.Geometry.CircleGeometry.js"></script>
-		<script src="js/Sidebar.Geometry.CubeGeometry.js"></script>
 		<script src="js/Sidebar.Geometry.CylinderGeometry.js"></script>
 		<script src="js/Sidebar.Geometry.IcosahedronGeometry.js"></script>
 		<script src="js/Sidebar.Geometry.PlaneGeometry.js"></script>

editor/js/Editor.js

@@ -339,8 +339,8 @@ Editor.prototype = {
 
 		var types = {
 
+			'BoxGeometry': THREE.BoxGeometry,
 			'CircleGeometry': THREE.CircleGeometry,
-			'CubeGeometry': THREE.CubeGeometry,
 			'CylinderGeometry': THREE.CylinderGeometry,
 			'ExtrudeGeometry': THREE.ExtrudeGeometry,
 			'IcosahedronGeometry': THREE.IcosahedronGeometry,

editor/js/Menubar.Add.js

@@ -62,11 +62,11 @@ Menubar.Add = function ( editor ) {
 	} );
 	options.add( option );
 
-	// add cube
+	// add box
 
 	var option = new UI.Panel();
 	option.setClass( 'option' );
-	option.setTextContent( 'Cube' );
+	option.setTextContent( 'Box' );
 	option.onClick( function () {
 
 		var width = 100;
@@ -77,9 +77,9 @@ Menubar.Add = function ( editor ) {
 		var heightSegments = 1;
 		var depthSegments = 1;
 
-		var geometry = new THREE.CubeGeometry( width, height, depth, widthSegments, heightSegments, depthSegments );
+		var geometry = new THREE.BoxGeometry( width, height, depth, widthSegments, heightSegments, depthSegments );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshPhongMaterial() );
-		mesh.name = 'Cube ' + ( ++ meshCount );
+		mesh.name = 'Box ' + ( ++ meshCount );
 
 		editor.addObject( mesh );
 		editor.select( mesh );

editor/js/Sidebar.Geometry.CubeGeometry.js → editor/js/Sidebar.Geometry.BoxGeometry.js

@@ -1,4 +1,4 @@
-Sidebar.Geometry.CubeGeometry = function ( signals, object ) {
+Sidebar.Geometry.BoxGeometry = function ( signals, object ) {
 
 	var container = new UI.Panel();
 
@@ -72,7 +72,7 @@ Sidebar.Geometry.CubeGeometry = function ( signals, object ) {
 
 		object.geometry.dispose();
 
-		object.geometry = new THREE.CubeGeometry(
+		object.geometry = new THREE.BoxGeometry(
 			width.getValue(),
 			height.getValue(),
 			depth.getValue(),

editor/js/Sidebar.Geometry.js

@@ -100,14 +100,14 @@ Sidebar.Geometry = function ( editor ) {
 
 			}
 
-			if ( geometry instanceof THREE.CircleGeometry ) {
+			if ( geometry instanceof THREE.BoxGeometry ) {
 
-				parameters = new Sidebar.Geometry.CircleGeometry( signals, object );
+				parameters = new Sidebar.Geometry.BoxGeometry( signals, object );
 				container.add( parameters );
 
-			} else if ( geometry instanceof THREE.CubeGeometry ) {
+			} else if ( geometry instanceof THREE.CircleGeometry ) {
 
-				parameters = new Sidebar.Geometry.CubeGeometry( signals, object );
+				parameters = new Sidebar.Geometry.CircleGeometry( signals, object );
 				container.add( parameters );
 
 			} else if ( geometry instanceof THREE.CylinderGeometry ) {

examples/canvas_camera_orthographic.html

@@ -71,7 +71,7 @@
 
 				// Cubes
 
-				var geometry = new THREE.CubeGeometry( 50, 50, 50 );
+				var geometry = new THREE.BoxGeometry( 50, 50, 50 );
 				var material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } );
 
 				for ( var i = 0; i < 100; i ++ ) {

examples/canvas_camera_orthographic2.html

@@ -138,7 +138,7 @@
 
 				// Cubes
 
-				var geometry = new THREE.CubeGeometry( 50, 50, 50 );
+				var geometry = new THREE.BoxGeometry( 50, 50, 50 );
 				var material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } );
 
 				for ( var i = 0; i < 100; i ++ ) {

examples/canvas_geometry_cube.html

@@ -60,7 +60,7 @@
 
 				// Cube
 
-				var geometry = new THREE.CubeGeometry( 200, 200, 200 );
+				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 
 				for ( var i = 0; i < geometry.faces.length; i += 2 ) {
 

examples/canvas_geometry_hierarchy.html

@@ -48,7 +48,7 @@
 
 				scene = new THREE.Scene();
 
-				var geometry = new THREE.CubeGeometry( 100, 100, 100 );
+				var geometry = new THREE.BoxGeometry( 100, 100, 100 );
 				var material = new THREE.MeshNormalMaterial( { overdraw: 0.5 } );
 
 				group = new THREE.Object3D();

examples/canvas_geometry_panorama.html

@@ -78,7 +78,7 @@
 
 				];
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 300, 300, 300, 7, 7, 7 ), new THREE.MeshFaceMaterial( materials ) );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 300, 300, 300, 7, 7, 7 ), new THREE.MeshFaceMaterial( materials ) );
 				mesh.scale.x = - 1;
 				scene.add( mesh );
 

examples/canvas_geometry_panorama_fisheye.html

@@ -78,7 +78,7 @@
 
 				];
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 300, 300, 300, 7, 7, 7 ), new THREE.MeshFaceMaterial( materials ) );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 300, 300, 300, 7, 7, 7 ), new THREE.MeshFaceMaterial( materials ) );
 				mesh.scale.x = - 1;
 				scene.add( mesh );
 

examples/canvas_interactive_cubes.html

@@ -48,7 +48,7 @@
 
 				scene = new THREE.Scene();
 
-				var geometry = new THREE.CubeGeometry( 100, 100, 100 );
+				var geometry = new THREE.BoxGeometry( 100, 100, 100 );
 
 				for ( var i = 0; i < 10; i ++ ) {
 

examples/canvas_interactive_cubes_tween.html

@@ -47,7 +47,7 @@
 
 				scene = new THREE.Scene();
 
-				var geometry = new THREE.CubeGeometry( 100, 100, 100 );
+				var geometry = new THREE.BoxGeometry( 100, 100, 100 );
 
 				for ( var i = 0; i < 20; i ++ ) {
 

examples/canvas_interactive_voxelpainter.html

@@ -30,7 +30,7 @@
 			target = new THREE.Vector3( 0, 200, 0 );
 			var normalMatrix = new THREE.Matrix3();
 
-			var cubeGeometry = new THREE.CubeGeometry( 50, 50, 50 );
+			var cubeGeometry = new THREE.BoxGeometry( 50, 50, 50 );
 			var cubeMaterial = new THREE.MeshLambertMaterial( { color: 0x00ff80, overdraw: 0.5 } );
 
 			init();

examples/canvas_materials_depth.html

@@ -70,7 +70,7 @@
 
 				// Cubes
 
-				geometry = new THREE.CubeGeometry( 100, 100, 100 );
+				geometry = new THREE.BoxGeometry( 100, 100, 100 );
 				material = new THREE.MeshDepthMaterial( { overdraw: true } );
 
 				for ( var i = 0; i < 20; i ++ ) {

examples/css3d_sandbox.html

@@ -50,7 +50,7 @@
 
 				scene = new THREE.Scene();
 
-				geometry = new THREE.CubeGeometry( 200, 200, 200 );
+				geometry = new THREE.BoxGeometry( 200, 200, 200 );
 				material = new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, wireframeLinewidth: 1 } );
 
 				mesh = new THREE.Mesh( geometry, material );

examples/js/Octree.js

@@ -111,7 +111,7 @@
 		
 		if ( this.scene ) {
 			
-			this.visualGeometry = new THREE.CubeGeometry( 1, 1, 1 );
+			this.visualGeometry = new THREE.BoxGeometry( 1, 1, 1 );
 			this.visualMaterial = new THREE.MeshBasicMaterial( { color: 0xFF0066, wireframe: true, wireframeLinewidth: 1 } );
 			
 		}

examples/js/controls/PathControls.js

@@ -285,8 +285,8 @@ THREE.PathControls = function ( object, domElement ) {
 
 			var dummyParentMaterial = new THREE.MeshLambertMaterial( { color: 0x0077ff } ),
 			dummyChildMaterial  = new THREE.MeshLambertMaterial( { color: 0x00ff00 } ),
-			dummyParentGeo = new THREE.CubeGeometry( 10, 10, 20 ),
-			dummyChildGeo  = new THREE.CubeGeometry( 2, 2, 10 );
+			dummyParentGeo = new THREE.BoxGeometry( 10, 10, 20 ),
+			dummyChildGeo  = new THREE.BoxGeometry( 2, 2, 10 );
 
 			this.animationParent = new THREE.Mesh( dummyParentGeo, dummyParentMaterial );
 

examples/js/controls/TransformControls.js

@@ -558,7 +558,7 @@ THREE.TransformGizmoScale = function () {
 	THREE.TransformGizmo.call( this );
 
 	var arrowGeometry = new THREE.Geometry();
-	var mesh = new THREE.Mesh( new THREE.CubeGeometry( 0.125, 0.125, 0.125 ) );
+	var mesh = new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ) );
 	mesh.position.y = 0.5;
 	THREE.GeometryUtils.merge( arrowGeometry, mesh );
 
@@ -588,7 +588,7 @@ THREE.TransformGizmoScale = function () {
 			new THREE.Vector3( Math.PI/2, 0, 0 )
 		],
 		XYZ: [
-			new THREE.Mesh( new THREE.CubeGeometry( 0.125, 0.125, 0.125 ), new THREE.TransformGizmoMaterial( { color: 0xffffff, opacity: 0.25 } ) )
+			new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ), new THREE.TransformGizmoMaterial( { color: 0xffffff, opacity: 0.25 } ) )
 		]
 
 	}
@@ -624,7 +624,7 @@ THREE.TransformGizmoScale = function () {
 			new THREE.Vector3( Math.PI/2, 0, 0 )
 		],
 		XYZ: [
-			new THREE.Mesh( new THREE.CubeGeometry( 0.4, 0.4, 0.4 ), new THREE.TransformGizmoMaterial( { color: 0xffffff, opacity: 0.25 } ) )
+			new THREE.Mesh( new THREE.BoxGeometry( 0.4, 0.4, 0.4 ), new THREE.TransformGizmoMaterial( { color: 0xffffff, opacity: 0.25 } ) )
 		]
 	}
 

examples/js/crossfade/scenes.js

@@ -40,7 +40,7 @@ function generateGeometry(objectType, numObjects) {
 
 		if ( objectType == "cube" )
 		{
-			geom = new THREE.CubeGeometry( 1, 1, 1 );
+			geom = new THREE.BoxGeometry( 1, 1, 1 );
 			scale.y = Math.random() * 200 + 100;
 			scale.z = Math.random() * 200 + 100;
 			color.setRGB( 0, 0, Math.random()+0.1 );

examples/js/exporters/ObjectExporter.js

@@ -50,9 +50,9 @@ THREE.ObjectExporter.prototype = {
 					data.widthSegments = geometry.widthSegments;
 					data.heightSegments = geometry.heightSegments;
 
-				} else if ( geometry instanceof THREE.CubeGeometry ) {
+				} else if ( geometry instanceof THREE.BoxGeometry ) {
 
-					data.type = 'CubeGeometry';
+					data.type = 'BoxGeometry';
 					data.width = geometry.width;
 					data.height = geometry.height;
 					data.depth = geometry.depth;

examples/js/exporters/SceneExporter.js

@@ -378,7 +378,7 @@ THREE.SceneExporter.prototype = {
 
 				];
 
-			} else if ( g instanceof THREE.CubeGeometry ) {
+			} else if ( g instanceof THREE.BoxGeometry ) {
 
 				var output = [
 

examples/js/loaders/VRMLLoader.js

@@ -644,7 +644,7 @@ THREE.VRMLLoader.prototype = {
 
                         var s = data.size;
 
-						parent.geometry = new THREE.CubeGeometry( s.x, s.y, s.z );
+						parent.geometry = new THREE.BoxGeometry( s.x, s.y, s.z );
 
 					} else if ( 'Cylinder' === data.nodeType ) {
 

examples/js/loaders/deprecated/ObjectLoader4.js

@@ -1,299 +0,0 @@
-/**
- * @author mrdoob / http://mrdoob.com/
- */
-
-THREE.ObjectLoader4 = function () {};
-
-THREE.ObjectLoader4.prototype = {
-
-	constructor: THREE.ObjectLoader,
-
-	load: function ( url ) {
-
-		var scope = this;
-		var request = new XMLHttpRequest();
-
-		request.addEventListener( 'load', function ( event ) {
-
-			var response = scope.parse( JSON.parse( event.target.responseText ) );
-
-			scope.dispatchEvent( { type: 'load', content: response } );
-
-		}, false );
-
-		request.addEventListener( 'progress', function ( event ) {
-
-			scope.dispatchEvent( { type: 'progress', loaded: event.loaded, total: event.total } );
-
-		}, false );
-
-		request.addEventListener( 'error', function () {
-
-			scope.dispatchEvent( { type: 'error', message: 'Couldn\'t load URL [' + url + ']' } );
-
-		}, false );
-
-		request.open( 'GET', url, true );
-		request.send( null );
-
-	},
-
-	parse: function ( json ) {
-
-		var geometries = this.parseGeometries( json.geometries );
-
-		var materials = this.parseMaterials( json.materials );
-
-		var object = this.parseObject( json.object, geometries, materials );
-
-		return object;
-
-	},
-
-	parseGeometries: function ( json ) {
-
-		var geometries = [];
-
-		if ( json !== undefined ) {
-
-			var loader = new THREE.JSONLoader();
-
-			for ( var i = 0, l = json.length; i < l; i ++ ) {
-
-				var geometry;
-				var data = json[ i ];
-
-				switch ( data.type ) {
-
-					case 'PlaneGeometry':
-
-						geometry = new THREE.PlaneGeometry(
-							data.width,
-							data.height,
-							data.widthSegments,
-							data.heightSegments
-						);
-
-						break;
-
-					case 'CubeGeometry':
-
-						geometry = new THREE.CubeGeometry(
-							data.width,
-							data.height,
-							data.depth,
-							data.widthSegments,
-							data.heightSegments,
-							data.depthSegments
-						);
-
-						break;
-
-					case 'CylinderGeometry':
-
-						geometry = new THREE.CylinderGeometry(
-							data.radiusTop,
-							data.radiusBottom,
-							data.height,
-							data.radiusSegments,
-							data.heightSegments,
-							data.openEnded
-						);
-
-						break;
-
-					case 'SphereGeometry':
-
-						geometry = new THREE.SphereGeometry(
-							data.radius,
-							data.widthSegments,
-							data.heightSegments,
-							data.phiStart,
-							data.phiLength,
-							data.thetaStart,
-							data.thetaLength
-						);
-
-						break;
-
-					case 'IcosahedronGeometry':
-
-						geometry = new THREE.IcosahedronGeometry(
-							data.radius,
-							data.detail
-						);
-
-						break;
-
-					case 'TorusGeometry':
-
-						geometry = new THREE.TorusGeometry(
-							data.radius,
-							data.tube,
-							data.radialSegments,
-							data.tubularSegments,
-							data.arc
-						);
-
-						break;
-
-					case 'TorusKnotGeometry':
-
-						geometry = new THREE.TorusKnotGeometry(
-							data.radius,
-							data.tube,
-							data.radialSegments,
-							data.tubularSegments,
-							data.p,
-							data.q,
-							data.heightScale
-						);
-
-						break;
-
-					case 'Geometry':
-
-						geometry = loader.parse( data.data ).geometry;
-
-						break;
-
-				}
-
-				if ( data.name !== undefined ) geometry.name = data.name;
-
-				geometries.push( geometry );
-
-			}
-
-		}
-
-		return geometries;
-
-	},
-
-	parseMaterials: function ( json ) {
-
-		var materials = [];
-
-		if ( json !== undefined ) {
-
-			var loader = new THREE.MaterialLoader();
-
-			for ( var i = 0, l = json.length; i < l; i ++ ) {
-
-				var data = json[ i ];
-				var material = loader.parse( data );
-
-				if ( data.name !== undefined ) material.name = data.name;
-
-				materials.push( material );
-
-			}
-
-		}
-
-		return materials;
-
-	},
-
-	parseObject: function ( data, geometries, materials ) {
-
-		var object;
-
-		switch ( data.type ) {
-
-			case 'Scene':
-
-				object = new THREE.Scene();
-
-				break;
-
-			case 'PerspectiveCamera':
-
-				object = new THREE.PerspectiveCamera( data.fov, data.aspect, data.near, data.far );
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-
-				break;
-
-			case 'OrthographicCamera':
-
-				object = new THREE.OrthographicCamera( data.left, data.right, data.top, data.bottom, data.near, data.far );
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-
-				break;
-
-			case 'AmbientLight':
-
-				object = new THREE.AmbientLight( data.color );
-
-				break;
-
-			case 'DirectionalLight':
-
-				object = new THREE.DirectionalLight( data.color, data.intensity );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'PointLight':
-
-				object = new THREE.PointLight( data.color, data.intensity, data.distance );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'SpotLight':
-
-				object = new THREE.SpotLight( data.color, data.intensity, data.distance, data.angle, data.exponent );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'HemisphereLight':
-
-				object = new THREE.HemisphereLight( data.color, data.groundColor, data.intensity );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'Mesh':
-
-				object = new THREE.Mesh( geometries[ data.geometry ], materials[ data.material ] );
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-				object.scale.fromArray( data.scale );
-
-				break;
-
-			default:
-
-				object = new THREE.Object3D();
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-				object.scale.fromArray( data.scale );
-
-		}
-
-		if ( data.name !== undefined ) object.name = data.name;
-		if ( data.visible !== undefined ) object.visible = data.visible;
-		if ( data.userData !== undefined ) object.userData = data.userData;
-
-		if ( data.children !== undefined ) {
-
-			for ( var i = 0, l = data.children.length; i < l; i ++ ) {
-
-				object.add( this.parseObject( data.children[ i ], geometries, materials ) );
-
-			}
-
-		}
-
-		return object;
-
-	}
-
-};
-
-THREE.EventDispatcher.prototype.apply( THREE.ObjectLoader4.prototype );

examples/js/loaders/deprecated/ObjectLoader41.js

@@ -1,297 +0,0 @@
-/**
- * @author mrdoob / http://mrdoob.com/
- */
-
-THREE.ObjectLoader41 = function () {};
-
-THREE.ObjectLoader41.prototype = {
-
-	constructor: THREE.ObjectLoader,
-
-	load: function ( url ) {
-
-		var scope = this;
-		var request = new XMLHttpRequest();
-
-		request.addEventListener( 'load', function ( event ) {
-
-			var response = scope.parse( JSON.parse( event.target.responseText ) );
-
-			scope.dispatchEvent( { type: 'load', content: response } );
-
-		}, false );
-
-		request.addEventListener( 'progress', function ( event ) {
-
-			scope.dispatchEvent( { type: 'progress', loaded: event.loaded, total: event.total } );
-
-		}, false );
-
-		request.addEventListener( 'error', function () {
-
-			scope.dispatchEvent( { type: 'error', message: 'Couldn\'t load URL [' + url + ']' } );
-
-		}, false );
-
-		request.open( 'GET', url, true );
-		request.send( null );
-
-	},
-
-	parse: function ( json ) {
-
-		var geometries = this.parseGeometries( json.geometries );
-		var materials = this.parseMaterials( json.materials );
-		var object = this.parseObject( json.object, geometries, materials );
-
-		return object;
-
-	},
-
-	parseGeometries: function ( json ) {
-
-		var geometries = {};
-
-		if ( json !== undefined ) {
-
-			var loader = new THREE.JSONLoader();
-
-			for ( var id in json ) {
-
-				var geometry;
-				var data = json[ id ];
-
-				switch ( data.type ) {
-
-					case 'PlaneGeometry':
-
-						geometry = new THREE.PlaneGeometry(
-							data.width,
-							data.height,
-							data.widthSegments,
-							data.heightSegments
-						);
-
-						break;
-
-					case 'CubeGeometry':
-
-						geometry = new THREE.CubeGeometry(
-							data.width,
-							data.height,
-							data.depth,
-							data.widthSegments,
-							data.heightSegments,
-							data.depthSegments
-						);
-
-						break;
-
-					case 'CylinderGeometry':
-
-						geometry = new THREE.CylinderGeometry(
-							data.radiusTop,
-							data.radiusBottom,
-							data.height,
-							data.radiusSegments,
-							data.heightSegments,
-							data.openEnded
-						);
-
-						break;
-
-					case 'SphereGeometry':
-
-						geometry = new THREE.SphereGeometry(
-							data.radius,
-							data.widthSegments,
-							data.heightSegments,
-							data.phiStart,
-							data.phiLength,
-							data.thetaStart,
-							data.thetaLength
-						);
-
-						break;
-
-					case 'IcosahedronGeometry':
-
-						geometry = new THREE.IcosahedronGeometry(
-							data.radius,
-							data.detail
-						);
-
-						break;
-
-					case 'TorusGeometry':
-
-						geometry = new THREE.TorusGeometry(
-							data.radius,
-							data.tube,
-							data.radialSegments,
-							data.tubularSegments,
-							data.arc
-						);
-
-						break;
-
-					case 'TorusKnotGeometry':
-
-						geometry = new THREE.TorusKnotGeometry(
-							data.radius,
-							data.tube,
-							data.radialSegments,
-							data.tubularSegments,
-							data.p,
-							data.q,
-							data.heightScale
-						);
-
-						break;
-
-					case 'Geometry':
-
-						geometry = loader.parse( data.data ).geometry;
-
-						break;
-
-				}
-
-				if ( data.name !== undefined ) geometry.name = data.name;
-
-				geometries[ id ] = geometry;
-
-			}
-
-		}
-
-		return geometries;
-
-	},
-
-	parseMaterials: function ( json ) {
-
-		var materials = {};
-
-		if ( json !== undefined ) {
-
-			var loader = new THREE.MaterialLoader();
-
-			for ( var id in json ) {
-
-				var data = json[ id ];
-				var material = loader.parse( data );
-
-				if ( data.name !== undefined ) material.name = data.name;
-
-				materials[ id ] = material;
-
-			}
-
-		}
-
-		return materials;
-
-	},
-
-	parseObject: function ( data, geometries, materials ) {
-
-		var object;
-
-		switch ( data.type ) {
-
-			case 'Scene':
-
-				object = new THREE.Scene();
-
-				break;
-
-			case 'PerspectiveCamera':
-
-				object = new THREE.PerspectiveCamera( data.fov, data.aspect, data.near, data.far );
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-
-				break;
-
-			case 'OrthographicCamera':
-
-				object = new THREE.OrthographicCamera( data.left, data.right, data.top, data.bottom, data.near, data.far );
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-
-				break;
-
-			case 'AmbientLight':
-
-				object = new THREE.AmbientLight( data.color );
-
-				break;
-
-			case 'DirectionalLight':
-
-				object = new THREE.DirectionalLight( data.color, data.intensity );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'PointLight':
-
-				object = new THREE.PointLight( data.color, data.intensity, data.distance );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'SpotLight':
-
-				object = new THREE.SpotLight( data.color, data.intensity, data.distance, data.angle, data.exponent );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'HemisphereLight':
-
-				object = new THREE.HemisphereLight( data.color, data.groundColor, data.intensity );
-				object.position.fromArray( data.position );
-
-				break;
-
-			case 'Mesh':
-
-				object = new THREE.Mesh( geometries[ data.geometry ], materials[ data.material ] );
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-				object.scale.fromArray( data.scale );
-
-				break;
-
-			default:
-
-				object = new THREE.Object3D();
-				object.position.fromArray( data.position );
-				object.rotation.fromArray( data.rotation );
-				object.scale.fromArray( data.scale );
-
-		}
-
-		if ( data.name !== undefined ) object.name = data.name;
-		if ( data.visible !== undefined ) object.visible = data.visible;
-		if ( data.userData !== undefined ) object.userData = data.userData;
-
-		if ( data.children !== undefined ) {
-
-			for ( var child in data.children ) {
-
-				object.add( this.parseObject( data.children[ child ], geometries, materials ) );
-
-			}
-
-		}
-
-		return object;
-
-	}
-
-};
-
-THREE.EventDispatcher.prototype.apply( THREE.ObjectLoader41.prototype );

examples/misc_controls_oculusrift.html

@@ -92,7 +92,7 @@
 				hemiLight.position.set( 0, 500, 0 );
 				scene.add( hemiLight );
 
-				var geometry = new THREE.CubeGeometry( 100, 100, 200 );
+				var geometry = new THREE.BoxGeometry( 100, 100, 200 );
 
 				var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif' );
 				texture.anisotropy = renderer.getMaxAnisotropy();

examples/misc_controls_pointerlock.html

@@ -225,7 +225,7 @@
 
 				// objects
 
-				geometry = new THREE.CubeGeometry( 20, 20, 20 );
+				geometry = new THREE.BoxGeometry( 20, 20, 20 );
 
 				for ( var i = 0, l = geometry.faces.length; i < l; i ++ ) {
 

examples/misc_controls_transform.html

@@ -63,7 +63,7 @@
 				var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif', new THREE.UVMapping(), render );
 				texture.anisotropy = renderer.getMaxAnisotropy();
 
-				var geometry = new THREE.CubeGeometry( 200, 200, 200 );
+				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 				var material = new THREE.MeshLambertMaterial( { map: texture } );
 
 				control = new THREE.TransformControls( camera, renderer.domElement );

examples/misc_ubiquity_test.html

@@ -55,7 +55,7 @@
 
 				// CUBES
 
-				var cube = new THREE.CubeGeometry( 100, 100, 100 );
+				var cube = new THREE.BoxGeometry( 100, 100, 100 );
 
 				mesh = new THREE.Mesh( cube, new THREE.MeshBasicMaterial( { color: 0x0000ff, opacity: 0.5, transparent: true } ) );
 				mesh.position.x = 500;

examples/misc_ubiquity_test2.html

@@ -50,7 +50,7 @@
 				texture.wrapS = THREE.RepeatWrapping;
 				texture.wrapT = THREE.RepeatWrapping;
 
-				var geometry = new THREE.CubeGeometry( 150, 150, 150, 4, 4, 4 );
+				var geometry = new THREE.BoxGeometry( 150, 150, 150, 4, 4, 4 );
 				var material = new THREE.MeshBasicMaterial( { map: texture, overdraw: 0.5 } );
 
 				mesh = new THREE.Mesh( geometry, material );

examples/misc_uv_tests.html

@@ -28,7 +28,7 @@
 
 			test('new THREE.CylinderGeometry( 25, 75, 100, 10, 5 )', new THREE.CylinderGeometry( 25, 75, 100, 10, 5 ));
 
-			test('new THREE.CubeGeometry( 100, 100, 100, 4, 4, 4 )', new THREE.CubeGeometry( 100, 100, 100, 4, 4, 4 ));
+			test('new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 )', new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 ));
 
 			var points = [];
 

examples/software_sandbox.html

@@ -68,7 +68,7 @@
 
 				// Plane
 
-				var geometry = new THREE.CubeGeometry( 200, 200, 200 );
+				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 
 				for ( var i = 0, j = geometry.faces.length; i < j; i ++ ) {
 

examples/webgl_animation_cloth.html

@@ -249,7 +249,7 @@
 
 				// poles
 
-				var poleGeo = new THREE.CubeGeometry( 5, 375, 5 );
+				var poleGeo = new THREE.BoxGeometry( 5, 375, 5 );
 				var poleMat = new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0x111111, shiness: 100 } );
 
 				var mesh = new THREE.Mesh( poleGeo, poleMat );
@@ -266,14 +266,14 @@
 				mesh.castShadow = true;
 				scene.add( mesh );
 
-				var mesh = new THREE.Mesh( new THREE.CubeGeometry( 255, 5, 5 ), poleMat );
+				var mesh = new THREE.Mesh( new THREE.BoxGeometry( 255, 5, 5 ), poleMat );
 				mesh.position.y = -250 + 750/2;
 				mesh.position.x = 0;
 				mesh.receiveShadow = true;
 				mesh.castShadow = true;
 				scene.add( mesh );
 
-				var gg = new THREE.CubeGeometry( 10, 10, 10 );
+				var gg = new THREE.BoxGeometry( 10, 10, 10 );
 				var mesh = new THREE.Mesh( gg, poleMat );
 				mesh.position.y = -250;
 				mesh.position.x = 125;

examples/webgl_custom_attributes_particles2.html

@@ -131,7 +131,7 @@
 
 			vc1 = geometry.vertices.length;
 
-			var geometry2 = new THREE.CubeGeometry( 0.8 * radius, 0.8 * radius, 0.8 * radius, 10, 10, 10 );
+			var geometry2 = new THREE.BoxGeometry( 0.8 * radius, 0.8 * radius, 0.8 * radius, 10, 10, 10 );
 
 			THREE.GeometryUtils.merge( geometry, geometry2 );
 

examples/webgl_custom_attributes_particles3.html

@@ -157,7 +157,7 @@
 			var m, dummyMaterial = new THREE.MeshFaceMaterial();
 
 			radius = 200;
-			var geometry2 = new THREE.CubeGeometry( radius, 0.1 * radius, 0.1 * radius, 50, 5, 5 );
+			var geometry2 = new THREE.BoxGeometry( radius, 0.1 * radius, 0.1 * radius, 50, 5, 5 );
 
 			function addGeo( geo, x, y, z, ry ) {
 
@@ -185,7 +185,7 @@
 
 			// corner edges
 
-			var geometry3 = new THREE.CubeGeometry( 0.1 * radius, radius * 1.2, 0.1 * radius, 5, 60, 5 );
+			var geometry3 = new THREE.BoxGeometry( 0.1 * radius, radius * 1.2, 0.1 * radius, 5, 60, 5 );
 
 			addGeo( geometry3,  110, 0,  110, 0 );
 			addGeo( geometry3,  110, 0, -110, 0 );

examples/webgl_effects_anaglyph.html

@@ -118,7 +118,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100000, 100000, 100000 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100000, 100000, 100000 ), material );
 				scene.add( mesh );
 
 				//

examples/webgl_effects_crosseyed.html

@@ -119,7 +119,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100000, 100000, 100000 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100000, 100000, 100000 ), material );
 				scene.add( mesh );
 
 				//

examples/webgl_effects_parallaxbarrier.html

@@ -197,7 +197,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100000, 100000, 100000 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100000, 100000, 100000 ), material );
 				scene.add( mesh );
 
 				//

examples/webgl_geometries.html

@@ -79,7 +79,7 @@
 				object.position.set( -400, 0, 0 );
 				scene.add( object );
 
-				object = new THREE.Mesh( new THREE.CubeGeometry( 100, 100, 100, 4, 4, 4 ), material );
+				object = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 ), material );
 				object.position.set( -200, 0, 0 );
 				scene.add( object );
 

examples/webgl_geometry_cube.html

@@ -36,7 +36,7 @@
 
 				scene = new THREE.Scene();
 
-				var geometry = new THREE.CubeGeometry( 200, 200, 200 );
+				var geometry = new THREE.BoxGeometry( 200, 200, 200 );
 
 				var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif' );
 				texture.anisotropy = renderer.getMaxAnisotropy();

examples/webgl_geometry_hierarchy.html

@@ -48,7 +48,7 @@
 				scene = new THREE.Scene();
 				scene.fog = new THREE.Fog( 0xffffff, 1, 10000 );
 
-				var geometry = new THREE.CubeGeometry( 100, 100, 100 );
+				var geometry = new THREE.BoxGeometry( 100, 100, 100 );
 				var material = new THREE.MeshNormalMaterial();
 
 				group = new THREE.Object3D();

examples/webgl_geometry_hierarchy2.html

@@ -47,7 +47,7 @@
 
 				scene = new THREE.Scene();
 
-				var geometry = new THREE.CubeGeometry( 100, 100, 100 );
+				var geometry = new THREE.BoxGeometry( 100, 100, 100 );
 				var material = new THREE.MeshNormalMaterial();
 
 				root = new THREE.Mesh( geometry, material );

examples/webgl_geometry_normals.html

@@ -59,7 +59,7 @@
 
 			var geometriesParams = [
 
-				{ type: 'CubeGeometry', args: [ 200, 200, 200, 2, 2, 2, materials ] },
+				{ type: 'BoxGeometry', args: [ 200, 200, 200, 2, 2, 2, materials ] },
 				{ type: 'TorusGeometry', args: [ 100, 60, 12, 12 ] },
 				{ type: 'TorusKnotGeometry', args: [  ] },
 				{ type: 'SphereGeometry', args: [ 100, 12, 12 ] },

examples/webgl_geometry_subdivision.html

@@ -61,7 +61,7 @@
 
 			var geometriesParams = [
 
-				{ type: 'CubeGeometry', args: [ 200, 200, 200, 2, 2, 2, materials ] },
+				{ type: 'BoxGeometry', args: [ 200, 200, 200, 2, 2, 2, materials ] },
 				{ type: 'TorusGeometry', args: [ 100, 60, 4, 8, Math.PI*2 ] },
 				{ type: 'TorusKnotGeometry', args: [  ], scale:0.25, meshScale:4 },
 				{ type: 'SphereGeometry', args: [ 100, 3, 3 ], meshScale:2 },

examples/webgl_gpgpu_birds.html

@@ -549,7 +549,7 @@
 
 		
 				plane = new THREE.PlaneGeometry( BOUNDS, BOUNDS, 1, 1 );
-				// new THREE.CubeGeometry( BOUNDS, BOUNDS, BOUNDS),
+				// new THREE.BoxGeometry( BOUNDS, BOUNDS, BOUNDS),
 
 				cube = new THREE.Mesh(
 					plane,

examples/webgl_interactive_cubes.html

@@ -55,7 +55,7 @@
 				light.position.set( -1, -1, -1 ).normalize();
 				scene.add( light );
 
-				var geometry = new THREE.CubeGeometry( 20, 20, 20 );
+				var geometry = new THREE.BoxGeometry( 20, 20, 20 );
 
 				for ( var i = 0; i < 2000; i ++ ) {
 

examples/webgl_interactive_cubes_gpu.html

@@ -126,7 +126,7 @@
 
 					// give the geom's vertices a random color, to be displayed
 
-					var geom = new THREE.CubeGeometry( 1, 1, 1 );
+					var geom = new THREE.BoxGeometry( 1, 1, 1 );
 					var color = new THREE.Color( Math.random() * 0xffffff );
 					applyVertexColors( geom, color );
 
@@ -139,7 +139,7 @@
 
 					//give the pickingGeom's vertices a color corresponding to the "id"
 
-					var pickingGeom = new THREE.CubeGeometry( 1, 1, 1 );
+					var pickingGeom = new THREE.BoxGeometry( 1, 1, 1 );
 					var pickingColor = new THREE.Color( i );
 					applyVertexColors( pickingGeom, pickingColor );
 
@@ -165,7 +165,7 @@
 
 				pickingScene.add( new THREE.Mesh( pickingGeometry, pickingMaterial ) );
 
-				highlightBox = new THREE.Mesh( new THREE.CubeGeometry( 1, 1, 1 ), new THREE.MeshLambertMaterial( { color: 0xffff00 } ) );
+				highlightBox = new THREE.Mesh( new THREE.BoxGeometry( 1, 1, 1 ), new THREE.MeshLambertMaterial( { color: 0xffff00 } ) );
 				scene.add( highlightBox );
 
 				projector = new THREE.Projector();

examples/webgl_interactive_draggablecubes.html

@@ -71,7 +71,7 @@
 
 				scene.add( light );
 
-				var geometry = new THREE.CubeGeometry( 40, 40, 40 );
+				var geometry = new THREE.BoxGeometry( 40, 40, 40 );
 
 				for ( var i = 0; i < 200; i ++ ) {
 

examples/webgl_interactive_voxelpainter.html

@@ -61,14 +61,14 @@
 
 				// roll-over helpers
 
-				rollOverGeo = new THREE.CubeGeometry( 50, 50, 50 );
+				rollOverGeo = new THREE.BoxGeometry( 50, 50, 50 );
 				rollOverMaterial = new THREE.MeshBasicMaterial( { color: 0xff0000, opacity: 0.5, transparent: true } );
 				rollOverMesh = new THREE.Mesh( rollOverGeo, rollOverMaterial );
 				scene.add( rollOverMesh );
 
 				// cubes
 
-				cubeGeo = new THREE.CubeGeometry( 50, 50, 50 );
+				cubeGeo = new THREE.BoxGeometry( 50, 50, 50 );
 				cubeMaterial = new THREE.MeshLambertMaterial( { color: 0xfeb74c, ambient: 0x00ff80, shading: THREE.FlatShading, map: THREE.ImageUtils.loadTexture( "textures/square-outline-textured.png" ) } );
 				cubeMaterial.ambient = cubeMaterial.color;
 

examples/webgl_lensflares.html

@@ -92,7 +92,7 @@
 
 				var s = 250;
 
-				var cube = new THREE.CubeGeometry( s, s, s );
+				var cube = new THREE.BoxGeometry( s, s, s );
 				var material = new THREE.MeshPhongMaterial( { ambient: 0x333333, color: 0xffffff, specular: 0xffffff, shininess: 50 } );
 
 

examples/webgl_lights_pointlights2.html

@@ -140,7 +140,7 @@
 
 				// OBJECTS
 
-				//var objectGeometry = new THREE.CubeGeometry( 0.5, 1, 1 );
+				//var objectGeometry = new THREE.BoxGeometry( 0.5, 1, 1 );
 				//var objectGeometry = new THREE.SphereGeometry( 1.5, 16, 8 );
 				var objectGeometry = new THREE.TorusGeometry( 1.5, 0.4, 8, 16 );
 

examples/webgl_loader_ctm_materials.html

@@ -127,7 +127,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100, 100, 100 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
 				sceneCube.add( mesh );
 
 				// LIGHTS

examples/webgl_loader_scene.html

@@ -422,7 +422,7 @@
 				var object, geometry, material, light, count = 500, range = 200;
 
 				material = new THREE.MeshLambertMaterial( { color:0xffffff } );
-				geometry = new THREE.CubeGeometry( 5, 5, 5 );
+				geometry = new THREE.BoxGeometry( 5, 5, 5 );
 
 				for( var i = 0; i < count; i++ ) {
 

examples/webgl_loader_scene_blender.html

@@ -336,7 +336,7 @@
 				var object, geometry, material, light, count = 500, range = 200;
 
 				material = new THREE.MeshLambertMaterial( { color:0xffffff } );
-				geometry = new THREE.CubeGeometry( 5, 5, 5 );
+				geometry = new THREE.BoxGeometry( 5, 5, 5 );
 
 				for( var i = 0; i < count; i++ ) {
 

examples/webgl_materials_cars.html

@@ -204,7 +204,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100, 100, 100 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
 				sceneCube.add( mesh );
 
 				//

examples/webgl_materials_cubemap.html

@@ -131,7 +131,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100, 100, 100 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
 				sceneCube.add( mesh );
 
 				//

examples/webgl_materials_cubemap_balls_reflection.html

@@ -121,7 +121,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100, 100, 100 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
 				sceneCube.add( mesh );
 
 				//

examples/webgl_materials_cubemap_balls_refraction.html

@@ -120,7 +120,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100, 100, 100 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
 				sceneCube.add( mesh );
 
 				//

examples/webgl_materials_cubemap_dynamic2.html

@@ -78,7 +78,7 @@
 				sphere = new THREE.Mesh( new THREE.SphereGeometry( 20, 30, 15 ), material );
 				scene.add( sphere );
 
-				cube = new THREE.Mesh( new THREE.CubeGeometry( 20, 20, 20 ), material );
+				cube = new THREE.Mesh( new THREE.BoxGeometry( 20, 20, 20 ), material );
 				scene.add( cube );
 
 				torus = new THREE.Mesh( new THREE.TorusKnotGeometry( 20, 5, 100, 25 ), material );

examples/webgl_materials_cubemap_escher.html

@@ -108,7 +108,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 6000, 6000, 6000 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 6000, 6000, 6000 ), material );
 				scene.add( mesh );
 
 				//

examples/webgl_materials_cubemap_refraction.html

@@ -123,7 +123,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100000, 100000, 100000 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100000, 100000, 100000 ), material );
 				sceneCube.add( mesh );
 
 				//

examples/webgl_materials_shaders_fresnel.html

@@ -132,7 +132,7 @@
 
 				} ),
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 100000, 100000, 100000 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 100000, 100000, 100000 ), material );
 				sceneCube.add( mesh );
 
 				//

examples/webgl_materials_texture_compressed.html

@@ -59,7 +59,7 @@
 
 				scene = new THREE.Scene();
 
-				geometry = new THREE.CubeGeometry( 200, 200, 200 );
+				geometry = new THREE.BoxGeometry( 200, 200, 200 );
 
 				/*
 				This is how compressed textures are supposed to be used:
@@ -140,13 +140,13 @@
 				scene.add( mesh );
 				meshes.push( mesh );
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 200, 200, 200 ), material5 );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 200, 200, 200 ), material5 );
 				mesh.position.x = 200;
 				mesh.position.y = 200;
 				scene.add( mesh );
 				meshes.push( mesh );
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 200, 200, 200 ), material6 );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 200, 200, 200 ), material6 );
 				mesh.position.x = 200;
 				mesh.position.y = -200;
 				scene.add( mesh );

examples/webgl_materials_video.html

@@ -136,7 +136,7 @@
 					ox = i;
 					oy = j;
 
-					geometry = new THREE.CubeGeometry( xsize, ysize, xsize );
+					geometry = new THREE.BoxGeometry( xsize, ysize, xsize );
 					
 					change_uvs( geometry, ux, uy, ox, oy );
 

examples/webgl_materials_wireframe.html

@@ -68,8 +68,8 @@
 
 				var size = 150;
 
-				var geometryLines = new THREE.CubeGeometry( size, size, size );
-				var geometryTris = new THREE.CubeGeometry( size, size, size );
+				var geometryLines = new THREE.BoxGeometry( size, size, size );
+				var geometryTris = new THREE.BoxGeometry( size, size, size );
 
 				// wireframe using gl.LINES
 

examples/webgl_morphtargets.html

@@ -107,7 +107,7 @@
 				scene.add( light );
 
 
-				var geometry = new THREE.CubeGeometry( 100, 100, 100 );
+				var geometry = new THREE.BoxGeometry( 100, 100, 100 );
 				var material = new THREE.MeshLambertMaterial( { color: 0xffffff, morphTargets: true } );
 
 				// construct 8 blend shapes

examples/webgl_nearestneighbour.html

@@ -105,7 +105,7 @@
 
 				];
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 10000, 10000, 10000, 7, 7, 7 ), new THREE.MeshFaceMaterial( materials ) );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 10000, 10000, 10000, 7, 7, 7 ), new THREE.MeshFaceMaterial( materials ) );
 				mesh.scale.x = - 1;
 				scene.add(mesh);
 				

examples/webgl_octree.html

@@ -127,7 +127,7 @@
 				
 					// create new object
 				
-					geometry = new THREE.CubeGeometry( 50, 50, 50 );
+					geometry = new THREE.BoxGeometry( 50, 50, 50 );
 					material = new THREE.MeshBasicMaterial();
 					material.color.setRGB( baseR, baseG, baseB );
 				

examples/webgl_octree_raycasting.html

@@ -104,7 +104,7 @@
 			
 			// create all objects
 			
-			var simpleGeometry = new THREE.CubeGeometry( 1, 1, 1 );
+			var simpleGeometry = new THREE.BoxGeometry( 1, 1, 1 );
 			
 			for ( var i = 0; i < simpleMeshCount - 1; i++ ) {
 				

examples/webgl_postprocessing_dof2.html

@@ -143,7 +143,7 @@ Use WEBGL Depth buffer support?
 
 				} );
 
-				mesh = new THREE.Mesh( new THREE.CubeGeometry( 1000, 1000, 1000 ), material );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 1000, 1000, 1000 ), material );
 				scene.add( mesh );
 
 

examples/webgl_shader2.html

@@ -227,7 +227,7 @@
 
 					mlib[ i ] = material;
 
-					mesh = new THREE.Mesh( new THREE.CubeGeometry( size, size, size ), new THREE.MeshFaceMaterial( [ mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ] ] ) );
+					mesh = new THREE.Mesh( new THREE.BoxGeometry( size, size, size ), new THREE.MeshFaceMaterial( [ mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ] ] ) );
 					mesh.position.x = i - ( params.length - 1 ) / 2;
 					mesh.position.y = i % 2 - 0.5;
 					scene.add( mesh );

examples/webgl_shaders_ocean.html

@@ -165,7 +165,7 @@
 				});
 
 				var skyBox = new THREE.Mesh(
-					new THREE.CubeGeometry( 1000000, 1000000, 1000000 ),
+					new THREE.BoxGeometry( 1000000, 1000000, 1000000 ),
 					skyBoxMaterial
 				);
 				

examples/webgl_shading_physical.html

@@ -216,7 +216,7 @@
 
 				var sphereGeometry = new THREE.SphereGeometry( 100, 64, 32 );
 				var torusGeometry = new THREE.TorusGeometry( 240, 60, 32, 64 );
-				var cubeGeometry = new THREE.CubeGeometry( 150, 150, 150 );
+				var cubeGeometry = new THREE.BoxGeometry( 150, 150, 150 );
 
 				addObject( torusGeometry, materialPhong, 0, 100, 0, 0 );
 				addObject( cubeGeometry, materialLambert, 350, 75, 300, 0 );
@@ -249,9 +249,9 @@
 
 				}
 
-				var bigCube = new THREE.CubeGeometry( 50, 500, 50 );
-				var midCube = new THREE.CubeGeometry( 50, 200, 50 );
-				var smallCube = new THREE.CubeGeometry( 100, 100, 100 );
+				var bigCube = new THREE.BoxGeometry( 50, 500, 50 );
+				var midCube = new THREE.BoxGeometry( 50, 200, 50 );
+				var smallCube = new THREE.BoxGeometry( 100, 100, 100 );
 
 				addObjectColor( bigCube,   0xff0000, -500, 250, 0, 0 );
 				addObjectColor( smallCube, 0xff0000, -500, 50, -150, 0 );
@@ -265,8 +265,8 @@
 				addObjectColor( midCube,   0xff00ff, 0, 100, 500, 0 );
 				addObjectColor( smallCube, 0xff00ff, -150, 50, 500, 0 );
 
-				addObjectColor( new THREE.CubeGeometry( 500, 10, 10 ), 0xffff00, 0, 600, 0, Math.PI/4 );
-				addObjectColor( new THREE.CubeGeometry( 250, 10, 10 ), 0xffff00, 0, 600, 0, 0 );
+				addObjectColor( new THREE.BoxGeometry( 500, 10, 10 ), 0xffff00, 0, 600, 0, Math.PI/4 );
+				addObjectColor( new THREE.BoxGeometry( 250, 10, 10 ), 0xffff00, 0, 600, 0, 0 );
 
 				addObjectColor( new THREE.SphereGeometry( 100, 32, 26 ), 0xffffff, -300, 100, 300, 0 );
 

examples/webgl_shadowmap.html

@@ -281,7 +281,7 @@
 
 				// CUBES
 
-				var mesh = new THREE.Mesh( new THREE.CubeGeometry( 1500, 220, 150 ), planeMaterial );
+				var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1500, 220, 150 ), planeMaterial );
 
 				mesh.position.y = FLOOR - 50;
 				mesh.position.z = 20;
@@ -291,7 +291,7 @@
 
 				scene.add( mesh );
 
-				var mesh = new THREE.Mesh( new THREE.CubeGeometry( 1600, 170, 250 ), planeMaterial );
+				var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1600, 170, 250 ), planeMaterial );
 
 				mesh.position.y = FLOOR - 50;
 				mesh.position.z = 20;

examples/webgl_shadowmap_performance.html

@@ -246,7 +246,7 @@
 
 				// CUBES
 
-				var mesh = new THREE.Mesh( new THREE.CubeGeometry( 1500, 220, 150 ), planeMaterial );
+				var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1500, 220, 150 ), planeMaterial );
 
 				mesh.position.y = FLOOR - 50;
 				mesh.position.z = 20;
@@ -256,7 +256,7 @@
 
 				scene.add( mesh );
 
-				var mesh = new THREE.Mesh( new THREE.CubeGeometry( 1600, 170, 250 ), planeMaterial );
+				var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1600, 170, 250 ), planeMaterial );
 
 				mesh.position.y = FLOOR - 50;
 				mesh.position.z = 20;

examples/webgldeferred_arealights.html

@@ -163,7 +163,7 @@
 
 			function createAreaEmitter( light ) {
 
-				var geometry = new THREE.CubeGeometry( 1, 1, 1 );
+				var geometry = new THREE.BoxGeometry( 1, 1, 1 );
 				var material = new THREE.MeshBasicMaterial( { color: light.color.getHex(), vertexColors: THREE.FaceColors } );
 
 				var backColor = 0x222222;

src/extras/helpers/BoundingBoxHelper.js

@@ -12,7 +12,7 @@ THREE.BoundingBoxHelper = function ( object, hex ) {
 
 	this.box = new THREE.Box3();
 
-	THREE.Mesh.call( this, new THREE.CubeGeometry( 1, 1, 1 ), new THREE.MeshBasicMaterial( { color: color, wireframe: true } ) );
+	THREE.Mesh.call( this, new THREE.BoxGeometry( 1, 1, 1 ), new THREE.MeshBasicMaterial( { color: color, wireframe: true } ) );
 
 };
 

src/loaders/ObjectLoader.js

@@ -69,18 +69,10 @@ THREE.ObjectLoader.prototype = {
 
 						break;
 
-					case 'CircleGeometry':
-
-						geometry = new THREE.CircleGeometry(
-							data.radius,
-							data.segments
-						);
-
-						break;
-
-					case 'CubeGeometry':
+					case 'BoxGeometry':
+					case 'CubeGeometry': // DEPRECATED
 
-						geometry = new THREE.CubeGeometry(
+						geometry = new THREE.BoxGeometry(
 							data.width,
 							data.height,
 							data.depth,
@@ -91,6 +83,15 @@ THREE.ObjectLoader.prototype = {
 
 						break;
 
+					case 'CircleGeometry':
+
+						geometry = new THREE.CircleGeometry(
+							data.radius,
+							data.segments
+						);
+
+						break;
+
 					case 'CylinderGeometry':
 
 						geometry = new THREE.CylinderGeometry(

src/loaders/SceneLoader.js

@@ -830,7 +830,7 @@ THREE.SceneLoader.prototype = {
 
 			if ( geoJSON.type === "cube" ) {
 
-				geometry = new THREE.CubeGeometry( geoJSON.width, geoJSON.height, geoJSON.depth, geoJSON.widthSegments, geoJSON.heightSegments, geoJSON.depthSegments );
+				geometry = new THREE.BoxGeometry( geoJSON.width, geoJSON.height, geoJSON.depth, geoJSON.widthSegments, geoJSON.heightSegments, geoJSON.depthSegments );
 				geometry.name = geoID;
 				result.geometries[ geoID ] = geometry;