Merge commit 'add6e916a8327e492f8fec16bc0e7cd543a59566' into pr/conte…

…xt-restore

* commit 'add6e916a8327e492f8fec16bc0e7cd543a59566':
  Move font map cache from `Font` to `Engine` (galacean#1387)
  "v1.0.0-alpha.0"
  glTF parse support custom extsnions and parser (galacean#1008)
  Optimization `Transform` direction related API (galacean#1381)
  refactor: opt code
  refactor: opt code
  refactor: opt code
  refactor: opt code
  refactor: opt code
  feat: refactor transform API
  Add `toJSON` in base math class (galacean#1380)

packages/design/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasis-engine/design",
-  "version": "0.9.0-beta.66",
+  "version": "1.0.0-alpha.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

packages/draco/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasis-engine/draco",
-  "version": "0.9.0-beta.66",
+  "version": "1.0.0-alpha.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

packages/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasis-engine/loader",
-  "version": "0.9.0-beta.66",
+  "version": "1.0.0-alpha.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

packages/loader/src/GLTFContentRestorer.ts

@@ -2,8 +2,8 @@ import { AssetPromise, BlendShape, Buffer, ContentRestorer, ModelMesh, request,
 import { RequestConfig } from "@oasis-engine/core/types/asset/request";
 import { Vector2 } from "@oasis-engine/math";
 import { GLTFResource } from "./gltf/GLTFResource";
+import { IBufferView } from "./gltf/GLTFSchema";
 import { GLTFUtil } from "./gltf/GLTFUtil";
-import { IBufferView } from "./gltf/Schema";
 
 /**
  * @internal

packages/loader/src/GLTFLoader.ts

@@ -1,7 +1,7 @@
 import { AssetPromise, AssetType, Loader, LoadItem, resourceLoader, ResourceManager } from "@oasis-engine/core";
-import { GLTFParser } from "./gltf/GLTFParser";
+import { GLTFPipeline } from "./gltf/GLTFPipeline";
 import { GLTFResource } from "./gltf/GLTFResource";
-import { ParserContext } from "./gltf/parser/ParserContext";
+import { GLTFParserContext } from "./gltf/parser";
 import { GLTFContentRestorer } from "./GLTFContentRestorer";
 
 @resourceLoader(AssetType.Prefab, ["gltf", "glb"])
@@ -10,15 +10,16 @@ export class GLTFLoader extends Loader<GLTFResource> {
    * @override
    */
   load(item: LoadItem, resourceManager: ResourceManager): Record<string, AssetPromise<any>> {
-    const url = item.url;
-    const context = new ParserContext(url);
+    const { url } = item;
+    const params = <GLTFParams>item.params;
+    const context = new GLTFParserContext(url);
     const glTFResource = new GLTFResource(resourceManager.engine, url);
     const restorer = new GLTFContentRestorer(glTFResource);
     const masterPromiseInfo = context.masterPromiseInfo;
 
     context.contentRestorer = restorer;
     context.glTFResource = glTFResource;
-    context.keepMeshData = item.params?.keepMeshData ?? false;
+    context.keepMeshData = params?.keepMeshData ?? false;
 
     masterPromiseInfo.onCancel(() => {
       const { chainPromises } = context;
@@ -27,8 +28,8 @@ export class GLTFLoader extends Loader<GLTFResource> {
       }
     });
 
-    GLTFParser.defaultPipeline
-      .parse(context)
+    (params?.pipeline || GLTFPipeline.defaultPipeline)
+      ._parse(context)
       .then((glTFResource) => {
         resourceManager.addContentRestorer(restorer);
         masterPromiseInfo.resolve(glTFResource);
@@ -48,4 +49,6 @@ export class GLTFLoader extends Loader<GLTFResource> {
 export interface GLTFParams {
   /** Keep raw mesh data for glTF parser, default is false. */
   keepMeshData: boolean;
+  /** Custom glTF pipeline. */
+  pipeline: GLTFPipeline;
 }

packages/loader/src/gltf/GLTFPipeline.ts

@@ -0,0 +1,76 @@
+import { AssetPromise } from "@oasis-engine/core";
+import { GLTFResource } from "./GLTFResource";
+import { GLTFAnimationParser } from "./parser/GLTFAnimationParser";
+import { GLTFBufferParser } from "./parser/GLTFBufferParser";
+import { GLTFEntityParser } from "./parser/GLTFEntityParser";
+import { GLTFMaterialParser } from "./parser/GLTFMaterialParser";
+import { GLTFMeshParser } from "./parser/GLTFMeshParser";
+import { GLTFParser } from "./parser/GLTFParser";
+import { GLTFParserContext } from "./parser/GLTFParserContext";
+import { GLTFSceneParser } from "./parser/GLTFSceneParser";
+import { GLTFSkinParser } from "./parser/GLTFSkinParser";
+import { GLTFTextureParser } from "./parser/GLTFTextureParser";
+import { GLTFValidator } from "./parser/GLTFValidator";
+
+/**
+ * GLTF pipeline.
+ */
+export class GLTFPipeline {
+  /**
+   * Default pipeline.
+   */
+  static defaultPipeline = new GLTFPipeline(
+    GLTFBufferParser,
+    GLTFValidator,
+    GLTFTextureParser,
+    GLTFMaterialParser,
+    GLTFMeshParser,
+    GLTFEntityParser,
+    GLTFSkinParser,
+    GLTFAnimationParser,
+    GLTFSceneParser
+  );
+
+  private _parsers: GLTFParser[] = [];
+
+  /**
+   * Constructor of GLTFPipeline.
+   * @param parsers - Parsers to be executed in order
+   */
+  constructor(...parsers: (new () => GLTFParser)[]) {
+    parsers.forEach((pipe: new () => GLTFParser, index: number) => {
+      this._parsers[index] = new pipe();
+    });
+  }
+
+  /**
+   * @internal
+   */
+  _parse(context: GLTFParserContext): AssetPromise<GLTFResource> {
+    const glTFResource = context.glTFResource;
+    let lastParser;
+
+    return new AssetPromise<GLTFResource>((resolve, reject) => {
+      this._parsers.forEach((parser: GLTFParser) => {
+        if (lastParser) {
+          lastParser = lastParser.then(() => {
+            return parser.parse(context);
+          });
+          if (lastParser.cancel) {
+            context.chainPromises.push(lastParser);
+          }
+        } else {
+          lastParser = parser.parse(context);
+        }
+      });
+
+      if (lastParser) {
+        lastParser
+          .then(() => {
+            resolve(glTFResource);
+          })
+          .catch(reject);
+      }
+    });
+  }
+}

packages/loader/src/gltf/GLTFResource.ts

@@ -7,7 +7,6 @@ import {
   Light,
   Material,
   ModelMesh,
-  Renderer,
   Skin,
   Texture2D
 } from "@oasis-engine/core";
@@ -38,8 +37,8 @@ export class GLTFResource extends EngineObject {
   sceneRoots: Entity[];
   /** Oasis RootEntity after SceneParser. */
   defaultSceneRoot: Entity;
-  /** Renderer can replace material by `renderer.setMaterial` if glTF use plugin-in KHR_materials_variants. */
-  variants?: { renderer: Renderer; material: Material; variants: string[] }[];
+  /** Extensions data. */
+  extensionsData: Record<string, any>;
 
   constructor(engine: Engine, url: string) {
     super(engine);
@@ -62,6 +61,6 @@ export class GLTFResource extends EngineObject {
     this.cameras = null;
     this.lights = null;
     this.sceneRoots = null;
-    this.variants = null;
+    this.extensionsData = null;
   }
 }

packages/loader/src/gltf/Schema.ts → packages/loader/src/gltf/GLTFSchema.ts

@@ -853,3 +853,6 @@ export interface IGLTF extends IProperty {
    */
   textures?: ITexture[];
 }
+
+/** glTF extensible owner schema. */
+export type GLTFExtensionOwnerSchema = IMeshPrimitive | IMaterial | ITextureInfo | INode;

packages/loader/src/gltf/GLTFUtil.ts

@@ -1,28 +1,8 @@
 import { IndexFormat, TypedArray, VertexElementFormat } from "@oasis-engine/core";
 import { Color, Vector2, Vector3, Vector4 } from "@oasis-engine/math";
 import { BufferDataRestoreInfo, RestoreDataAccessor } from "../GLTFContentRestorer";
-import { BufferInfo, ParserContext } from "./parser/ParserContext";
-import { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF } from "./Schema";
-
-const charCodeOfDot = ".".charCodeAt(0);
-const reEscapeChar = /\\(\\)?/g;
-const rePropName = RegExp(
-  // Match anything that isn't a dot or bracket.
-  "[^.[\\]]+" +
-    "|" +
-    // Or match property names within brackets.
-    "\\[(?:" +
-    // Match a non-string expression.
-    "([^\"'][^[]*)" +
-    "|" +
-    // Or match strings (supports escaping characters).
-    "([\"'])((?:(?!\\2)[^\\\\]|\\\\.)*?)\\2" +
-    ")\\]" +
-    "|" +
-    // Or match "" as the space between consecutive dots or empty brackets.
-    "(?=(?:\\.|\\[\\])(?:\\.|\\[\\]|$))",
-  "g"
-);
+import { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF } from "./GLTFSchema";
+import { BufferInfo, GLTFParserContext } from "./parser/GLTFParserContext";
 
 /**
  * @internal
@@ -148,7 +128,7 @@ export class GLTFUtil {
     }
   }
 
-  static getAccessorBuffer(context: ParserContext, bufferViews: IBufferView[], accessor: IAccessor): BufferInfo {
+  static getAccessorBuffer(context: GLTFParserContext, bufferViews: IBufferView[], accessor: IAccessor): BufferInfo {
     const { buffers } = context;
 
     const componentType = accessor.componentType;
@@ -433,7 +413,7 @@ export class GLTFUtil {
    * Parse the glb format.
    */
   static parseGLB(
-    context: ParserContext,
+    context: GLTFParserContext,
     glb: ArrayBuffer
   ): {
     glTF: IGLTF;

packages/loader/src/gltf/extensions/KHR_materials_clearcoat.ts

@@ -1,13 +1,16 @@
 import { PBRMaterial } from "@oasis-engine/core";
-import { MaterialParser } from "../parser/MaterialParser";
-import { registerExtension } from "../parser/Parser";
-import { ParserContext } from "../parser/ParserContext";
-import { ExtensionParser } from "./ExtensionParser";
-import { IKHRMaterialsClearcoat } from "./Schema";
+import { GLTFMaterialParser } from "../parser/GLTFMaterialParser";
+import { registerGLTFExtension } from "../parser/GLTFParser";
+import { GLTFParserContext } from "../parser/GLTFParserContext";
+import { GLTFExtensionMode, GLTFExtensionParser } from "./GLTFExtensionParser";
+import { IKHRMaterialsClearcoat } from "./GLTFExtensionSchema";
 
-@registerExtension("KHR_materials_clearcoat")
-class KHR_materials_clearcoat extends ExtensionParser {
-  parseEngineResource(schema: IKHRMaterialsClearcoat, material: PBRMaterial, context: ParserContext): void {
+@registerGLTFExtension("KHR_materials_clearcoat", GLTFExtensionMode.AdditiveParse)
+class KHR_materials_clearcoat extends GLTFExtensionParser {
+  /**
+   * @override
+   */
+  additiveParse(context: GLTFParserContext, material: PBRMaterial, schema: IKHRMaterialsClearcoat): void {
     const { textures } = context.glTFResource;
     const {
       clearcoatFactor = 0,
@@ -22,15 +25,15 @@ class KHR_materials_clearcoat extends ExtensionParser {
 
     if (clearcoatTexture) {
       material.clearCoatTexture = textures[clearcoatTexture.index];
-      MaterialParser._checkOtherTextureTransform(clearcoatTexture, "Clear coat");
+      GLTFMaterialParser._checkOtherTextureTransform(clearcoatTexture, "Clear coat");
     }
     if (clearcoatRoughnessTexture) {
       material.clearCoatRoughnessTexture = textures[clearcoatRoughnessTexture.index];
-      MaterialParser._checkOtherTextureTransform(clearcoatRoughnessTexture, "Clear coat roughness");
+      GLTFMaterialParser._checkOtherTextureTransform(clearcoatRoughnessTexture, "Clear coat roughness");
     }
     if (clearcoatNormalTexture) {
       material.clearCoatNormalTexture = textures[clearcoatNormalTexture.index];
-      MaterialParser._checkOtherTextureTransform(clearcoatNormalTexture, "Clear coat normal");
+      GLTFMaterialParser._checkOtherTextureTransform(clearcoatNormalTexture, "Clear coat normal");
     }
   }
 }