Merge pull request #1427 from pixiv/fix/seperate-nodes-entry-for-backward-compatibility

fix: seperate nodes entry for backward compatibility

Author: yue4u

README.md

@@ -92,7 +92,7 @@ Code like this:
 
 ```javascript
 import * as THREE from 'three';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { VRMLoaderPlugin } from '@pixiv/three-vrm';
 
 const scene = new THREE.Scene();
@@ -131,25 +131,31 @@ loader.load(
 ### Use with WebGPURenderer
 
 Starting from v3, we provide [WebGPURenderer](https://github.com/mrdoob/three.js/blob/master/examples/jsm/renderers/webgpu/WebGPURenderer.js) compatibility.
-To use three-vrm with WebGPURenderer, specify the WebGPU-compatible `MToonNodeMaterialLoaderPlugin` for the `mtoonMaterialPlugin` option of `VRMLoaderPlugin`.
+To use three-vrm with WebGPURenderer, specify the WebGPU-compatible `MToonNodeMaterial` for the `materialType` option of `MToonMaterialLoaderPlugin`.
 
 `MToonNodeMaterial` only supports Three.js r161 or later.
 The NodeMaterial system of Three.js is still under development, so we may break compatibility with older versions of Three.js more frequently than other parts of three-vrm.
 
 ```js
-import { VRMLoaderPlugin, MToonNodeMaterialLoaderPlugin } from '@pixiv/three-vrm';
+import { VRMLoaderPlugin } from '@pixiv/three-vrm';
+import { MToonNodeMaterial } from '@pixiv/three-vrm/nodes';
 
 // ...
 
 // Register a VRMLoaderPlugin
 loader.register((parser) => {
 
-  // create a WebGPU compatible MToon loader plugin
-  const mtoonMaterialPlugin = new MToonNodeMaterialLoaderPlugin(parser);
+  // create a WebGPU compatible MToonMaterialLoaderPlugin
+  const mtoonMaterialPlugin = new MToonMaterialLoaderPlugin(parser, {
+
+    // set the material type to MToonNodeMaterial
+    materialType: MToonNodeMaterial,
+
+  });
 
   return new VRMLoaderPlugin(parser, {
 
-    // Specify the MToon loader plugin to use in the VRMLoaderPlugin instance
+    // Specify the MToonMaterialLoaderPlugin to use in the VRMLoaderPlugin instance
     mtoonMaterialPlugin,
 
   });

bin/build.mjs

@@ -55,11 +55,25 @@ async function buildPackage(absWorkingDir) {
    * @param {'esm' | 'cjs'} format
    */
   const entryPoints = (format) => {
-    let outFilename = filename + (format === 'esm' ? '.module' : '');
-    outFilename += DEV ? '' : '.min';
+    /**
+     * Add suffix according to the format to the given basename of the output file.
+     * @param {string} base Basename of the output file
+     * @returns {string} `<base>[.module][.min]`
+     */
+    const addSuffix = (base) => {
+      let outFilename = base + (format === 'esm' ? '.module' : '');
+      return outFilename + (DEV ? '' : '.min');
+    };
+
+    const needsNodesBuild = ['@pixiv/three-vrm', '@pixiv/three-vrm-materials-mtoon'].includes(packageJson.name);
+    const extraEntryPoints = needsNodesBuild
+      ? { [addSuffix('nodes/index')]: 'src/nodes/index.ts' }
+      : {};
+
     return {
       entryPoints: {
-        [outFilename]: 'src/index.ts',
+        [addSuffix(filename)]: 'src/index.ts',
+        ...extraEntryPoints,
       },
       format,
     };

packages/three-vrm-animation/src/VRMAnimationLoaderPlugin.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { GLTF, GLTFLoaderPlugin, GLTFParser } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF, GLTFLoaderPlugin, GLTFParser } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { GLTF as GLTFSchema } from '@gltf-transform/core';
 import { VRMCVRMAnimation } from '@pixiv/types-vrmc-vrm-animation-1.0';
 import type { VRMHumanBoneName } from '@pixiv/three-vrm-core';

packages/three-vrm-materials-mtoon/README.md

@@ -11,26 +11,25 @@ MToon (toon material) module for @pixiv/three-vrm
 ## WebGPU Support
 
 Starting from v3, we provide [WebGPURenderer](https://github.com/mrdoob/three.js/blob/master/examples/jsm/renderers/webgpu/WebGPURenderer.js) compatibility.
-To use three-vrm with WebGPURenderer, specify the WebGPU-compatible `MToonNodeMaterialLoaderPlugin` for the `mtoonMaterialPlugin` option of `VRMLoaderPlugin`.
+To use MToon with WebGPURenderer, specify the WebGPU-compatible `MToonNodeMaterial` for the `materialType` option of `MToonMaterialLoaderPlugin`.
 
 `MToonNodeMaterial` only supports Three.js r161 or later.
 The NodeMaterial system of Three.js is still under development, so we may break compatibility with older versions of Three.js more frequently than other parts of three-vrm.
 
 ```js
-import { VRMLoaderPlugin, MToonNodeMaterialLoaderPlugin } from '@pixiv/three-vrm';
+import { MToonMaterialLoaderPlugin } from '@pixiv/three-vrm-materials-mtoon';
+import { MToonNodeMaterial } from '@pixiv/three-vrm-materials-mtoon/nodes';
 
 // ...
 
-// Register a VRMLoaderPlugin
+// Register a MToonMaterialLoaderPlugin with MToonNodeMaterial
 loader.register((parser) => {
 
-  // create a WebGPU compatible MToon loader plugin
-  const mtoonMaterialPlugin = new MToonNodeMaterialLoaderPlugin(parser);
+  // create a WebGPU compatible MToonMaterialLoaderPlugin
+  return new MToonMaterialLoaderPlugin(parser, {
 
-  return new VRMLoaderPlugin(parser, {
-
-    // Specify the MToon loader plugin to use in the VRMLoaderPlugin instance
-    mtoonMaterialPlugin,
+    // set the material type to MToonNodeMaterial
+    materialType: MToonNodeMaterial,
 
   });
 

packages/three-vrm-materials-mtoon/examples/webgpu-feature-test.html

@@ -25,7 +25,8 @@
 				"imports": {
 					"three": "https://cdn.jsdelivr.net/npm/[email protected]/build/three.module.js",
 					"three/addons/": "https://cdn.jsdelivr.net/npm/[email protected]/examples/jsm/",
-					"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
+					"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js",
+					"@pixiv/three-vrm-materials-mtoon/nodes": "../lib/nodes/index.module.js"
 				}
 			}
 		</script>
@@ -34,7 +35,7 @@
 			import * as THREE from 'three';
 			import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
-			import { MToonNodeMaterial } from '@pixiv/three-vrm-materials-mtoon';
+			import { MToonNodeMaterial } from '@pixiv/three-vrm-materials-mtoon/nodes';
 
 			// renderer
 			const renderer = new WebGPURenderer();

packages/three-vrm-materials-mtoon/examples/webgpu-loader-plugin.html

@@ -23,9 +23,10 @@
 		<script type="importmap">
 			{
 				"imports": {
-					"three": "https://cdn.jsdelivr.net/npm/[email protected]/build/three.module.js",
-					"three/addons/": "https://cdn.jsdelivr.net/npm/[email protected]/examples/jsm/",
-					"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
+					"three": "https://cdn.jsdelivr.net/npm/[email protected]/build/three.module.js",
+					"three/addons/": "https://cdn.jsdelivr.net/npm/[email protected]/examples/jsm/",
+					"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js",
+					"@pixiv/three-vrm-materials-mtoon/nodes": "../lib/nodes/index.module.js"
 				}
 			}
 		</script>
@@ -35,7 +36,8 @@
 			import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
 			import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
-			import { MToonNodeMaterialLoaderPlugin } from '@pixiv/three-vrm-materials-mtoon';
+			import { MToonMaterialLoaderPlugin } from '@pixiv/three-vrm-materials-mtoon';
+			import { MToonNodeMaterial } from '@pixiv/three-vrm-materials-mtoon/nodes';
 
 			// renderer
 			const renderer = new WebGPURenderer();
@@ -67,8 +69,14 @@
 
 			loader.register( ( parser ) => {
 
-				const plugin = new MToonNodeMaterialLoaderPlugin( parser );
-				return plugin;
+
+				// create a WebGPU compatible MToonMaterialLoaderPlugin
+				return new MToonMaterialLoaderPlugin( parser, {
+
+					// set the material type to MToonNodeMaterial
+					materialType: MToonNodeMaterial,
+
+				} );
 
 			} );
 

packages/three-vrm-materials-mtoon/package.json

@@ -18,6 +18,11 @@
       "import": "./lib/three-vrm-materials-mtoon.module.js",
       "require": "./lib/three-vrm-materials-mtoon.cjs"
     },
+    "./nodes": {
+      "types": "./types/nodes/index.d.ts",
+      "import": "./lib/nodes/index.module.js",
+      "require": "./lib/nodes/index.cjs"
+    },
     "./package.json": "./package.json"
   },
   "repository": {

packages/three-vrm-materials-mtoon/src/MToonMaterialLoaderPlugin.ts

@@ -2,13 +2,13 @@ import * as THREE from 'three';
 import * as V1MToonSchema from '@pixiv/types-vrmc-materials-mtoon-1.0';
 import type { GLTF, GLTFLoader, GLTFLoaderPlugin, GLTFParser } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import type { MToonMaterialParameters } from './MToonMaterialParameters';
-import { MToonMaterialOutlineWidthMode } from './MToonMaterialOutlineWidthMode';
+import type { MToonMaterialOutlineWidthMode } from './MToonMaterialOutlineWidthMode';
 import { GLTFMToonMaterialParamsAssignHelper } from './GLTFMToonMaterialParamsAssignHelper';
-import { MToonMaterialLoaderPluginOptions } from './MToonMaterialLoaderPluginOptions';
+import type { MToonMaterialLoaderPluginOptions } from './MToonMaterialLoaderPluginOptions';
 import type { MToonMaterialDebugMode } from './MToonMaterialDebugMode';
 import { GLTF as GLTFSchema } from '@gltf-transform/core';
 import { MToonMaterial } from './MToonMaterial';
-import type { MToonNodeMaterialLoaderPlugin } from './nodes/MToonNodeMaterialLoaderPlugin';
+import type { MToonNodeMaterial } from './nodes/MToonNodeMaterial';
 
 /**
  * Possible spec versions it recognizes.
@@ -18,24 +18,56 @@ const POSSIBLE_SPEC_VERSIONS = new Set(['1.0', '1.0-beta']);
 /**
  * A loader plugin of {@link GLTFLoader} for the extension `VRMC_materials_mtoon`.
  *
- * This plugin is for uses with WebGLRenderer.
- * To use MToon in WebGPURenderer, use {@link MToonNodeMaterialLoaderPlugin} instead.
+ * This plugin is for uses with WebGLRenderer by default.
+ * To use MToon in WebGPURenderer, set {@link materialType} to {@link MToonNodeMaterial}.
+ *
+ * @example to use with WebGPURenderer
+ * ```js
+ * import { MToonMaterialLoaderPlugin } from '@pixiv/three-vrm-materials-mtoon';
+ * import { MToonNodeMaterial } from '@pixiv/three-vrm-materials-mtoon/nodes';
+ *
+ * // ...
+ *
+ * // Register a MToonMaterialLoaderPlugin with MToonNodeMaterial
+ * loader.register((parser) => {
+ *
+ *   // create a WebGPU compatible MToonMaterialLoaderPlugin
+ *   return new MToonMaterialLoaderPlugin(parser, {
+ *
+ *     // set the material type to MToonNodeMaterial
+ *     materialType: MToonNodeMaterial,
+ *
+ *   });
+ *
+ * });
+ * ```
  */
 export class MToonMaterialLoaderPlugin implements GLTFLoaderPlugin {
   public static EXTENSION_NAME = 'VRMC_materials_mtoon';
 
+  /**
+   * The type of the material that this plugin will generate.
+   *
+   * If you are using this plugin with WebGPU, set this to {@link MToonNodeMaterial}.
+   *
+   * @default MToonMaterial
+   */
+  public materialType: typeof THREE.Material;
+
   /**
    * This value will be added to `renderOrder` of every meshes who have MaterialsMToon.
    * The final renderOrder will be sum of this `renderOrderOffset` and `renderQueueOffsetNumber` for each materials.
-   * `0` by default.
+   *
+   * @default 0
    */
   public renderOrderOffset: number;
 
   /**
    * There is a line of the shader called "comment out if you want to PBR absolutely" in VRM0.0 MToon.
    * When this is true, the material enables the line to make it compatible with the legacy rendering of VRM.
    * Usually not recommended to turn this on.
-   * `false` by default.
+   *
+   * @default false
    */
   public v0CompatShade: boolean;
 
@@ -44,6 +76,8 @@ export class MToonMaterialLoaderPlugin implements GLTFLoaderPlugin {
    * You can visualize several components for diagnosis using debug mode.
    *
    * See: {@link MToonMaterialDebugMode}
+   *
+   * @default 'none'
    */
   public debugMode: MToonMaterialDebugMode;
 
@@ -62,6 +96,7 @@ export class MToonMaterialLoaderPlugin implements GLTFLoaderPlugin {
   public constructor(parser: GLTFParser, options: MToonMaterialLoaderPluginOptions = {}) {
     this.parser = parser;
 
+    this.materialType = options.materialType ?? MToonMaterial;
     this.renderOrderOffset = options.renderOrderOffset ?? 0;
     this.v0CompatShade = options.v0CompatShade ?? false;
     this.debugMode = options.debugMode ?? 'none';
@@ -80,7 +115,7 @@ export class MToonMaterialLoaderPlugin implements GLTFLoaderPlugin {
   public getMaterialType(materialIndex: number): typeof THREE.Material | null {
     const v1Extension = this._getMToonExtension(materialIndex);
     if (v1Extension) {
-      return MToonMaterial;
+      return this.materialType;
     }
 
     return null;
@@ -248,6 +283,22 @@ export class MToonMaterialLoaderPlugin implements GLTFLoaderPlugin {
     }
   }
 
+  /**
+   * Check whether the material should generate outline or not.
+   * @param surfaceMaterial The material to check
+   * @returns True if the material should generate outline
+   */
+  private _shouldGenerateOutline(surfaceMaterial: THREE.Material): boolean {
+    // we might receive MToonNodeMaterial as well as MToonMaterial
+    // so we're gonna duck type to check if it's compatible with MToon type outlines
+    return (
+      typeof (surfaceMaterial as any).outlineWidthMode === 'string' &&
+      (surfaceMaterial as any).outlineWidthMode !== 'none' &&
+      typeof (surfaceMaterial as any).outlineWidthFactor === 'number' &&
+      (surfaceMaterial as any).outlineWidthFactor > 0.0
+    );
+  }
+
   /**
    * Generate outline for the given mesh, if it needs.
    *
@@ -265,15 +316,7 @@ export class MToonMaterialLoaderPlugin implements GLTFLoaderPlugin {
       return;
     }
 
-    // check whether we really have to prepare outline or not
-    // we might receive MToonNodeMaterial as well as MToonMaterial
-    // so we're gonna duck type to check if it's compatible with MToon type outlines
-    if (
-      typeof (surfaceMaterial as any).outlineWidthMode !== 'string' ||
-      (surfaceMaterial as any).outlineWidthMode === 'none' ||
-      typeof (surfaceMaterial as any).outlineWidthFactor !== 'number' ||
-      (surfaceMaterial as any).outlineWidthFactor <= 0.0
-    ) {
+    if (!this._shouldGenerateOutline(surfaceMaterial)) {
       return;
     }
 

packages/three-vrm-materials-mtoon/src/MToonMaterialLoaderPluginOptions.ts

@@ -1,18 +1,31 @@
+import type * as THREE from 'three';
 import type { MToonMaterialDebugMode } from './MToonMaterialDebugMode';
+import type { MToonNodeMaterial } from './nodes/MToonNodeMaterial';
 
 export interface MToonMaterialLoaderPluginOptions {
+  /**
+   * The type of the material that the loader plugin will generate.
+   *
+   * If you are using this plugin with WebGPU, set this to {@link MToonNodeMaterial}.
+   *
+   * @default MToonMaterial
+   */
+  materialType?: typeof THREE.Material;
+
   /**
    * This value will be added to `renderOrder` of every meshes who have MToonMaterial.
    * The final `renderOrder` will be sum of this `renderOrderOffset` and `renderQueueOffsetNumber` for each materials.
-   * `0` by default.
+   *
+   * @default 0
    */
   renderOrderOffset?: number;
 
   /**
    * There is a line of the shader called "comment out if you want to PBR absolutely" in VRM0.0 MToon.
    * When this is true, the material enables the line to make it compatible with the legacy rendering of VRM.
    * Usually not recommended to turn this on.
-   * `false` by default.
+   *
+   * @default false
    */
   v0CompatShade?: boolean;
 
@@ -21,6 +34,8 @@ export interface MToonMaterialLoaderPluginOptions {
    * You can visualize several components for diagnosis using debug mode.
    *
    * See: {@link MToonMaterialDebugMode}
+   *
+   * @default 'none'
    */
   debugMode?: MToonMaterialDebugMode;
 }

packages/three-vrm-materials-mtoon/src/index.ts

@@ -4,5 +4,3 @@ export { MToonMaterial } from './MToonMaterial';
 export { MToonMaterialDebugMode } from './MToonMaterialDebugMode';
 export { MToonMaterialOutlineWidthMode } from './MToonMaterialOutlineWidthMode';
 export type { MToonMaterialParameters } from './MToonMaterialParameters';
-
-export * from './nodes';