updated three to r108 (google#744)

* updated three to r108

* reverting model change

* Update fidelity test goldens

package.json

@@ -111,7 +111,7 @@
   },
   "dependencies": {
     "lit-element": "^2.2.0",
-    "three": "^0.105.2"
+    "three": "^0.108.0"
   },
   "publishConfig": {
     "access": "public"

src/three-components/ModelUtils.ts

@@ -15,8 +15,6 @@
 import {Bone, Camera, Material, Object3D, Scene, Shader, Skeleton, SkinnedMesh} from 'three';
 
 import {cubeUVChunk} from './shader-chunk/cube_uv_reflection_fragment.glsl.js';
-import {envmapChunk} from './shader-chunk/envmap_physical_pars_fragment.glsl.js';
-import {lightsChunk} from './shader-chunk/lights_fragment_maps.glsl.js';
 import {normalmapChunk} from './shader-chunk/normalmap_pars_fragment.glsl.js';
 
 // NOTE(cdata): What follows is a TypeScript-ified version of:
@@ -49,8 +47,6 @@ const updateShader = (shader: Shader) => {
   shader.fragmentShader =
       shader.fragmentShader
           .replace('#include <cube_uv_reflection_fragment>', cubeUVChunk)
-          .replace('#include <envmap_physical_pars_fragment>', envmapChunk)
-          .replace('#include <lights_fragment_maps>', lightsChunk)
           .replace('#include <normalmap_pars_fragment>', normalmapChunk);
 };
 

src/three-components/shader-chunk/normalmap_pars_fragment.glsl.js

@@ -4,42 +4,61 @@ export const normalmapChunk = /* glsl */ `
 	uniform sampler2D normalMap;
 	uniform vec2 normalScale;
 
-	#ifdef OBJECTSPACE_NORMALMAP
+#endif
+
+#ifdef OBJECTSPACE_NORMALMAP
+
+	uniform mat3 normalMatrix;
+
+#endif
+
+#if ! defined ( USE_TANGENT ) && ( defined ( TANGENTSPACE_NORMALMAP ) || defined ( USE_CLEARCOAT_NORMALMAP ) )
+
+	// Per-Pixel Tangent Space Normal Mapping
+	// http://hacksoflife.blogspot.ch/2009/11/per-pixel-tangent-space-normal-mapping.html
+
+	vec3 perturbNormal2Arb( vec3 eye_pos, vec3 surf_norm, vec2 normalScale, in sampler2D normalMap ) {
+
+		// Workaround for Adreno 3XX dFd*( vec3 ) bug. See #9988
+
+		vec3 q0 = vec3( dFdx( eye_pos.x ), dFdx( eye_pos.y ), dFdx( eye_pos.z ) );
+		vec3 q1 = vec3( dFdy( eye_pos.x ), dFdy( eye_pos.y ), dFdy( eye_pos.z ) );
+		vec2 st0 = dFdx( vUv.st );
+		vec2 st1 = dFdy( vUv.st );
 
-		uniform mat3 normalMatrix;
+		float scale = sign( st1.t * st0.s - st0.t * st1.s ); // we do not care about the magnitude
 
-	#else
+		vec3 S = normalize( ( q0 * st1.t - q1 * st0.t ) * scale );
+		vec3 T = normalize( ( - q0 * st1.s + q1 * st0.s ) * scale );
+		vec3 N = normalize( surf_norm );
 
-		// Per-Pixel Tangent Space Normal Mapping
-		// http://hacksoflife.blogspot.ch/2009/11/per-pixel-tangent-space-normal-mapping.html
+		// (elalish) Biased the normal mip to anti-alias the normal's screen-space derivatives
+		vec3 mapN = texture2D( normalMap, vUv, 2.0 ).xyz * 2.0 - 1.0;
 
-		vec3 perturbNormal2Arb( vec3 eye_pos, vec3 surf_norm ) {
+		mapN.xy *= normalScale;
 
-			// Workaround for Adreno 3XX dFd*( vec3 ) bug. See #9988
+		#ifdef DOUBLE_SIDED
 
-			vec3 q0 = vec3( dFdx( eye_pos.x ), dFdx( eye_pos.y ), dFdx( eye_pos.z ) );
-			vec3 q1 = vec3( dFdy( eye_pos.x ), dFdy( eye_pos.y ), dFdy( eye_pos.z ) );
-			vec2 st0 = dFdx( vUv.st );
-			vec2 st1 = dFdy( vUv.st );
+			// Workaround for Adreno GPUs gl_FrontFacing bug. See #15850 and #10331
+			// http://hacksoflife.blogspot.com/2009/11/per-pixel-tangent-space-normal-mapping.html?showComment=1522254677437#c5087545147696715943
+			vec3 NfromST = cross( S, T );
+			if( dot( NfromST, N ) > 0.0 ) {
 
-			float scale = sign( st1.t * st0.s - st0.t * st1.s ); // we do not care about the magnitude
+				S *= -1.0;
+				T *= -1.0;
 
-			vec3 S = normalize( ( q0 * st1.t - q1 * st0.t ) * scale );
-			vec3 T = normalize( ( - q0 * st1.s + q1 * st0.s ) * scale );
-			vec3 N = normalize( surf_norm );
-			mat3 tsn = mat3( S, T, N );
+			}
 
-            // (elalish) Biased the normal mip to anti-alias the normal's screen-space derivatives
-			vec3 mapN = texture2D( normalMap, vUv, 2.0 ).xyz * 2.0 - 1.0;
+		#else
 
-			mapN.xy *= normalScale;
 			mapN.xy *= ( float( gl_FrontFacing ) * 2.0 - 1.0 );
 
-			return normalize( tsn * mapN );
+		#endif
 
-		}
+		mat3 tsn = mat3( S, T, N );
+		return normalize( tsn * mapN );
 
-	#endif
+	}
 
 #endif
-`;
+`;