From c45c122207ec0a074253c1f65297da303a949894 Mon Sep 17 00:00:00 2001
From: 0b5vr <0b5vr@0b5vr.com>
Date: Fri, 28 Jan 2022 13:21:57 +0900
Subject: [PATCH 1/3] deps: Bump Three.js to r137

---
 packages/three-vrm/examples/animations.html      |  6 +++---
 packages/three-vrm/examples/basic.html           |  6 +++---
 packages/three-vrm/examples/blendshapes.html     |  6 +++---
 packages/three-vrm/examples/bones.html           |  6 +++---
 packages/three-vrm/examples/debug.html           |  6 +++---
 packages/three-vrm/examples/dnd.html             |  6 +++---
 packages/three-vrm/examples/encoding.html        |  6 +++---
 packages/three-vrm/examples/envmap.html          |  6 +++---
 packages/three-vrm/examples/firstperson.html     |  6 +++---
 packages/three-vrm/examples/lookat-advanced.html |  6 +++---
 packages/three-vrm/examples/lookat.html          |  6 +++---
 packages/three-vrm/examples/materials-debug.html |  6 +++---
 packages/three-vrm/examples/meta.html            |  6 +++---
 packages/three-vrm/examples/mouse.html           |  6 +++---
 packages/three-vrm/package.json                  |  8 ++++----
 yarn.lock                                        | 16 ++++++++--------
 16 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/packages/three-vrm/examples/animations.html b/packages/three-vrm/examples/animations.html
index d9a3bf0f2..cb20fb9f0 100644
--- 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
index 5bed84eeb..141e54ef8 100644
--- 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
index e6dceb078..edfc7fd89 100644
--- 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
index e4fdeaf77..e4a7278ed 100644
--- 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
index c1d0fbb09..4c1757eb4 100644
--- 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
index b8ca1ee03..b253063a6 100644
--- 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
index 0b3191a3b..746ba77ec 100644
--- 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
index 293b6ea2c..56e42b624 100644
--- 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
index 1d8cd58e5..226bd5b0c 100644
--- 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
index 2b6fe9f07..3c8792fd2 100644
--- 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
index af3e38477..b6386fd0c 100644
--- 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
index 322c37a39..f2587fa96 100644
--- 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
index 39e89ef25..2cf8327c8 100644
--- 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
index fdaf36e37..7f91c483b 100644
--- 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
index 6a8ce1c86..cbbe791a9 100644
--- 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/yarn.lock b/yarn.lock
index 3cdc6f474..bff8e534c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1019,10 +1019,10 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/three@^0.136.1":
-  version "0.136.1"
-  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.136.1.tgz#030fc01cdc5ce82cad93db17b94a24515cb4b50e"
-  integrity sha512-gzTw6RR4dU8sGf+RpLBWWKHRVIJ4gwKVQPk+IFCgha04Efg/itXYUalX6iBcYeSmaDu0qE5M7uTq0XLQpU4FAg==
+"@types/three@^0.137.0":
+  version "0.137.0"
+  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.137.0.tgz#6047e0658262b4de7c464a40288f9071ddd9a6d5"
+  integrity sha512-Xc5EAlfYmgrCLI/VlSVqiRJAtzhWF0Rw2jSq48nqJy+Hcb5sfDOXyfZn1+RNcHyi9l8CeCAXCZygO8IyeOJVEA==
 
 "@typescript-eslint/eslint-plugin@^4.6.1":
   version "4.14.2"
@@ -6264,10 +6264,10 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-three@^0.136.0:
-  version "0.136.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.136.0.tgz#b1504db021b46398ef468aa7849f3dcabb814f50"
-  integrity sha512-+fEMX7nYLz2ZesVP/dyifli5Jf8gR3XPAnFJveQ80aMhibFduzrADnjMbARXh8+W9qLK7rshJCjAIL/6cDxC+A==
+three@^0.137.4:
+  version "0.137.4"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.137.4.tgz#ec73b6a6c40b733d56544b13d0c3cdb0bce5d0a7"
+  integrity sha512-kUyOZNX+dMbvaS0mGYM1BaXHkHVNQdpryWH8dBg3mn725dJcTo9/5rjyH+OJ8V0r+XbZPz7sncV+c3Gjpc9UBA==
 
 through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:
   version "2.0.5"

From c788b8cf3c800d874ee94e1e74f3000fd1fb756f Mon Sep 17 00:00:00 2001
From: 0b5vr <0b5vr@0b5vr.com>
Date: Fri, 28 Jan 2022 13:31:59 +0900
Subject: [PATCH 2/3] chore: add `.js` to examples imports

---
 packages/three-vrm/src/VRM.ts                                 | 2 +-
 packages/three-vrm/src/VRMImporter.ts                         | 2 +-
 packages/three-vrm/src/blendshape/VRMBlendShapeImporter.ts    | 2 +-
 packages/three-vrm/src/debug/VRMDebug.ts                      | 2 +-
 packages/three-vrm/src/debug/VRMImporterDebug.ts              | 2 +-
 packages/three-vrm/src/debug/VRMLookAtImporterDebug.ts        | 2 +-
 packages/three-vrm/src/debug/VRMSpringBoneImporterDebug.ts    | 2 +-
 packages/three-vrm/src/firstperson/VRMFirstPersonImporter.ts  | 2 +-
 packages/three-vrm/src/humanoid/VRMHumanoidImporter.ts        | 2 +-
 packages/three-vrm/src/lookat/VRMLookAtImporter.ts            | 2 +-
 packages/three-vrm/src/material/VRMMaterialImporter.ts        | 2 +-
 packages/three-vrm/src/meta/VRMMetaImporter.ts                | 2 +-
 packages/three-vrm/src/springbone/VRMSpringBoneImporter.ts    | 2 +-
 packages/three-vrm/src/utils/gltfExtractPrimitivesFromNode.ts | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/three-vrm/src/VRM.ts b/packages/three-vrm/src/VRM.ts
index 83d6c1e5f..f24531439 100644
--- 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
index e4976d6f6..41e2cbe4d 100644
--- 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
index 742917f3e..10c2330c1 100644
--- 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
index b28de8ad0..f2f07bf4f 100644
--- 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
index 1326d11c8..6772a7e04 100644
--- 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
index 264084620..4c0147a12 100644
--- 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
index 965f18f94..632dee6d4 100644
--- 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
index 1cc91abc7..ab295890e 100644
--- 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
index 84286b75d..744eee4b7 100644
--- 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
index f237654ed..41ddef755 100644
--- 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/VRMMaterialImporter.ts b/packages/three-vrm/src/material/VRMMaterialImporter.ts
index cfa5af1c2..610276286 100644
--- 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/meta/VRMMetaImporter.ts b/packages/three-vrm/src/meta/VRMMetaImporter.ts
index b08da1d79..c3e6abc6d 100644
--- a/packages/three-vrm/src/meta/VRMMetaImporter.ts
+++ b/packages/three-vrm/src/meta/VRMMetaImporter.ts
@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import { VRMSchema } from '../types';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMMeta } from './VRMMeta';
 import { VRMMetaImporterOptions } from './VRMMetaImporterOptions';
 
diff --git a/packages/three-vrm/src/springbone/VRMSpringBoneImporter.ts b/packages/three-vrm/src/springbone/VRMSpringBoneImporter.ts
index 34f09b555..f3f838eb7 100644
--- a/packages/three-vrm/src/springbone/VRMSpringBoneImporter.ts
+++ b/packages/three-vrm/src/springbone/VRMSpringBoneImporter.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 { GLTFNode, VRMSchema } from '../types';
 import { VRMSpringBone } from './VRMSpringBone';
 import { VRMSpringBoneColliderGroup, VRMSpringBoneColliderMesh } from './VRMSpringBoneColliderGroup';
diff --git a/packages/three-vrm/src/utils/gltfExtractPrimitivesFromNode.ts b/packages/three-vrm/src/utils/gltfExtractPrimitivesFromNode.ts
index 9e34f4a4b..690acb6df 100644
--- a/packages/three-vrm/src/utils/gltfExtractPrimitivesFromNode.ts
+++ b/packages/three-vrm/src/utils/gltfExtractPrimitivesFromNode.ts
@@ -1,4 +1,4 @@
-import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import type { GLTFPrimitive, GLTFSchema } from '../types';
 
 function extractPrimitivesInternal(gltf: GLTF, nodeIndex: number, node: THREE.Object3D): GLTFPrimitive[] | null {

From 54daf043867f8cd09edfb2672093a688952b3531 Mon Sep 17 00:00:00 2001
From: 0b5vr <0b5vr@0b5vr.com>
Date: Fri, 28 Jan 2022 15:23:52 +0900
Subject: [PATCH 3/3] fix: Remove shader side encoding functions

See: https://github.com/mrdoob/three.js/pull/23129
---
 .../three-vrm/src/material/MToonMaterial.ts   | 15 +-----
 .../src/material/getTexelDecodingFunction.ts  | 46 -------------------
 .../three-vrm/src/material/shaders/mtoon.frag | 16 ++++---
 .../three-vrm/src/material/shaders/unlit.frag |  6 +--
 4 files changed, 12 insertions(+), 71 deletions(-)
 delete mode 100644 packages/three-vrm/src/material/getTexelDecodingFunction.ts

diff --git a/packages/three-vrm/src/material/MToonMaterial.ts b/packages/three-vrm/src/material/MToonMaterial.ts
index 2a9a26cec..7a0e81214 100644
--- 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/getTexelDecodingFunction.ts b/packages/three-vrm/src/material/getTexelDecodingFunction.ts
deleted file mode 100644
index 94108ab48..000000000
--- a/packages/three-vrm/src/material/getTexelDecodingFunction.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import * as THREE from 'three';
-
-/**
- * Ref: https://github.com/mrdoob/three.js/blob/r136/src/renderers/webgl/WebGLProgram.js#L22
- */
-export const getEncodingComponents = (encoding: THREE.TextureEncoding): [string, string] => {
-  if (parseInt(THREE.REVISION, 10) >= 136) {
-    switch (encoding) {
-      case THREE.LinearEncoding:
-        return ['Linear', '( value )'];
-      case THREE.sRGBEncoding:
-        return ['sRGB', '( value )'];
-      default:
-        console.warn('THREE.WebGLProgram: Unsupported encoding:', encoding);
-        return ['Linear', '( value )'];
-    }
-  } else {
-    // COMPAT: pre-r136
-    switch (encoding) {
-      case THREE.LinearEncoding:
-        return ['Linear', '( value )'];
-      case THREE.sRGBEncoding:
-        return ['sRGB', '( value )'];
-      case (THREE as any).RGBEEncoding:
-        return ['RGBE', '( value )'];
-      case THREE.RGBM7Encoding:
-        return ['RGBM', '( value, 7.0 )'];
-      case THREE.RGBM16Encoding:
-        return ['RGBM', '( value, 16.0 )'];
-      case (THREE as any).RGBDEncoding:
-        return ['RGBD', '( value, 256.0 )'];
-      case (THREE as any).GammaEncoding:
-        return ['Gamma', '( value, float( GAMMA_FACTOR ) )'];
-      default:
-        throw new Error('unsupported encoding: ' + encoding);
-    }
-  }
-};
-
-/**
- * https://github.com/mrdoob/three.js/blob/r136/src/renderers/webgl/WebGLProgram.js#L52
- */
-export const getTexelDecodingFunction = (functionName: string, encoding: THREE.TextureEncoding): string => {
-  const components = getEncodingComponents(encoding);
-  return 'vec4 ' + functionName + '( vec4 value ) { return ' + components[0] + 'ToLinear' + components[1] + '; }';
-};
diff --git a/packages/three-vrm/src/material/shaders/mtoon.frag b/packages/three-vrm/src/material/shaders/mtoon.frag
index 063fb8919..d0f40d440 100644
--- a/packages/three-vrm/src/material/shaders/mtoon.frag
+++ b/packages/three-vrm/src/material/shaders/mtoon.frag
@@ -294,7 +294,11 @@ void main() {
 
   // #include <map_fragment>
   #ifdef USE_MAP
-    diffuseColor *= mapTexelToLinear( texture2D( map, uv ) );
+    vec4 sampledDiffuseColor = texture2D( map, uv );
+    #ifdef DECODE_VIDEO_TEXTURE
+      sampledDiffuseColor = vec4( mix( pow( sampledDiffuseColor.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), sampledDiffuseColor.rgb * 0.0773993808, vec3( lessThanEqual( sampledDiffuseColor.rgb, vec3( 0.04045 ) ) ) ), sampledDiffuseColor.w );
+    #endif
+    diffuseColor *= sampledDiffuseColor;
   #endif
 
   #include <color_fragment>
@@ -383,7 +387,7 @@ void main() {
 
   // #include <emissivemap_fragment>
   #ifdef USE_EMISSIVEMAP
-    totalEmissiveRadiance *= emissiveMapTexelToLinear( texture2D( emissiveMap, uv ) ).rgb;
+    totalEmissiveRadiance *= texture2D( emissiveMap, uv ).rgb;
   #endif
 
   #ifdef DEBUG_NORMAL
@@ -400,7 +404,7 @@ void main() {
 
   material.shadeColor = shadeColor;
   #ifdef USE_SHADETEXTURE
-    material.shadeColor *= shadeTextureTexelToLinear( texture2D( shadeTexture, uv ) ).rgb;
+    material.shadeColor *= texture2D( shadeTexture, uv ).rgb;
   #endif
 
   material.shadingGrade = 1.0;
@@ -542,7 +546,7 @@ void main() {
   // #include <lights_fragment_maps>
   #ifdef USE_LIGHTMAP
     vec4 lightMapTexel = texture2D( lightMap, vUv2 );
-    vec3 lightMapIrradiance = lightMapTexelToLinear( lightMapTexel ).rgb * lightMapIntensity;
+    vec3 lightMapIrradiance = lightMapTexel.rgb * lightMapIntensity;
     #ifndef PHYSICALLY_CORRECT_LIGHTS
       lightMapIrradiance *= PI;
     #endif
@@ -583,7 +587,7 @@ void main() {
   vec3 rimMix = mix( vec3( 1.0 ), lightingSum + indirectLightIntensity * irradiance, rimLightingMix );
   vec3 rim = rimColor * pow( saturate( 1.0 - dot( viewDir, normal ) + rimLift ), rimFresnelPower );
   #ifdef USE_RIMTEXTURE
-    rim *= rimTextureTexelToLinear( texture2D( rimTexture, uv ) ).rgb;
+    rim *= texture2D( rimTexture, uv ).rgb;
   #endif
   col += rim;
 
@@ -593,7 +597,7 @@ void main() {
       vec3 x = normalize( vec3( viewDir.z, 0.0, -viewDir.x ) );
       vec3 y = cross( viewDir, x ); // guaranteed to be normalized
       vec2 sphereUv = 0.5 + 0.5 * vec2( dot( x, normal ), -dot( y, normal ) );
-      vec3 matcap = sphereAddTexelToLinear( texture2D( sphereAdd, sphereUv ) ).xyz;
+      vec3 matcap = texture2D( sphereAdd, sphereUv ).xyz;
       col += matcap;
     }
   #endif
diff --git a/packages/three-vrm/src/material/shaders/unlit.frag b/packages/three-vrm/src/material/shaders/unlit.frag
index 38841fd0a..ca1b8a608 100644
--- a/packages/three-vrm/src/material/shaders/unlit.frag
+++ b/packages/three-vrm/src/material/shaders/unlit.frag
@@ -24,11 +24,7 @@ void main() {
 
   #include <logdepthbuf_fragment>
 
-  // #include <map_fragment>
-  #ifdef USE_MAP
-    diffuseColor *= mapTexelToLinear( texture2D( map, vUv ) );
-  #endif
-
+  #include <map_fragment>
   #include <color_fragment>
   // #include <alphamap_fragment>
 
