Merge branch 'dev' into dev_pbr_transparency

zkx1 · Aug 22, 2019 · f05816d · f05816d
2 parents 2712f3d + 17affe6
commit f05816d
Show file tree

Hide file tree

Showing 25 changed files with 209 additions and 164 deletions.
diff --git a/build/three.js b/build/three.js
@@ -19387,6 +19387,8 @@
 					shadow.map = new WebGLRenderTarget( _shadowMapSize.x, _shadowMapSize.y, pars );
 					shadow.map.texture.name = light.name + ".shadowMap";
 
+					shadow.camera.updateProjectionMatrix();
+
 				}
 
 				_renderer.setRenderTarget( shadow.map );

diff --git a/build/three.min.js b/build/three.min.js
diff --git a/build/three.module.js b/build/three.module.js
@@ -19381,6 +19381,8 @@ function WebGLShadowMap( _renderer, _objects, maxTextureSize ) {
 				shadow.map = new WebGLRenderTarget( _shadowMapSize.x, _shadowMapSize.y, pars );
 				shadow.map.texture.name = light.name + ".shadowMap";
 
+				shadow.camera.updateProjectionMatrix();
+
 			}
 
 			_renderer.setRenderTarget( shadow.map );

diff --git a/docs/api/en/materials/MeshPhysicalMaterial.html b/docs/api/en/materials/MeshPhysicalMaterial.html
@@ -75,8 +75,8 @@ <h3>[property:Object defines]</h3>
 			<code>
 				{
 
+					'STANDARD': ''
 					'PHYSICAL': '',
-					'ADVANCED_PHYSICAL': ''
 
 				};
 			</code>

diff --git a/docs/api/en/materials/MeshStandardMaterial.html b/docs/api/en/materials/MeshStandardMaterial.html
@@ -122,7 +122,7 @@ <h3>[property:Color color]</h3>
 		<h3>[property:Object defines]</h3>
 		<p>An object of the form:
 			<code>
-				{ 'PHYSICAL': '' };
+				{ 'STANDARD': '' };
 			</code>
 
 			This is used by the [page:WebGLRenderer] for selecting shaders.

diff --git a/docs/api/zh/materials/MeshPhysicalMaterial.html b/docs/api/zh/materials/MeshPhysicalMaterial.html
@@ -69,8 +69,8 @@ <h3>[property:Object defines]</h3>
 			<code>
 				{
 
+					'STANDARD': ''
 					'PHYSICAL': '',
-					'ADVANCED_PHYSICAL': ''
 
 				};
 			</code>

diff --git a/docs/api/zh/materials/MeshStandardMaterial.html b/docs/api/zh/materials/MeshStandardMaterial.html
@@ -97,7 +97,7 @@ <h3>[property:Color color]</h3>
 		<h3>[property:Object defines]</h3>
 		<p>如下形式的对象:
 			<code>
-				{ 'PHYSICAL': '' };
+				{ 'STANDARD': '' };
 			</code>
 			[page:WebGLRenderer]使用它来选择shaders。
 		</p>

diff --git a/examples/js/effects/OutlineEffect.js b/examples/js/effects/OutlineEffect.js
@@ -125,7 +125,7 @@ THREE.OutlineEffect = function ( renderer, parameters ) {
 
 	var vertexShaderChunk2 = [
 
-		"#if ! defined( LAMBERT ) && ! defined( PHONG ) && ! defined( TOON ) && ! defined( PHYSICAL )",
+		"#if ! defined( LAMBERT ) && ! defined( PHONG ) && ! defined( TOON ) && ! defined( STANDARD )",
 		"	#ifndef USE_ENVMAP",
 		"		vec3 objectNormal = normalize( normal );",
 		"	#endif",

diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js
@@ -726,7 +726,7 @@ THREE.GLTFLoader = ( function () {
 				materialParams.vertexShader = shader.vertexShader;
 				materialParams.fragmentShader = fragmentShader;
 				materialParams.uniforms = uniforms;
-				materialParams.defines = { 'PHYSICAL': '' }
+				materialParams.defines = { 'STANDARD': '' }
 
 				materialParams.color = new THREE.Color( 1.0, 1.0, 1.0 );
 				materialParams.opacity = 1.0;

diff --git a/examples/jsm/effects/OutlineEffect.js b/examples/jsm/effects/OutlineEffect.js
@@ -132,7 +132,7 @@ var OutlineEffect = function ( renderer, parameters ) {
 
 	var vertexShaderChunk2 = [
 
-		"#if ! defined( LAMBERT ) && ! defined( PHONG ) && ! defined( TOON ) && ! defined( PHYSICAL )",
+		"#if ! defined( LAMBERT ) && ! defined( PHONG ) && ! defined( TOON ) && ! defined( STANDARD )",
 		"	#ifndef USE_ENVMAP",
 		"		vec3 objectNormal = normalize( normal );",
 		"	#endif",

diff --git a/examples/jsm/loaders/GLTFLoader.js b/examples/jsm/loaders/GLTFLoader.js
@@ -791,7 +791,7 @@ var GLTFLoader = ( function () {
 				materialParams.vertexShader = shader.vertexShader;
 				materialParams.fragmentShader = fragmentShader;
 				materialParams.uniforms = uniforms;
-				materialParams.defines = { 'PHYSICAL': '' }
+				materialParams.defines = { 'STANDARD': '' }
 
 				materialParams.color = new Color( 1.0, 1.0, 1.0 );
 				materialParams.opacity = 1.0;

diff --git a/examples/jsm/nodes/materials/nodes/StandardNode.js b/examples/jsm/nodes/materials/nodes/StandardNode.js
@@ -33,7 +33,7 @@ StandardNode.prototype.build = function ( builder ) {
 
 	var code;
 
-	builder.define('PHYSICAL');
+	builder.define('STANDARD');
 
 	var useClearcoat = this.clearcoat || this.clearcoatRoughness || this.clearCoatNormal;
 

diff --git a/src/materials/MeshPhysicalMaterial.js b/src/materials/MeshPhysicalMaterial.js
@@ -23,8 +23,8 @@ function MeshPhysicalMaterial( parameters ) {
 
 	this.defines = {
 
-		'PHYSICAL': '',
-		'ADVANCED_PHYSICAL': ''
+		'STANDARD': '',
+		'PHYSICAL': ''
 
 	};
 
@@ -57,8 +57,8 @@ MeshPhysicalMaterial.prototype.copy = function ( source ) {
 
 	this.defines = {
 
-		'PHYSICAL': '',
-		'ADVANCED_PHYSICAL': ''
+		'STANDARD': '',
+		'PHYSICAL': ''
 
 	};
 

diff --git a/src/materials/MeshStandardMaterial.js b/src/materials/MeshStandardMaterial.js
@@ -59,7 +59,7 @@ function MeshStandardMaterial( parameters ) {
 
 	Material.call( this );
 
-	this.defines = { 'PHYSICAL': '' };
+	this.defines = { 'STANDARD': '' };
 
 	this.type = 'MeshStandardMaterial';
 
@@ -123,7 +123,7 @@ MeshStandardMaterial.prototype.copy = function ( source ) {
 
 	Material.prototype.copy.call( this, source );
 
-	this.defines = { 'PHYSICAL': '' };
+	this.defines = { 'STANDARD': '' };
 
 	this.color.copy( source.color );
 	this.roughness = source.roughness;

diff --git a/src/math/Vector2.d.ts b/src/math/Vector2.d.ts
@@ -396,12 +396,19 @@ export class Vector2 implements Vector {
 	equals( v: Vector2 ): boolean;
 
 	/**
-	 * Sets this vector's x value to be array[offset] and y value to be array[offset + 1].
+	 * Sets this vector's x and y value from the provided array.
 	 * @param array the source array.
 	 * @param offset (optional) offset into the array. Default is 0.
 	 */
 	fromArray( array: number[], offset?: number ): this;
 
+	/**
+	 * Sets this vector's x and y value from the provided array-like.
+	 * @param array the source array-like.
+	 * @param offset (optional) offset into the array-like. Default is 0.
+	 */
+	fromArray( array: ArrayLike<number>, offset?: number ): this;
+
 	/**
 	 * Returns an array [x, y], or copies x and y into the provided array.
 	 * @param array (optional) array to store the vector to. If this is not provided, a new array will be created.

diff --git a/src/math/Vector3.d.ts b/src/math/Vector3.d.ts
@@ -248,23 +248,35 @@ export class Vector3 implements Vector {
 	 */
 	equals( v: Vector3 ): boolean;
 
-	fromArray( xyz: number[], offset?: number ): Vector3;
+	/**
+	 * Sets this vector's x, y and z value from the provided array.
+	 * @param array the source array.
+	 * @param offset (optional) offset into the array. Default is 0.
+	 */
+	fromArray( array: number[], offset?: number ): this;
+
+	/**
+	 * Sets this vector's x, y and z value from the provided array-lik.
+	 * @param array the source array-like.
+	 * @param offset (optional) offset into the array-like. Default is 0.
+	 */
+	fromArray( array: ArrayLike<number>, offset?: number ): this;
 
 	/**
 	 * Returns an array [x, y, z], or copies x, y and z into the provided array.
 	 * @param array (optional) array to store the vector to. If this is not provided, a new array will be created.
 	 * @param offset (optional) optional offset into the array.
 	 * @return The created or provided array.
 	 */
-	toArray( xyz?: number[], offset?: number ): number[];
+	toArray( array?: number[], offset?: number ): number[];
 
 	/**
 	 * Copies x, y and z into the provided array-like.
 	 * @param array array-like to store the vector to.
 	 * @param offset (optional) optional offset into the array.
 	 * @return The provided array-like.
 	 */
-	toArray( xyz: ArrayLike<number>, offset?: number ): ArrayLike<number>;
+	toArray( array: ArrayLike<number>, offset?: number ): ArrayLike<number>;
 
 	fromBufferAttribute(
 		attribute: BufferAttribute,

diff --git a/src/math/Vector4.d.ts b/src/math/Vector4.d.ts
@@ -174,9 +174,35 @@ export class Vector4 implements Vector {
 	 */
 	equals( v: Vector4 ): boolean;
 
-	fromArray( xyzw: number[], offset?: number ): this;
+	/**
+	 * Sets this vector's x, y, z and w value from the provided array.
+	 * @param array the source array.
+	 * @param offset (optional) offset into the array. Default is 0.
+	 */
+	fromArray( array: number[], offset?: number ): this;
+
+	/**
+	 * Sets this vector's x, y, z and w value from the provided array-like.
+	 * @param array the source array-like.
+	 * @param offset (optional) offset into the array-like. Default is 0.
+	 */
+	fromArray( array: ArrayLike<number>, offset?: number ): this;
 
-	toArray( xyzw?: number[], offset?: number ): number[];
+	/**
+	 * Returns an array [x, y, z, w], or copies x, y, z and w into the provided array.
+	 * @param array (optional) array to store the vector to. If this is not provided, a new array will be created.
+	 * @param offset (optional) optional offset into the array.
+	 * @return The created or provided array.
+	 */
+	toArray( array?: number[], offset?: number ): number[];
+
+	/**
+	 * Copies x, y, z and w into the provided array-like.
+	 * @param array array-like to store the vector to.
+	 * @param offset (optional) optional offset into the array.
+	 * @return The provided array-like.
+	 */
+	toArray( array: ArrayLike<number>, offset?: number ): ArrayLike<number>;
 
 	fromBufferAttribute(
 		attribute: BufferAttribute,

diff --git a/src/renderers/shaders/ShaderChunk/aomap_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/aomap_fragment.glsl.js
@@ -6,7 +6,7 @@ export default /* glsl */`
 
 	reflectedLight.indirectDiffuse *= ambientOcclusion;
 
-	#if defined( USE_ENVMAP ) && defined( PHYSICAL )
+	#if defined( USE_ENVMAP ) && defined( STANDARD )
 
 		float dotNV = saturate( dot( geometry.normal, geometry.viewDir ) );
 

diff --git a/src/renderers/shaders/ShaderChunk/clipping_planes_pars_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/clipping_planes_pars_fragment.glsl.js
@@ -1,7 +1,7 @@
 export default /* glsl */`
 #if NUM_CLIPPING_PLANES > 0
 
-	#if ! defined( PHYSICAL ) && ! defined( PHONG ) && ! defined( MATCAP )
+	#if ! defined( STANDARD ) && ! defined( PHONG ) && ! defined( MATCAP )
 		varying vec3 vViewPosition;
 	#endif
 

diff --git a/src/renderers/shaders/ShaderChunk/clipping_planes_pars_vertex.glsl.js b/src/renderers/shaders/ShaderChunk/clipping_planes_pars_vertex.glsl.js
@@ -1,5 +1,5 @@
 export default /* glsl */`
-#if NUM_CLIPPING_PLANES > 0 && ! defined( PHYSICAL ) && ! defined( PHONG ) && ! defined( MATCAP )
+#if NUM_CLIPPING_PLANES > 0 && ! defined( STANDARD ) && ! defined( PHONG ) && ! defined( MATCAP )
 	varying vec3 vViewPosition;
 #endif
 `;
diff --git a/src/renderers/shaders/ShaderChunk/clipping_planes_vertex.glsl.js b/src/renderers/shaders/ShaderChunk/clipping_planes_vertex.glsl.js
@@ -1,5 +1,5 @@
 export default /* glsl */`
-#if NUM_CLIPPING_PLANES > 0 && ! defined( PHYSICAL ) && ! defined( PHONG ) && ! defined( MATCAP )
+#if NUM_CLIPPING_PLANES > 0 && ! defined( STANDARD ) && ! defined( PHONG ) && ! defined( MATCAP )
 	vViewPosition = - mvPosition.xyz;
 #endif
 `;
diff --git a/src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl.js b/src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl.js
@@ -15,7 +15,7 @@ export default /* glsl */`
 
 	#endif
 
-	#if defined( USE_ENVMAP ) && defined( PHYSICAL ) && defined( ENVMAP_TYPE_CUBE_UV )
+	#if defined( USE_ENVMAP ) && defined( STANDARD ) && defined( ENVMAP_TYPE_CUBE_UV )
 
 		irradiance += getLightProbeIndirectIrradiance( /*lightProbe,*/ geometry, maxMipLevel );
 

diff --git a/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js b/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js
@@ -1,13 +1,7 @@
 export default /* glsl */`
-#define PHYSICAL_REFLECTION
+#define STANDARD
 
 #ifdef PHYSICAL
-
-	#define CLEARCOAT
-
-#endif
-
-#ifdef ADVANCED_PHYSICAL
 	#define REFLECTIVITY
 	#define CLEARCOAT
 	#define TRANSPARENCY

diff --git a/src/renderers/shaders/ShaderLib/meshphysical_vert.glsl.js b/src/renderers/shaders/ShaderLib/meshphysical_vert.glsl.js
@@ -1,5 +1,5 @@
 export default /* glsl */`
-#define PHYSICAL
+#define STANDARD
 
 varying vec3 vViewPosition;
 

diff --git a/src/renderers/webgl/WebGLShadowMap.js b/src/renderers/webgl/WebGLShadowMap.js
@@ -140,6 +140,8 @@ function WebGLShadowMap( _renderer, _objects, maxTextureSize ) {
 				shadow.map = new WebGLRenderTarget( _shadowMapSize.x, _shadowMapSize.y, pars );
 				shadow.map.texture.name = light.name + ".shadowMap";
 
+				shadow.camera.updateProjectionMatrix();
+
 			}
 
 			_renderer.setRenderTarget( shadow.map );
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,8 +75,8 @@ <h3>[property:Object defines]</h3> @@
     			<code>
     				{
+    					'STANDARD': ''
     					'PHYSICAL': '',
-    					'ADVANCED_PHYSICAL': ''
     				};
     			</code>
@@ Expand Down @@