Merge pull request #910 from pixiv/bump-three-r137

Bump three.js to r137
pixiv · Jan 28, 2022 · 5ab93c5 · 5ab93c5
2 parents cedd633 + 54daf04
commit 5ab93c5
Show file tree

Hide file tree

Showing 34 changed files with 80 additions and 139 deletions.
diff --git a/packages/three-vrm/examples/animations.html b/packages/three-vrm/examples/animations.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/basic.html b/packages/three-vrm/examples/basic.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/blendshapes.html b/packages/three-vrm/examples/blendshapes.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/bones.html b/packages/three-vrm/examples/bones.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/debug.html b/packages/three-vrm/examples/debug.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/dnd.html b/packages/three-vrm/examples/dnd.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/encoding.html b/packages/three-vrm/examples/encoding.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/envmap.html b/packages/three-vrm/examples/envmap.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/firstperson.html b/packages/three-vrm/examples/firstperson.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/lookat-advanced.html b/packages/three-vrm/examples/lookat-advanced.html
@@ -21,9 +21,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			const _v3A = new THREE.Vector3();

diff --git a/packages/three-vrm/examples/lookat.html b/packages/three-vrm/examples/lookat.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/materials-debug.html b/packages/three-vrm/examples/materials-debug.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/meta.html b/packages/three-vrm/examples/meta.html
@@ -30,9 +30,9 @@
 	<body>
 		<span id="meta"></span>
 		<img id="thumbnail" alt="thumbnail" />
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/examples/mouse.html b/packages/three-vrm/examples/mouse.html
@@ -19,9 +19,9 @@
 	</head>
 
 	<body>
-		<script src="https://unpkg.com/three@0.136.0/build/three.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/loaders/GLTFLoader.js"></script>
-		<script src="https://unpkg.com/three@0.136.0/examples/js/controls/OrbitControls.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/build/three.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/loaders/GLTFLoader.js"></script>
+		<script src="https://unpkg.com/three@0.137.4/examples/js/controls/OrbitControls.js"></script>
 		<script src="../lib/three-vrm.js"></script>
 		<script>
 			// renderer

diff --git a/packages/three-vrm/package.json b/packages/three-vrm/package.json
@@ -48,13 +48,13 @@
     ]
   },
   "devDependencies": {
-    "@types/three": "^0.136.1",
+    "@types/three": "^0.137.0",
     "lint-staged": "10.5.4",
     "quicktype": "^15.0.258",
-    "three": "^0.136.0"
+    "three": "^0.137.4"
   },
   "peerDependencies": {
-    "@types/three": "^0.136.1",
-    "three": "^0.136.0"
+    "@types/three": "^0.137.0",
+    "three": "^0.137.4"
   }
 }
diff --git a/packages/three-vrm/src/VRM.ts b/packages/three-vrm/src/VRM.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMBlendShapeProxy } from './blendshape';
 import { VRMFirstPerson } from './firstperson';
 import { VRMHumanoid } from './humanoid';

diff --git a/packages/three-vrm/src/VRMImporter.ts b/packages/three-vrm/src/VRMImporter.ts
@@ -1,4 +1,4 @@
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMBlendShapeImporter } from './blendshape';
 import { VRMFirstPersonImporter } from './firstperson';
 import { VRMHumanoidImporter } from './humanoid/VRMHumanoidImporter';

diff --git a/packages/three-vrm/src/blendshape/VRMBlendShapeImporter.ts b/packages/three-vrm/src/blendshape/VRMBlendShapeImporter.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { GLTFSchema, VRMSchema } from '../types';
 import { gltfExtractPrimitivesFromNode } from '../utils/gltfExtractPrimitivesFromNode';
 import { renameMaterialProperty } from '../utils/renameMaterialProperty';

diff --git a/packages/three-vrm/src/debug/VRMDebug.ts b/packages/three-vrm/src/debug/VRMDebug.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRM, VRMParameters } from '../VRM';
 import { VRMImporterOptions } from '../VRMImporter';
 import { VRMDebugOptions } from './VRMDebugOptions';

diff --git a/packages/three-vrm/src/debug/VRMImporterDebug.ts b/packages/three-vrm/src/debug/VRMImporterDebug.ts
@@ -1,4 +1,4 @@
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMImporter, VRMImporterOptions } from '../VRMImporter';
 import { VRMDebug } from './VRMDebug';
 import { VRMDebugOptions } from './VRMDebugOptions';

diff --git a/packages/three-vrm/src/debug/VRMLookAtImporterDebug.ts b/packages/three-vrm/src/debug/VRMLookAtImporterDebug.ts
@@ -1,4 +1,4 @@
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMBlendShapeProxy } from '../blendshape';
 import { VRMFirstPerson } from '../firstperson';
 import { VRMHumanoid } from '../humanoid';

diff --git a/packages/three-vrm/src/debug/VRMSpringBoneImporterDebug.ts b/packages/three-vrm/src/debug/VRMSpringBoneImporterDebug.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMSpringBoneImporter } from '../springbone/VRMSpringBoneImporter';
 import { VRMSpringBoneManagerDebug } from './VRMSpringBoneManagerDebug';
 import { VRMSchema } from '../types';

diff --git a/packages/three-vrm/src/firstperson/VRMFirstPersonImporter.ts b/packages/three-vrm/src/firstperson/VRMFirstPersonImporter.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMHumanoid } from '../humanoid';
 import { GLTFNode, GLTFSchema, VRMSchema } from '../types';
 import { gltfExtractPrimitivesFromNodes } from '../utils/gltfExtractPrimitivesFromNode';

diff --git a/packages/three-vrm/src/humanoid/VRMHumanoidImporter.ts b/packages/three-vrm/src/humanoid/VRMHumanoidImporter.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMSchema } from '../types';
 import { VRMHumanBone } from './VRMHumanBone';
 import { VRMHumanBoneArray } from './VRMHumanBoneArray';

diff --git a/packages/three-vrm/src/lookat/VRMLookAtImporter.ts b/packages/three-vrm/src/lookat/VRMLookAtImporter.ts
@@ -1,4 +1,4 @@
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMBlendShapeProxy } from '../blendshape';
 import { VRMFirstPerson } from '../firstperson';
 import { VRMHumanoid } from '../humanoid';

diff --git a/packages/three-vrm/src/material/MToonMaterial.ts b/packages/three-vrm/src/material/MToonMaterial.ts
@@ -1,7 +1,6 @@
 /* tslint:disable:member-ordering */
 
 import * as THREE from 'three';
-import { getTexelDecodingFunction } from './getTexelDecodingFunction';
 import vertexShader from './shaders/mtoon.vert';
 import fragmentShader from './shaders/mtoon.frag';
 
@@ -575,21 +574,9 @@ export class MToonMaterial extends THREE.ShaderMaterial {
       OUTLINE_COLOR_MIXED: this._outlineColorMode === MToonMaterialOutlineColorMode.MixedLighting,
     };
 
-    // == texture encodings ====================================================
-    const encodings =
-      (this.shadeTexture !== null
-        ? getTexelDecodingFunction('shadeTextureTexelToLinear', this.shadeTexture.encoding) + '\n'
-        : '') +
-      (this.sphereAdd !== null
-        ? getTexelDecodingFunction('sphereAddTexelToLinear', this.sphereAdd.encoding) + '\n'
-        : '') +
-      (this.rimTexture !== null
-        ? getTexelDecodingFunction('rimTextureTexelToLinear', this.rimTexture.encoding) + '\n'
-        : '');
-
     // == generate shader code =================================================
     this.vertexShader = vertexShader;
-    this.fragmentShader = encodings + fragmentShader;
+    this.fragmentShader = fragmentShader;
 
     // == set needsUpdate flag =================================================
     this.needsUpdate = true;

diff --git a/packages/three-vrm/src/material/VRMMaterialImporter.ts b/packages/three-vrm/src/material/VRMMaterialImporter.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { GLTFSchema, VRMSchema } from '../types';
 import { gltfExtractPrimitivesFromNodes } from '../utils/gltfExtractPrimitivesFromNode';
 import { MToonMaterial, MToonMaterialOutlineWidthMode } from './MToonMaterial';

diff --git a/packages/three-vrm/src/material/getTexelDecodingFunction.ts b/packages/three-vrm/src/material/getTexelDecodingFunction.ts