@galacean/effects-plugin-model 2.10.0-alpha.1 → 2.10.0-alpha.2

package/dist/index.mjs

@@ -3,11 +3,11 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.10.0-alpha.1
+ * Version: v2.10.0-alpha.2
  */
 
 import * as EFFECTS from '@galacean/effects';
-import { math, spec, Transform, PLAYER_OPTIONS_ENV_EDITOR, RenderPassAttachmentStorageType, glContext, Material, Mesh, Geometry, ShaderFactory, effectsClass, HitTestType, RendererComponent, Behaviour, AnimationClip, TextureSourceType, Texture, DestroyOptions, RenderPassDestroyAttachmentType, GLSLVersion, Player, Renderer, getDefaultTextureFactory, loadImage, generateGUID, addItem, removeItem, VFXItem, Plugin, glType2VertexFormatType, Downloader, getStandardJSON, isObject, registerPlugin, logger } from '@galacean/effects';
+import { math, spec, Transform, PLAYER_OPTIONS_ENV_EDITOR, RenderPassAttachmentStorageType, glContext, Material, Mesh, Geometry, VertexBuffer, ShaderFactory, effectsClass, HitTestType, RendererComponent, Behaviour, AnimationClip, TextureSourceType, Texture, DestroyOptions, RenderPassDestroyAttachmentType, GLSLVersion, Player, Renderer, getDefaultTextureFactory, loadImage, generateGUID, addItem, removeItem, VFXItem, Plugin, glType2VertexFormatType, Downloader, getStandardJSON, isObject, registerPlugin, logger } from '@galacean/effects';
 
 /**
  * Model 插件元素类型
@@ -1437,16 +1437,15 @@ function GetNum2GLName(ctx) {
                     3,
                     7
                 ]);
+                var _obj;
                 return {
-                    attributes: {
-                        aPos: {
-                            type: glContext.FLOAT,
-                            size: 1,
-                            data: data,
-                            stride: Float32Array.BYTES_PER_ELEMENT,
-                            offset: 0
-                        }
-                    },
+                    attributes: (_obj = {}, _obj[VertexBuffer.PositionKind] = {
+                        type: glContext.FLOAT,
+                        size: 1,
+                        data: data,
+                        stride: Float32Array.BYTES_PER_ELEMENT,
+                        offset: 0
+                    }, _obj),
                     mode: glContext.LINES,
                     indices: {
                         data: index
@@ -3134,30 +3133,27 @@ var normal = new Vector3();
    * @returns 几何参数
    */ MeshHelper.getPlaneGeometry = function getPlaneGeometry() {
         var data = MeshHelper.getPlaneVertexArray();
+        var _obj;
         return {
-            attributes: {
-                aPos: {
-                    type: glContext.FLOAT,
-                    size: 3,
-                    data: data,
-                    stride: Float32Array.BYTES_PER_ELEMENT * 8,
-                    offset: 0
-                },
-                aUV: {
-                    type: glContext.FLOAT,
-                    size: 2,
-                    stride: Float32Array.BYTES_PER_ELEMENT * 8,
-                    offset: Float32Array.BYTES_PER_ELEMENT * 3,
-                    dataSource: "aPos"
-                },
-                aNormal: {
-                    type: glContext.FLOAT,
-                    size: 3,
-                    stride: Float32Array.BYTES_PER_ELEMENT * 8,
-                    offset: Float32Array.BYTES_PER_ELEMENT * 5,
-                    dataSource: "aPos"
-                }
-            },
+            attributes: (_obj = {}, _obj[VertexBuffer.PositionKind] = {
+                type: glContext.FLOAT,
+                size: 3,
+                data: data,
+                stride: Float32Array.BYTES_PER_ELEMENT * 8,
+                offset: 0
+            }, _obj[VertexBuffer.UVKind] = {
+                type: glContext.FLOAT,
+                size: 2,
+                stride: Float32Array.BYTES_PER_ELEMENT * 8,
+                offset: Float32Array.BYTES_PER_ELEMENT * 3,
+                dataSource: VertexBuffer.PositionKind
+            }, _obj[VertexBuffer.NormalKind] = {
+                type: glContext.FLOAT,
+                size: 3,
+                stride: Float32Array.BYTES_PER_ELEMENT * 8,
+                offset: Float32Array.BYTES_PER_ELEMENT * 5,
+                dataSource: VertexBuffer.PositionKind
+            }, _obj),
             drawStart: 0,
             drawCount: data.length / 8
         };
@@ -3584,19 +3580,19 @@ var normal = new Vector3();
    */ PluginHelper.getAttributeName = function getAttributeName(name) {
         switch(name){
             case "POSITION":
-                return "aPos";
+                return VertexBuffer.PositionKind;
             case "NORMAL":
-                return "aNormal";
+                return VertexBuffer.NormalKind;
             case "TANGENT":
-                return "aTangent";
+                return VertexBuffer.TangentKind;
             case "TEXCOORD_0":
-                return "aUV";
+                return VertexBuffer.UVKind;
             case "TEXCOORD_1":
-                return "aUV2";
+                return VertexBuffer.UV2Kind;
             case "JOINTS_0":
-                return "aJoints";
+                return VertexBuffer.JointsKind;
             case "WEIGHTS_0":
-                return "aWeights";
+                return VertexBuffer.WeightsKind;
         }
         if (!name.startsWith("a")) {
             // aPos, aNormal, aTangent,
@@ -3988,21 +3984,18 @@ var AttributeArray = /*#__PURE__*/ function() {
    */ _proto.create = function create(geometry, bindMatrices) {
         this.drawStart = 0;
         this.drawCount = Math.abs(geometry.getDrawCount());
-        // FIXME: 需要geometry中的attributes数组，GLGeometry有这个数组，其他的没有
-        // @ts-expect-error
-        var attributes = geometry.attributes;
         //
         this.index = geometry.getIndexData();
-        var positionAttrib = attributes["aPos"];
-        var positionArray = geometry.getAttributeData("aPos");
+        var positionAttrib = getAttributeLayout(geometry.getVertexBuffer(VertexBuffer.PositionKind));
+        var positionArray = geometry.getAttributeData(VertexBuffer.PositionKind);
         this.position = new AttributeArray();
         this.position.create(positionAttrib, positionArray);
         //
-        var jointAttrib = attributes["aJoints"];
-        var weightAttrib = attributes["aWeights"];
+        var jointAttrib = getAttributeLayout(geometry.getVertexBuffer(VertexBuffer.JointsKind));
+        var weightAttrib = getAttributeLayout(geometry.getVertexBuffer(VertexBuffer.WeightsKind));
         if (jointAttrib !== undefined && weightAttrib !== undefined) {
-            var jointArray = geometry.getAttributeData("aJoints");
-            var weightArray = geometry.getAttributeData("aWeights");
+            var jointArray = geometry.getAttributeData(VertexBuffer.JointsKind);
+            var weightArray = geometry.getAttributeData(VertexBuffer.WeightsKind);
             this.joint = new AttributeArray();
             this.joint.create(jointAttrib, jointArray);
             this.weight = new AttributeArray();
@@ -4102,21 +4095,18 @@ var AttributeArray = /*#__PURE__*/ function() {
    */ _proto.create = function create(geometry, doubleSided, bindMatrices) {
         this.drawStart = 0;
         this.drawCount = Math.abs(geometry.getDrawCount());
-        // FIXME: 需要geometry中的attributes数组，GLGeometry有这个数组，其他的没有
-        // @ts-expect-error
-        var attributes = geometry.attributes;
         //
         this.index = geometry.getIndexData();
-        var positionAttrib = attributes["aPos"];
-        var positionArray = geometry.getAttributeData("aPos");
+        var positionAttrib = getAttributeLayout(geometry.getVertexBuffer(VertexBuffer.PositionKind));
+        var positionArray = geometry.getAttributeData(VertexBuffer.PositionKind);
         this.position = new AttributeArray();
         this.position.create(positionAttrib, positionArray);
         //
-        var jointAttrib = attributes["aJoints"];
-        var weightAttrib = attributes["aWeights"];
+        var jointAttrib = getAttributeLayout(geometry.getVertexBuffer(VertexBuffer.JointsKind));
+        var weightAttrib = getAttributeLayout(geometry.getVertexBuffer(VertexBuffer.WeightsKind));
         if (jointAttrib !== undefined && weightAttrib !== undefined) {
-            var jointArray = geometry.getAttributeData("aJoints");
-            var weightArray = geometry.getAttributeData("aWeights");
+            var jointArray = geometry.getAttributeData(VertexBuffer.JointsKind);
+            var weightArray = geometry.getAttributeData(VertexBuffer.WeightsKind);
             this.joint = new AttributeArray();
             this.joint.create(jointAttrib, jointArray);
             this.weight = new AttributeArray();
@@ -4505,8 +4495,7 @@ var AttributeArray = /*#__PURE__*/ function() {
         if (!_instanceof1(v, Geometry)) {
             console.error("Invalid geometry type " + this.stringify(v) + ".");
         }
-        // @ts-expect-error
-        if (v.isDestroyed === true) {
+        if (v.isDisposed()) {
             console.error("Geometry object is destroyed.");
         }
         if (!this.checkNonnegative(v.getDrawStart())) {
@@ -4579,12 +4568,7 @@ var AttributeArray = /*#__PURE__*/ function() {
    * @param name - 名称
    * @returns
    */ CheckerHelper.createAttributeArray = function createAttributeArray(v, name) {
-        // @ts-expect-error
-        var attributes = v.attributes;
-        if (attributes === undefined) {
-            return;
-        }
-        var dataAttrib = attributes[name];
+        var dataAttrib = getAttributeLayout(v.getVertexBuffer(name));
         if (dataAttrib === undefined) {
             return;
         }
@@ -5055,6 +5039,18 @@ var AttributeArray = /*#__PURE__*/ function() {
     };
     return CheckerHelper;
 }();
+function getAttributeLayout(vertexBuffer) {
+    if (!vertexBuffer) {
+        return;
+    }
+    return {
+        type: vertexBuffer.type,
+        size: vertexBuffer.getSize(),
+        offset: vertexBuffer.byteOffset,
+        stride: vertexBuffer.byteStride,
+        normalize: vertexBuffer.normalized
+    };
+}
 /**
  * 半精度浮点数组类
  */ var Float16ArrayWrapper = /*#__PURE__*/ function() {
@@ -7224,7 +7220,10 @@ var PSkyboxType;
         this.loadSkybox = loadSkybox;
         if (this.brdfLutTexture === undefined || this.brdfLutTexture.isDestroyed) {
             if (CompositionCache.brdfLutTexOptions === undefined) {
-                throw new Error("Please load brdfLutTexOptions at first.");
+                // A Composition can be created and played directly without going through
+                // the player's asynchronous asset-loading lifecycle. In that case the
+                // optional BRDF LUT is not ready yet, but non-PBR content can still run.
+                return;
             }
             //
             var brdfLutTextureName = "brdfLutTexture";
@@ -7858,6 +7857,14 @@ function _assert_this_initialized(self) {
     return self;
 }
 
+var uvKinds = [
+    VertexBuffer.UVKind,
+    VertexBuffer.UV2Kind,
+    VertexBuffer.UV3Kind,
+    VertexBuffer.UV4Kind,
+    VertexBuffer.UV5Kind,
+    VertexBuffer.UV6Kind
+];
 /**
  * Mesh 类，负责 Mesh 相关的骨骼动画和 PBR 渲染
  */ var PMesh = /*#__PURE__*/ function(PEntity) {
@@ -8767,7 +8774,7 @@ function _assert_this_initialized(self) {
    * 是否压缩格式
    * @returns
    */ _proto.isCompressed = function isCompressed() {
-        var positionAttrib = this.geometry.getAttributeData("aPos");
+        var positionAttrib = this.geometry.getAttributeData(VertexBuffer.PositionKind);
         if (positionAttrib === undefined) {
             return false;
         }
@@ -8779,48 +8786,45 @@ function _assert_this_initialized(self) {
    * 是否有位置属性
    * @returns
    */ _proto.hasPositions = function hasPositions() {
-        return this.hasAttribute("aPos");
+        return this.hasAttribute(VertexBuffer.PositionKind);
     };
     /**
    * 是否有法线属性
    * @returns
    */ _proto.hasNormals = function hasNormals() {
-        return this.hasAttribute("aNormal");
+        return this.hasAttribute(VertexBuffer.NormalKind);
     };
     /**
    * 是否有切线属性
    * @returns
    */ _proto.hasTangents = function hasTangents() {
-        return this.hasAttribute("aTangent");
+        return this.hasAttribute(VertexBuffer.TangentKind);
     };
     /**
    * 是否有纹理坐标属性
    * @param index - 纹理坐标索引
    * @returns
    */ _proto.hasUVCoords = function hasUVCoords(index) {
-        if (index === 1) {
-            return this.hasAttribute("aUV");
-        } else {
-            return this.hasAttribute("aUV" + index);
-        }
+        var kind = uvKinds[index - 1];
+        return kind !== undefined && this.hasAttribute(kind);
     };
     /**
    * 是否有颜色属性
    * @returns
    */ _proto.hasColors = function hasColors() {
-        return this.hasAttribute("aColor");
+        return this.hasAttribute(VertexBuffer.ColorKind);
     };
     /**
    * 是否有关节点属性
    * @returns
    */ _proto.hasJoints = function hasJoints() {
-        return this.hasAttribute("aJoints");
+        return this.hasAttribute(VertexBuffer.JointsKind);
     };
     /**
    * 是否有权重属性
    * @returns
    */ _proto.hasWeights = function hasWeights() {
-        return this.hasAttribute("aWeights");
+        return this.hasAttribute(VertexBuffer.WeightsKind);
     };
     return PGeometry;
 }();
@@ -10455,8 +10459,9 @@ var JSONConverter = /*#__PURE__*/ function() {
             var _geomProps_indices;
             var geomProps = deserializeGeometry(prim.geometry, oldScene.bins);
             var material = _this.getMaterialData(prim.material, oldScene);
-            if (_instanceof1((_geomProps_indices = geomProps.indices) == null ? void 0 : _geomProps_indices.data, Uint8Array)) {
-                var oldIndices = geomProps.indices.data;
+            var indexData = (_geomProps_indices = geomProps.indices) == null ? void 0 : _geomProps_indices.data;
+            if (_instanceof1(indexData, Uint8Array)) {
+                var oldIndices = indexData;
                 var newIndices = new Uint16Array(oldIndices.length);
                 for(var i = 0; i < oldIndices.length; i++){
                     newIndices[i] = oldIndices[i];
@@ -11113,7 +11118,7 @@ function getGeometryDataFromOptions(geomOptions) {
             verticesNormalize = (_attribData_normalize = attribData.normalize) != null ? _attribData_normalize : false;
             var _attribData_type;
             verticesType = glType2VertexFormatType((_attribData_type = attribData.type) != null ? _attribData_type : glContext.FLOAT);
-        } else if (attrib === "aNormal") {
+        } else if (attrib === VertexBuffer.NormalKind) {
             // @ts-expect-error
             modelData.normals = attribData.data;
             var _attribData_normalize1;
@@ -11428,45 +11433,10 @@ function mergeTypedArray(array1, array2, offset) {
         return result6;
     }
 }
-var vertexBufferSemanticMap = {
-    aPos: "POSITION",
-    aUV: "TEXCOORD0",
-    aUV2: "TEXCOORD1",
-    aNormal: "NORMAL",
-    aTangent: "TANGENT",
-    aColor: "COLOR",
-    aJoints: "JOINTS",
-    aWeights: "WEIGHTS",
-    //
-    a_Position: "POSITION",
-    a_UV: "TEXCOORD0",
-    a_UV1: "TEXCOORD0",
-    a_UV2: "TEXCOORD1",
-    a_Normal: "NORMAL",
-    a_Tangent: "TANGENT",
-    a_Color: "COLOR",
-    a_Joints: "JOINTS",
-    a_Joint1: "JOINTS",
-    a_Weights: "WEIGHTS",
-    a_Weight1: "WEIGHTS",
-    //
-    a_Target_Position0: "POSITION_BS0",
-    a_Target_Position1: "POSITION_BS1",
-    a_Target_Position2: "POSITION_BS2",
-    a_Target_Position3: "POSITION_BS3",
-    a_Target_Position4: "POSITION_BS4",
-    a_Target_Position5: "POSITION_BS5",
-    a_Target_Position6: "POSITION_BS6",
-    a_Target_Position7: "POSITION_BS7",
-    a_Target_Normal0: "NORMAL_BS0",
-    a_Target_Normal1: "NORMAL_BS1",
-    a_Target_Normal2: "NORMAL_BS2",
-    a_Target_Normal3: "NORMAL_BS3",
-    a_Target_Tangent0: "TANGENT_BS0",
-    a_Target_Tangent1: "TANGENT_BS1",
-    a_Target_Tangent2: "TANGENT_BS2",
-    a_Target_Tangent3: "TANGENT_BS3"
-};
+var _obj;
+var vertexBufferSemanticMap = (_obj = {}, _obj[VertexBuffer.PositionKind] = "POSITION", _obj[VertexBuffer.UVKind] = "TEXCOORD0", _obj[VertexBuffer.UV2Kind] = "TEXCOORD1", _obj[VertexBuffer.NormalKind] = "NORMAL", _obj[VertexBuffer.TangentKind] = "TANGENT", _obj[VertexBuffer.ColorKind] = "COLOR", _obj[VertexBuffer.JointsKind] = "JOINTS", _obj[VertexBuffer.WeightsKind] = "WEIGHTS", //
+_obj.a_Position = "POSITION", _obj.a_UV = "TEXCOORD0", _obj.a_UV1 = "TEXCOORD0", _obj.a_UV2 = "TEXCOORD1", _obj.a_Normal = "NORMAL", _obj.a_Tangent = "TANGENT", _obj.a_Color = "COLOR", _obj.a_Joints = "JOINTS", _obj.a_Joint1 = "JOINTS", _obj.a_Weights = "WEIGHTS", _obj.a_Weight1 = "WEIGHTS", //
+_obj.a_Target_Position0 = "POSITION_BS0", _obj.a_Target_Position1 = "POSITION_BS1", _obj.a_Target_Position2 = "POSITION_BS2", _obj.a_Target_Position3 = "POSITION_BS3", _obj.a_Target_Position4 = "POSITION_BS4", _obj.a_Target_Position5 = "POSITION_BS5", _obj.a_Target_Position6 = "POSITION_BS6", _obj.a_Target_Position7 = "POSITION_BS7", _obj.a_Target_Normal0 = "NORMAL_BS0", _obj.a_Target_Normal1 = "NORMAL_BS1", _obj.a_Target_Normal2 = "NORMAL_BS2", _obj.a_Target_Normal3 = "NORMAL_BS3", _obj.a_Target_Tangent0 = "TANGENT_BS0", _obj.a_Target_Tangent1 = "TANGENT_BS1", _obj.a_Target_Tangent2 = "TANGENT_BS2", _obj.a_Target_Tangent3 = "TANGENT_BS3", _obj);
 
 function getDefaultEffectsGLTFLoader(engine, options) {
     if (!defaultGLTFLoader) {
@@ -12351,8 +12321,8 @@ var LoaderImpl = /*#__PURE__*/ function() {
             return false;
         }
     };
-    /**
-   * for old scene compatibility
+    /**
+   * for old scene compatibility
    */ _proto.processLight = function processLight(lights, fromGLTF) {
         var _this = this;
         lights.forEach(function(l) {
@@ -12726,8 +12696,8 @@ var GeometryProxy = /*#__PURE__*/ function() {
                         attributes["a_Weight1"] = this._getBufferAttrib(weightAttrib);
                     }
                 }
-                /**
-     * 设置Morph动画需要的Attribute，主要包括Position，Normal和Tangent
+                /**
+     * 设置Morph动画需要的Attribute，主要包括Position，Normal和Tangent
      */ for(var i = 0; i < 8; i++){
                     var positionAttrib = this.getTargetPosition(i);
                     if (positionAttrib !== undefined) {
@@ -12744,13 +12714,14 @@ var GeometryProxy = /*#__PURE__*/ function() {
                 }
                 var indexArray = this.indexArray;
                 if (indexArray !== undefined) {
+                    var indices = _instanceof1(indexArray, Uint8Array) ? new Uint16Array(indexArray) : indexArray;
                     return Geometry.create(this.engine, {
                         attributes: attributes,
                         indices: {
-                            data: indexArray
+                            data: indices
                         },
                         drawStart: 0,
-                        drawCount: indexArray.length,
+                        drawCount: indices.length,
                         mode: glContext.TRIANGLES
                     });
                 } else {
@@ -13192,7 +13163,7 @@ var GLTFHelper = /*#__PURE__*/ function() {
 registerPlugin("model", ModelPlugin);
 /**
  * 插件版本号
- */ var version = "2.10.0-alpha.1";
+ */ var version = "2.10.0-alpha.2";
 logger.info("Plugin model version: " + version + ".");
 if (version !== EFFECTS.version) {
     console.error("注意：请统一 Model 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Model plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");