Merge pull request #1348 from pixiv/bump-three-r160

deps: Bump three to r160
pixiv · Jan 17, 2024 · 60368ba · 60368ba
2 parents 7652ef5 + 3deb0b8
commit 60368ba
Show file tree

Hide file tree

Showing 50 changed files with 154 additions and 161 deletions.
diff --git a/README.md b/README.md
@@ -46,8 +46,8 @@ Code like this:
 <script type="importmap">
   {
     "imports": {
-      "three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-      "three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+      "three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+      "three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
       "@pixiv/three-vrm": "three-vrm.module.js"
     }
   }

diff --git a/packages/three-vrm-core/examples/expressions.html b/packages/three-vrm-core/examples/expressions.html
@@ -26,8 +26,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
 				}
 			}
@@ -59,7 +59,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			light.position.set( 1.0, 1.0, 1.0 ).normalize();
 			scene.add( light );
 

diff --git a/packages/three-vrm-core/examples/firstPerson.html b/packages/three-vrm-core/examples/firstPerson.html
@@ -32,8 +32,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
 				}
 			}
@@ -65,7 +65,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			light.position.set( 1.0, 1.0, 1.0 ).normalize();
 			scene.add( light );
 

diff --git a/packages/three-vrm-core/examples/humanoid.html b/packages/three-vrm-core/examples/humanoid.html
@@ -26,8 +26,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
 				}
 			}
@@ -59,7 +59,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			light.position.set( 1.0, 1.0, 1.0 ).normalize();
 			scene.add( light );
 

diff --git a/packages/three-vrm-core/examples/humanoidAnimation/index.html b/packages/three-vrm-core/examples/humanoidAnimation/index.html
@@ -38,8 +38,8 @@
 			{
 				"imports": {
 					"fflate": "https://unpkg.com/[email protected]/esm/browser.js",
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-core": "../../lib/three-vrm-core.module.js"
 				}
 			}

diff --git a/packages/three-vrm-core/examples/humanoidAnimation/main.js b/packages/three-vrm-core/examples/humanoidAnimation/main.js
@@ -25,7 +25,7 @@ controls.update();
 const scene = new THREE.Scene();
 
 // light
-const light = new THREE.DirectionalLight( 0xffffff );
+const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 light.position.set( 1.0, 1.0, 1.0 ).normalize();
 scene.add( light );
 

diff --git a/packages/three-vrm-core/examples/lookAt.html b/packages/three-vrm-core/examples/lookAt.html
@@ -32,8 +32,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
 				}
 			}
@@ -65,7 +65,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			light.position.set( 1.0, 1.0, 1.0 ).normalize();
 			scene.add( light );
 

diff --git a/packages/three-vrm-core/examples/meta.html b/packages/three-vrm-core/examples/meta.html
@@ -39,8 +39,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
 				}
 			}
@@ -72,7 +72,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			light.position.set( 1.0, 1.0, 1.0 ).normalize();
 			scene.add( light );
 

diff --git a/packages/three-vrm-core/package.json b/packages/three-vrm-core/package.json
@@ -54,11 +54,11 @@
     "@pixiv/types-vrmc-vrm-1.0": "2.0.7"
   },
   "devDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   },
   "peerDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   }
 }
diff --git a/packages/three-vrm-materials-hdr-emissive-multiplier/examples/loader-plugin.html b/packages/three-vrm-materials-hdr-emissive-multiplier/examples/loader-plugin.html
@@ -26,8 +26,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-materials-hdr-emissive-multiplier": "../lib/three-vrm-materials-hdr-emissive-multiplier.module.js"
 				}
 			}
@@ -59,7 +59,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			scene.add( light );
 
 			// gltf and vrm

diff --git a/packages/three-vrm-materials-hdr-emissive-multiplier/package.json b/packages/three-vrm-materials-hdr-emissive-multiplier/package.json
@@ -52,11 +52,11 @@
     "@pixiv/types-vrmc-materials-hdr-emissive-multiplier-1.0": "2.0.7"
   },
   "devDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   },
   "peerDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   }
 }
diff --git a/packages/three-vrm-materials-mtoon/examples/emissive-strength.html b/packages/three-vrm-materials-mtoon/examples/emissive-strength.html
@@ -24,8 +24,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
 				}
 			}
@@ -62,7 +62,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			scene.add( light );
 
 			// gltf and vrm

diff --git a/packages/three-vrm-materials-mtoon/examples/feature-test.html b/packages/three-vrm-materials-mtoon/examples/feature-test.html
@@ -26,8 +26,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
 				}
 			}
@@ -58,7 +58,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			scene.add( light );
 
 			// test objects

diff --git a/packages/three-vrm-materials-mtoon/examples/loader-plugin.html b/packages/three-vrm-materials-mtoon/examples/loader-plugin.html
@@ -26,8 +26,8 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
-					"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
+					"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
+					"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
 					"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
 				}
 			}
@@ -59,7 +59,7 @@
 			const scene = new THREE.Scene();
 
 			// light
-			const light = new THREE.DirectionalLight( 0xffffff );
+			const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
 			scene.add( light );
 
 			// gltf and vrm

diff --git a/packages/three-vrm-materials-mtoon/package.json b/packages/three-vrm-materials-mtoon/package.json
@@ -53,11 +53,11 @@
     "@pixiv/types-vrmc-materials-mtoon-1.0": "2.0.7"
   },
   "devDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   },
   "peerDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   }
 }
diff --git a/packages/three-vrm-materials-mtoon/src/MToonMaterial.ts b/packages/three-vrm-materials-mtoon/src/MToonMaterial.ts
@@ -445,8 +445,8 @@ export class MToonMaterial extends THREE.ShaderMaterial {
         uvAnimationScrollYOffset: { value: 0.0 },
         uvAnimationRotationPhase: { value: 0.0 },
       },
-      parameters.uniforms,
-    ]);
+      parameters.uniforms ?? {},
+    ]) as any;
 
     // == finally compile the shader program =======================================================
     this.setValues(parameters);

diff --git a/packages/three-vrm-materials-mtoon/src/shaders/mtoon.frag b/packages/three-vrm-materials-mtoon/src/shaders/mtoon.frag
@@ -170,17 +170,12 @@ vec3 getDiffuse(
   return col;
 }
 
+// COMPAT: pre-r156 uses a struct GeometricContext
 #if THREE_VRM_THREE_REVISION >= 157
   void RE_Direct_MToon( const in IncidentLight directLight, const in vec3 geometryPosition, const in vec3 geometryNormal, const in vec3 geometryViewDir, const in vec3 geometryClearcoatNormal, const in MToonMaterial material, const in float shadow, inout ReflectedLight reflectedLight ) {
     float dotNL = clamp( dot( geometryNormal, directLight.direction ), -1.0, 1.0 );
     vec3 irradiance = directLight.color;
 
-    #if THREE_VRM_THREE_REVISION < 132
-      #ifndef PHYSICALLY_CORRECT_LIGHTS
-        irradiance *= PI;
-      #endif
-    #endif
-
     // directSpecular will be used for rim lighting, not an actual specular
     reflectedLight.directSpecular += irradiance;
 
@@ -611,11 +606,12 @@ void main() {
   // Since we want to take shadows into account of shading instead of irradiance,
   // we had to modify the codes that multiplies the results of shadowmap into color of direct lights.
 
+  // COMPAT: pre-r156 uses a struct GeometricContext
   #if THREE_VRM_THREE_REVISION >= 157
     vec3 geometryPosition = - vViewPosition;
     vec3 geometryNormal = normal;
     vec3 geometryViewDir = ( isOrthographic ) ? vec3( 0, 0, 1 ) : normalize( vViewPosition );
-    
+
     vec3 geometryClearcoatNormal;
 
     #ifdef USE_CLEARCOAT
@@ -654,6 +650,7 @@ void main() {
 
       pointLight = pointLights[ i ];
 
+      // COMPAT: pre-r156 uses a struct GeometricContext
       #if THREE_VRM_THREE_REVISION >= 157
         getPointLightInfo( pointLight, geometryPosition, directLight );
       #elif THREE_VRM_THREE_REVISION >= 132
@@ -668,6 +665,7 @@ void main() {
       shadow = all( bvec2( directLight.visible, receiveShadow ) ) ? getPointShadow( pointShadowMap[ i ], pointLightShadow.shadowMapSize, pointLightShadow.shadowBias, pointLightShadow.shadowRadius, vPointShadowCoord[ i ], pointLightShadow.shadowCameraNear, pointLightShadow.shadowCameraFar ) : 1.0;
       #endif
 
+      // COMPAT: pre-r156 uses a struct GeometricContext
       #if THREE_VRM_THREE_REVISION >= 157
         RE_Direct( directLight, geometryPosition, geometryNormal, geometryViewDir, geometryClearcoatNormal, material, shadow, reflectedLight );
       #else
@@ -691,6 +689,7 @@ void main() {
 
       spotLight = spotLights[ i ];
 
+      // COMPAT: pre-r156 uses a struct GeometricContext
       #if THREE_VRM_THREE_REVISION >= 157
         getSpotLightInfo( spotLight, geometryPosition, directLight );
       #elif THREE_VRM_THREE_REVISION >= 132
@@ -705,6 +704,7 @@ void main() {
       shadow = all( bvec2( directLight.visible, receiveShadow ) ) ? getShadow( spotShadowMap[ i ], spotLightShadow.shadowMapSize, spotLightShadow.shadowBias, spotLightShadow.shadowRadius, vSpotShadowCoord[ i ] ) : 1.0;
       #endif
 
+      // COMPAT: pre-r156 uses a struct GeometricContext
       #if THREE_VRM_THREE_REVISION >= 157
         RE_Direct( directLight, geometryPosition, geometryNormal, geometryViewDir, geometryClearcoatNormal, material, shadow, reflectedLight );
       #else
@@ -728,6 +728,7 @@ void main() {
 
       directionalLight = directionalLights[ i ];
 
+      // COMPAT: pre-r156 uses a struct GeometricContext
       #if THREE_VRM_THREE_REVISION >= 157
         getDirectionalLightInfo( directionalLight, directLight );
       #elif THREE_VRM_THREE_REVISION >= 132
@@ -742,6 +743,7 @@ void main() {
       shadow = all( bvec2( directLight.visible, receiveShadow ) ) ? getShadow( directionalShadowMap[ i ], directionalLightShadow.shadowMapSize, directionalLightShadow.shadowBias, directionalLightShadow.shadowRadius, vDirectionalShadowCoord[ i ] ) : 1.0;
       #endif
 
+      // COMPAT: pre-r156 uses a struct GeometricContext
       #if THREE_VRM_THREE_REVISION >= 157
         RE_Direct( directLight, geometryPosition, geometryNormal, geometryViewDir, geometryClearcoatNormal, material, shadow, reflectedLight );
       #else
@@ -774,6 +776,8 @@ void main() {
 
     vec3 irradiance = getAmbientLightIrradiance( ambientLightColor );
 
+    // COMPAT: pre-r156 uses a struct GeometricContext
+    // COMPAT: pre-r156 doesn't have a define USE_LIGHT_PROBES
     #if THREE_VRM_THREE_REVISION >= 157
       #if defined( USE_LIGHT_PROBES )
         irradiance += getLightProbeIrradiance( lightProbe, geometryNormal );
@@ -789,6 +793,7 @@ void main() {
       #pragma unroll_loop_start
       for ( int i = 0; i < NUM_HEMI_LIGHTS; i ++ ) {
 
+        // COMPAT: pre-r156 uses a struct GeometricContext
         #if THREE_VRM_THREE_REVISION >= 157
           irradiance += getHemisphereLightIrradiance( hemisphereLights[ i ], geometryNormal );
         #elif THREE_VRM_THREE_REVISION >= 133

diff --git a/packages/three-vrm-materials-v0compat/package.json b/packages/three-vrm-materials-v0compat/package.json
@@ -49,11 +49,11 @@
     "@pixiv/types-vrmc-materials-mtoon-1.0": "2.0.7"
   },
   "devDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   },
   "peerDependencies": {
-    "@types/three": "^0.154.0",
-    "three": "^0.154.0"
+    "@types/three": "^0.160.0",
+    "three": "^0.160.0"
   }
 }