diff --git a/packages/core/src/graphic/BufferUtil.ts b/packages/core/src/graphic/BufferUtil.ts index 23e7adb37..f9faa8fa0 100644 --- a/packages/core/src/graphic/BufferUtil.ts +++ b/packages/core/src/graphic/BufferUtil.ts @@ -1,7 +1,7 @@ -import { BufferUsage } from "./enums/BufferUsage"; -import { VertexElementFormat } from "./enums/VertexElementFormat"; import { DataType } from "../base/Constant"; +import { BufferUsage } from "./enums/BufferUsage"; import { IndexFormat } from "./enums/IndexFormat"; +import { VertexElementFormat } from "./enums/VertexElementFormat"; export interface ElementInfo { size: number; @@ -21,7 +21,7 @@ export class BufferUtil { } } - static _getGLIndexByteCount(indexFormat: IndexFormat): DataType { + static _getGLIndexByteCount(indexFormat: IndexFormat): number { switch (indexFormat) { case IndexFormat.UInt8: return 1; diff --git a/packages/loader/src/gltf/extensions/GALACEAN_materials_remap.ts b/packages/loader/src/gltf/extensions/GALACEAN_materials_remap.ts new file mode 100644 index 000000000..7898b72a5 --- /dev/null +++ b/packages/loader/src/gltf/extensions/GALACEAN_materials_remap.ts @@ -0,0 +1,17 @@ +import { Material } from "@galacean/engine-core"; +import { registerGLTFExtension } from "../parser/GLTFParser"; +import { GLTFParserContext } from "../parser/GLTFParserContext"; +import { GLTFExtensionMode, GLTFExtensionParser } from "./GLTFExtensionParser"; +import { IGalaceanMaterialRemap } from "./GLTFExtensionSchema"; + +@registerGLTFExtension("GALACEAN_materials_remap", GLTFExtensionMode.CreateAndParse) +class GALACEAN_materials_remap extends GLTFExtensionParser { + /** + * @override + */ + createAndParse(context: GLTFParserContext, schema: IGalaceanMaterialRemap): Promise { + const { engine } = context.glTFResource; + // @ts-ignore + return engine.resourceManager.getResourceByRef(schema); + } +} diff --git a/packages/loader/src/gltf/extensions/Galacean_materials_remap.ts b/packages/loader/src/gltf/extensions/Galacean_materials_remap.ts index 66b696d0d..7898b72a5 100644 --- a/packages/loader/src/gltf/extensions/Galacean_materials_remap.ts +++ b/packages/loader/src/gltf/extensions/Galacean_materials_remap.ts @@ -4,8 +4,8 @@ import { GLTFParserContext } from "../parser/GLTFParserContext"; import { GLTFExtensionMode, GLTFExtensionParser } from "./GLTFExtensionParser"; import { IGalaceanMaterialRemap } from "./GLTFExtensionSchema"; -@registerGLTFExtension("OASIS_materials_remap", GLTFExtensionMode.CreateAndParse) -class GalaceanMaterialsRemap extends GLTFExtensionParser { +@registerGLTFExtension("GALACEAN_materials_remap", GLTFExtensionMode.CreateAndParse) +class GALACEAN_materials_remap extends GLTFExtensionParser { /** * @override */ diff --git a/tests/package.json b/tests/package.json index c6fba2376..4b2d78a59 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,7 +1,7 @@ { "name": "@galacean/engine-tests", "private": true, - "version": "0.9.0-alpha.4", + "version": "1.0.0-alpha.6", "license": "MIT", "main": "dist/main.js", "module": "dist/module.js",