build2.sh now builds using Geometry2.

src/core/Geometry2.js

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

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.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegments, depthSegments ) {
+THREE.BoxGeometry = function ( width, height, depth, widthSegments, heightSegments, depthSegments ) {
 
-	THREE.Geometry2.call( this );
+	THREE.Geometry.call( this );
 
 	var scope = this;
 
@@ -110,4 +110,4 @@ THREE.BoxGeometry2 = function ( width, height, depth, widthSegments, heightSegme
 
 };
 
-THREE.BoxGeometry2.prototype = Object.create( THREE.Geometry2.prototype );
+THREE.BoxGeometry.prototype = Object.create( THREE.Geometry.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.PlaneGeometry2 = function ( width, height, widthSegments, heightSegments ) {
+THREE.PlaneGeometry = function ( width, height, widthSegments, heightSegments ) {
 
-	THREE.Geometry2.call( this, ( widthSegments * heightSegments ) * 2 * 3 );
+	THREE.Geometry.call( this, ( widthSegments * heightSegments ) * 2 * 3 );
 
 	var vertices = this.vertices;
 	var normals = this.normals;
@@ -76,4 +76,4 @@ THREE.PlaneGeometry2 = function ( width, height, widthSegments, heightSegments )
 
 };
 
-THREE.PlaneGeometry2.prototype = Object.create( THREE.Geometry2.prototype );
+THREE.PlaneGeometry.prototype = Object.create( THREE.Geometry.prototype );

utils/build/build2.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-python build.py --include common2 --include extras --output ../../build/three.js
-python build.py --include common2 --include extras --minify --output ../../build/three.min.js
+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,7 +28,6 @@
 	"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

@@ -0,0 +1,93 @@
+[
+	"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/Projector.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/extras.json

@@ -26,7 +26,6 @@
 	"src/extras/cameras/CubeCamera.js",
 	"src/extras/cameras/CombinedCamera.js",
 	"src/extras/geometries/BoxGeometry.js",
-	"src/extras/geometries/BoxGeometry2.js",
 	"src/extras/geometries/CircleGeometry.js",
 	"src/extras/geometries/CubeGeometry.js",
 	"src/extras/geometries/CylinderGeometry.js",
@@ -34,7 +33,6 @@
 	"src/extras/geometries/ShapeGeometry.js",
 	"src/extras/geometries/LatheGeometry.js",
 	"src/extras/geometries/PlaneGeometry.js",
-	"src/extras/geometries/PlaneGeometry2.js",
 	"src/extras/geometries/RingGeometry.js",
 	"src/extras/geometries/SphereGeometry.js",
 	"src/extras/geometries/TextGeometry.js",

utils/build/includes/extras2.json

@@ -0,0 +1,53 @@
+[
+	"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"
+]