Reverting to previous approach for developing Geometry2.

examples/canvas_geometry2_cube.html

@@ -17,6 +17,9 @@
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="../src/extras/geometries/BoxGeometry2.js"></script>
+		<script src="../src/extras/geometries/PlaneGeometry2.js"></script>
+
 		<script src="js/libs/stats.min.js"></script>
 
 		<script>

src/core/Geometry2.js

@@ -2,7 +2,7 @@
  * @author mrdoob / http://mrdoob.com/
  */
 
-THREE.Geometry = function ( size ) {
+THREE.Geometry2 = function ( size ) {
 
 	this.id = THREE.GeometryIdCount ++;
 	this.uuid = THREE.Math.generateUUID();
@@ -18,9 +18,9 @@ THREE.Geometry = function ( size ) {
 
 };
 
-THREE.Geometry.prototype = {
+THREE.Geometry2.prototype = {
 
-	constructor: THREE.Geometry,
+	constructor: THREE.Geometry2,
 
 	applyMatrix: function ( matrix ) {
 
@@ -78,4 +78,4 @@ THREE.Geometry.prototype = {
 
 };
 
-THREE.EventDispatcher.prototype.apply( THREE.Geometry.prototype );
+THREE.EventDispatcher.prototype.apply( THREE.Geometry2.prototype );

src/core/Projector.js

@@ -340,6 +340,22 @@ THREE.Projector = function () {
 
 					}
 
+				} else if ( geometry instanceof THREE.Geometry2 ) {
+
+					vertices = geometry.vertices;
+
+					for ( var i = 0, l = vertices.length; i < l; i += 3 ) {
+
+						renderList.pushVertex( vertices[ i ], vertices[ i + 1 ], vertices[ i + 2 ] );
+
+					}
+
+					for ( var i = 0, l = vertices.length / 3; i < l; i += 3 ) {
+
+						renderList.pushTriangle( i, i + 1, i + 2 );
+
+					}
+
 				} else if ( geometry instanceof THREE.Geometry ) {
 
 					vertices = geometry.vertices;

src/core/Projector2.js

@@ -1,672 +0,0 @@
-/**
- * @author mrdoob / http://mrdoob.com/
- * @author supereggbert / http://www.paulbrunt.co.uk/
- * @author julianwa / https://github.com/julianwa
- */
-
-THREE.Projector = function () {
-
-	var _object, _objectCount, _objectPool = [], _objectPoolLength = 0,
-	_vertex, _vertexCount, _vertexPool = [], _vertexPoolLength = 0,
-	_face, _face3Count, _face3Pool = [], _face3PoolLength = 0,
-	_line, _lineCount, _linePool = [], _linePoolLength = 0,
-	_sprite, _spriteCount, _spritePool = [], _spritePoolLength = 0,
-
-	_renderData = { objects: [], sprites: [], lights: [], elements: [] },
-
-	_vA = new THREE.Vector3(),
-	_vB = new THREE.Vector3(),
-	_vC = new THREE.Vector3(),
-
-	_vector3 = new THREE.Vector3(),
-	_vector4 = new THREE.Vector4(),
-
-	_clipBox = new THREE.Box3( new THREE.Vector3( -1, -1, -1 ), new THREE.Vector3( 1, 1, 1 ) ),
-	_boundingBox = new THREE.Box3(),
-	_points3 = new Array( 3 ),
-	_points4 = new Array( 4 ),
-
-	_viewMatrix = new THREE.Matrix4(),
-	_viewProjectionMatrix = new THREE.Matrix4(),
-
-	_modelMatrix,
-	_modelViewProjectionMatrix = new THREE.Matrix4(),
-
-	_normalMatrix = new THREE.Matrix3(),
-	_normalViewMatrix = new THREE.Matrix3(),
-
-	_centroid = new THREE.Vector3(),
-
-	_frustum = new THREE.Frustum(),
-
-	_clippedVertex1PositionScreen = new THREE.Vector4(),
-	_clippedVertex2PositionScreen = new THREE.Vector4();
-
-	this.projectVector = function ( vector, camera ) {
-
-		camera.matrixWorldInverse.getInverse( camera.matrixWorld );
-
-		_viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, camera.matrixWorldInverse );
-
-		return vector.applyProjection( _viewProjectionMatrix );
-
-	};
-
-	this.unprojectVector = function () {
-
-		var projectionMatrixInverse = new THREE.Matrix4();
-
-		return function ( vector, camera ) {
-
-			projectionMatrixInverse.getInverse( camera.projectionMatrix );
-			_viewProjectionMatrix.multiplyMatrices( camera.matrixWorld, projectionMatrixInverse );
-
-			return vector.applyProjection( _viewProjectionMatrix );
-
-		};
-
-	}();
-
-	this.pickingRay = function ( vector, camera ) {
-
-		// set two vectors with opposing z values
-		vector.z = -1.0;
-		var end = new THREE.Vector3( vector.x, vector.y, 1.0 );
-
-		this.unprojectVector( vector, camera );
-		this.unprojectVector( end, camera );
-
-		// find direction from vector to end
-		end.sub( vector ).normalize();
-
-		return new THREE.Raycaster( vector, end );
-
-	};
-
-	var getObject = function ( object ) {
-
-		_object = getNextObjectInPool();
-		_object.id = object.id;
-		_object.object = object;
-
-		if ( object.renderDepth !== null ) {
-
-			_object.z = object.renderDepth;
-
-		} else {
-
-			_vector3.setFromMatrixPosition( object.matrixWorld );
-			_vector3.applyProjection( _viewProjectionMatrix );
-			_object.z = _vector3.z;
-
-		}
-
-		return _object;
-
-	};
-
-	var projectObject = function ( object ) {
-
-		if ( object.visible === false ) return;
-
-		if ( object instanceof THREE.Light ) {
-
-			_renderData.lights.push( object );
-
-		} else if ( object instanceof THREE.Mesh || object instanceof THREE.Line ) {
-
-			if ( object.frustumCulled === false || _frustum.intersectsObject( object ) === true ) {
-
-				_renderData.objects.push( getObject( object ) );
-
-			}
-
-		} else if ( object instanceof THREE.Sprite ) {
-
-			_renderData.sprites.push( getObject( object ) );
-
-		}
-
-		for ( var i = 0, l = object.children.length; i < l; i ++ ) {
-
-			projectObject( object.children[ i ] );
-
-		}
-
-	};
-
-	var projectGraph = function ( root, sortObjects ) {
-
-		_objectCount = 0;
-
-		_renderData.objects.length = 0;
-		_renderData.sprites.length = 0;
-		_renderData.lights.length = 0;
-
-		projectObject( root );
-
-		if ( sortObjects === true ) {
-
-			_renderData.objects.sort( painterSort );
-
-		}
-
-	};
-
-	var RenderList = function () {
-
-		var object = null;
-
-		var setObject = function ( value ) {
-
-			object = value;
-
-		};
-
-		var projectVertex = function ( vertex ) {
-
-			var position = vertex.position;
-			var positionWorld = vertex.positionWorld;
-			var positionScreen = vertex.positionScreen;
-
-			positionWorld.copy( position ).applyMatrix4( _modelMatrix );
-			positionScreen.copy( positionWorld ).applyMatrix4( _viewProjectionMatrix );
-
-			var invW = 1 / positionScreen.w;
-
-			positionScreen.x *= invW;
-			positionScreen.y *= invW;
-			positionScreen.z *= invW;
-
-			vertex.visible = positionScreen.x >= -1 && positionScreen.x <= 1 &&
-					 positionScreen.y >= -1 && positionScreen.y <= 1 &&
-					 positionScreen.z >= -1 && positionScreen.z <= 1;
-
-		};
-
-		var pushVertex = function ( x, y, z ) {
-
-			_vertex = getNextVertexInPool();
-			_vertex.position.set( x, y, z );
-
-			projectVertex( _vertex );
-
-		};
-
-		var checkTriangleVisibility = function ( v1, v2, v3 ) {
-
-			_points3[ 0 ] = v1.positionScreen;
-			_points3[ 1 ] = v2.positionScreen;
-			_points3[ 2 ] = v3.positionScreen;
-
-			if ( v1.visible === true || v2.visible === true || v3.visible === true ||
-				_clipBox.isIntersectionBox( _boundingBox.setFromPoints( _points3 ) ) ) {
-
-				return ( ( v3.positionScreen.x - v1.positionScreen.x ) *
-					    ( v2.positionScreen.y - v1.positionScreen.y ) -
-					    ( v3.positionScreen.y - v1.positionScreen.y ) *
-					    ( v2.positionScreen.x - v1.positionScreen.x ) ) < 0;
-
-			}
-
-			return false;
-
-		};
-
-		var pushLine = function ( a, b ) {
-
-			var v1 = _vertexPool[ a ];
-			var v2 = _vertexPool[ b ];
-
-			_line = getNextLineInPool();
-
-			_line.id = object.id;
-			_line.v1.copy( v1 );
-			_line.v2.copy( v2 );
-			_face.z = ( v1.positionScreen.z + v2.positionScreen.z ) / 2;
-
-			_line.material = object.material;
-
-			_renderData.elements.push( _line );
-
-		};
-
-		var pushTriangle = function ( a, b, c ) {
-
-			var v1 = _vertexPool[ a ];
-			var v2 = _vertexPool[ b ];
-			var v3 = _vertexPool[ c ];
-
-			if ( checkTriangleVisibility( v1, v2, v3 ) === true ) {
-
-				_face = getNextFace3InPool();
-
-				_face.id = object.id;
-				_face.v1.copy( v1 );
-				_face.v2.copy( v2 );
-				_face.v3.copy( v3 );
-				_face.z = ( v1.positionScreen.z + v2.positionScreen.z + v3.positionScreen.z ) / 3;
-
-				_face.material = object.material;
-
-				_renderData.elements.push( _face );
-
-			}
-
-		};
-
-		return {
-			setObject: setObject,
-			projectVertex: projectVertex,
-			checkTriangleVisibility: checkTriangleVisibility,
-			pushVertex: pushVertex,
-			pushLine: pushLine,
-			pushTriangle: pushTriangle
-		}
-
-	};
-
-	var renderList = new RenderList();
-
-	this.projectScene = function ( scene, camera, sortObjects, sortElements ) {
-
-		var object, geometry, vertices, faces, face, faceVertexNormals, faceVertexUvs, uvs,
-		isFaceMaterial, objectMaterials;
-
-		_face3Count = 0;
-		_lineCount = 0;
-		_spriteCount = 0;
-
-		_renderData.elements.length = 0;
-
-		if ( scene.autoUpdate === true ) scene.updateMatrixWorld();
-		if ( camera.parent === undefined ) camera.updateMatrixWorld();
-
-		_viewMatrix.copy( camera.matrixWorldInverse.getInverse( camera.matrixWorld ) );
-		_viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, _viewMatrix );
-
-		_normalViewMatrix.getNormalMatrix( _viewMatrix );
-
-		_frustum.setFromMatrix( _viewProjectionMatrix );
-
-		projectGraph( scene, sortObjects );
-
-		for ( var o = 0, ol = _renderData.objects.length; o < ol; o ++ ) {
-
-			object = _renderData.objects[ o ].object;
-			geometry = object.geometry;
-
-			renderList.setObject( object );
-
-			_modelMatrix = object.matrixWorld;
-
-			_vertexCount = 0;
-
-			if ( object instanceof THREE.Mesh ) {
-
-				if ( geometry instanceof THREE.BufferGeometry ) {
-
-					var attributes = geometry.attributes;
-
-					if ( attributes.position !== undefined ) {
-
-						var positions = attributes.position.array;
-
-						for ( var i = 0, l = positions.length; i < l; i += 3 ) {
-
-							renderList.pushVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
-
-						}
-
-						if ( attributes.index !== undefined ) {
-
-							var indices = attributes.index.array;
-
-							for ( var i = 0, l = indices.length; i < l; i += 3 ) {
-
-								renderList.pushTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ] );
-
-							}
-
-						} else {
-
-							for ( var i = 0, l = positions.length / 3; i < l; i += 3 ) {
-
-								renderList.pushTriangle( i, i + 1, i + 2 );
-
-							}
-
-						}
-
-					}
-
-				} else if ( geometry instanceof THREE.Geometry ) {
-
-					vertices = geometry.vertices;
-
-					for ( var i = 0, l = vertices.length; i < l; i += 3 ) {
-
-						renderList.pushVertex( vertices[ i ], vertices[ i + 1 ], vertices[ i + 2 ] );
-
-					}
-
-					for ( var i = 0, l = vertices.length / 3; i < l; i += 3 ) {
-
-						renderList.pushTriangle( i, i + 1, i + 2 );
-
-					}
-
-				}
-
-			} else if ( object instanceof THREE.Line ) {
-
-				if ( geometry instanceof THREE.BufferGeometry ) {
-
-					var attributes = geometry.attributes;
-
-					if ( attributes.position !== undefined ) {
-
-						var positions = attributes.position.array;
-
-						for ( var i = 0, l = positions.length; i < l; i += 3 ) {
-
-							renderList.pushVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
-
-						}
-
-						if ( attributes.index !== undefined ) {
-
-							var indices = attributes.index.array;
-
-							for ( var i = 0, l = indices.length; i < l; i += 2 ) {
-
-								renderList.pushLine( indices[ i ], indices[ i + 1 ] );
-
-							}
-
-						} else {
-
-							for ( var i = 0, l = ( positions.length / 3 ) - 1; i < l; i ++ ) {
-
-								renderList.pushLine( i, i + 1 );
-
-							}
-
-						}
-
-					}
-
-				} else if ( geometry instanceof THREE.Geometry ) {
-
-					_modelViewProjectionMatrix.multiplyMatrices( _viewProjectionMatrix, _modelMatrix );
-
-					vertices = object.geometry.vertices;
-
-					v1 = getNextVertexInPool();
-					v1.positionScreen.copy( vertices[ 0 ] ).applyMatrix4( _modelViewProjectionMatrix );
-
-					// Handle LineStrip and LinePieces
-					var step = object.type === THREE.LinePieces ? 2 : 1;
-
-					for ( v = 1, vl = vertices.length; v < vl; v ++ ) {
-
-						v1 = getNextVertexInPool();
-						v1.positionScreen.copy( vertices[ v ] ).applyMatrix4( _modelViewProjectionMatrix );
-
-						if ( ( v + 1 ) % step > 0 ) continue;
-
-						v2 = _vertexPool[ _vertexCount - 2 ];
-
-						_clippedVertex1PositionScreen.copy( v1.positionScreen );
-						_clippedVertex2PositionScreen.copy( v2.positionScreen );
-
-						if ( clipLine( _clippedVertex1PositionScreen, _clippedVertex2PositionScreen ) === true ) {
-
-							// Perform the perspective divide
-							_clippedVertex1PositionScreen.multiplyScalar( 1 / _clippedVertex1PositionScreen.w );
-							_clippedVertex2PositionScreen.multiplyScalar( 1 / _clippedVertex2PositionScreen.w );
-
-							_line = getNextLineInPool();
-
-							_line.id = object.id;
-							_line.v1.positionScreen.copy( _clippedVertex1PositionScreen );
-							_line.v2.positionScreen.copy( _clippedVertex2PositionScreen );
-
-							_line.z = Math.max( _clippedVertex1PositionScreen.z, _clippedVertex2PositionScreen.z );
-
-							_line.material = object.material;
-
-							if ( object.material.vertexColors === THREE.VertexColors ) {
-
-								_line.vertexColors[ 0 ].copy( object.geometry.colors[ v ] );
-								_line.vertexColors[ 1 ].copy( object.geometry.colors[ v - 1 ] );
-
-							}
-
-							_renderData.elements.push( _line );
-
-						}
-
-					}
-
-				}
-
-			}
-
-		}
-
-		for ( o = 0, ol = _renderData.sprites.length; o < ol; o++ ) {
-
-			object = _renderData.sprites[ o ].object;
-
-			_modelMatrix = object.matrixWorld;
-
-			_vector4.set( _modelMatrix.elements[12], _modelMatrix.elements[13], _modelMatrix.elements[14], 1 );
-			_vector4.applyMatrix4( _viewProjectionMatrix );
-
-			var invW = 1 / _vector4.w;
-
-			_vector4.z *= invW;
-
-			if ( _vector4.z >= -1 && _vector4.z <= 1 ) {
-
-				_sprite = getNextSpriteInPool();
-				_sprite.id = object.id;
-				_sprite.x = _vector4.x * invW;
-				_sprite.y = _vector4.y * invW;
-				_sprite.z = _vector4.z;
-				_sprite.object = object;
-
-				_sprite.rotation = object.rotation;
-
-				_sprite.scale.x = object.scale.x * Math.abs( _sprite.x - ( _vector4.x + camera.projectionMatrix.elements[0] ) / ( _vector4.w + camera.projectionMatrix.elements[12] ) );
-				_sprite.scale.y = object.scale.y * Math.abs( _sprite.y - ( _vector4.y + camera.projectionMatrix.elements[5] ) / ( _vector4.w + camera.projectionMatrix.elements[13] ) );
-
-				_sprite.material = object.material;
-
-				_renderData.elements.push( _sprite );
-
-			}
-
-		}
-
-		if ( sortElements === true ) _renderData.elements.sort( painterSort );
-
-		return _renderData;
-
-	};
-
-	// Pools
-
-	function getNextObjectInPool() {
-
-		if ( _objectCount === _objectPoolLength ) {
-
-			var object = new THREE.RenderableObject();
-			_objectPool.push( object );
-			_objectPoolLength ++;
-			_objectCount ++;
-			return object;
-
-		}
-
-		return _objectPool[ _objectCount ++ ];
-
-	}
-
-	function getNextVertexInPool() {
-
-		if ( _vertexCount === _vertexPoolLength ) {
-
-			var vertex = new THREE.RenderableVertex();
-			_vertexPool.push( vertex );
-			_vertexPoolLength ++;
-			_vertexCount ++;
-			return vertex;
-
-		}
-
-		return _vertexPool[ _vertexCount ++ ];
-
-	}
-
-	function getNextFace3InPool() {
-
-		if ( _face3Count === _face3PoolLength ) {
-
-			var face = new THREE.RenderableFace3();
-			_face3Pool.push( face );
-			_face3PoolLength ++;
-			_face3Count ++;
-			return face;
-
-		}
-
-		return _face3Pool[ _face3Count ++ ];
-
-
-	}
-
-	function getNextLineInPool() {
-
-		if ( _lineCount === _linePoolLength ) {
-
-			var line = new THREE.RenderableLine();
-			_linePool.push( line );
-			_linePoolLength ++;
-			_lineCount ++
-			return line;
-
-		}
-
-		return _linePool[ _lineCount ++ ];
-
-	}
-
-	function getNextSpriteInPool() {
-
-		if ( _spriteCount === _spritePoolLength ) {
-
-			var sprite = new THREE.RenderableSprite();
-			_spritePool.push( sprite );
-			_spritePoolLength ++;
-			_spriteCount ++
-			return sprite;
-
-		}
-
-		return _spritePool[ _spriteCount ++ ];
-
-	}
-
-	//
-
-	function painterSort( a, b ) {
-
-		if ( a.z !== b.z ) {
-
-			return b.z - a.z;
-
-		} else if ( a.id !== b.id ) {
-
-			return a.id - b.id;
-
-		} else {
-
-			return 0;
-
-		}
-
-	}
-
-	function clipLine( s1, s2 ) {
-
-		var alpha1 = 0, alpha2 = 1,
-
-		// Calculate the boundary coordinate of each vertex for the near and far clip planes,
-		// Z = -1 and Z = +1, respectively.
-		bc1near =  s1.z + s1.w,
-		bc2near =  s2.z + s2.w,
-		bc1far =  - s1.z + s1.w,
-		bc2far =  - s2.z + s2.w;
-
-		if ( bc1near >= 0 && bc2near >= 0 && bc1far >= 0 && bc2far >= 0 ) {
-
-			// Both vertices lie entirely within all clip planes.
-			return true;
-
-		} else if ( ( bc1near < 0 && bc2near < 0) || (bc1far < 0 && bc2far < 0 ) ) {
-
-			// Both vertices lie entirely outside one of the clip planes.
-			return false;
-
-		} else {
-
-			// The line segment spans at least one clip plane.
-
-			if ( bc1near < 0 ) {
-
-				// v1 lies outside the near plane, v2 inside
-				alpha1 = Math.max( alpha1, bc1near / ( bc1near - bc2near ) );
-
-			} else if ( bc2near < 0 ) {
-
-				// v2 lies outside the near plane, v1 inside
-				alpha2 = Math.min( alpha2, bc1near / ( bc1near - bc2near ) );
-
-			}
-
-			if ( bc1far < 0 ) {
-
-				// v1 lies outside the far plane, v2 inside
-				alpha1 = Math.max( alpha1, bc1far / ( bc1far - bc2far ) );
-
-			} else if ( bc2far < 0 ) {
-
-				// v2 lies outside the far plane, v2 inside
-				alpha2 = Math.min( alpha2, bc1far / ( bc1far - bc2far ) );
-
-			}
-
-			if ( alpha2 < alpha1 ) {
-
-				// The line segment spans two boundaries, but is outside both of them.
-				// (This can't happen when we're only clipping against just near/far but good
-				//  to leave the check here for future usage if other clip planes are added.)
-				return false;
-
-			} else {
-
-				// Update the s1 and s2 vertices to match the clipped line segment.
-				s1.lerp( s2, alpha1 );
-				s2.lerp( s1, 1 - alpha2 );
-
-				return true;
-
-			}
-
-		}
-
-	}
-
-};

src/extras/geometries/BoxGeometry2.js

@@ -3,9 +3,9 @@
  * based on http://papervision3d.googlecode.com/svn/trunk/as3/trunk/src/org/papervision3d/objects/primitives/Cube.as
  */
 
-THREE.BoxGeometry = function ( width, height, depth, widthSegments, heightSegments, depthSegments ) {
+THREE.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegments, depthSegments ) {
 
-	THREE.Geometry.call( this );
+	THREE.Geometry2.call( this );
 
 	var scope = this;
 
@@ -110,4 +110,4 @@ THREE.BoxGeometry = function ( width, height, depth, widthSegments, heightSegmen
 
 };
 
-THREE.BoxGeometry.prototype = Object.create( THREE.Geometry.prototype );
+THREE.BoxGeometry2.prototype = Object.create( THREE.Geometry2.prototype );

src/extras/geometries/PlaneGeometry2.js

@@ -3,9 +3,9 @@
  * based on http://papervision3d.googlecode.com/svn/trunk/as3/trunk/src/org/papervision3d/objects/primitives/Plane.as
  */
 
-THREE.PlaneGeometry = function ( width, height, widthSegments, heightSegments ) {
+THREE.PlaneGeometry2 = function ( width, height, widthSegments, heightSegments ) {
 
-	THREE.Geometry.call( this, ( widthSegments * heightSegments ) * 2 * 3 );
+	THREE.Geometry2.call( this, ( widthSegments * heightSegments ) * 2 * 3 );
 
 	var vertices = this.vertices;
 	var normals = this.normals;
@@ -76,4 +76,4 @@ THREE.PlaneGeometry = function ( width, height, widthSegments, heightSegments )
 
 };
 
-THREE.PlaneGeometry.prototype = Object.create( THREE.Geometry.prototype );
+THREE.PlaneGeometry2.prototype = Object.create( THREE.Geometry2.prototype );

utils/build/build2.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-python build.py --include common2 --include extras2 --output ../../build/three2.js
-python build.py --include common2 --include extras2 --minify --output ../../build/three2.min.js

utils/build/includes/common.json

@@ -28,6 +28,7 @@
 	"src/core/Face3.js",
 	"src/core/Face4.js",
 	"src/core/Geometry.js",
+	"src/core/Geometry2.js",
 	"src/core/BufferGeometry.js",
 	"src/cameras/Camera.js",
 	"src/cameras/OrthographicCamera.js",

utils/build/includes/common2.json

@@ -1,93 +0,0 @@
-[
-	"src/Three.js",
-	"src/math/Color.js",
-	"src/math/Quaternion.js",
-	"src/math/Vector2.js",
-	"src/math/Vector3.js",
-	"src/math/Vector4.js",
-	"src/math/Euler.js",
-	"src/math/Line3.js",
-	"src/math/Box2.js",
-	"src/math/Box3.js",
-	"src/math/Matrix3.js",
-	"src/math/Matrix4.js",
-	"src/math/Ray.js",
-	"src/math/Sphere.js",
-	"src/math/Frustum.js",
-	"src/math/Plane.js",
-	"src/math/Math.js",
-	"src/math/Spline.js",
-	"src/math/Triangle.js",
-	"src/math/Vertex.js",
-	"src/math/UV.js",
-	"src/core/Clock.js",
-	"src/core/EventDispatcher.js",
-	"src/core/Raycaster.js",
-	"src/core/Object3D.js",
-	"src/core/Projector2.js",
-	"src/core/Face3.js",
-	"src/core/Face4.js",
-	"src/core/Geometry2.js",
-	"src/core/BufferGeometry.js",
-	"src/cameras/Camera.js",
-	"src/cameras/OrthographicCamera.js",
-	"src/cameras/PerspectiveCamera.js",
-	"src/lights/Light.js",
-	"src/lights/AmbientLight.js",
-	"src/lights/AreaLight.js",
-	"src/lights/DirectionalLight.js",
-	"src/lights/HemisphereLight.js",
-	"src/lights/PointLight.js",
-	"src/lights/SpotLight.js",
-	"src/loaders/Loader.js",
-	"src/loaders/XHRLoader.js",
-	"src/loaders/ImageLoader.js",
-	"src/loaders/JSONLoader.js",
-	"src/loaders/LoadingManager.js",
-	"src/loaders/BufferGeometryLoader.js",
-	"src/loaders/GeometryLoader.js",
-	"src/loaders/MaterialLoader.js",
-	"src/loaders/ObjectLoader.js",
-	"src/loaders/SceneLoader.js",
-	"src/loaders/TextureLoader.js",
-	"src/materials/Material.js",
-	"src/materials/LineBasicMaterial.js",
-	"src/materials/LineDashedMaterial.js",
-	"src/materials/MeshBasicMaterial.js",
-	"src/materials/MeshLambertMaterial.js",
-	"src/materials/MeshPhongMaterial.js",
-	"src/materials/MeshDepthMaterial.js",
-	"src/materials/MeshNormalMaterial.js",
-	"src/materials/MeshFaceMaterial.js",
-	"src/materials/ParticleSystemMaterial.js",
-	"src/materials/ShaderMaterial.js",
-	"src/materials/SpriteMaterial.js",
-	"src/materials/SpriteCanvasMaterial.js",
-	"src/textures/Texture.js",
-	"src/textures/CompressedTexture.js",
-	"src/textures/DataTexture.js",
-	"src/objects/ParticleSystem.js",
-	"src/objects/Line.js",
-	"src/objects/Mesh.js",
-	"src/objects/Bone.js",
-	"src/objects/SkinnedMesh.js",
-	"src/objects/MorphAnimMesh.js",
-	"src/objects/LOD.js",
-	"src/objects/Sprite.js",
-	"src/scenes/Scene.js",
-	"src/scenes/Fog.js",
-	"src/scenes/FogExp2.js",
-	"src/renderers/CanvasRenderer.js",
-	"src/renderers/shaders/ShaderChunk.js",
-	"src/renderers/shaders/UniformsUtils.js",
-	"src/renderers/shaders/UniformsLib.js",
-	"src/renderers/shaders/ShaderLib.js",
-	"src/renderers/WebGLRenderer.js",
-	"src/renderers/WebGLRenderTarget.js",
-	"src/renderers/WebGLRenderTargetCube.js",
-	"src/renderers/renderables/RenderableVertex.js",
-	"src/renderers/renderables/RenderableFace3.js",
-	"src/renderers/renderables/RenderableObject.js",
-	"src/renderers/renderables/RenderableSprite.js",
-	"src/renderers/renderables/RenderableLine.js"
-]

utils/build/includes/extras2.json

@@ -1,53 +0,0 @@
-[
-	"src/extras/GeometryUtils.js",
-	"src/extras/ImageUtils.js",
-	"src/extras/SceneUtils.js",
-	"src/extras/FontUtils.js",
-	"src/extras/core/Curve.js",
-	"src/extras/core/CurvePath.js",
-	"src/extras/core/Gyroscope.js",
-	"src/extras/core/Path.js",
-	"src/extras/core/Shape.js",
-	"src/extras/curves/LineCurve.js",
-	"src/extras/curves/QuadraticBezierCurve.js",
-	"src/extras/curves/CubicBezierCurve.js",
-	"src/extras/curves/SplineCurve.js",
-	"src/extras/curves/EllipseCurve.js",
-	"src/extras/curves/ArcCurve.js",
-	"src/extras/curves/LineCurve3.js",
-	"src/extras/curves/QuadraticBezierCurve3.js",
-	"src/extras/curves/CubicBezierCurve3.js",
-	"src/extras/curves/SplineCurve3.js",
-	"src/extras/curves/ClosedSplineCurve3.js",
-	"src/extras/animation/AnimationHandler.js",
-	"src/extras/animation/Animation.js",
-	"src/extras/animation/KeyFrameAnimation.js",
-	"src/extras/animation/MorphAnimation.js",
-	"src/extras/cameras/CubeCamera.js",
-	"src/extras/cameras/CombinedCamera.js",
-	"src/extras/geometries/BoxGeometry2.js",
-	"src/extras/geometries/PlaneGeometry2.js",
-	"src/extras/helpers/AxisHelper.js",
-	"src/extras/helpers/ArrowHelper.js",
-	"src/extras/helpers/BoxHelper.js",
-	"src/extras/helpers/BoundingBoxHelper.js",
-	"src/extras/helpers/CameraHelper.js",
-	"src/extras/helpers/DirectionalLightHelper.js",
-	"src/extras/helpers/EdgesHelper.js",
-	"src/extras/helpers/FaceNormalsHelper.js",
-	"src/extras/helpers/GridHelper.js",
-	"src/extras/helpers/HemisphereLightHelper.js",
-	"src/extras/helpers/PointLightHelper.js",
-	"src/extras/helpers/SpotLightHelper.js",
-	"src/extras/helpers/VertexNormalsHelper.js",
-	"src/extras/helpers/VertexTangentsHelper.js",
-	"src/extras/helpers/WireframeHelper.js",
-	"src/extras/objects/ImmediateRenderObject.js",
-	"src/extras/objects/LensFlare.js",
-	"src/extras/objects/MorphBlendMesh.js",
-	"src/extras/renderers/plugins/LensFlarePlugin.js",
-	"src/extras/renderers/plugins/ShadowMapPlugin.js",
-	"src/extras/renderers/plugins/SpritePlugin.js",
-	"src/extras/renderers/plugins/DepthPassPlugin.js",
-	"src/extras/shaders/ShaderFlares.js"
-]