Browse Source

Updated builds.

Mr.doob 9 years ago
parent
commit
87738cb6ea
2 changed files with 95 additions and 165 deletions
  1. 83 151
      build/three.js
  2. 12 14
      build/three.min.js

+ 83 - 151
build/three.js

@@ -16134,7 +16134,7 @@ THREE.Audio = function ( listener ) {
 	this.source.onended = this.onEnded.bind( this );
 	this.source.onended = this.onEnded.bind( this );
 
 
 	this.gain = this.context.createGain();
 	this.gain = this.context.createGain();
-	this.gain.connect( listener.getOutputNode());
+	this.gain.connect( listener.getOutputNode() );
 
 
 	this.autoplay = false;
 	this.autoplay = false;
 
 
@@ -16143,40 +16143,45 @@ THREE.Audio = function ( listener ) {
 	this.isPlaying = false;
 	this.isPlaying = false;
 	this.hasPlaybackControl = true;
 	this.hasPlaybackControl = true;
 	this.sourceType = 'empty';
 	this.sourceType = 'empty';
+	this.filter = null;
 
 
 };
 };
 
 
 THREE.Audio.prototype = Object.create( THREE.Object3D.prototype );
 THREE.Audio.prototype = Object.create( THREE.Object3D.prototype );
 THREE.Audio.prototype.constructor = THREE.Audio;
 THREE.Audio.prototype.constructor = THREE.Audio;
 
 
+THREE.Audio.prototype.getOutput = function () {
+
+	return this.gain;
+
+};
+
+THREE.Audio.prototype.load = function ( file ) {
 
 
-THREE.Audio.prototype.load = function ( fileName ) {
+	var buffer = new THREE.AudioBuffer( this.context );
+	buffer.load( file );
+
+	this.setBuffer( buffer );
 
 
-	var audioBuffer = new THREE.AudioBuffer(this.context);
-	audioBuffer.load(fileName);
-	this.setBuffer(audioBuffer);
 	return this;
 	return this;
 
 
 };
 };
 
 
-
 THREE.Audio.prototype.setNodeSource = function ( audioNode ) {
 THREE.Audio.prototype.setNodeSource = function ( audioNode ) {
 
 
 	this.hasPlaybackControl = false;
 	this.hasPlaybackControl = false;
 	this.sourceType = 'audioNode';
 	this.sourceType = 'audioNode';
 	this.source = audioNode;
 	this.source = audioNode;
 	this.connect();
 	this.connect();
-	
+
 	return this;
 	return this;
 
 
 };
 };
 
 
-
-
 THREE.Audio.prototype.setBuffer = function ( audioBuffer ) {
 THREE.Audio.prototype.setBuffer = function ( audioBuffer ) {
 
 
 	var scope = this;
 	var scope = this;
-	
+
 	audioBuffer.onReady(function(buffer) {
 	audioBuffer.onReady(function(buffer) {
 		scope.source.buffer = buffer;
 		scope.source.buffer = buffer;
 		scope.sourceType = 'buffer';
 		scope.sourceType = 'buffer';
@@ -16187,8 +16192,6 @@ THREE.Audio.prototype.setBuffer = function ( audioBuffer ) {
 
 
 };
 };
 
 
-
-
 THREE.Audio.prototype.play = function () {
 THREE.Audio.prototype.play = function () {
 
 
 	if ( this.isPlaying === true ) {
 	if ( this.isPlaying === true ) {
@@ -16197,7 +16200,7 @@ THREE.Audio.prototype.play = function () {
 		return;
 		return;
 
 
 	}
 	}
-	
+
 	if ( this.hasPlaybackControl === false ) {
 	if ( this.hasPlaybackControl === false ) {
 
 
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
@@ -16205,7 +16208,6 @@ THREE.Audio.prototype.play = function () {
 
 
 	}
 	}
 
 
-
 	var source = this.context.createBufferSource();
 	var source = this.context.createBufferSource();
 
 
 	source.buffer = this.source.buffer;
 	source.buffer = this.source.buffer;
@@ -16224,13 +16226,13 @@ THREE.Audio.prototype.play = function () {
 
 
 THREE.Audio.prototype.pause = function () {
 THREE.Audio.prototype.pause = function () {
 
 
-	if (this.hasPlaybackControl === false) {
-		
+	if ( this.hasPlaybackControl === false ) {
+
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		return;
 		return;
-		
+
 	}
 	}
-	
+
 	this.source.stop();
 	this.source.stop();
 	this.startTime = this.context.currentTime;
 	this.startTime = this.context.currentTime;
 
 
@@ -16238,11 +16240,11 @@ THREE.Audio.prototype.pause = function () {
 
 
 THREE.Audio.prototype.stop = function () {
 THREE.Audio.prototype.stop = function () {
 
 
-	if (this.hasPlaybackControl === false) {
-		
+	if ( this.hasPlaybackControl === false ) {
+
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		return;
 		return;
-		
+
 	}
 	}
 
 
 	this.source.stop();
 	this.source.stop();
@@ -16252,14 +16254,14 @@ THREE.Audio.prototype.stop = function () {
 
 
 THREE.Audio.prototype.connect = function () {
 THREE.Audio.prototype.connect = function () {
 
 
-	if ( this.filter !== undefined ) {
+	if ( this.filter !== null ) {
 
 
 		this.source.connect( this.filter );
 		this.source.connect( this.filter );
-		this.filter.connect( this.gain );
+		this.filter.connect( this.getOutput() );
 
 
 	} else {
 	} else {
 
 
-		this.source.connect( this.gain );
+		this.source.connect( this.getOutput() );
 
 
 	}
 	}
 
 
@@ -16267,14 +16269,14 @@ THREE.Audio.prototype.connect = function () {
 
 
 THREE.Audio.prototype.disconnect = function () {
 THREE.Audio.prototype.disconnect = function () {
 
 
-	if ( this.filter !== undefined ) {
+	if ( this.filter !== null ) {
 
 
 		this.source.disconnect( this.filter );
 		this.source.disconnect( this.filter );
-		this.filter.disconnect( this.gain );
+		this.filter.disconnect( this.getOutput() );
 
 
 	} else {
 	} else {
 
 
-		this.source.disconnect( this.gain );
+		this.source.disconnect( this.getOutput() );
 
 
 	}
 	}
 
 
@@ -16304,11 +16306,11 @@ THREE.Audio.prototype.getFilter = function () {
 
 
 THREE.Audio.prototype.setPlaybackRate = function ( value ) {
 THREE.Audio.prototype.setPlaybackRate = function ( value ) {
 
 
-	if (this.hasPlaybackControl === false) {
-		
+	if ( this.hasPlaybackControl === false ) {
+
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		return;
 		return;
-		
+
 	}
 	}
 
 
 	this.playbackRate = value;
 	this.playbackRate = value;
@@ -16335,11 +16337,11 @@ THREE.Audio.prototype.onEnded = function() {
 
 
 THREE.Audio.prototype.setLoop = function ( value ) {
 THREE.Audio.prototype.setLoop = function ( value ) {
 
 
-	if (this.hasPlaybackControl === false) {
-		
+	if ( this.hasPlaybackControl === false ) {
+
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		return;
 		return;
-		
+
 	}
 	}
 
 
 	this.source.loop = value;
 	this.source.loop = value;
@@ -16347,12 +16349,12 @@ THREE.Audio.prototype.setLoop = function ( value ) {
 };
 };
 
 
 THREE.Audio.prototype.getLoop = function () {
 THREE.Audio.prototype.getLoop = function () {
-	
-	if (this.hasPlaybackControl === false) {
-		
+
+	if ( this.hasPlaybackControl === false ) {
+
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		console.warn( 'THREE.Audio: this Audio has no playback control.' );
 		return false;
 		return false;
-		
+
 	}
 	}
 
 
 	return this.source.loop;
 	return this.source.loop;
@@ -16372,7 +16374,6 @@ THREE.Audio.prototype.getVolume = function () {
 
 
 };
 };
 
 
-
 // File:src/audio/AudioBuffer.js
 // File:src/audio/AudioBuffer.js
 
 
 /**
 /**
@@ -16400,12 +16401,15 @@ THREE.AudioBuffer.prototype.load = function ( file ) {
 
 
 			scope.buffer = buffer;
 			scope.buffer = buffer;
 			scope.ready = true;
 			scope.ready = true;
-			
-			for (var i = 0; i < scope.readyCallbacks.length; i++) {
+
+			for ( var i = 0; i < scope.readyCallbacks.length; i ++ ) {
+
 				scope.readyCallbacks[i](scope.buffer);
 				scope.readyCallbacks[i](scope.buffer);
+
 			}
 			}
+
 			scope.readyCallbacks = [];
 			scope.readyCallbacks = [];
-			
+
 		} );
 		} );
 
 
 	};
 	};
@@ -16416,17 +16420,19 @@ THREE.AudioBuffer.prototype.load = function ( file ) {
 };
 };
 
 
 THREE.AudioBuffer.prototype.onReady = function ( callback ) {
 THREE.AudioBuffer.prototype.onReady = function ( callback ) {
-	
-	if (this.ready) {
-		callback(this.buffer);
-	}
-	else {
-		this.readyCallbacks.push(callback);
+
+	if ( this.ready ) {
+
+		callback( this.buffer );
+
+	} else {
+
+		this.readyCallbacks.push( callback );
+
 	}
 	}
 
 
 };
 };
 
 
-
 // File:src/audio/PositionalAudio.js
 // File:src/audio/PositionalAudio.js
 
 
 /**
 /**
@@ -16445,59 +16451,12 @@ THREE.PositionalAudio = function ( listener ) {
 THREE.PositionalAudio.prototype = Object.create( THREE.Audio.prototype );
 THREE.PositionalAudio.prototype = Object.create( THREE.Audio.prototype );
 THREE.PositionalAudio.prototype.constructor = THREE.PositionalAudio;
 THREE.PositionalAudio.prototype.constructor = THREE.PositionalAudio;
 
 
+THREE.PositionalAudio.prototype.getOutput = function () {
 
 
-
-THREE.PositionalAudio.prototype.connect = function () {
-
-	if ( this.filter !== undefined ) {
-
-		this.source.connect( this.filter );
-		this.filter.connect( this.panner );
-
-	} else {
-
-		this.source.connect( this.panner );
-
-	}
-
-};
-
-THREE.PositionalAudio.prototype.disconnect = function () {
-
-	if ( this.filter !== undefined ) {
-
-		this.source.disconnect( this.filter );
-		this.filter.disconnect( this.panner );
-
-	} else {
-
-		this.source.disconnect( this.panner );
-
-	}
+	return this.panner;
 
 
 };
 };
 
 
-THREE.PositionalAudio.prototype.setFilter = function ( value ) {
-
-	if ( this.isPlaying === true ) {
-
-		this.disconnect();
-		this.filter = value;
-		this.connect();
-
-	} else {
-
-		this.filter = value;
-
-	}
-
-};
-
-THREE.PositionalAudio.prototype.getFilter = function () {
-
-	return this.filter;
-
-};
 
 
 THREE.PositionalAudio.prototype.setRefDistance = function ( value ) {
 THREE.PositionalAudio.prototype.setRefDistance = function ( value ) {
 
 
@@ -16580,47 +16539,48 @@ THREE.AudioListener = function () {
 	this.masterGain =  this.context.createGain();
 	this.masterGain =  this.context.createGain();
 	this.masterGain.connect(this.context.destination);
 	this.masterGain.connect(this.context.destination);
 	this.filter = null;
 	this.filter = null;
-	
+
 };
 };
 
 
 THREE.AudioListener.prototype = Object.create( THREE.Object3D.prototype );
 THREE.AudioListener.prototype = Object.create( THREE.Object3D.prototype );
 THREE.AudioListener.prototype.constructor = THREE.AudioListener;
 THREE.AudioListener.prototype.constructor = THREE.AudioListener;
 
 
 THREE.AudioListener.prototype.getOutputNode = function () {
 THREE.AudioListener.prototype.getOutputNode = function () {
-	
+
 	return this.masterGain;
 	return this.masterGain;
-	
+
 };
 };
 
 
 THREE.AudioListener.prototype.removeFilter = function ( ) {
 THREE.AudioListener.prototype.removeFilter = function ( ) {
-	
-	if (this.filter !== null) {
-	
-		this.masterGain.disconnect(this.filter);
-		this.filter.disconnect(this.context.destination);
-		this.masterGain.connect(this.context.destination);
+
+	if ( this.filter !== null ) {
+
+		this.masterGain.disconnect( this.filter );
+		this.filter.disconnect( this.context.destination );
+		this.masterGain.connect( this.context.destination );
 		this.filter = null;
 		this.filter = null;
-		
+
 	}
 	}
-	
+
 }
 }
 
 
 THREE.AudioListener.prototype.setFilter = function ( value ) {
 THREE.AudioListener.prototype.setFilter = function ( value ) {
 
 
-	if (this.filter !== null) {
-		
-		this.masterGain.disconnect(this.filter);
-		this.filter.disconnect(this.context.destination);
+	if ( this.filter !== null ) {
+
+		this.masterGain.disconnect( this.filter );
+		this.filter.disconnect( this.context.destination );
 
 
 	} else {
 	} else {
-		
-		this.masterGain.disconnect(this.context.destination);
-		
+
+		this.masterGain.disconnect( this.context.destination );
+
 	}
 	}
+
 	this.filter = value;
 	this.filter = value;
-	this.masterGain.connect(this.filter);
-	this.filter.connect(this.context.destination);	
-	
+	this.masterGain.connect( this.filter );
+	this.filter.connect( this.context.destination );
+
 };
 };
 
 
 THREE.AudioListener.prototype.getFilter = function () {
 THREE.AudioListener.prototype.getFilter = function () {
@@ -20580,7 +20540,6 @@ THREE.MeshPhongMaterial.prototype.copy = function ( source ) {
  * parameters = {
  * parameters = {
  *  color: <hex>,
  *  color: <hex>,
  *  roughness: <float>,
  *  roughness: <float>,
- *  reflectivity: <float>,
  *  metalness: <float>,
  *  metalness: <float>,
 
 
  *  emissive: <hex>,
  *  emissive: <hex>,
@@ -20608,8 +20567,6 @@ THREE.MeshPhongMaterial.prototype.copy = function ( source ) {
  *
  *
  *  roughnessMap: new THREE.Texture( <Image> ),
  *  roughnessMap: new THREE.Texture( <Image> ),
  *
  *
- *  reflectivityMap: new THREE.Texture( <Image> ),
- *
  *  metalnessMap: new THREE.Texture( <Image> ),
  *  metalnessMap: new THREE.Texture( <Image> ),
  *
  *
  *  alphaMap: new THREE.Texture( <Image> ),
  *  alphaMap: new THREE.Texture( <Image> ),
@@ -20645,7 +20602,6 @@ THREE.MeshStandardMaterial = function ( parameters ) {
 
 
 	this.color = new THREE.Color( 0xffffff ); // diffuse
 	this.color = new THREE.Color( 0xffffff ); // diffuse
 	this.roughness = 0.5;
 	this.roughness = 0.5;
-	this.reflectivity = 1;
 	this.metalness = 0;
 	this.metalness = 0;
 
 
 	this.emissive = new THREE.Color( 0x000000 );
 	this.emissive = new THREE.Color( 0x000000 );
@@ -20672,8 +20628,6 @@ THREE.MeshStandardMaterial = function ( parameters ) {
 
 
 	this.roughnessMap = null;
 	this.roughnessMap = null;
 
 
-	this.reflectivityMap = null;
-
 	this.metalnessMap = null;
 	this.metalnessMap = null;
 
 
 	this.alphaMap = null;
 	this.alphaMap = null;
@@ -20711,7 +20665,6 @@ THREE.MeshStandardMaterial.prototype.copy = function ( source ) {
 
 
 	this.color.copy( source.color );
 	this.color.copy( source.color );
 	this.roughness = source.roughness;
 	this.roughness = source.roughness;
-	this.reflectivity = source.reflectivity;
 	this.metalness = source.metalness;
 	this.metalness = source.metalness;
 
 
 	this.emissive.copy( source.emissive );
 	this.emissive.copy( source.emissive );
@@ -20738,8 +20691,6 @@ THREE.MeshStandardMaterial.prototype.copy = function ( source ) {
 
 
 	this.roughnessMap = source.roughnessMap;
 	this.roughnessMap = source.roughnessMap;
 
 
-	this.reflectivityMap = source.reflectivityMap;
-
 	this.metalnessMap = source.metalnessMap;
 	this.metalnessMap = source.metalnessMap;
 
 
 	this.alphaMap = source.alphaMap;
 	this.alphaMap = source.alphaMap;
@@ -23241,7 +23192,7 @@ THREE.ShaderChunk[ 'lights_phong_vertex'] = "#ifdef USE_ENVMAP\n	vWorldPosition
 
 
 // File:src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl
 // File:src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl
 
 
-THREE.ShaderChunk[ 'lights_standard_fragment'] = "PhysicalMaterial material;\nmaterial.diffuseColor = diffuseColor.rgb * ( 1.0 - metalnessFactor );\nmaterial.specularRoughness = roughnessFactor * 0.5 + 0.5;material.specularColor = mix( vec3( 0.08 ) * reflectivity, diffuseColor.rgb, metalnessFactor );\n";
+THREE.ShaderChunk[ 'lights_standard_fragment'] = "PhysicalMaterial material;\nmaterial.diffuseColor = diffuseColor.rgb * ( 1.0 - metalnessFactor );\nmaterial.specularRoughness = roughnessFactor * 0.5 + 0.5;material.specularColor = mix( vec3( 0.04 ), diffuseColor.rgb, metalnessFactor );\n";
 
 
 // File:src/renderers/shaders/ShaderChunk/lights_standard_pars_fragment.glsl
 // File:src/renderers/shaders/ShaderChunk/lights_standard_pars_fragment.glsl
 
 
@@ -23381,15 +23332,15 @@ THREE.ShaderChunk[ 'uv2_vertex'] = "#if defined( USE_LIGHTMAP ) || defined( USE_
 
 
 // File:src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl
 // File:src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl
 
 
-THREE.ShaderChunk[ 'uv_pars_fragment'] = "#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_REFLECTIVITYMAP ) || defined( USE_METALNESSMAP )\n	varying vec2 vUv;\n#endif";
+THREE.ShaderChunk[ 'uv_pars_fragment'] = "#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )\n	varying vec2 vUv;\n#endif";
 
 
 // File:src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl
 // File:src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl
 
 
-THREE.ShaderChunk[ 'uv_pars_vertex'] = "#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_REFLECTIVITYMAP ) || defined( USE_METALNESSMAP )\n	varying vec2 vUv;\n	uniform vec4 offsetRepeat;\n#endif\n";
+THREE.ShaderChunk[ 'uv_pars_vertex'] = "#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )\n	varying vec2 vUv;\n	uniform vec4 offsetRepeat;\n#endif\n";
 
 
 // File:src/renderers/shaders/ShaderChunk/uv_vertex.glsl
 // File:src/renderers/shaders/ShaderChunk/uv_vertex.glsl
 
 
-THREE.ShaderChunk[ 'uv_vertex'] = "#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_REFLECTIVITYMAP ) || defined( USE_METALNESSMAP )\n	vUv = uv * offsetRepeat.zw + offsetRepeat.xy;\n#endif";
+THREE.ShaderChunk[ 'uv_vertex'] = "#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )\n	vUv = uv * offsetRepeat.zw + offsetRepeat.xy;\n#endif";
 
 
 // File:src/renderers/shaders/ShaderChunk/worldpos_vertex.glsl
 // File:src/renderers/shaders/ShaderChunk/worldpos_vertex.glsl
 
 
@@ -23539,12 +23490,6 @@ THREE.UniformsLib = {
 
 
 	},
 	},
 
 
-	reflectivitymap: {
-
-		"reflectivityMap" : { type: "t", value: null }
-
-	},
-
 	metalnessmap: {
 	metalnessmap: {
 
 
 		"metalnessMap" : { type: "t", value: null }
 		"metalnessMap" : { type: "t", value: null }
@@ -24053,7 +23998,6 @@ THREE.ShaderLib = {
 			THREE.UniformsLib[ "normalmap" ],
 			THREE.UniformsLib[ "normalmap" ],
 			THREE.UniformsLib[ "displacementmap" ],
 			THREE.UniformsLib[ "displacementmap" ],
 			THREE.UniformsLib[ "roughnessmap" ],
 			THREE.UniformsLib[ "roughnessmap" ],
-			THREE.UniformsLib[ "reflectivitymap" ],
 			THREE.UniformsLib[ "metalnessmap" ],
 			THREE.UniformsLib[ "metalnessmap" ],
 			THREE.UniformsLib[ "fog" ],
 			THREE.UniformsLib[ "fog" ],
 			THREE.UniformsLib[ "lights" ],
 			THREE.UniformsLib[ "lights" ],
@@ -24167,7 +24111,6 @@ THREE.ShaderLib = {
 			THREE.ShaderChunk[ "bumpmap_pars_fragment" ],
 			THREE.ShaderChunk[ "bumpmap_pars_fragment" ],
 			THREE.ShaderChunk[ "normalmap_pars_fragment" ],
 			THREE.ShaderChunk[ "normalmap_pars_fragment" ],
 			THREE.ShaderChunk[ "roughnessmap_pars_fragment" ],
 			THREE.ShaderChunk[ "roughnessmap_pars_fragment" ],
-			//THREE.ShaderChunk[ "reflectivitymap_pars_fragment" ],
 			THREE.ShaderChunk[ "metalnessmap_pars_fragment" ],
 			THREE.ShaderChunk[ "metalnessmap_pars_fragment" ],
 			THREE.ShaderChunk[ "logdepthbuf_pars_fragment" ],
 			THREE.ShaderChunk[ "logdepthbuf_pars_fragment" ],
 
 
@@ -24184,7 +24127,6 @@ THREE.ShaderLib = {
 				THREE.ShaderChunk[ "alphatest_fragment" ],
 				THREE.ShaderChunk[ "alphatest_fragment" ],
 				THREE.ShaderChunk[ "specularmap_fragment" ],
 				THREE.ShaderChunk[ "specularmap_fragment" ],
 				THREE.ShaderChunk[ "roughnessmap_fragment" ],
 				THREE.ShaderChunk[ "roughnessmap_fragment" ],
-				//THREE.ShaderChunk[ "reflectivitymap_fragment" ],
 				THREE.ShaderChunk[ "metalnessmap_fragment" ],
 				THREE.ShaderChunk[ "metalnessmap_fragment" ],
 				THREE.ShaderChunk[ "normal_fragment" ],
 				THREE.ShaderChunk[ "normal_fragment" ],
 				THREE.ShaderChunk[ "emissivemap_fragment" ],
 				THREE.ShaderChunk[ "emissivemap_fragment" ],
@@ -26776,7 +26718,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 	function refreshUniformsStandard ( uniforms, material ) {
 	function refreshUniformsStandard ( uniforms, material ) {
 
 
 		uniforms.roughness.value = material.roughness;
 		uniforms.roughness.value = material.roughness;
-		//uniforms.reflectivity.value = material.reflectivity; // part of uniforms common
 		uniforms.metalness.value = material.metalness;
 		uniforms.metalness.value = material.metalness;
 
 
 		if ( material.roughnessMap ) {
 		if ( material.roughnessMap ) {
@@ -26785,12 +26726,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 		}
 		}
 
 
-		if ( material.reflectivityMap ) {
-
-			uniforms.reflectivityMap.value = material.reflectivityMap;
-
-		}
-
 		if ( material.metalnessMap ) {
 		if ( material.metalnessMap ) {
 
 
 			uniforms.metalnessMap.value = material.metalnessMap;
 			uniforms.metalnessMap.value = material.metalnessMap;
@@ -29380,7 +29315,6 @@ THREE.WebGLProgram = ( function () {
 				parameters.displacementMap && parameters.supportsVertexTextures ? '#define USE_DISPLACEMENTMAP' : '',
 				parameters.displacementMap && parameters.supportsVertexTextures ? '#define USE_DISPLACEMENTMAP' : '',
 				parameters.specularMap ? '#define USE_SPECULARMAP' : '',
 				parameters.specularMap ? '#define USE_SPECULARMAP' : '',
 				parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
 				parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
-				parameters.reflectivityMap ? '#define USE_REFLECTIVITYMAP' : '',
 				parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 				parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 				parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 				parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 				parameters.vertexColors ? '#define USE_COLOR' : '',
 				parameters.vertexColors ? '#define USE_COLOR' : '',
@@ -29499,7 +29433,6 @@ THREE.WebGLProgram = ( function () {
 				parameters.normalMap ? '#define USE_NORMALMAP' : '',
 				parameters.normalMap ? '#define USE_NORMALMAP' : '',
 				parameters.specularMap ? '#define USE_SPECULARMAP' : '',
 				parameters.specularMap ? '#define USE_SPECULARMAP' : '',
 				parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
 				parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
-				parameters.reflectivityMap ? '#define USE_REFLECTIVITYMAP' : '',
 				parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 				parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 				parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 				parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 				parameters.vertexColors ? '#define USE_COLOR' : '',
 				parameters.vertexColors ? '#define USE_COLOR' : '',
@@ -29709,7 +29642,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 	var parameterNames = [
 	var parameterNames = [
 		"precision", "supportsVertexTextures", "map", "envMap", "envMapMode",
 		"precision", "supportsVertexTextures", "map", "envMap", "envMapMode",
 		"lightMap", "aoMap", "emissiveMap", "bumpMap", "normalMap", "displacementMap", "specularMap",
 		"lightMap", "aoMap", "emissiveMap", "bumpMap", "normalMap", "displacementMap", "specularMap",
-		"roughnessMap", "reflectivityMap", "metalnessMap",
+		"roughnessMap", "metalnessMap",
 		"alphaMap", "combine", "vertexColors", "fog", "useFog", "fogExp",
 		"alphaMap", "combine", "vertexColors", "fog", "useFog", "fogExp",
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
@@ -29797,7 +29730,6 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 			normalMap: !! material.normalMap,
 			normalMap: !! material.normalMap,
 			displacementMap: !! material.displacementMap,
 			displacementMap: !! material.displacementMap,
 			roughnessMap: !! material.roughnessMap,
 			roughnessMap: !! material.roughnessMap,
-			reflectivityMap: !! material.reflectivityMap,
 			metalnessMap: !! material.metalnessMap,
 			metalnessMap: !! material.metalnessMap,
 			specularMap: !! material.specularMap,
 			specularMap: !! material.specularMap,
 			alphaMap: !! material.alphaMap,
 			alphaMap: !! material.alphaMap,

File diff suppressed because it is too large
+ 12 - 14
build/three.min.js


Some files were not shown because too many files changed in this diff