-- size, ++ speed

package.json

@@ -10,6 +10,7 @@
   },
   "scripts": {
     "build": "cd ./utils/build && node build.js --include common --include extras",
+	"build.release": "cd ./utils/build && node build.js --include common --include extras --minify --output ../../build/three.min.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {

src/animation/AnimationAction.js

@@ -119,8 +119,6 @@ THREE.AnimationAction._new.prototype = {
 
 	isRunning: function() {
 
-		var start = this._startTime;
-
 		return this.enabled && ! this.paused && this.timeScale !== 0 &&
 				this._startTime === null && this._mixer._isActiveAction( this );
 
@@ -187,8 +185,6 @@ THREE.AnimationAction._new.prototype = {
 
 	crossFadeFrom: function( fadeOutAction, duration, warp ) {
 
-		var mixer = this._mixer;
-
 		fadeOutAction.fadeOut( duration );
 		this.fadeIn( duration );
 

src/animation/AnimationObjectGroup.js

@@ -164,7 +164,6 @@ THREE.AnimationObjectGroup.prototype = {
 	remove: function( var_args ) {
 
 		var objects = this._objects,
-			nObjects = objects.length,
 			nCachedObjects = this.nCachedObjects_,
 			indicesByUUID = this._indicesByUUID,
 			bindings = this._bindings,

src/core/BufferGeometry.js

@@ -5,7 +5,7 @@
 
 THREE.BufferGeometry = function () {
 
-	Object.defineProperty( this, 'id', { value: THREE.GeometryIdCount ++ } );
+	Object.defineProperty( this, 'id', { value: THREE.geometryIdCount ++ } );
 
 	this.uuid = THREE.Math.generateUUID();
 

src/core/DirectGeometry.js

@@ -4,7 +4,7 @@
 
 THREE.DirectGeometry = function () {
 
-	Object.defineProperty( this, 'id', { value: THREE.GeometryIdCount ++ } );
+	Object.defineProperty( this, 'id', { value: THREE.geometryIdCount ++ } );
 
 	this.uuid = THREE.Math.generateUUID();
 

src/core/Geometry.js

@@ -9,7 +9,7 @@
 
 THREE.Geometry = function () {
 
-	Object.defineProperty( this, 'id', { value: THREE.GeometryIdCount ++ } );
+	Object.defineProperty( this, 'id', { value: THREE.geometryIdCount ++ } );
 
 	this.uuid = THREE.Math.generateUUID();
 
@@ -1202,4 +1202,4 @@ Object.assign( THREE.Geometry.prototype, THREE.EventDispatcher.prototype, {
 
 } );
 
-THREE.GeometryIdCount = 0;
+THREE.geometryIdCount = 0;

src/core/Object3D.js

@@ -8,7 +8,7 @@
 
 THREE.Object3D = function () {
 
-	Object.defineProperty( this, 'id', { value: THREE.Object3DIdCount ++ } );
+	Object.defineProperty( this, 'id', { value: THREE.object3DIdCount ++ } );
 
 	this.uuid = THREE.Math.generateUUID();
 
@@ -715,4 +715,4 @@ Object.assign( THREE.Object3D.prototype, THREE.EventDispatcher.prototype, {
 
 } );
 
-THREE.Object3DIdCount = 0;
+THREE.object3DIdCount = 0;

src/materials/Material.js

@@ -5,7 +5,7 @@
 
 THREE.Material = function () {
 
-	Object.defineProperty( this, 'id', { value: THREE.MaterialIdCount ++ } );
+	Object.defineProperty( this, 'id', { value: THREE.materialIdCount ++ } );
 
 	this.uuid = THREE.Math.generateUUID();
 
@@ -321,4 +321,4 @@ THREE.Material.prototype = {
 
 Object.assign( THREE.Material.prototype, THREE.EventDispatcher.prototype );
 
-THREE.MaterialIdCount = 0;
+THREE.materialIdCount = 0;

src/renderers/WebGLRenderer.js

@@ -527,6 +527,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	this.dispose = function() {
 
+		THREE.WebGLUniforms.purgeCache();
 		_canvas.removeEventListener( 'webglcontextlost', onContextLost, false );
 
 	};

src/renderers/webgl/WebGLUniforms.js

@@ -71,13 +71,6 @@ THREE.WebGLUniforms = ( function() { // scope
 		arrayCacheF32 = [],
 		arrayCacheI32 = [],
 
-		uncacheTemporaryArrays = function() {
-
-			arrayCacheF32.length = 0;
-			arrayCacheI32.length = 0;
-
-		},
-
 	// Flattening for arrays of vectors and matrices
 
 		flatten = function( array, nBlocks, blockSize ) {
@@ -596,6 +589,13 @@ THREE.WebGLUniforms = ( function() { // scope
 
 	};
 
+	WebGLUniforms.purgeCache = function() {
+
+		arrayCacheF32.length = 0;
+		arrayCacheI32.length = 0;
+
+	};
+
 	return WebGLUniforms;
 
 } )();

src/textures/Texture.js

@@ -6,7 +6,7 @@
 
 THREE.Texture = function ( image, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding ) {
 
-	Object.defineProperty( this, 'id', { value: THREE.TextureIdCount ++ } );
+	Object.defineProperty( this, 'id', { value: THREE.texturelIdCount ++ } );
 
 	this.uuid = THREE.Math.generateUUID();
 
@@ -276,4 +276,4 @@ THREE.Texture.prototype = {
 
 Object.assign( THREE.Texture.prototype, THREE.EventDispatcher.prototype );
 
-THREE.TextureIdCount = 0;
+THREE.texturelIdCount = 0;

utils/build/build.js

@@ -2,8 +2,17 @@ var fs = require("fs");
 var path = require("path");
 var argparse =  require( "argparse" );
 var uglify = require("uglify-js");
+var constify = require("./constifier/constify");
+var generateSpec = require("./constifier/generateThreeSpec.js");
 var spawn = require('child_process').spawn;
 
+// This script can be invoked via:
+//
+//     npm run build
+//     npm run build.min
+//
+// See 'package.json' for the command lines.
+
 function main() {
 
 	"use strict";
@@ -16,12 +25,12 @@ function main() {
 	parser.addArgument( ['--output'], { defaultValue: '../../build/three.js' } );
 	parser.addArgument( ['--sourcemaps'], { action: 'storeTrue', defaultValue: true } );
 
-	
+
 	var args = parser.parseArgs();
-	
+
 	var output = args.output;
 	console.log(' * Building ' + output);
-	
+
 	var sourcemap = '';
 	var sourcemapping = '';
 
@@ -38,16 +47,16 @@ function main() {
 	if ( args.amd ){
 		buffer.push('function ( root, factory ) {\n\n\tif ( typeof define === \'function\' && define.amd ) {\n\n\t\tdefine( [ \'exports\' ], factory );\n\n\t} else if ( typeof exports === \'object\' ) {\n\n\t\tfactory( exports );\n\n\t} else {\n\n\t\tfactory( root );\n\n\t}\n\n}( this, function ( exports ) {\n\n');
 	};
-	
+
 	for ( var i = 0; i < args.include.length; i ++ ){
-		
+
 		var contents = fs.readFileSync( './includes/' + args.include[i] + '.json', 'utf8' );
 		var files = JSON.parse( contents );
 
 		for ( var j = 0; j < files.length; j ++ ){
 
 			var file = '../../' + files[ j ];
-			
+
 			buffer.push('// File:' + files[ j ]);
 			buffer.push('\n\n');
 
@@ -67,21 +76,28 @@ function main() {
 		}
 
 	}
-	
+
 	if ( args.amd ){
 		buffer.push('exports.THREE = THREE;\n\n} ) );');
 	};
-
-	var temp = buffer.join( '' );
-
-	if ( !args.minify ){
 
-		fs.writeFileSync( output, temp, 'utf8' );
+	var temp = buffer.join( '' );
+	fs.writeFileSync( output, temp, 'utf8' );
 
-	} else {
+	if ( args.minify ){
 
 		var LICENSE = "threejs.org/license";
 
+		// Constant substitution
+
+		var constifierSpec = generateSpec( path.resolve( __dirname, output ) );
+
+		sources.forEach( function( source ) {
+
+			source.contents = constify( source.contents, constifierSpec );
+
+		} );
+
 		// Parsing
 
 		var toplevel = null;

utils/build/build.py

@@ -14,11 +14,34 @@
 import shutil
 import tempfile
 
+from constifier import constify
+
 from io import open
 
+def readText(path):
+
+        with open(path,'r',encoding='utf-8') as f:
+            result=f.read()
+            f.close()
+            return result
+
+def writeText(path,contents):
+
+        with open(path,'w',encoding='utf-8') as f:
+            f.write(contents)
+            f.close()
+
+def readJSON(path):
+
+        with open(path,'r',encoding='utf-8') as f:
+            result=json.load(f)
+            f.close()
+            return result
+
+
 def main(argv=None):
 
-	parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser()
 	parser.add_argument('--include', action='append', required=True)
 	parser.add_argument('--externs', action='append', default=['externs/common.js'])
 	parser.add_argument('--amd', action='store_true', default=False)
@@ -51,8 +74,9 @@ def main(argv=None):
 		tmp.write(u'( function ( root, factory ) {\n\n\tif ( typeof define === \'function\' && define.amd ) {\n\n\t\tdefine( [ \'exports\' ], factory );\n\n\t} else if ( typeof exports === \'object\' ) {\n\n\t\tfactory( exports );\n\n\t} else {\n\n\t\tfactory( root );\n\n\t}\n\n}( this, function ( exports ) {\n\n')
 
 	for include in args.include:
-		with open('includes/' + include + '.json','r', encoding='utf-8') as f:
-			files = json.load(f)
+
+                files = readJSON('includes/' + include + '.json')
+
 		for filename in files:
 			tmp.write(u'// File:' + filename)
 			tmp.write(u'\n\n')
@@ -85,9 +109,27 @@ def main(argv=None):
 	else:
 		backup = ''
 		if os.path.exists(output):
-			with open(output, 'r', encoding='utf-8') as f: backup = f.read()
+			backup=readText(output)
 			os.remove(output)
 
+                # Constifier
+
+                #specTempFile = tempfile.NamedTemporaryFile(delete=False)
+                #specTempFile.close()
+
+                specFile = '../../build/three.constspec.json' # specTempFile.name
+
+                if os.system( 'node -e 0' ) == 0:
+                    os.system( 'node constifier/generateThreeSpec.js ' + path + ' ' + specFile )
+                else:
+                    specFile = '../../build/three.constspec.json'
+                    print( "WARNING: Information for constant compression cannot be updated automatically. Please install node.js" )
+
+                writeText( path, constify( readText(path), readJSON(specFile) ) )
+                #os.remove( specTempFile.name )
+
+                # Closure compiler
+
 		externs = ' --externs '.join(args.externs)
 		source = ' '.join(sources)
 		cmd = 'java -jar compiler/compiler.jar --warning_level=VERBOSE --jscomp_off=globalThis --jscomp_off=checkTypes --externs %s --language_in=ECMASCRIPT5_STRICT --js %s --js_output_file %s %s' % (externs, path, output, sourcemapargs)
@@ -96,11 +138,11 @@ def main(argv=None):
 		# header
 
 		if os.path.exists(output):
-			with open(output, 'r', encoding='utf-8') as f: text = f.read()
-			with open(output, 'w', encoding='utf-8') as f: f.write('// threejs.org/license\n' + text + sourcemapping)
+			text=readText(output)
+                        writeText(output, '// threejs.org/license\n' + text + sourcemapping)
 		else:
+			writeText(output, backup)
 			print("Minification with Closure compiler failed. Check your Java runtime version.")
-			with open(output, 'w', encoding='utf-8') as f: f.write(backup)
 
 	os.close(fd)
 	os.remove(path)

utils/build/constifier/__init__.py

@@ -0,0 +1,54 @@
+import re
+
+def constify( sourceCode, spec, debug = False ):
+
+    for ctxSpec in spec:
+        if ctxSpec.get('contextRegExp') is not None:
+            break
+
+        ctxSpec['contextRegExp'] = re.compile(
+                ctxSpec.get( 'contextRegExpString', None ) )
+
+    def debugOutput( match ):
+
+        start, end = match.start( 1 ), match.end()
+
+        lineStart = sourceCode.rfind( '\n', 0, start ) + 1
+        lineEnd = sourceCode.find( '\n', end )
+        if lineEnd == -1: lineEnd = len( sourceCode )
+
+        line = sourceCode[ lineStart : lineEnd ]
+        prefix = line[ : start - lineStart ]
+
+        line = line.expandtabs( 4 )
+        prefix = prefix.expandtabs( 4 )
+
+        print line
+        print ' ' * len( prefix ) + '^'
+
+    def replaceConstant( match ):
+        before, context, identifier = match.groups()
+
+        for ctxSpec in spec:
+
+            if not ctxSpec['contextRegExp'].match( context ): continue
+
+            value = ctxSpec['constants'].get( identifier )
+
+            if value is not None:
+                if debug: debugOutput(match)
+                return before + unicode( value )
+
+            break
+
+        return match.group( 0 )
+
+    return re.sub(
+            r'(^|\W)(\w+)\s*\.\s*([A-Z]\w+)(?!\s*=[^=])',
+            # matches <context> . <Id>
+            # where 'Id' must refer to an uppercase identifier.
+            # The construct must not be followed by '=', but may
+            # be followed by '=='.
+
+            replaceConstant, sourceCode )
+