@galacean/effects-plugin-model 2.0.0-alpha.11 → 2.0.0-alpha.13

package/dist/index.mjs

@@ -3,10 +3,10 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.0.0-alpha.11
+ * Version: v2.0.0-alpha.13
  */
 
-import { math, Transform, PLAYER_OPTIONS_ENV_EDITOR, spec, glContext, Texture, TextureSourceType, RenderPassAttachmentStorageType, Material, Mesh, Geometry, GLSLVersion, DestroyOptions, addItem, removeItem, effectsClass, RendererComponent, ItemBehaviour, TimelineComponent, HitTestType, RenderPass, TextureLoadAction, RenderPassDestroyAttachmentType, Player, Renderer, getDefaultTextureFactory, loadImage, generateGUID, VFXItem, AbstractPlugin, Downloader, getStandardJSON, registerPlugin, logger } from '@galacean/effects';
+import { math, Transform, PLAYER_OPTIONS_ENV_EDITOR, spec, glContext, Texture, TextureSourceType, RenderPassAttachmentStorageType, Material, Mesh, Geometry, GLSLVersion, addItem, removeItem, effectsClass, RendererComponent, ItemBehaviour, HitTestType, AnimationClip, RenderPass, TextureLoadAction, DestroyOptions, RenderPassDestroyAttachmentType, Player, Renderer, getDefaultTextureFactory, loadImage, generateGUID, VFXItem, AbstractPlugin, glType2VertexFormatType, Downloader, getStandardJSON, registerPlugin, logger, version as version$1 } from '@galacean/effects';
 
 /**
  * Model 插件元素类型
@@ -790,6 +790,41 @@ var ctrlMap = {
     return new CTRL(binary[index], start, byteLength / CTRL.BYTES_PER_ELEMENT);
 }
 
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+
+function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
+    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+    if (it) return (it = it.call(o)).next.bind(it);
+    // Fallback for engines without symbol support
+    if (Array.isArray(o) || (it = _unsupported_iterable_to_array(o)) || allowArrayLike && o && typeof o.length === "number") {
+        if (it) o = it;
+        var i = 0;
+        return function() {
+            if (i >= o.length) return {
+                done: true
+            };
+            return {
+                done: false,
+                value: o[i++]
+            };
+        };
+    }
+    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
 var InterpolationSampler = /*#__PURE__*/ function() {
     function InterpolationSampler(time, data, componentCount) {
         this.time = time;
@@ -1086,7 +1121,7 @@ var TextureDataMode;
    */ _this.skeleton = 0;
         /**
    * 关节索引
-   */ _this.jointList = [];
+   */ _this.jointItem = [];
         /**
    * 逆绑定矩阵
    */ _this.inverseBindMatrices = [];
@@ -1101,27 +1136,26 @@ var TextureDataMode;
     var _proto = PSkin.prototype;
     /**
    * 创建蒙皮对象
-   * @param options - 蒙皮相关数据
+   * @param props - 蒙皮相关数据
    * @param engine - 引擎对象
-   * @param parentItem - 场景树父元素
-   */ _proto.create = function create(options, engine, parentItem) {
-        var _options_name;
-        this.name = this.genName((_options_name = options.name) != null ? _options_name : "Unnamed skin");
+   * @param rootBoneItem - 场景树父元素
+   */ _proto.create = function create(props, engine, rootBoneItem) {
+        var _props_rootBoneName;
+        this.name = (_props_rootBoneName = props.rootBoneName) != null ? _props_rootBoneName : "Unnamed skin";
         this.type = PObjectType.skin;
         //
-        this.parentItem = parentItem;
-        var _options_skeleton;
-        this.skeleton = (_options_skeleton = options.skeleton) != null ? _options_skeleton : -1;
-        this.jointList = options.joints;
+        this.rootBoneItem = rootBoneItem;
+        this.skeleton = -1;
+        this.jointItem = this.getJointItems(props, rootBoneItem);
         this.animationMatrices = [];
         //
         this.inverseBindMatrices = [];
         //
         this.textureDataMode = this.getTextureDataMode(this.getJointCount(), engine);
-        var matList = options.inverseBindMatrices;
+        var matList = props.inverseBindMatrices;
         if (matList !== undefined && matList.length > 0) {
-            if (matList.length % 16 !== 0 || matList.length !== this.jointList.length * 16) {
-                throw new Error("Invalid array length, invert bind matrices " + matList.length + ", joint array " + this.jointList.length);
+            if (matList.length % 16 !== 0 || matList.length !== this.jointItem.length * 16) {
+                throw new Error("Invalid array length, invert bind matrices " + matList.length + ", joint array " + this.jointItem.length);
             }
             var matrixCount = matList.length / 16;
             for(var i = 0; i < matrixCount; i++){
@@ -1134,26 +1168,17 @@ var TextureDataMode;
    * 更新蒙皮矩阵
    */ _proto.updateSkinMatrices = function updateSkinMatrices() {
         var _this = this;
-        var _this_parentItem;
         this.animationMatrices = [];
-        var parentTree = (_this_parentItem = this.parentItem) == null ? void 0 : _this_parentItem.getComponent(ModelTreeComponent);
-        if (parentTree !== undefined) {
-            for(var i = 0; i < this.jointList.length; i++){
-                var joint = this.jointList[i];
-                var node = parentTree.content.getNodeById(joint);
-                // let parent = node?.transform.parentTransform;
-                // while(parent !== undefined){
-                //   const pos = parent.position;
-                //   parent.setPosition(pos[0], pos[1], pos[2]);
-                //   parent = parent.parentTransform;
-                // }
-                if (node === undefined) {
-                    console.error("Can't find joint " + joint + " in node tree " + this.parentItem + ".");
-                    break;
-                }
-                var mat4 = node.transform.getWorldMatrix();
-                this.animationMatrices.push(mat4.clone());
-            }
+        for(var i = 0; i < this.jointItem.length; i++){
+            var node = this.jointItem[i];
+            // let parent = node?.transform.parentTransform;
+            // while(parent !== undefined){
+            //   const pos = parent.position;
+            //   parent.setPosition(pos[0], pos[1], pos[2]);
+            //   parent = parent.parentTransform;
+            // }
+            var mat4 = node.transform.getWorldMatrix();
+            this.animationMatrices.push(mat4.clone());
         }
         if (this.animationMatrices.length === this.inverseBindMatrices.length) {
             this.animationMatrices.forEach(function(mat, index) {
@@ -1188,13 +1213,13 @@ var TextureDataMode;
    * 更新父元素
    * @param parentItem - 场景树父元素
    */ _proto.updateParentItem = function updateParentItem(parentItem) {
-        this.parentItem = parentItem;
+        this.rootBoneItem = parentItem;
     };
     /**
    * 获取关节点数
    * @returns
    */ _proto.getJointCount = function getJointCount() {
-        return this.jointList.length;
+        return this.jointItem.length;
     };
     /**
    * 是否纹理数据模式
@@ -1205,8 +1230,8 @@ var TextureDataMode;
     /**
    * 销毁
    */ _proto.dispose = function dispose() {
-        this.parentItem = undefined;
-        this.jointList = [];
+        this.rootBoneItem = undefined;
+        this.jointItem = [];
         this.inverseBindMatrices = [];
         this.animationMatrices = [];
     };
@@ -1228,6 +1253,38 @@ var TextureDataMode;
             return 0;
         }
     };
+    _proto.getJointItems = function getJointItems(props, rootBoneItem) {
+        var _props_boneNames;
+        var name2Item = this.genNodeName(rootBoneItem);
+        var jointItems = [];
+        (_props_boneNames = props.boneNames) == null ? void 0 : _props_boneNames.forEach(function(boneName) {
+            var node = name2Item[boneName];
+            if (!node) {
+                throw new Error("Can't find node of bone name " + boneName);
+            }
+            jointItems.push(node);
+        });
+        return jointItems;
+    };
+    _proto.genNodeName = function genNodeName(node) {
+        var name2Item = {};
+        var nameList = [];
+        name2Item[""] = node;
+        for(var _iterator = _create_for_of_iterator_helper_loose(node.children), _step; !(_step = _iterator()).done;){
+            var child = _step.value;
+            this.genNodeNameDFS(child, nameList, name2Item);
+        }
+        return name2Item;
+    };
+    _proto.genNodeNameDFS = function genNodeNameDFS(node, nameList, name2Item) {
+        nameList.push(node.name);
+        name2Item[nameList.join("/")] = node;
+        for(var _iterator = _create_for_of_iterator_helper_loose(node.children), _step; !(_step = _iterator()).done;){
+            var child = _step.value;
+            this.genNodeNameDFS(child, nameList, name2Item);
+        }
+        nameList.pop();
+    };
     return PSkin;
 }(PObject);
 /**
@@ -1245,6 +1302,10 @@ var TextureDataMode;
    * 范围要在 `[0, 8]` 之间，否则会报错。
    */ _this.morphWeightsLength = 0;
         /**
+   * weights 数组的具体数据，来自动画控制器的每帧更新
+   * 数组的长度必须和 morphWeightsLength 相同，否则会出错。
+   */ _this.morphWeightsArray = [];
+        /**
    * 是否有 Position 相关的 Morph 动画，shader 中需要知道
    */ _this.hasPositionMorph = false;
         /**
@@ -1286,7 +1347,7 @@ var TextureDataMode;
         });
         if (this.morphWeightsLength > 0) {
             // 有Morph动画，申请weights数据，判断各个属性是否有相关动画
-            this.morphWeightsArray = new Float32Array(this.morphWeightsLength);
+            this.morphWeightsArray = Array(this.morphWeightsLength).fill(0);
             this.hasPositionMorph = positionCount == this.morphWeightsLength;
             this.hasNormalMorph = normalCount == this.morphWeightsLength;
             this.hasTangentMorph = tangentCount == this.morphWeightsLength;
@@ -1313,14 +1374,11 @@ var TextureDataMode;
         }
         return true;
     };
-    _proto.dispose = function dispose() {
-        this.morphWeightsArray = undefined;
-    };
     /**
    * 初始化 Morph target 的权重数组
    * @param weights - glTF Mesh 的权重数组，长度必须严格一致
    */ _proto.initWeights = function initWeights(weights) {
-        if (this.morphWeightsArray === undefined) {
+        if (this.morphWeightsArray.length === 0) {
             return;
         }
         var morphWeights = this.morphWeightsArray;
@@ -1330,6 +1388,16 @@ var TextureDataMode;
             }
         });
     };
+    _proto.updateWeights = function updateWeights(weights) {
+        var _this = this;
+        if (weights.length != this.morphWeightsArray.length) {
+            console.error("Length of morph weights mismatch: input " + weights.length + ", internel " + this.morphWeightsArray.length);
+            return;
+        }
+        weights.forEach(function(value, index) {
+            return _this.morphWeightsArray[index] = value;
+        });
+    };
     /**
    * 当前状态是否有 Morph 动画：
    * 需要判断 weights 数组长度，以及 Position、Normal 和 Tangent 是否有动画
@@ -1369,38 +1437,38 @@ var TextureDataMode;
 /**
    * Morph 动画中 Position 相关的 Attribute 名称
    */ PMorph.positionNameList = [
-    "a_Target_Position0",
-    "a_Target_Position1",
-    "a_Target_Position2",
-    "a_Target_Position3",
-    "a_Target_Position4",
-    "a_Target_Position5",
-    "a_Target_Position6",
-    "a_Target_Position7"
+    "aTargetPosition0",
+    "aTargetPosition1",
+    "aTargetPosition2",
+    "aTargetPosition3",
+    "aTargetPosition4",
+    "aTargetPosition5",
+    "aTargetPosition6",
+    "aTargetPosition7"
 ];
 /**
    * Morph 动画中 Normal 相关的 Attribute 名称
    */ PMorph.normalNameList = [
-    "a_Target_Normal0",
-    "a_Target_Normal1",
-    "a_Target_Normal2",
-    "a_Target_Normal3",
-    "a_Target_Normal4",
-    "a_Target_Normal5",
-    "a_Target_Normal6",
-    "a_Target_Normal7"
+    "aTargetNormal0",
+    "aTargetNormal1",
+    "aTargetNormal2",
+    "aTargetNormal3",
+    "aTargetNormal4",
+    "aTargetNormal5",
+    "aTargetNormal6",
+    "aTargetNormal7"
 ];
 /**
    * Morph 动画中 Tangent 相关的 Attribute 名称
    */ PMorph.tangentNameList = [
-    "a_Target_Tangent0",
-    "a_Target_Tangent1",
-    "a_Target_Tangent2",
-    "a_Target_Tangent3",
-    "a_Target_Tangent4",
-    "a_Target_Tangent5",
-    "a_Target_Tangent6",
-    "a_Target_Tangent7"
+    "aTargetTangent0",
+    "aTargetTangent1",
+    "aTargetTangent2",
+    "aTargetTangent3",
+    "aTargetTangent4",
+    "aTargetTangent5",
+    "aTargetTangent6",
+    "aTargetTangent7"
 ];
 var PAnimInterpType;
 (function(PAnimInterpType) {
@@ -2429,7 +2497,7 @@ function _assert_this_initialized(self) {
    */ parentIndex = -1;
         _this./**
    * primitive 对象数组
-   */ primitives = [];
+   */ subMeshes = [];
         _this./**
    * 是否隐藏，默认是隐藏
    */ hide = true;
@@ -2457,18 +2525,22 @@ function _assert_this_initialized(self) {
         _this.parentIndex = proxy.getParentIndex();
         _this.parentItem = proxy.parentItem;
         _this.parentItemId = parentId;
+        _this.rootBoneItem = meshData.rootBone;
         _this.skin = proxy.getSkinObj(engine);
         _this.morph = proxy.getMorphObj();
         _this.hide = proxy.isHide();
         _this.priority = (owner == null ? void 0 : (_owner_item = owner.item) == null ? void 0 : _owner_item.listIndex) || 0;
         //
-        _this.primitives = [];
-        proxy.getPrimitives().forEach(function(primOpts) {
-            var primObj = new PPrimitive(_this.engine);
-            primObj.create(primOpts, _assert_this_initialized(_this));
-            _this.primitives.push(primObj);
+        _this.subMeshes = [];
+        var geometry = proxy.getGeometry();
+        var _owner_materials;
+        var materials = (_owner_materials = owner == null ? void 0 : owner.materials) != null ? _owner_materials : [];
+        materials.forEach(function(material) {
+            var subMesh = new PSubMesh(_this.engine);
+            subMesh.create(geometry, material, _assert_this_initialized(_this));
+            _this.subMeshes.push(subMesh);
         });
-        if (_this.primitives.length <= 0) {
+        if (_this.subMeshes.length <= 0) {
             console.warn("No primitive inside mesh item " + name);
         }
         _this.boundingBox = _this.getItemBoundingBox(meshData.interaction);
@@ -2484,7 +2556,7 @@ function _assert_this_initialized(self) {
             return;
         }
         this.isBuilt = true;
-        this.primitives.forEach(function(prim) {
+        this.subMeshes.forEach(function(prim) {
             prim.build(scene.maxLightCount, {}, scene.skybox);
         });
         if (PGlobalState.getInstance().visBoundingBox) {
@@ -2496,6 +2568,9 @@ function _assert_this_initialized(self) {
    */ _proto.update = function update() {
         if (this.owner !== undefined) {
             this.transform.fromEffectsTransform(this.owner.transform);
+            if (this.morph && this.morph.hasMorph() && this.owner.morphWeights.length > 0) {
+                this.morph.updateWeights(this.owner.morphWeights);
+            }
         }
     };
     /**
@@ -2506,9 +2581,8 @@ function _assert_this_initialized(self) {
         var _this_skin;
         (_this_skin = this.skin) == null ? void 0 : _this_skin.updateSkinMatrices();
         this.updateMaterial(scene);
-        this.primitives.forEach(function(prim) {
-            var mesh = prim.effectsMesh;
-            renderer.drawGeometry(mesh.geometry, mesh.material);
+        this.subMeshes.forEach(function(subMesh, index) {
+            renderer.drawGeometry(subMesh.getEffectsGeometry(), subMesh.getEffectsMaterial(), index);
         });
         if (this.visBoundingBox && this.boundingBoxMesh !== undefined) {
             var mesh = this.boundingBoxMesh.mesh;
@@ -2533,10 +2607,10 @@ function _assert_this_initialized(self) {
         this.skin = undefined;
         (_this_morph = this.morph) == null ? void 0 : _this_morph.dispose();
         this.morph = undefined;
-        this.primitives.forEach(function(prim) {
+        this.subMeshes.forEach(function(prim) {
             prim.dispose();
         });
-        this.primitives = [];
+        this.subMeshes = [];
         (_this_boundingBoxMesh = this.boundingBoxMesh) == null ? void 0 : _this_boundingBoxMesh.dispose();
         this.boundingBoxMesh = undefined;
     };
@@ -2579,7 +2653,7 @@ function _assert_this_initialized(self) {
         var worldMatrix = this.matrix;
         var normalMatrix = worldMatrix.clone().invert().transpose();
         var sceneStates = scene.sceneStates;
-        this.primitives.forEach(function(prim) {
+        this.subMeshes.forEach(function(prim) {
             prim.updateMaterial(worldMatrix, normalMatrix, sceneStates);
         });
         if (this.boundingBoxMesh !== undefined) {
@@ -2633,7 +2707,7 @@ function _assert_this_initialized(self) {
         }
         var mint;
         if (PGlobalState.getInstance().isEditorEnv) {
-            this.primitives.forEach(function(prim) {
+            this.subMeshes.forEach(function(prim) {
                 var primt = prim.hitTesting(newOrigin, newDirection, worldMatrix, invWorldMatrix);
                 if (primt !== undefined) {
                     if (mint === undefined || mint > primt) {
@@ -2661,7 +2735,7 @@ function _assert_this_initialized(self) {
    */ _proto.computeBoundingBox = function computeBoundingBox(worldMatrix) {
         var box = this.boundingBox.makeEmpty();
         var inverseWorldMatrix = worldMatrix.clone().invert();
-        this.primitives.forEach(function(prim) {
+        this.subMeshes.forEach(function(prim) {
             var subbox = prim.computeBoundingBox(inverseWorldMatrix);
             box.union(subbox);
         });
@@ -2718,24 +2792,14 @@ function _assert_this_initialized(self) {
    */ function get() {
                 return this.skin !== undefined;
             }
-        },
-        {
-            key: "mriMeshs",
-            get: /**
-   * 获取 GE Mesh 数组
-   */ function get() {
-                return this.primitives.map(function(prim) {
-                    return prim.effectsMesh;
-                });
-            }
         }
     ]);
     return PMesh;
 }(PEntity);
 /**
- * Primitive 类，负责 Sub Mesh相关的功能，支持骨骼动画和 PBR 渲染
- */ var PPrimitive = /*#__PURE__*/ function() {
-    function PPrimitive(engine) {
+ * PSubMesh 类，负责 Sub Mesh相关的功能，支持骨骼动画和 PBR 渲染
+ */ var PSubMesh = /*#__PURE__*/ function() {
+    function PSubMesh(engine) {
         this.engine = engine;
         this./**
    * 名称
@@ -2750,17 +2814,17 @@ function _assert_this_initialized(self) {
    * 是否压缩，模式不压缩
    */ isCompressed = false;
     }
-    var _proto = PPrimitive.prototype;
+    var _proto = PSubMesh.prototype;
     /**
    * 创建 Primitive 对象
    * @param data - Primitive 参数
    * @param parent - 所属 Mesh 对象
-   */ _proto.create = function create(data, parent) {
+   */ _proto.create = function create(geometry, material, parent) {
         this.parent = parent;
         this.skin = parent.skin;
         this.morph = parent.morph;
-        this.setGeometry(data.geometry);
-        this.setMaterial(data.material);
+        this.setGeometry(geometry);
+        this.setMaterial(material);
         this.name = parent.name;
         this.effectsPriority = parent.priority;
         this.geometry.setHide(parent.hide);
@@ -2798,6 +2862,7 @@ function _assert_this_initialized(self) {
         var primitiveMacroList = this.getMacroList(lightCount, true, skybox);
         var materialMacroList = this.material.getMacroList(primitiveMacroList);
         var newSemantics = uniformSemantics != null ? uniformSemantics : {};
+        // FIXME: Semantics整体移除
         newSemantics["_ViewProjectionMatrix"] = "VIEWPROJECTION";
         //newSemantics["uView"] = 'VIEWINVERSE';
         newSemantics["_ModelMatrix"] = "MODEL";
@@ -2806,6 +2871,7 @@ function _assert_this_initialized(self) {
         var isWebGL2 = PGlobalState.getInstance().isWebGL2;
         if (this.material.effectMaterial) {
             material = this.material.effectMaterial;
+            // FIXME: Semantics整体移除
             // @ts-expect-error
             material.uniformSemantics = newSemantics;
             materialMacroList.forEach(function(macro) {
@@ -2825,16 +2891,6 @@ function _assert_this_initialized(self) {
             });
             this.material.setMaterialStates(material);
         }
-        var mesh = Mesh.create(this.engine, {
-            name: this.name,
-            material: material,
-            geometry: this.getEffectsGeometry(),
-            priority: this.effectsPriority
-        });
-        if (this.effectsMesh !== undefined) {
-            this.effectsMesh.dispose();
-        }
-        this.effectsMesh = mesh;
     };
     _proto.getFeatureList = function getFeatureList(lightCount, pbrPass, skybox) {
         var featureList = [];
@@ -3032,12 +3088,6 @@ function _assert_this_initialized(self) {
         this.jointMatrixTexture = undefined;
         (_this_jointNormalMatTexture = this.jointNormalMatTexture) == null ? void 0 : _this_jointNormalMatTexture.dispose();
         this.jointNormalMatTexture = undefined;
-        this.effectsMesh.dispose({
-            geometries: DestroyOptions.keep,
-            material: DestroyOptions.keep
-        });
-        // @ts-expect-error
-        this.effectsMesh = undefined;
     };
     /**
    * 更新内部 GE 材质着色器 Uniform 数据，根据场景状态
@@ -3047,7 +3097,7 @@ function _assert_this_initialized(self) {
    */ _proto.updateMaterial = function updateMaterial(worldMatrix, nomralMatrix, sceneStates) {
         this.updateUniformsByAnimation(worldMatrix, nomralMatrix);
         this.updateUniformsByScene(sceneStates);
-        this.material.updateUniforms(this.getModelMaterial());
+        this.material.updateUniforms(this.getEffectsMaterial());
     };
     /**
    * 点击测试，先进行简单的包围合测试，然后再计算精准的点击测试，这个测试非常耗时不要在移动端上使用
@@ -3120,7 +3170,7 @@ function _assert_this_initialized(self) {
         }
     };
     _proto.updateUniformsByAnimation = function updateUniformsByAnimation(worldMatrix, normalMatrix) {
-        var material = this.getModelMaterial();
+        var material = this.getEffectsMaterial();
         material.setMatrix("_ModelMatrix", worldMatrix);
         material.setMatrix("_NormalMatrix", normalMatrix);
         //
@@ -3152,16 +3202,12 @@ function _assert_this_initialized(self) {
         // Morph 相关的数据更新，仅需要更新 weights 数组
         var morph = this.morph;
         if (morph !== undefined && morph.hasMorph()) {
-            var morphWeights = morph.morphWeightsArray;
-            var morphWeightNumbers = [];
-            morphWeights.forEach(function(val) {
-                return morphWeightNumbers.push(val);
-            });
-            material.setFloats("_morphWeights", morphWeightNumbers);
+            var morphWeights = morph.morphWeightsArray.slice();
+            material.setFloats("_morphWeights", morphWeights);
         }
     };
     _proto.updateUniformsByScene = function updateUniformsByScene(sceneStates) {
-        var material = this.getModelMaterial();
+        var material = this.getEffectsMaterial();
         material.setMatrix("_ViewProjectionMatrix", sceneStates.viewProjectionMatrix);
         material.setVector3("_Camera", sceneStates.cameraPosition);
         //
@@ -3258,8 +3304,8 @@ function _assert_this_initialized(self) {
     /**
    * 获取 GE 材质
    * @returns
-   */ _proto.getModelMaterial = function getModelMaterial() {
-        return this.effectsMesh.material;
+   */ _proto.getEffectsMaterial = function getEffectsMaterial() {
+        return this.material.effectMaterial;
     };
     /**
    * 是否无光照材质
@@ -3294,7 +3340,7 @@ function _assert_this_initialized(self) {
             return this.boundingBox.clone().applyMatrix4(matrix);
         }
     };
-    return PPrimitive;
+    return PSubMesh;
 }();
 /**
  * 3D 几何类
@@ -3370,7 +3416,7 @@ function _assert_this_initialized(self) {
    * 是否有切线属性
    * @returns
    */ _proto.hasTangents = function hasTangents() {
-        return this.hasAttribute("a_Tangent");
+        return this.hasAttribute("aTangent");
     };
     /**
    * 是否有纹理坐标属性
@@ -3387,19 +3433,19 @@ function _assert_this_initialized(self) {
    * 是否有颜色属性
    * @returns
    */ _proto.hasColors = function hasColors() {
-        return this.hasAttribute("a_Color");
+        return this.hasAttribute("aColor");
     };
     /**
    * 是否有关节点属性
    * @returns
    */ _proto.hasJoints = function hasJoints() {
-        return this.hasAttribute("a_Joint1");
+        return this.hasAttribute("aJoints");
     };
     /**
    * 是否有权重属性
    * @returns
    */ _proto.hasWeights = function hasWeights() {
-        return this.hasAttribute("a_Weight1");
+        return this.hasAttribute("aWeights");
     };
     return PGeometry;
 }();
@@ -3408,34 +3454,17 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
         this.itemData = itemData;
         this.parentItem = parentItem;
         this.data = itemData;
-        // Morph 对象创建，需要为每个 Primitive 中 Geometry 对象创建 Morph
-        // 并且要求创建的 Morph 对象状态是相同的，否则就报错
-        var isSuccess = true;
+        this.geometry = itemData.geometry;
+        this.rootBoneItem = itemData.rootBone;
         var morphObj = new PMorph();
-        var _this_data = this.data, primitives = _this_data.primitives, morph = _this_data.morph;
-        primitives.forEach(function(prim, idx) {
-            if (idx === 0) {
-                morphObj.create(prim.geometry);
-            } else {
-                var tempMorph = new PMorph();
-                if (!tempMorph.create(prim.geometry)) {
-                    isSuccess = false;
-                } else {
-                    if (!morphObj.equals(tempMorph)) {
-                        isSuccess = false;
-                        console.error("Morpth target mismatch between primtives: " + JSON.stringify(morphObj) + ", " + JSON.stringify(tempMorph));
-                    }
-                }
-            }
-        });
-        if (isSuccess) {
+        if (morphObj.create(this.geometry)) {
+            var _itemData_morph;
             // 设置初始权重数组
-            if ((morph == null ? void 0 : morph.weights) !== undefined) {
-                morphObj.initWeights(morph.weights);
+            if ((_itemData_morph = itemData.morph) == null ? void 0 : _itemData_morph.weights) {
+                var _itemData_morph1;
+                morphObj.initWeights((_itemData_morph1 = itemData.morph) == null ? void 0 : _itemData_morph1.weights);
             }
             this.morphObj = morphObj;
-        } else {
-            this.morphObj = new PMorph();
         }
     }
     var _proto = EffectsMeshProxy.prototype;
@@ -3468,27 +3497,27 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
     _proto.getParentIndex = function getParentIndex() {
         return -1;
     };
-    _proto.getPrimitives = function getPrimitives() {
-        return this.data.primitives;
+    _proto.getGeometry = function getGeometry() {
+        return this.data.geometry;
+    };
+    _proto.getMaterials = function getMaterials() {
+        return this.data.materials;
     };
-    _proto.getPrimitiveCount = function getPrimitiveCount() {
-        return this.data.primitives.length;
+    _proto.getMaterialCount = function getMaterialCount() {
+        return this.data.materials.length;
     };
     _proto.hasSkin = function hasSkin() {
-        // FIXME: skin
-        //return this.options.skin !== undefined;
-        return false;
+        var skin = this.geometry.getSkinProps();
+        return !!(skin.rootBoneName && skin.boneNames && skin.inverseBindMatrices && this.rootBoneItem);
     };
     _proto.getSkinOpts = function getSkinOpts() {
-        // FIXME: skin
-        //return this.options.skin;
-        return;
+        return this.geometry.getSkinProps();
     };
     _proto.getSkinObj = function getSkinObj(engine) {
         var skin = this.getSkinOpts();
-        if (skin !== undefined) {
+        if (skin.rootBoneName && skin.boneNames && skin.inverseBindMatrices && this.rootBoneItem) {
             var skinObj = new PSkin();
-            skinObj.create(skin, engine, this.parentItem);
+            skinObj.create(skin, engine, this.rootBoneItem);
             return skinObj;
         }
         return undefined;
@@ -3878,7 +3907,7 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
     return PSceneManager;
 }();
 
-var primitiveVert = "precision highp float;\n#define FEATURES\n#include <webglCompatibility.glsl>\n#include <animation.vert.glsl>\nvsIn vec4 aPos;vsOut vec3 v_Position;\n#ifdef HAS_NORMALS\nvsIn vec4 aNormal;\n#endif\n#ifdef HAS_TANGENTS\nvsIn vec4 a_Tangent;\n#endif\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nvsOut mat3 v_TBN;\n#else\nvsOut vec3 v_Normal;\n#endif\n#endif\n#ifdef HAS_UV_SET1\nvsIn vec2 aUV;\n#endif\n#ifdef HAS_UV_SET2\nvsIn vec2 aUV2;\n#endif\nvsOut vec2 v_UVCoord1;\n#ifdef HAS_UV_SET2\nvsOut vec2 v_UVCoord2;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC3\nvsIn vec3 a_Color;vsOut vec3 v_Color;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC4\nvsIn vec4 a_Color;vsOut vec4 v_Color;\n#endif\nuniform mat4 _ViewProjectionMatrix;uniform mat4 _ModelMatrix;uniform mat4 _NormalMatrix;\n#ifdef EDITOR_TRANSFORM\nuniform vec4 uEditorTransform;\n#endif\n#ifdef USE_SHADOW_MAPPING\nuniform mat4 _LightViewProjectionMatrix;uniform float _DeltaSceneSize;vsOut vec4 v_PositionLightSpace;vsOut vec4 v_dPositionLightSpace;\n#endif\nvec4 getPosition(){vec4 pos=vec4(aPos.xyz,1.0);\n#ifdef USE_MORPHING\npos+=getTargetPosition();\n#endif\n#ifdef USE_SKINNING\npos=getSkinningMatrix()*pos;\n#endif\nreturn pos;}\n#ifdef HAS_NORMALS\nvec4 getNormal(){vec4 normal=aNormal;\n#ifdef USE_MORPHING\nnormal+=getTargetNormal();\n#endif\n#ifdef USE_SKINNING\nnormal=getSkinningNormalMatrix()*normal;\n#endif\nreturn normalize(normal);}\n#endif\n#ifdef HAS_TANGENTS\nvec4 getTangent(){vec4 tangent=a_Tangent;\n#ifdef USE_MORPHING\ntangent+=getTargetTangent();\n#endif\n#ifdef USE_SKINNING\ntangent=getSkinningMatrix()*tangent;\n#endif\nreturn normalize(tangent);}\n#endif\nvoid main(){vec4 pos=_ModelMatrix*getPosition();v_Position=vec3(pos.xyz)/pos.w;\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nvec4 tangent=getTangent();vec3 normalW=normalize(vec3(_NormalMatrix*vec4(getNormal().xyz,0.0)));vec3 tangentW=normalize(vec3(_ModelMatrix*vec4(tangent.xyz,0.0)));vec3 bitangentW=cross(normalW,tangentW)*tangent.w;v_TBN=mat3(tangentW,bitangentW,normalW);\n#else\nv_Normal=normalize(vec3(_NormalMatrix*vec4(getNormal().xyz,0.0)));\n#endif\n#endif\nv_UVCoord1=vec2(0.0,0.0);\n#ifdef HAS_UV_SET1\nv_UVCoord1=aUV;\n#endif\n#ifdef HAS_UV_SET2\nv_UVCoord2=aUV2;\n#endif\n#if defined(HAS_VERTEX_COLOR_VEC3) || defined(HAS_VERTEX_COLOR_VEC4)\nv_Color=a_Color;\n#endif\n#ifdef USE_SHADOW_MAPPING\nv_PositionLightSpace=_LightViewProjectionMatrix*pos;vec3 dpos=vec3(_DeltaSceneSize);v_dPositionLightSpace=_LightViewProjectionMatrix*(pos+vec4(dpos,0));\n#endif\ngl_Position=_ViewProjectionMatrix*pos;\n#ifdef EDITOR_TRANSFORM\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}";
+var primitiveVert = "precision highp float;\n#define FEATURES\n#include <webglCompatibility.glsl>\n#include <animation.vert.glsl>\nvsIn vec4 aPos;vsOut vec3 v_Position;\n#ifdef HAS_NORMALS\nvsIn vec4 aNormal;\n#endif\n#ifdef HAS_TANGENTS\nvsIn vec4 aTangent;\n#endif\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nvsOut mat3 v_TBN;\n#else\nvsOut vec3 v_Normal;\n#endif\n#endif\n#ifdef HAS_UV_SET1\nvsIn vec2 aUV;\n#endif\n#ifdef HAS_UV_SET2\nvsIn vec2 aUV2;\n#endif\nvsOut vec2 v_UVCoord1;\n#ifdef HAS_UV_SET2\nvsOut vec2 v_UVCoord2;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC3\nvsIn vec3 aColor;vsOut vec3 v_Color;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC4\nvsIn vec4 aColor;vsOut vec4 v_Color;\n#endif\nuniform mat4 _ViewProjectionMatrix;uniform mat4 _ModelMatrix;uniform mat4 _NormalMatrix;\n#ifdef EDITOR_TRANSFORM\nuniform vec4 uEditorTransform;\n#endif\n#ifdef USE_SHADOW_MAPPING\nuniform mat4 _LightViewProjectionMatrix;uniform float _DeltaSceneSize;vsOut vec4 v_PositionLightSpace;vsOut vec4 v_dPositionLightSpace;\n#endif\nvec4 getPosition(){vec4 pos=vec4(aPos.xyz,1.0);\n#ifdef USE_MORPHING\npos+=getTargetPosition();\n#endif\n#ifdef USE_SKINNING\npos=getSkinningMatrix()*pos;\n#endif\nreturn pos;}\n#ifdef HAS_NORMALS\nvec4 getNormal(){vec4 normal=aNormal;\n#ifdef USE_MORPHING\nnormal+=getTargetNormal();\n#endif\n#ifdef USE_SKINNING\nnormal=getSkinningNormalMatrix()*normal;\n#endif\nreturn normalize(normal);}\n#endif\n#ifdef HAS_TANGENTS\nvec4 getTangent(){vec4 tangent=aTangent;\n#ifdef USE_MORPHING\ntangent+=getTargetTangent();\n#endif\n#ifdef USE_SKINNING\ntangent=getSkinningMatrix()*tangent;\n#endif\nreturn normalize(tangent);}\n#endif\nvoid main(){vec4 pos=_ModelMatrix*getPosition();v_Position=vec3(pos.xyz)/pos.w;\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nvec4 tangent=getTangent();vec3 normalW=normalize(vec3(_NormalMatrix*vec4(getNormal().xyz,0.0)));vec3 tangentW=normalize(vec3(_ModelMatrix*vec4(tangent.xyz,0.0)));vec3 bitangentW=cross(normalW,tangentW)*tangent.w;v_TBN=mat3(tangentW,bitangentW,normalW);\n#else\nv_Normal=normalize(vec3(_NormalMatrix*vec4(getNormal().xyz,0.0)));\n#endif\n#endif\nv_UVCoord1=vec2(0.0,0.0);\n#ifdef HAS_UV_SET1\nv_UVCoord1=aUV;\n#endif\n#ifdef HAS_UV_SET2\nv_UVCoord2=aUV2;\n#endif\n#if defined(HAS_VERTEX_COLOR_VEC3) || defined(HAS_VERTEX_COLOR_VEC4)\nv_Color=aColor;\n#endif\n#ifdef USE_SHADOW_MAPPING\nv_PositionLightSpace=_LightViewProjectionMatrix*pos;vec3 dpos=vec3(_DeltaSceneSize);v_dPositionLightSpace=_LightViewProjectionMatrix*(pos+vec4(dpos,0));\n#endif\ngl_Position=_ViewProjectionMatrix*pos;\n#ifdef EDITOR_TRANSFORM\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}";
 
 var metallicRoughnessFrag = "\n#define FEATURES\n#ifndef WEBGL2\n#extension GL_OES_standard_derivatives : enable\n#endif\n#if !defined(WEBGL2) && defined(USE_TEX_LOD)\n#extension GL_EXT_shader_texture_lod : enable\n#endif\n#ifdef USE_HDR\n#extension GL_OES_texture_float : enable\n#extension GL_OES_texture_float_linear : enable\n#endif\n#if !defined(WEBGL2) && defined(USE_WBOIT)\n#extension GL_EXT_draw_buffers: require\n#endif\n#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\n#ifdef WEBGL2\n#ifdef USE_WBOIT\nlayout(location=0)out vec4 outFragColor0;layout(location=1)out vec4 outFragColor1;\n#else\nout vec4 outFragColor;\n#endif\n#else\n#ifdef USE_WBOIT\n#define outFragColor0 gl_FragData[0]\n#define outFragColor1 gl_FragData[1]\n#else\n#define outFragColor gl_FragColor\n#endif\n#endif\n#include <webglCompatibility.glsl>\n#include <extensions.frag.glsl>\n#include <tonemapping.frag.glsl>\n#include <textures.vert.glsl>\n#include <functions.frag.glsl>\n#include <shadowCommon.vert.glsl>\n#include <shadow.frag.glsl>\nstruct Light{vec3 direction;float range;vec3 color;float intensity;vec3 position;float innerConeCos;float outerConeCos;int type;vec2 padding;};const int LightType_Directional=0;const int LightType_Point=1;const int LightType_Spot=2;const int LightType_Ambient=3;\n#ifdef USE_PUNCTUAL\nuniform Light _Lights[LIGHT_COUNT];\n#endif\n#if defined(MATERIAL_SPECULARGLOSSINESS) || defined(MATERIAL_METALLICROUGHNESS)\nuniform float _MetallicFactor;uniform float _RoughnessFactor;uniform vec4 _BaseColorFactor;\n#endif\n#ifdef MATERIAL_SPECULARGLOSSINESS\nuniform vec3 _SpecularFactor;uniform vec4 _DiffuseFactor;uniform float _GlossinessFactor;\n#endif\n#ifdef ALPHAMODE_MASK\nuniform float _AlphaCutoff;\n#endif\n#ifdef ADD_FOG\nuniform vec4 _FogColor;\n#ifdef LINEAR_FOG\nuniform float _FogNear;uniform float _FogFar;\n#endif\n#ifdef EXP_FOG\nuniform float _FogDensity;\n#endif\n#endif\n#ifdef PREVIEW_BORDER\nuniform vec4 uPreviewColor;\n#endif\nuniform vec3 _Camera;uniform int _MipCount;struct MaterialInfo{float perceptualRoughness;vec3 reflectance0;float alphaRoughness;vec3 diffuseColor;vec3 reflectance90;vec3 specularColor;};\n#ifdef ADD_FOG\nvec3 getMixFogColor(vec3 baseColor){vec3 distance=_Camera-v_Position;float fogAmount=0.0;\n#ifdef LINEAR_FOG\nfogAmount=smoothstep(_FogNear,_FogFar,distance[2]);\n#endif\n#ifdef EXP_FOG\n#define LOG2 1.442695\nfogAmount=1.-exp2(-_FogDensity*_FogDensity*distance[2]*distance[2]*LOG2);fogAmount=clamp(fogAmount,0.,1.);\n#endif\nvec3 mixColor=baseColor.rgb+(vec3(_FogColor)-baseColor.rgb)*fogAmount;return mixColor;}\n#endif\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 getIrradiance(vec3 norm,SHCoefficients c){float x=norm.x;float y=norm.y;float z=norm.z;float c1=0.429043;float c2=0.511664;float c3=0.743125;float c4=0.886227;float c5=0.247708;vec3 irradiance=c1*c.l22*(x*x-y*y)+c3*c.l20*(z*z)+c4*c.l00-c5*c.l20+2.0*c1*(c.l2m2*x*y+c.l21*x*z+c.l2m1*y*z)+2.0*c2*(c.l11*x+c.l1m1*y+c.l10*z);return irradiance;}\n#endif\n#ifdef USE_IBL\nvec3 getIBLContribution(MaterialInfo materialInfo,vec3 n,vec3 v){float NdotV=clamp(dot(n,v),0.0,1.0);float lod=clamp(materialInfo.perceptualRoughness*float(_MipCount),0.0,float(_MipCount));vec3 reflection=normalize(reflect(-v,n));vec2 brdfSamplePoint=clamp(vec2(NdotV,materialInfo.perceptualRoughness),vec2(0.0,0.0),vec2(1.0,1.0));vec2 brdf=texture2D(_brdfLUT,brdfSamplePoint).rg;vec4 diffuseColor=vec4(1.0,0.0,0.0,1.0);\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 irradiance=getIrradiance(n,_shCoefficients);diffuseColor=vec4(irradiance,1.0);\n#else\ndiffuseColor=textureCube(_DiffuseEnvSampler,n);\n#endif\n#ifdef USE_TEX_LOD\nvec4 specularSample=_textureCubeLodEXT(_SpecularEnvSampler,reflection,lod);\n#else\nvec4 specularSample=textureCube(_SpecularEnvSampler,reflection,lod);\n#endif\n#ifdef USE_HDR\nvec3 diffuseLight=diffuseColor.rgb;vec3 specularLight=specularSample.rgb;\n#else\nvec3 diffuseLight=SRGBtoLINEAR(diffuseColor).rgb;vec3 specularLight=SRGBtoLINEAR(specularSample).rgb;\n#endif\nvec3 diffuse=diffuseLight*materialInfo.diffuseColor;vec3 specular=specularLight*(materialInfo.specularColor*brdf.x+brdf.y);return diffuse*_IblIntensity[0]+specular*_IblIntensity[1];}\n#endif\nvec3 diffuse(MaterialInfo materialInfo){return materialInfo.diffuseColor/M_PI;}vec3 specularReflection(MaterialInfo materialInfo,AngularInfo angularInfo){return materialInfo.reflectance0+(materialInfo.reflectance90-materialInfo.reflectance0)*pow(clamp(1.0-angularInfo.VdotH,0.0,1.0),5.0);}float visibilityOcclusion(MaterialInfo materialInfo,AngularInfo angularInfo){float NdotL=angularInfo.NdotL;float NdotV=angularInfo.NdotV;float alphaRoughnessSq=materialInfo.alphaRoughness*materialInfo.alphaRoughness;float GGXV=NdotL*sqrt(NdotV*NdotV*(1.0-alphaRoughnessSq)+alphaRoughnessSq);float GGXL=NdotV*sqrt(NdotL*NdotL*(1.0-alphaRoughnessSq)+alphaRoughnessSq);float GGX=GGXV+GGXL;if(GGX>0.0){return 0.5/GGX;}return 0.0;}float microfacetDistribution(MaterialInfo materialInfo,AngularInfo angularInfo){float alphaRoughnessSq=materialInfo.alphaRoughness*materialInfo.alphaRoughness;float f=(angularInfo.NdotH*alphaRoughnessSq-angularInfo.NdotH)*angularInfo.NdotH+1.0;return alphaRoughnessSq/(M_PI*f*f);}vec3 getPointShade(vec3 pointToLight,MaterialInfo materialInfo,vec3 normal,vec3 view){AngularInfo angularInfo=getAngularInfo(pointToLight,normal,view);if(angularInfo.NdotL>0.0||angularInfo.NdotV>0.0){vec3 F=specularReflection(materialInfo,angularInfo);float Vis=visibilityOcclusion(materialInfo,angularInfo);float D=microfacetDistribution(materialInfo,angularInfo);vec3 diffuseContrib=(1.0-F)*diffuse(materialInfo);vec3 specContrib=F*Vis*D;return angularInfo.NdotL*(diffuseContrib+specContrib);}return vec3(0.0,0.0,0.0);}float getRangeAttenuation(float range,float distance){if(range<=0.0){return 1.0;}return 1.0/(pow(5.0*distance/range,2.0)+1.0);}float getSpotAttenuation(vec3 pointToLight,vec3 spotDirection,float outerConeCos,float innerConeCos){float actualCos=dot(normalize(spotDirection),normalize(-pointToLight));if(actualCos>outerConeCos){if(actualCos<innerConeCos){return smoothstep(outerConeCos,innerConeCos,actualCos);}return 1.0;}return 0.0;}vec3 applyDirectionalLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view,float shadow){vec3 pointToLight=-light.direction;vec3 shade=getPointShade(pointToLight,materialInfo,normal,view)*shadow;return light.intensity*light.color*shade;}vec3 applyPointLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view){vec3 pointToLight=light.position-v_Position;float distance=length(pointToLight);float attenuation=getRangeAttenuation(light.range,distance);vec3 shade=getPointShade(pointToLight,materialInfo,normal,view);return light.color*shade*attenuation*light.intensity;}vec3 applySpotLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view,float shadow){vec3 pointToLight=light.position-v_Position;float distance=length(pointToLight);float rangeAttenuation=getRangeAttenuation(light.range,distance);float spotAttenuation=getSpotAttenuation(pointToLight,light.direction,light.outerConeCos,light.innerConeCos);vec3 shade=getPointShade(pointToLight,materialInfo,normal,view)*shadow;return rangeAttenuation*spotAttenuation*light.intensity*light.color*shade;}vec3 applyAmbientLight(Light light,MaterialInfo materialInfo){return light.intensity*light.color*diffuse(materialInfo);}float weight(float z,float a){return clamp(pow(min(1.0,a*10.0)+0.01,3.0)*1e8*pow(1.0-z*0.9,3.0),1e-2,3e3);}void writeFragmentColor(vec4 fragColor){\n#if !defined(ALPHAMODE_OPAQUE) && defined(USE_WBOIT)\nfloat w=weight(gl_FragCoord.z,fragColor.a);fragColor.rgb*=fragColor.a;outFragColor0=vec4(fragColor.rgb*w,fragColor.a);outFragColor1=vec4(fragColor.a*w);\n#else\noutFragColor=fragColor;\n#endif\n}void main(){float perceptualRoughness=0.0;float metallic=0.0;vec4 baseColor=vec4(0.0,0.0,0.0,1.0);vec3 diffuseColor=vec3(0.0);vec3 specularColor=vec3(0.0);vec3 f0=vec3(0.04);\n#ifdef PREVIEW_BORDER\nwriteFragmentColor(uPreviewColor);return;\n#endif\n#ifdef MATERIAL_SPECULARGLOSSINESS\n#ifdef HAS_SPECULAR_GLOSSINESS_MAP\nvec4 sgSample=SRGBtoLINEAR(texture2D(_SpecularGlossinessSampler,getSpecularGlossinessUV()));perceptualRoughness=(1.0-sgSample.a*_GlossinessFactor);f0=sgSample.rgb*_SpecularFactor;\n#else\nf0=_SpecularFactor;perceptualRoughness=1.0-_GlossinessFactor;\n#endif\n#ifdef HAS_DIFFUSE_MAP\nbaseColor=SRGBtoLINEAR(texture2D(_DiffuseSampler,getDiffuseUV()))*_DiffuseFactor;\n#else\nbaseColor=SRGBtoLINEAR(_DiffuseFactor);\n#endif\nbaseColor*=getVertexColor();specularColor=f0;float oneMinusSpecularStrength=1.0-max(max(f0.r,f0.g),f0.b);diffuseColor=baseColor.rgb*oneMinusSpecularStrength;\n#ifdef DEBUG_METALLIC\nmetallic=solveMetallic(baseColor.rgb,specularColor,oneMinusSpecularStrength);\n#endif\n#endif\n#ifdef MATERIAL_METALLICROUGHNESS\n#ifdef HAS_METALLIC_ROUGHNESS_MAP\nvec4 mrSample=texture2D(_MetallicRoughnessSampler,getMetallicRoughnessUV());perceptualRoughness=mrSample.g*_RoughnessFactor;metallic=mrSample.b*_MetallicFactor;\n#else\nmetallic=_MetallicFactor;perceptualRoughness=_RoughnessFactor;\n#endif\n#ifdef HAS_BASE_COLOR_MAP\nbaseColor=SRGBtoLINEAR(texture2D(_BaseColorSampler,getBaseColorUV()))*_BaseColorFactor;\n#else\nbaseColor=SRGBtoLINEAR(_BaseColorFactor);\n#endif\nbaseColor*=getVertexColor();diffuseColor=baseColor.rgb*(vec3(1.0)-f0)*(1.0-metallic);specularColor=mix(f0,baseColor.rgb,metallic);\n#endif\n#ifdef ALPHAMODE_MASK\nif(baseColor.a<_AlphaCutoff){discard;}baseColor.a=1.0;\n#endif\n#ifdef ALPHAMODE_OPAQUE\nbaseColor.a=1.0;\n#endif\n#ifdef MATERIAL_UNLIT\n#ifndef DEBUG_OUTPUT\n#ifdef ADD_FOG\nvec3 mixColor=getMixFogColor(baseColor.rgb);vec4 fragColorUnlit=vec4(LINEARtoSRGB(mixColor)*baseColor.a,baseColor.a);\n#else\nvec4 fragColorUnlit=vec4(LINEARtoSRGB(baseColor.rgb)*baseColor.a,baseColor.a);\n#endif\nwriteFragmentColor(fragColorUnlit);\n#else\n#ifdef DEBUG_UV\noutFragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),getNormal()));\n#endif\n#ifdef DEBUG_METALLIC\noutFragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\noutFragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\noutFragColor.rgb=getNormal()*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\noutFragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\noutFragColor.rgb=vec3(1.0);\n#endif\n#ifdef DEBUG_EMISSIVE\noutFragColor.rgb=vec3(0.0);\n#endif\n#ifdef DEBUG_ALPHA\noutFragColor.rgb=vec3(baseColor.a);\n#endif\noutFragColor.a=1.0;\n#endif\nreturn;\n#endif\nmetallic=clamp(metallic,0.0,1.0);float alphaRoughness=perceptualRoughness*perceptualRoughness;vec3 normal=getNormal();\n#ifdef USE_SPECULAR_AA\nfloat AARoughnessFactor=getAARoughnessFactor(normal);perceptualRoughness+=AARoughnessFactor;alphaRoughness+=AARoughnessFactor;\n#endif\nperceptualRoughness=clamp(perceptualRoughness,0.04,1.0);alphaRoughness=clamp(alphaRoughness,0.04,1.0);float reflectance=max(max(specularColor.r,specularColor.g),specularColor.b);vec3 specularEnvironmentR0=specularColor.rgb;vec3 specularEnvironmentR90=vec3(clamp(reflectance*50.0,0.0,1.0));MaterialInfo materialInfo=MaterialInfo(perceptualRoughness,specularEnvironmentR0,alphaRoughness,diffuseColor,specularEnvironmentR90,specularColor);vec3 color=vec3(0.0,0.0,0.0);vec3 view=normalize(_Camera-v_Position);float shadow=1.0;\n#ifdef USE_SHADOW_MAPPING\nshadow=getShadowContribution();\n#endif\n#ifdef USE_PUNCTUAL\nfor(int i=0;i<LIGHT_COUNT;++i){Light light=_Lights[i];if(light.type==LightType_Directional){color+=applyDirectionalLight(light,materialInfo,normal,view,shadow);}else if(light.type==LightType_Point){color+=applyPointLight(light,materialInfo,normal,view);}else if(light.type==LightType_Spot){color+=applySpotLight(light,materialInfo,normal,view,shadow);}else if(light.type==LightType_Ambient){color+=applyAmbientLight(light,materialInfo);}}\n#endif\n#ifdef USE_IBL\ncolor+=getIBLContribution(materialInfo,normal,view);\n#endif\nfloat ao=1.0;\n#ifdef HAS_OCCLUSION_MAP\nao=texture2D(_OcclusionSampler,getOcclusionUV()).r;color=mix(color,color*ao,_OcclusionStrength);\n#endif\nvec3 emissive=vec3(0);\n#ifndef DEBUG_OUTPUT\n#ifdef ADD_FOG\nvec4 toneMapColor=SRGBtoLINEAR(vec4(toneMap(color),baseColor.a));color=getMixFogColor(toneMapColor.rgb);vec4 fragColorOut=vec4(LINEARtoSRGB(color.rgb)*baseColor.a,baseColor.a);\n#else\ncolor=toneMap(color)*baseColor.a;\n#ifdef HAS_EMISSIVE\ncolor+=_EmissiveFactor.rgb*_EmissiveIntensity;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nemissive=SRGBtoLINEAR(texture2D(_EmissiveSampler,getEmissiveUV())).rgb*_EmissiveFactor.rgb*_EmissiveIntensity;color+=emissive;\n#endif\nvec4 fragColorOut=vec4(color,baseColor.a);\n#endif\nwriteFragmentColor(fragColorOut);\n#else\n#ifdef DEBUG_UV\noutFragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),normal));\n#endif\n#ifdef DEBUG_METALLIC\noutFragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\noutFragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\noutFragColor.rgb=normal*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\noutFragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\n#ifdef HAS_OCCLUSION_MAP\noutFragColor.rgb=vec3(mix(1.0,ao,_OcclusionStrength));\n#else\noutFragColor.rgb=vec3(1.0);\n#endif\n#endif\n#ifdef DEBUG_EMISSIVE\n#ifdef HAS_EMISSIVE\nemissive=_EmissiveFactor.rgb*_EmissiveIntensity;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nemissive=SRGBtoLINEAR(texture2D(_EmissiveSampler,getEmissiveUV())).rgb*_EmissiveFactor.rgb*_EmissiveIntensity;\n#endif\noutFragColor.rgb=LINEARtoSRGB(emissive);\n#endif\n#ifdef DEBUG_F0\noutFragColor.rgb=vec3(f0);\n#endif\n#ifdef DEBUG_ALPHA\noutFragColor.rgb=vec3(baseColor.a);\n#endif\noutFragColor.a=1.0;\n#endif\n}";
 
@@ -3886,9 +3915,9 @@ var shadowPassFrag = "#define FEATURES\n#include <shadowCommon.vert.glsl>\n#incl
 
 var skyboxVert = "precision highp float;\n#define FEATURES\n#include <webglCompatibility.glsl>\nvsIn vec3 aPos;vsOut vec3 v_CameraDir;uniform mat4 _InvViewProjectionMatrix;void main(){vec4 dir=_InvViewProjectionMatrix*vec4(aPos.xy,1,1);v_CameraDir=normalize(dir.xyz/dir.w);gl_Position=vec4(aPos.xy,0.99999,1);}";
 
-var skyboxFrag = "precision highp float;\n#define FEATURES\n#if !defined(WEBGL2) && defined(USE_TEX_LOD)\n#extension GL_EXT_shader_texture_lod : enable\n#endif\n#if !defined(WEBGL2)\n#extension GL_OES_standard_derivatives : enable\n#endif\n#include <webglCompatibility.glsl>\n#include <extensions.frag.glsl>\n#ifdef WEBGL2\nout vec4 outFragColor;\n#else\n#define outFragColor gl_FragColor\n#endif\nuniform sampler2D _brdfLUT;uniform vec2 _IblIntensity;uniform int _MipCount;uniform samplerCube _DiffuseEnvSampler;uniform samplerCube _SpecularEnvSampler;fsIn vec3 v_CameraDir;\n#ifdef IRRADIANCE_COEFFICIENTS\nstruct SHCoefficients{vec3 l00,l1m1,l10,l11,l2m2,l2m1,l20,l21,l22;};uniform SHCoefficients _shCoefficients;vec3 getIrradiance(vec3 norm,SHCoefficients c){float x=norm.x;float y=norm.y;float z=norm.z;float c1=0.429043;float c2=0.511664;float c3=0.743125;float c4=0.886227;float c5=0.247708;vec3 irradiance=c1*c.l22*(x*x-y*y)+c3*c.l20*(z*z)+c4*c.l00-c5*c.l20+2.0*c1*(c.l2m2*x*y+c.l21*x*z+c.l2m1*y*z)+2.0*c2*(c.l11*x+c.l1m1*y+c.l10*z);return irradiance;}\n#endif\nvec3 getIBLContribution(vec3 n,vec3 v){const float metallic=0.9;const float perceptualRoughness=0.1;const vec4 baseColor=vec4(1.0);const vec3 f0=vec3(0.04);const vec3 diffuseColor=baseColor.rgb*(vec3(1.0)-f0)*(1.0-metallic);const vec3 specularColor=mix(f0,baseColor.rgb,metallic);float NdotV=clamp(dot(n,v),0.0,1.0);float lod=clamp(perceptualRoughness*float(_MipCount),0.0,float(_MipCount));vec3 reflection=normalize(reflect(-v,n));vec2 brdfSamplePoint=clamp(vec2(NdotV,perceptualRoughness),vec2(0.0,0.0),vec2(1.0,1.0));vec2 brdf=texture2D(_brdfLUT,brdfSamplePoint).rg;vec4 diffuseSample=vec4(1.0,0.0,0.0,1.0);\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 irradiance=getIrradiance(n,_shCoefficients);diffuseSample=vec4(irradiance,1.0);\n#else\ndiffuseSample=textureCube(_DiffuseEnvSampler,n);\n#endif\n#ifdef USE_TEX_LOD\nvec4 specularSample=_textureCubeLodEXT(_SpecularEnvSampler,reflection,lod);\n#else\nvec4 specularSample=textureCube(_SpecularEnvSampler,reflection,lod);\n#endif\nvec3 diffuseLight=diffuseSample.rgb;vec3 specularLight=specularSample.rgb;vec3 diffuse=diffuseLight*diffuseColor;vec3 specular=specularLight*(specularColor*brdf.x+brdf.y);return diffuse*_IblIntensity[0]+specular*_IblIntensity[1];}void main(){vec3 dir=normalize(v_CameraDir);outFragColor=vec4(getIBLContribution(dir,dir),1.0);}";
+var skyboxFrag = "\n#define FEATURES\n#if !defined(WEBGL2) && defined(USE_TEX_LOD)\n#extension GL_EXT_shader_texture_lod : enable\n#endif\n#if !defined(WEBGL2)\n#extension GL_OES_standard_derivatives : enable\n#endif\nprecision highp float;\n#include <webglCompatibility.glsl>\n#include <extensions.frag.glsl>\n#ifdef WEBGL2\nout vec4 outFragColor;\n#else\n#define outFragColor gl_FragColor\n#endif\nuniform sampler2D _brdfLUT;uniform vec2 _IblIntensity;uniform int _MipCount;uniform samplerCube _DiffuseEnvSampler;uniform samplerCube _SpecularEnvSampler;fsIn vec3 v_CameraDir;\n#ifdef IRRADIANCE_COEFFICIENTS\nstruct SHCoefficients{vec3 l00,l1m1,l10,l11,l2m2,l2m1,l20,l21,l22;};uniform SHCoefficients _shCoefficients;vec3 getIrradiance(vec3 norm,SHCoefficients c){float x=norm.x;float y=norm.y;float z=norm.z;float c1=0.429043;float c2=0.511664;float c3=0.743125;float c4=0.886227;float c5=0.247708;vec3 irradiance=c1*c.l22*(x*x-y*y)+c3*c.l20*(z*z)+c4*c.l00-c5*c.l20+2.0*c1*(c.l2m2*x*y+c.l21*x*z+c.l2m1*y*z)+2.0*c2*(c.l11*x+c.l1m1*y+c.l10*z);return irradiance;}\n#endif\nvec3 getIBLContribution(vec3 n,vec3 v){const float metallic=0.9;const float perceptualRoughness=0.1;const vec4 baseColor=vec4(1.0);const vec3 f0=vec3(0.04);const vec3 diffuseColor=baseColor.rgb*(vec3(1.0)-f0)*(1.0-metallic);const vec3 specularColor=mix(f0,baseColor.rgb,metallic);float NdotV=clamp(dot(n,v),0.0,1.0);float lod=clamp(perceptualRoughness*float(_MipCount),0.0,float(_MipCount));vec3 reflection=normalize(reflect(-v,n));vec2 brdfSamplePoint=clamp(vec2(NdotV,perceptualRoughness),vec2(0.0,0.0),vec2(1.0,1.0));vec2 brdf=texture2D(_brdfLUT,brdfSamplePoint).rg;vec4 diffuseSample=vec4(1.0,0.0,0.0,1.0);\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 irradiance=getIrradiance(n,_shCoefficients);diffuseSample=vec4(irradiance,1.0);\n#else\ndiffuseSample=textureCube(_DiffuseEnvSampler,n);\n#endif\n#ifdef USE_TEX_LOD\nvec4 specularSample=_textureCubeLodEXT(_SpecularEnvSampler,reflection,lod);\n#else\nvec4 specularSample=textureCube(_SpecularEnvSampler,reflection,lod);\n#endif\nvec3 diffuseLight=diffuseSample.rgb;vec3 specularLight=specularSample.rgb;vec3 diffuse=diffuseLight*diffuseColor;vec3 specular=specularLight*(specularColor*brdf.x+brdf.y);return diffuse*_IblIntensity[0]+specular*_IblIntensity[1];}void main(){vec3 dir=normalize(v_CameraDir);outFragColor=vec4(getIBLContribution(dir,dir),1.0);}";
 
-var animationVertGLSL = "#ifdef HAS_TARGET_POSITION0\nvsIn vec3 a_Target_Position0;\n#endif\n#ifdef HAS_TARGET_POSITION1\nvsIn vec3 a_Target_Position1;\n#endif\n#ifdef HAS_TARGET_POSITION2\nvsIn vec3 a_Target_Position2;\n#endif\n#ifdef HAS_TARGET_POSITION3\nvsIn vec3 a_Target_Position3;\n#endif\n#ifdef HAS_TARGET_POSITION4\nvsIn vec3 a_Target_Position4;\n#endif\n#ifdef HAS_TARGET_POSITION5\nvsIn vec3 a_Target_Position5;\n#endif\n#ifdef HAS_TARGET_POSITION6\nvsIn vec3 a_Target_Position6;\n#endif\n#ifdef HAS_TARGET_POSITION7\nvsIn vec3 a_Target_Position7;\n#endif\n#ifdef HAS_TARGET_NORMAL0\nvsIn vec3 a_Target_Normal0;\n#endif\n#ifdef HAS_TARGET_NORMAL1\nvsIn vec3 a_Target_Normal1;\n#endif\n#ifdef HAS_TARGET_NORMAL2\nvsIn vec3 a_Target_Normal2;\n#endif\n#ifdef HAS_TARGET_NORMAL3\nvsIn vec3 a_Target_Normal3;\n#endif\n#ifdef HAS_TARGET_NORMAL4\nvsIn vec3 a_Target_Normal4;\n#endif\n#ifdef HAS_TARGET_TANGENT0\nvsIn vec3 a_Target_Tangent0;\n#endif\n#ifdef HAS_TARGET_TANGENT1\nvsIn vec3 a_Target_Tangent1;\n#endif\n#ifdef HAS_TARGET_TANGENT2\nvsIn vec3 a_Target_Tangent2;\n#endif\n#ifdef HAS_TARGET_TANGENT3\nvsIn vec3 a_Target_Tangent3;\n#endif\n#ifdef HAS_TARGET_TANGENT4\nvsIn vec3 a_Target_Tangent4;\n#endif\n#ifdef USE_MORPHING\nuniform float _morphWeights[WEIGHT_COUNT];\n#endif\n#ifdef HAS_JOINT_SET1\nvsIn vec4 a_Joint1;\n#endif\n#ifdef HAS_JOINT_SET2\nvsIn vec4 a_Joint2;\n#endif\n#ifdef HAS_WEIGHT_SET1\nvsIn vec4 a_Weight1;\n#endif\n#ifdef HAS_WEIGHT_SET2\nvsIn vec4 a_Weight2;\n#endif\n#ifdef USE_SKINNING\n#ifdef USE_SKINNING_TEXTURE\nuniform sampler2D _jointMatrixSampler;uniform sampler2D _jointNormalMatrixSampler;\n#else\nuniform mat4 _jointMatrix[JOINT_COUNT];uniform mat4 _jointNormalMatrix[JOINT_COUNT];\n#endif\n#endif\n#define ROW0_U ((0.5 + 0.0) / 4.0)\n#define ROW1_U ((0.5 + 1.0) / 4.0)\n#define ROW2_U ((0.5 + 2.0) / 4.0)\n#define ROW3_U ((0.5 + 3.0) / 4.0)\n#ifdef USE_SKINNING\nmat4 getJointMatrix(float boneNdx){\n#ifdef USE_SKINNING_TEXTURE\nfloat v=(boneNdx+0.5)/float(JOINT_COUNT);return mat4(texture2D(_jointMatrixSampler,vec2(ROW0_U,v)),texture2D(_jointMatrixSampler,vec2(ROW1_U,v)),texture2D(_jointMatrixSampler,vec2(ROW2_U,v)),texture2D(_jointMatrixSampler,vec2(ROW3_U,v)));\n#else\nreturn _jointMatrix[int(boneNdx)];\n#endif\n}mat4 getJointNormalMatrix(float boneNdx){\n#ifdef USE_SKINNING_TEXTURE\nfloat v=(boneNdx+0.5)/float(JOINT_COUNT);return mat4(texture2D(_jointNormalMatrixSampler,vec2(ROW0_U,v)),texture2D(_jointNormalMatrixSampler,vec2(ROW1_U,v)),texture2D(_jointNormalMatrixSampler,vec2(ROW2_U,v)),texture2D(_jointNormalMatrixSampler,vec2(ROW3_U,v)));\n#else\nreturn _jointNormalMatrix[int(boneNdx)];\n#endif\n}mat4 getSkinningMatrix(){mat4 skin=mat4(0);\n#if defined(HAS_WEIGHT_SET1) && defined(HAS_JOINT_SET1)\nskin+=a_Weight1.x*getJointMatrix(a_Joint1.x)+a_Weight1.y*getJointMatrix(a_Joint1.y)+a_Weight1.z*getJointMatrix(a_Joint1.z)+a_Weight1.w*getJointMatrix(a_Joint1.w);\n#endif\nreturn skin;}mat4 getSkinningNormalMatrix(){mat4 skin=mat4(0);\n#if defined(HAS_WEIGHT_SET1) && defined(HAS_JOINT_SET1)\nskin+=a_Weight1.x*getJointNormalMatrix(a_Joint1.x)+a_Weight1.y*getJointNormalMatrix(a_Joint1.y)+a_Weight1.z*getJointNormalMatrix(a_Joint1.z)+a_Weight1.w*getJointNormalMatrix(a_Joint1.w);\n#endif\nreturn skin;}\n#endif\n#ifdef USE_MORPHING\nvec4 getTargetPosition(){vec4 pos=vec4(0);\n#ifdef HAS_TARGET_POSITION0\npos.xyz+=_morphWeights[0]*a_Target_Position0;\n#endif\n#ifdef HAS_TARGET_POSITION1\npos.xyz+=_morphWeights[1]*a_Target_Position1;\n#endif\n#ifdef HAS_TARGET_POSITION2\npos.xyz+=_morphWeights[2]*a_Target_Position2;\n#endif\n#ifdef HAS_TARGET_POSITION3\npos.xyz+=_morphWeights[3]*a_Target_Position3;\n#endif\n#ifdef HAS_TARGET_POSITION4\npos.xyz+=_morphWeights[4]*a_Target_Position4;\n#endif\nreturn pos;}vec4 getTargetNormal(){vec4 normal=vec4(0);\n#ifdef HAS_TARGET_NORMAL0\nnormal.xyz+=_morphWeights[0]*a_Target_Normal0;\n#endif\n#ifdef HAS_TARGET_NORMAL1\nnormal.xyz+=_morphWeights[1]*a_Target_Normal1;\n#endif\n#ifdef HAS_TARGET_NORMAL2\nnormal.xyz+=_morphWeights[2]*a_Target_Normal2;\n#endif\n#ifdef HAS_TARGET_NORMAL3\nnormal.xyz+=_morphWeights[3]*a_Target_Normal3;\n#endif\n#ifdef HAS_TARGET_NORMAL4\nnormal.xyz+=_morphWeights[4]*a_Target_Normal4;\n#endif\nreturn normal;}vec4 getTargetTangent(){vec4 tangent=vec4(0);\n#ifdef HAS_TARGET_TANGENT0\ntangent.xyz+=_morphWeights[0]*a_Target_Tangent0;\n#endif\n#ifdef HAS_TARGET_TANGENT1\ntangent.xyz+=_morphWeights[1]*a_Target_Tangent1;\n#endif\n#ifdef HAS_TARGET_TANGENT2\ntangent.xyz+=_morphWeights[2]*a_Target_Tangent2;\n#endif\n#ifdef HAS_TARGET_TANGENT3\ntangent.xyz+=_morphWeights[3]*a_Target_Tangent3;\n#endif\n#ifdef HAS_TARGET_TANGENT4\ntangent.xyz+=_morphWeights[4]*a_Target_Tangent4;\n#endif\nreturn tangent;}\n#endif\n";
+var animationVertGLSL = "#ifdef HAS_TARGET_POSITION0\nvsIn vec3 aTargetPosition0;\n#endif\n#ifdef HAS_TARGET_POSITION1\nvsIn vec3 aTargetPosition1;\n#endif\n#ifdef HAS_TARGET_POSITION2\nvsIn vec3 aTargetPosition2;\n#endif\n#ifdef HAS_TARGET_POSITION3\nvsIn vec3 aTargetPosition3;\n#endif\n#ifdef HAS_TARGET_POSITION4\nvsIn vec3 aTargetPosition4;\n#endif\n#ifdef HAS_TARGET_POSITION5\nvsIn vec3 aTargetPosition5;\n#endif\n#ifdef HAS_TARGET_POSITION6\nvsIn vec3 aTargetPosition6;\n#endif\n#ifdef HAS_TARGET_POSITION7\nvsIn vec3 aTargetPosition7;\n#endif\n#ifdef HAS_TARGET_NORMAL0\nvsIn vec3 aTargetNormal0;\n#endif\n#ifdef HAS_TARGET_NORMAL1\nvsIn vec3 aTargetNormal1;\n#endif\n#ifdef HAS_TARGET_NORMAL2\nvsIn vec3 aTargetNormal2;\n#endif\n#ifdef HAS_TARGET_NORMAL3\nvsIn vec3 aTargetNormal3;\n#endif\n#ifdef HAS_TARGET_NORMAL4\nvsIn vec3 aTargetNormal4;\n#endif\n#ifdef HAS_TARGET_TANGENT0\nvsIn vec3 aTargetTangent0;\n#endif\n#ifdef HAS_TARGET_TANGENT1\nvsIn vec3 aTargetTangent1;\n#endif\n#ifdef HAS_TARGET_TANGENT2\nvsIn vec3 aTargetTangent2;\n#endif\n#ifdef HAS_TARGET_TANGENT3\nvsIn vec3 aTargetTangent3;\n#endif\n#ifdef HAS_TARGET_TANGENT4\nvsIn vec3 aTargetTangent4;\n#endif\n#ifdef USE_MORPHING\nuniform float _morphWeights[WEIGHT_COUNT];\n#endif\n#ifdef HAS_JOINT_SET1\nvsIn vec4 aJoints;\n#endif\n#ifdef HAS_JOINT_SET2\nvsIn vec4 aJoint2;\n#endif\n#ifdef HAS_WEIGHT_SET1\nvsIn vec4 aWeights;\n#endif\n#ifdef HAS_WEIGHT_SET2\nvsIn vec4 aWeight2;\n#endif\n#ifdef USE_SKINNING\n#ifdef USE_SKINNING_TEXTURE\nuniform sampler2D _jointMatrixSampler;uniform sampler2D _jointNormalMatrixSampler;\n#else\nuniform mat4 _jointMatrix[JOINT_COUNT];uniform mat4 _jointNormalMatrix[JOINT_COUNT];\n#endif\n#endif\n#define ROW0_U ((0.5 + 0.0) / 4.0)\n#define ROW1_U ((0.5 + 1.0) / 4.0)\n#define ROW2_U ((0.5 + 2.0) / 4.0)\n#define ROW3_U ((0.5 + 3.0) / 4.0)\n#ifdef USE_SKINNING\nmat4 getJointMatrix(float boneNdx){\n#ifdef USE_SKINNING_TEXTURE\nfloat v=(boneNdx+0.5)/float(JOINT_COUNT);return mat4(texture2D(_jointMatrixSampler,vec2(ROW0_U,v)),texture2D(_jointMatrixSampler,vec2(ROW1_U,v)),texture2D(_jointMatrixSampler,vec2(ROW2_U,v)),texture2D(_jointMatrixSampler,vec2(ROW3_U,v)));\n#else\nreturn _jointMatrix[int(boneNdx)];\n#endif\n}mat4 getJointNormalMatrix(float boneNdx){\n#ifdef USE_SKINNING_TEXTURE\nfloat v=(boneNdx+0.5)/float(JOINT_COUNT);return mat4(texture2D(_jointNormalMatrixSampler,vec2(ROW0_U,v)),texture2D(_jointNormalMatrixSampler,vec2(ROW1_U,v)),texture2D(_jointNormalMatrixSampler,vec2(ROW2_U,v)),texture2D(_jointNormalMatrixSampler,vec2(ROW3_U,v)));\n#else\nreturn _jointNormalMatrix[int(boneNdx)];\n#endif\n}mat4 getSkinningMatrix(){mat4 skin=mat4(0);\n#if defined(HAS_WEIGHT_SET1) && defined(HAS_JOINT_SET1)\nskin+=aWeights.x*getJointMatrix(aJoints.x)+aWeights.y*getJointMatrix(aJoints.y)+aWeights.z*getJointMatrix(aJoints.z)+aWeights.w*getJointMatrix(aJoints.w);\n#endif\nreturn skin;}mat4 getSkinningNormalMatrix(){mat4 skin=mat4(0);\n#if defined(HAS_WEIGHT_SET1) && defined(HAS_JOINT_SET1)\nskin+=aWeights.x*getJointNormalMatrix(aJoints.x)+aWeights.y*getJointNormalMatrix(aJoints.y)+aWeights.z*getJointNormalMatrix(aJoints.z)+aWeights.w*getJointNormalMatrix(aJoints.w);\n#endif\nreturn skin;}\n#endif\n#ifdef USE_MORPHING\nvec4 getTargetPosition(){vec4 pos=vec4(0);\n#ifdef HAS_TARGET_POSITION0\npos.xyz+=_morphWeights[0]*aTargetPosition0;\n#endif\n#ifdef HAS_TARGET_POSITION1\npos.xyz+=_morphWeights[1]*aTargetPosition1;\n#endif\n#ifdef HAS_TARGET_POSITION2\npos.xyz+=_morphWeights[2]*aTargetPosition2;\n#endif\n#ifdef HAS_TARGET_POSITION3\npos.xyz+=_morphWeights[3]*aTargetPosition3;\n#endif\n#ifdef HAS_TARGET_POSITION4\npos.xyz+=_morphWeights[4]*aTargetPosition4;\n#endif\nreturn pos;}vec4 getTargetNormal(){vec4 normal=vec4(0);\n#ifdef HAS_TARGET_NORMAL0\nnormal.xyz+=_morphWeights[0]*aTargetNormal0;\n#endif\n#ifdef HAS_TARGET_NORMAL1\nnormal.xyz+=_morphWeights[1]*aTargetNormal1;\n#endif\n#ifdef HAS_TARGET_NORMAL2\nnormal.xyz+=_morphWeights[2]*aTargetNormal2;\n#endif\n#ifdef HAS_TARGET_NORMAL3\nnormal.xyz+=_morphWeights[3]*aTargetNormal3;\n#endif\n#ifdef HAS_TARGET_NORMAL4\nnormal.xyz+=_morphWeights[4]*aTargetNormal4;\n#endif\nreturn normal;}vec4 getTargetTangent(){vec4 tangent=vec4(0);\n#ifdef HAS_TARGET_TANGENT0\ntangent.xyz+=_morphWeights[0]*aTargetTangent0;\n#endif\n#ifdef HAS_TARGET_TANGENT1\ntangent.xyz+=_morphWeights[1]*aTargetTangent1;\n#endif\n#ifdef HAS_TARGET_TANGENT2\ntangent.xyz+=_morphWeights[2]*aTargetTangent2;\n#endif\n#ifdef HAS_TARGET_TANGENT3\ntangent.xyz+=_morphWeights[3]*aTargetTangent3;\n#endif\n#ifdef HAS_TARGET_TANGENT4\ntangent.xyz+=_morphWeights[4]*aTargetTangent4;\n#endif\nreturn tangent;}\n#endif\n";
 
 var extensionsFragGLSL = "vec3 _dFdx(vec3 coord){\n#if defined(GL_OES_standard_derivatives) || defined(WEBGL2)\nreturn dFdx(coord);\n#endif\nreturn vec3(0.0);}vec3 _dFdy(vec3 coord){\n#if defined(GL_OES_standard_derivatives) || defined(WEBGL2)\nreturn dFdy(coord);\n#endif\nreturn vec3(0.0);}\n#ifdef USE_TEX_LOD\nvec4 _textureCubeLodEXT(samplerCube sampler,vec3 coord,float lod){\n#if defined(WEBGL2) || defined(GL_EXT_shader_texture_lod)\nreturn textureCubeLodEXT(sampler,coord,lod);\n#else\nreturn textureCube(sampler,coord,lod);\n#endif\n}\n#endif\n";
 
@@ -4341,6 +4370,9 @@ var ModelMeshComponent = /*#__PURE__*/ function(RendererComponent) {
         var _this;
         _this = RendererComponent.call(this, engine) || this;
         /**
+   * morph 动画权重
+   */ _this.morphWeights = [];
+        /**
    * 获取点击测试参数，根据元素包围盒进行相交测试，Mesh 对象会进行更加精确的点击测试
    * @param force - 是否强制进行点击测试
    * @returns 点击测试参数
@@ -4657,9 +4689,9 @@ var ModelCameraComponent = /*#__PURE__*/ function(ItemBehaviour) {
    */ _proto.start = function start() {
         this.createContent();
         this.item.type = VFX_ITEM_TYPE_3D;
-        this.timeline = this.item.getComponent(TimelineComponent);
         var scene = getSceneManager(this);
         scene == null ? void 0 : scene.addItem(this.content);
+        this.updateMainCamera();
     };
     /**
    * 组件更新，更新内部对象状态
@@ -4708,19 +4740,11 @@ var ModelCameraComponent = /*#__PURE__*/ function(ItemBehaviour) {
    * @param position - 位置
    * @param rotation - 旋转
    */ _proto.setTransform = function setTransform(position, rotation) {
-        var _this_timeline_findTrack, _this_timeline;
-        var clip = (_this_timeline = this.timeline) == null ? void 0 : (_this_timeline_findTrack = _this_timeline.findTrack("AnimationTrack")) == null ? void 0 : _this_timeline_findTrack.findClip("AnimationTimelineClip");
-        if (position !== undefined) {
+        if (position) {
             this.transform.setPosition(position.x, position.y, position.z);
-            if (clip) {
-                clip.playable.originalTransform.position = position.clone();
-            }
         }
-        if (rotation !== undefined) {
+        if (rotation) {
             this.transform.setRotation(rotation.x, rotation.y, rotation.z);
-            if (clip) {
-                clip.playable.originalTransform.rotation = rotation.clone();
-            }
         }
         this.updateMainCamera();
     };
@@ -4729,6 +4753,155 @@ var ModelCameraComponent = /*#__PURE__*/ function(ItemBehaviour) {
 ModelCameraComponent = __decorate([
     effectsClass(spec.DataType.CameraComponent)
 ], ModelCameraComponent);
+var AnimationComponent = /*#__PURE__*/ function(ItemBehaviour) {
+    _inherits(AnimationComponent, ItemBehaviour);
+    function AnimationComponent(engine) {
+        var _this;
+        _this = ItemBehaviour.call(this, engine) || this;
+        _this.elapsedTime = 0;
+        _this.animation = -1;
+        _this.clips = [];
+        return _this;
+    }
+    var _proto = AnimationComponent.prototype;
+    /**
+   * 组件开始，需要创建内部对象和添加到场景管理器中
+   */ _proto.start = function start() {
+        this.elapsedTime = 0;
+        this.item.type = VFX_ITEM_TYPE_3D;
+    };
+    /**
+   * 组件更新，更新内部对象状态
+   * @param dt - 更新间隔
+   */ _proto.update = function update(dt) {
+        this.elapsedTime += dt * 0.001;
+        if (this.animation >= 0 && this.animation < this.clips.length) {
+            this.clips[this.animation].sampleAnimation(this.item, this.elapsedTime);
+        }
+    };
+    /**
+   * 组件销毁
+   */ _proto.onDestroy = function onDestroy() {};
+    /**
+   * 反序列化，记录传入参数
+   * @param data - 组件参数
+   */ _proto.fromData = function fromData(data) {
+        var _this = this;
+        ItemBehaviour.prototype.fromData.call(this, data);
+        this.data = data;
+        var _data_name;
+        //
+        this.name = (_data_name = data.name) != null ? _data_name : "<empty>";
+        var _data_animation;
+        this.animation = (_data_animation = data.animation) != null ? _data_animation : -1;
+        this.clips = [];
+        data.animationClips.forEach(function(clipData) {
+            var clipObj = new ModelAnimationClip(_this.engine);
+            clipObj.setFromAnimationClip(clipData);
+            _this.clips.push(clipObj);
+        });
+    };
+    return AnimationComponent;
+}(ItemBehaviour);
+AnimationComponent = __decorate([
+    effectsClass(spec.DataType.AnimationComponent)
+], AnimationComponent);
+var ModelAnimationClip = /*#__PURE__*/ function(AnimationClip) {
+    _inherits(ModelAnimationClip, AnimationClip);
+    function ModelAnimationClip() {
+        var _this;
+        _this = AnimationClip.apply(this, arguments) || this;
+        _this.path2Node = {};
+        return _this;
+    }
+    var _proto = ModelAnimationClip.prototype;
+    _proto.sampleAnimation = function sampleAnimation(vfxItem, time) {
+        var duration = vfxItem.duration;
+        var life = Math.max(0, time) % duration;
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.positionCurves), _step; !(_step = _iterator()).done;){
+            var curve = _step.value;
+            var maxTime = curve.keyFrames.getMaxTime();
+            var value = curve.keyFrames.getValue(life % maxTime);
+            var target = this.getTargetItem(vfxItem, curve.path);
+            target == null ? void 0 : target.transform.setPosition(value.x, value.y, value.z);
+        }
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(this.rotationCurves), _step1; !(_step1 = _iterator1()).done;){
+            var curve1 = _step1.value;
+            var maxTime1 = curve1.keyFrames.getMaxTime();
+            var value1 = curve1.keyFrames.getValue(life % maxTime1);
+            var target1 = this.getTargetItem(vfxItem, curve1.path);
+            target1 == null ? void 0 : target1.transform.setQuaternion(value1.x, value1.y, value1.z, value1.w);
+        }
+        for(var _iterator2 = _create_for_of_iterator_helper_loose(this.scaleCurves), _step2; !(_step2 = _iterator2()).done;){
+            var curve2 = _step2.value;
+            var maxTime2 = curve2.keyFrames.getMaxTime();
+            var value2 = curve2.keyFrames.getValue(life % maxTime2);
+            var target2 = this.getTargetItem(vfxItem, curve2.path);
+            target2 == null ? void 0 : target2.transform.setScale(value2.x, value2.y, value2.z);
+        }
+        for(var _iterator3 = _create_for_of_iterator_helper_loose(this.floatCurves), _step3; !(_step3 = _iterator3()).done;){
+            var curve3 = _step3.value;
+            var maxTime3 = curve3.keyFrames.getMaxTime();
+            var value3 = curve3.keyFrames.getValue(life % maxTime3);
+            var target3 = this.getTargetItem(vfxItem, curve3.path);
+            if (curve3.className === "ModelMeshComponent") {
+                var component = target3 == null ? void 0 : target3.getComponent(ModelMeshComponent);
+                if (component) {
+                    var properties = curve3.property.split(".");
+                    setProperty(component, properties, value3);
+                } else {
+                    console.error("Can't find mesh component");
+                }
+            } else {
+                console.warn("Ignore curve: className " + curve3.className);
+            }
+        }
+    };
+    _proto.setFromAnimationClip = function setFromAnimationClip(clip) {
+        this.positionCurves = clip.positionCurves.slice();
+        this.rotationCurves = clip.rotationCurves.slice();
+        this.scaleCurves = clip.scaleCurves.slice();
+        this.floatCurves = clip.floatCurves.slice();
+    };
+    _proto.getTargetItem = function getTargetItem(rootItem, path) {
+        if (this.path2Node[path]) {
+            return this.path2Node[path];
+        }
+        var target = rootItem;
+        var nameList = path.split("/");
+        for(var _iterator = _create_for_of_iterator_helper_loose(nameList), _step; !(_step = _iterator()).done;){
+            var name = _step.value;
+            var findTag = false;
+            for(var _iterator1 = _create_for_of_iterator_helper_loose(target.children), _step1; !(_step1 = _iterator1()).done;){
+                var child = _step1.value;
+                if (child.name === name) {
+                    target = child;
+                    findTag = true;
+                    break;
+                }
+            }
+            if (!findTag) {
+                throw new Error("Can't find path in tree " + rootItem.id + ", " + path);
+            }
+        }
+        this.path2Node[path] = target;
+        return target;
+    };
+    return ModelAnimationClip;
+}(AnimationClip);
+function setProperty(obj, properties, value) {
+    var len = properties.length;
+    var current = obj;
+    for(var i = 0; i < len - 1; i++){
+        var propName = properties[i];
+        if (!(propName in current) || typeof current[propName] !== "object") {
+            console.error("Invalid properties " + properties);
+            return;
+        }
+        current = current[propName];
+    }
+    current[properties[len - 1]] = value;
+}
 
 // 射线与带旋转的包围盒求交
 // function transformDirection (m: Matrix4, direction: Vector3) {
@@ -6077,20 +6250,20 @@ var normal = new Vector3();
             case "NORMAL":
                 return "aNormal";
             case "TANGENT":
-                return "a_Tangent";
+                return "aTangent";
             case "TEXCOORD_0":
                 return "aUV";
             case "TEXCOORD_1":
                 return "aUV2";
             case "JOINTS_0":
-                return "a_Joint1";
+                return "aJoints";
             case "WEIGHTS_0":
-                return "a_Weight1";
+                return "aWeights";
         }
-        if (!name.startsWith("a_")) {
-            // aPos, aNormal, a_Tangent,
-            // aUV, aUV2, a_Joint1, a_Weight1
-            // a_Target_XXX
+        if (!name.startsWith("a")) {
+            // aPos, aNormal, aTangent,
+            // aUV, aUV2, aJoints, aWeights
+            // aTargetXXX
             console.warn("Unknown attribute name: " + name);
         }
         return name;
@@ -6159,7 +6332,9 @@ var normal = new Vector3();
             canvas: canvas,
             renderFramework: "webgl2",
             env: PLAYER_OPTIONS_ENV_EDITOR,
-            willCaptureImage: true,
+            renderOptions: {
+                willCaptureImage: true
+            },
             manualRender: manualRender
         });
     };
@@ -6485,11 +6660,11 @@ var AttributeArray = /*#__PURE__*/ function() {
         this.position = new AttributeArray();
         this.position.create(positionAttrib, positionArray);
         //
-        var jointAttrib = attributes["a_Joint1"];
-        var weightAttrib = attributes["a_Weight1"];
+        var jointAttrib = attributes["aJoints"];
+        var weightAttrib = attributes["aWeights"];
         if (jointAttrib !== undefined && weightAttrib !== undefined) {
-            var jointArray = geometry.getAttributeData("a_Joint1");
-            var weightArray = geometry.getAttributeData("a_Weight1");
+            var jointArray = geometry.getAttributeData("aJoints");
+            var weightArray = geometry.getAttributeData("aWeights");
             this.joint = new AttributeArray();
             this.joint.create(jointAttrib, jointArray);
             this.weight = new AttributeArray();
@@ -6599,11 +6774,11 @@ var AttributeArray = /*#__PURE__*/ function() {
         this.position = new AttributeArray();
         this.position.create(positionAttrib, positionArray);
         //
-        var jointAttrib = attributes["a_Joint1"];
-        var weightAttrib = attributes["a_Weight1"];
+        var jointAttrib = attributes["aJoints"];
+        var weightAttrib = attributes["aWeights"];
         if (jointAttrib !== undefined && weightAttrib !== undefined) {
-            var jointArray = geometry.getAttributeData("a_Joint1");
-            var weightArray = geometry.getAttributeData("a_Weight1");
+            var jointArray = geometry.getAttributeData("aJoints");
+            var weightArray = geometry.getAttributeData("aWeights");
             this.joint = new AttributeArray();
             this.joint.create(jointAttrib, jointArray);
             this.weight = new AttributeArray();
@@ -7025,15 +7200,15 @@ var AttributeArray = /*#__PURE__*/ function() {
     //   }
     //   this.assertGeometryBuffer(v, 'aPos', maxLength);
     //   this.assertGeometryBuffer(v, 'aNormal', maxLength);
-    //   this.assertGeometryBuffer(v, 'a_Tangent', maxLength);
+    //   this.assertGeometryBuffer(v, 'aTangent', maxLength);
     //   this.assertGeometryBuffer(v, 'aUV', maxLength);
-    //   this.assertGeometryBuffer(v, 'a_Joint1', maxLength);
-    //   this.assertGeometryBuffer(v, 'a_Weight1', maxLength);
+    //   this.assertGeometryBuffer(v, 'aJoints', maxLength);
+    //   this.assertGeometryBuffer(v, 'aWeights', maxLength);
     //   // 索引检查
     //   if(s !== undefined){
     //     const matLen = s.inverseBindMatrices?.length ?? 0;
     //     if(matLen > 0){
-    //       const jointArray = this.createAttributeArray(v, "a_Joint1");
+    //       const jointArray = this.createAttributeArray(v, "aJoints");
     //       if(jointArray !== undefined){
     //         for(let i = 0; i < maxLength; i++){
     //           const data = jointArray.getData(i);
@@ -11348,7 +11523,7 @@ var GeometryProxy = /*#__PURE__*/ function() {
                 if (this.hasTangent) {
                     var attrib2 = this.tangentAttrib;
                     if (attrib2 !== undefined) {
-                        attributes["a_Tangent"] = this._getBufferAttrib(attrib2);
+                        attributes["aTangent"] = this._getBufferAttrib(attrib2);
                     }
                 }
                 this.texCoordList.forEach(function(val) {
@@ -11359,11 +11534,11 @@ var GeometryProxy = /*#__PURE__*/ function() {
                 if (this.hasSkinAnimation) {
                     var jointAttrib = this.jointAttribute;
                     if (jointAttrib !== undefined) {
-                        attributes["a_Joint1"] = this._getBufferAttrib(jointAttrib);
+                        attributes["aJoints"] = this._getBufferAttrib(jointAttrib);
                     }
                     var weightAttrib = this.weightAttribute;
                     if (weightAttrib !== undefined) {
-                        attributes["a_Weight1"] = this._getBufferAttrib(weightAttrib);
+                        attributes["aWeights"] = this._getBufferAttrib(weightAttrib);
                     }
                 }
                 /**
@@ -11371,15 +11546,15 @@ var GeometryProxy = /*#__PURE__*/ function() {
      */ for(var i = 0; i < 8; i++){
                     var positionAttrib = this.getTargetPosition(i);
                     if (positionAttrib !== undefined) {
-                        attributes["a_Target_Position" + i] = this._getBufferAttrib(positionAttrib);
+                        attributes["aTargetPosition" + i] = this._getBufferAttrib(positionAttrib);
                     }
                     var normalAttrib = this.getTargetNormal(i);
                     if (normalAttrib !== undefined) {
-                        attributes["a_Target_Normal" + i] = this._getBufferAttrib(normalAttrib);
+                        attributes["aTargetNormal" + i] = this._getBufferAttrib(normalAttrib);
                     }
                     var tangentAttrib = this.getTargetTangent(i);
                     if (tangentAttrib !== undefined) {
-                        attributes["a_Target_Tangent" + i] = this._getBufferAttrib(tangentAttrib);
+                        attributes["aTargetTangent" + i] = this._getBufferAttrib(tangentAttrib);
                     }
                 }
                 var indexArray = this.indexArray;
@@ -11829,44 +12004,9 @@ var GLTFHelper = /*#__PURE__*/ function() {
     return GLTFHelper;
 }();
 
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-
-function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-    if (it) return (it = it.call(o)).next.bind(it);
-    // Fallback for engines without symbol support
-    if (Array.isArray(o) || (it = _unsupported_iterable_to_array(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-        var i = 0;
-        return function() {
-            if (i >= o.length) return {
-                done: true
-            };
-            return {
-                done: false,
-                value: o[i++]
-            };
-        };
-    }
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
 var JSONConverter = /*#__PURE__*/ function() {
     function JSONConverter(player) {
-        this.treeNodes = [];
+        this.treeInfo = new TreeInfo();
         this.engine = player.renderer.engine;
         this.renderer = player.renderer;
         this.downloader = new Downloader();
@@ -11897,6 +12037,12 @@ var JSONConverter = /*#__PURE__*/ function() {
                         sceneJSON = _state.sent();
                         _state.label = 3;
                     case 3:
+                        // @ts-expect-error
+                        sceneJSON.textures.forEach(function(tex) {
+                            if (tex.source === undefined) {
+                                tex.source = 0;
+                            }
+                        });
                         oldScene = getStandardJSON(sceneJSON);
                         binFiles = [];
                         if (!oldScene.bins) return [
@@ -11929,7 +12075,7 @@ var JSONConverter = /*#__PURE__*/ function() {
                     case 7:
                         // @ts-expect-error
                         oldScene.bins = binFiles;
-                        newScene = {
+                        newScene = _extends({}, oldScene, {
                             version: "3.0",
                             playerVersion: {
                                 web: "3.0",
@@ -11937,18 +12083,14 @@ var JSONConverter = /*#__PURE__*/ function() {
                             },
                             type: "ge",
                             compositions: [],
-                            compositionId: oldScene.compositionId,
                             images: [],
-                            shapes: oldScene.shapes,
-                            plugins: oldScene.plugins,
                             textures: [],
                             items: [],
                             components: [],
                             materials: [],
                             shaders: [],
                             geometries: []
-                        };
-                        _this.treeNodes = [];
+                        });
                         _this.setImage(newScene, oldScene);
                         return [
                             4,
@@ -11970,7 +12112,6 @@ var JSONConverter = /*#__PURE__*/ function() {
     _proto.setImage = function setImage(newScene, oldScene) {
         var newImages = [];
         oldScene.images.forEach(function(image) {
-            image.id = generateGUID();
             newImages.push(image);
         });
         newScene.images = newImages;
@@ -12080,8 +12221,6 @@ var JSONConverter = /*#__PURE__*/ function() {
             var comp = _step.value;
             if (comp.dataType === spec.DataType.SkyboxComponent) {
                 newComponents.push(this.createSkyboxComponent(comp, newScene));
-            } else if (comp.dataType === spec.DataType.MeshComponent) {
-                newComponents.push(this.createMeshComponent(comp, newScene, oldScene));
             } else if (comp.dataType === spec.DataType.LightComponent) {
                 newComponents.push(this.createLightComponent(comp, newScene));
             } else if (comp.dataType === spec.DataType.CameraComponent) {
@@ -12093,18 +12232,31 @@ var JSONConverter = /*#__PURE__*/ function() {
                 treeComp.options.tree.animation = undefined;
                 treeComp.options.tree.animations = undefined;
                 newComponents.push(comp);
-            } else {
+            } else if (comp.dataType !== spec.DataType.MeshComponent) {
                 newComponents.push(comp);
             }
         }
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(oldScene.components), _step1; !(_step1 = _iterator1()).done;){
+            var comp1 = _step1.value;
+            if (comp1.dataType === spec.DataType.MeshComponent) {
+                newComponents.push(this.createMeshComponent(comp1, newScene, oldScene));
+            }
+        }
     };
     _proto.setItem = function setItem(newScene, oldScene) {};
     _proto.setComposition = function setComposition(newScene, oldScene) {
         var _newScene_items;
         newScene.items = oldScene.items;
-        (_newScene_items = newScene.items).push.apply(_newScene_items, [].concat(this.treeNodes));
+        (_newScene_items = newScene.items).push.apply(_newScene_items, [].concat(this.treeInfo.getAllTreeNodeList()));
         newScene.compositionId = oldScene.compositionId;
         newScene.compositions = oldScene.compositions;
+        newScene.items.forEach(function(item) {
+            // @ts-expect-error
+            if (item.type === "root") {
+                // @ts-expect-error
+                item.type = "ECS";
+            }
+        });
         // @ts-expect-error
         newScene.compositions[0].items = newScene.items.map(function(item) {
             return {
@@ -12197,28 +12349,71 @@ var JSONConverter = /*#__PURE__*/ function() {
     };
     _proto.createMeshComponent = function createMeshComponent(component, newScene, oldScene) {
         var _this = this;
+        var _newScene_materials;
         var meshOptions = component.options;
-        var primitives = [];
+        var geometryPropsList = [];
+        var materialDatas = [];
         meshOptions.primitives.forEach(function(prim) {
-            var geometryData = _this.getGeometryData(prim.geometry, oldScene);
-            var materialData = _this.getMaterialData(prim.material, oldScene);
-            newScene.geometries.push(geometryData);
-            newScene.materials.push(materialData);
-            primitives.push({
-                geometry: {
-                    id: geometryData.id
-                },
-                material: {
-                    id: materialData.id
+            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 newIndices = new Uint16Array(oldIndices.length);
+                for(var i = 0; i < oldIndices.length; i++){
+                    newIndices[i] = oldIndices[i];
                 }
-            });
+                geomProps.indices.data = newIndices;
+            }
+            geometryPropsList.push(geomProps);
+            materialDatas.push(material);
         });
+        var geometryData = getGeometryDataFromPropsList(geometryPropsList);
+        if (!geometryData) {
+            throw new Error("no primitives");
+        }
+        newScene.geometries.push(geometryData);
+        (_newScene_materials = newScene.materials).push.apply(_newScene_materials, [].concat(materialDatas));
         var meshComponent = {
             id: component.id,
             dataType: component.dataType,
             item: component.item,
-            primitives: primitives
+            geometry: {
+                id: geometryData.id
+            },
+            materials: materialDatas.map(function(mat) {
+                var data = {
+                    id: mat.id
+                };
+                return data;
+            })
         };
+        if (meshOptions.skin) {
+            var parentItemId = component.item.id;
+            for(var _iterator = _create_for_of_iterator_helper_loose(oldScene.items), _step; !(_step = _iterator()).done;){
+                var item = _step.value;
+                if (item.id === component.item.id) {
+                    parentItemId = item.parentId;
+                }
+            }
+            if (parentItemId === component.item.id) {
+                throw new Error("Can't item " + component.item);
+            }
+            var treeItem = this.treeInfo.getTreeItemByNodeId(parentItemId);
+            var treeNodeList = this.treeInfo.getTreeNodeListByNodeId(parentItemId);
+            if (!treeItem || !treeNodeList) {
+                throw new Error("Can't find tree node list for " + component.item);
+            }
+            var rootBoneItem = this.setupBoneData(geometryData, meshOptions.skin, oldScene, treeItem, treeNodeList);
+            meshComponent.rootBone = {
+                id: rootBoneItem.id
+            };
+        }
+        if (meshOptions.weights !== undefined) {
+            meshComponent.morph = {
+                weights: meshOptions.weights
+            };
+        }
         return meshComponent;
     };
     _proto.createItemsFromTreeComponent = function createItemsFromTreeComponent(component, newScene, oldScene) {
@@ -12231,13 +12426,13 @@ var JSONConverter = /*#__PURE__*/ function() {
         });
         var treeComp = component;
         var treeData = treeComp.options.tree;
-        var itemList = [];
-        treeData.nodes.forEach(function(node) {
+        var treeNodeList = [];
+        treeData.nodes.forEach(function(node, index) {
             var _node_name;
             var item = {
                 id: generateGUID(),
                 parentId: treeItem.id,
-                name: (_node_name = node.name) != null ? _node_name : "<unnamed>",
+                name: (_node_name = node.name) != null ? _node_name : "node" + index,
                 duration: treeItem.duration,
                 // @ts-expect-error
                 type: "ECS",
@@ -12252,14 +12447,14 @@ var JSONConverter = /*#__PURE__*/ function() {
                 transform: _this.getTransformData(node.transform),
                 components: []
             };
-            itemList.push(item);
+            treeNodeList.push(item);
             newScene.items.push(item);
         });
         treeData.nodes.forEach(function(node, index) {
             var _node_children;
-            var item = itemList[index];
+            var item = treeNodeList[index];
             (_node_children = node.children) == null ? void 0 : _node_children.forEach(function(child) {
-                var childItem = itemList[child];
+                var childItem = treeNodeList[child];
                 childItem.parentId = item.id;
             });
         });
@@ -12270,14 +12465,13 @@ var JSONConverter = /*#__PURE__*/ function() {
                     var parentId = item.parentId.substring(0, index);
                     var subIndex = +item.parentId.substring(index + 1);
                     if (parentId === treeItem.id) {
-                        item.parentId = itemList[subIndex].id;
-                    } else {
-                        console.error("Invalid parent id " + item.parentId);
+                        item.parentId = treeNodeList[subIndex].id;
                     }
                 }
             }
         });
-        this.treeNodes = itemList;
+        this.treeInfo.add(treeItem, treeNodeList);
+        this.createAnimationComponent(treeData, treeItem, newScene, oldScene);
     };
     _proto.createLightComponent = function createLightComponent(component, scene) {
         var lightOptions = component.options;
@@ -12303,9 +12497,185 @@ var JSONConverter = /*#__PURE__*/ function() {
         }
         return lightComponent;
     };
-    _proto.getGeometryData = function getGeometryData(geometry, scene) {
-        var geomOptions = deserializeGeometry(geometry, scene.bins);
-        return getGeometryDataFromOptions(geomOptions);
+    _proto.createAnimationComponent = function createAnimationComponent(treeOptions, treeItem, newScene, oldScene) {
+        var _this = this;
+        var animation = treeOptions.animation, animations = treeOptions.animations;
+        var animationComponent = {
+            id: generateGUID(),
+            dataType: spec.DataType.AnimationComponent,
+            item: {
+                id: treeItem.id
+            },
+            animation: animation,
+            animationClips: []
+        };
+        if (animations && animations.length) {
+            // FIXME: calcuate tree item duration
+            var bins = oldScene.bins;
+            animations.forEach(function(anim) {
+                var clipData = {
+                    id: generateGUID(),
+                    name: anim.name,
+                    dataType: spec.DataType.AnimationClip,
+                    positionCurves: [],
+                    rotationCurves: [],
+                    scaleCurves: [],
+                    floatCurves: []
+                };
+                var totalAnimationTime = 0;
+                anim.tracks.forEach(function(track) {
+                    var inputArray = typedArrayFromBinary(bins, track.input);
+                    totalAnimationTime = Math.max(totalAnimationTime, inputArray[inputArray.length - 1]);
+                });
+                anim.tracks.forEach(function(track) {
+                    var inputArray = typedArrayFromBinary(bins, track.input);
+                    var outputArray = typedArrayFromBinary(bins, track.output);
+                    if (!_instanceof1(inputArray, Float32Array)) {
+                        throw new Error("Type of inputArray should be float32, " + inputArray);
+                    }
+                    if (!_instanceof1(outputArray, Float32Array)) {
+                        throw new Error("Type of outputArray should be float32, " + outputArray);
+                    }
+                    if (track.interpolation !== "LINEAR") {
+                        throw new Error("Invalid interpolation type " + track.interpolation);
+                    }
+                    if (track.path === "rotation") {
+                        var points = [];
+                        var controlPoints = [];
+                        var lineValue = [];
+                        for(var i = 0; i < inputArray.length; i++){
+                            points.push([
+                                outputArray[i * 4],
+                                outputArray[i * 4 + 1],
+                                outputArray[i * 4 + 2],
+                                outputArray[i * 4 + 3]
+                            ]);
+                            if (i > 0) {
+                                var p0 = Quaternion.fromArray(points[i - 1]);
+                                var p3 = Quaternion.fromArray(points[i]);
+                                var p1 = new Quaternion();
+                                var p2 = new Quaternion();
+                                p1.slerpQuaternions(p0, p3, 1 / 3);
+                                p2.slerpQuaternions(p0, p3, 2 / 3);
+                                controlPoints.push(p1.toArray());
+                                controlPoints.push(p2.toArray());
+                            }
+                            lineValue.push([
+                                spec.BezierKeyframeType.LINE,
+                                [
+                                    inputArray[i],
+                                    i
+                                ]
+                            ]);
+                        }
+                        var node = _this.treeInfo.getTreeNode(treeItem.id, track.node);
+                        var path = _this.treeInfo.getNodePath(node.id);
+                        var keyFrames = [
+                            spec.ValueType.BEZIER_CURVE_QUAT,
+                            [
+                                lineValue,
+                                points,
+                                controlPoints
+                            ]
+                        ];
+                        clipData.rotationCurves.push({
+                            path: path,
+                            keyFrames: keyFrames
+                        });
+                    } else if (track.path === "weights") {
+                        var node1 = _this.treeInfo.getTreeNode(treeItem.id, track.node);
+                        var path1 = _this.treeInfo.getNodePath(node1.id);
+                        if (node1.components.length === 0) {
+                            for(var i1 = 0; i1 < oldScene.items.length; i1++){
+                                var child = oldScene.items[i1];
+                                if (child.parentId === node1.id) {
+                                    path1 += "/" + child.name;
+                                    break;
+                                }
+                            }
+                        }
+                        var component = outputArray.length / inputArray.length;
+                        for(var c = 0; c < component; c++){
+                            var lineValue1 = [];
+                            for(var i2 = 0; i2 < inputArray.length; i2++){
+                                lineValue1.push([
+                                    spec.BezierKeyframeType.LINE,
+                                    [
+                                        inputArray[i2],
+                                        outputArray[i2 * component + c]
+                                    ]
+                                ]);
+                            }
+                            var keyFrames1 = [
+                                spec.ValueType.BEZIER_CURVE,
+                                lineValue1
+                            ];
+                            clipData.floatCurves.push({
+                                path: path1,
+                                className: "ModelMeshComponent",
+                                property: "morphWeights." + c,
+                                keyFrames: keyFrames1
+                            });
+                        }
+                    } else {
+                        var points1 = [];
+                        var controlPoints1 = [];
+                        var lineValue2 = [];
+                        for(var i3 = 0; i3 < inputArray.length; i3++){
+                            points1.push([
+                                outputArray[i3 * 3],
+                                outputArray[i3 * 3 + 1],
+                                outputArray[i3 * 3 + 2]
+                            ]);
+                            if (i3 > 0) {
+                                var p01 = Vector3.fromArray(points1[i3 - 1]);
+                                var p31 = Vector3.fromArray(points1[i3]);
+                                var p11 = new Vector3().lerpVectors(p01, p31, 1 / 3);
+                                var p21 = new Vector3().lerpVectors(p01, p31, 2 / 3);
+                                controlPoints1.push(p11.toArray());
+                                controlPoints1.push(p21.toArray());
+                            }
+                            lineValue2.push([
+                                spec.BezierKeyframeType.LINE,
+                                [
+                                    inputArray[i3],
+                                    i3
+                                ]
+                            ]);
+                        }
+                        var node2 = _this.treeInfo.getTreeNode(treeItem.id, track.node);
+                        var path2 = _this.treeInfo.getNodePath(node2.id);
+                        var keyFrames2 = [
+                            spec.ValueType.BEZIER_CURVE_PATH,
+                            [
+                                lineValue2,
+                                points1,
+                                controlPoints1
+                            ]
+                        ];
+                        if (track.path === "translation") {
+                            clipData.positionCurves.push({
+                                path: path2,
+                                keyFrames: keyFrames2
+                            });
+                        } else {
+                            clipData.scaleCurves.push({
+                                path: path2,
+                                keyFrames: keyFrames2
+                            });
+                        }
+                    }
+                });
+                newScene.animations.push(clipData);
+                animationComponent.animationClips.push({
+                    id: clipData.id
+                });
+            });
+        }
+        treeItem.components.push({
+            id: animationComponent.id
+        });
+        newScene.components.push(animationComponent);
     };
     _proto.getMaterialData = function getMaterialData(material, scene) {
         if (material.type === spec.MaterialType.unlit) {
@@ -12327,7 +12697,7 @@ var JSONConverter = /*#__PURE__*/ function() {
                 shader: {
                     id: UnlitShaderGUID
                 },
-                stringTags: this.getStringTags(material),
+                stringTags: {},
                 macros: [],
                 ints: {},
                 floats: floats,
@@ -12335,6 +12705,7 @@ var JSONConverter = /*#__PURE__*/ function() {
                 colors: colors,
                 textures: textures
             };
+            this.setupMaterial(material, newMaterial);
             return newMaterial;
         } else {
             var floats1 = {
@@ -12383,7 +12754,7 @@ var JSONConverter = /*#__PURE__*/ function() {
                 shader: {
                     id: PBRShaderGUID
                 },
-                stringTags: this.getStringTags(material),
+                stringTags: {},
                 macros: [],
                 ints: {},
                 floats: floats1,
@@ -12391,29 +12762,39 @@ var JSONConverter = /*#__PURE__*/ function() {
                 colors: colors1,
                 textures: textures1
             };
+            this.setupMaterial(material, newMaterial1);
             return newMaterial1;
         }
     };
-    _proto.getStringTags = function getStringTags(material) {
-        var stringTags = {};
-        var _material_depthMask;
-        stringTags["ZWrite"] = String((_material_depthMask = material.depthMask) != null ? _material_depthMask : true);
-        stringTags["ZTest"] = String(true);
-        if (material.blending === spec.MaterialBlending.masked) {
-            throw Error("Alpha mask not support");
-        } else if (material.blending === spec.MaterialBlending.translucent) {
-            stringTags["RenderType"] = RenderType.Blend;
+    _proto.setupMaterial = function setupMaterial(oldMat, newMat) {
+        if (oldMat.blending === spec.MaterialBlending.translucent) {
+            newMat.stringTags["RenderType"] = spec.RenderType.Transparent;
         } else {
-            stringTags["RenderType"] = RenderType.Opaque;
+            newMat.stringTags["RenderType"] = spec.RenderType.Opaque;
         }
-        if (material.side === spec.SideMode.BACK) {
-            stringTags["Cull"] = CullMode.Back;
-        } else if (material.side === spec.SideMode.DOUBLE) {
-            stringTags["Cull"] = CullMode.Double;
+        if (oldMat.blending === spec.MaterialBlending.masked) {
+            newMat.floats["AlphaClip"] = 1;
+            var _oldMat_alphaCutOff;
+            newMat.floats["_Cutoff"] = (_oldMat_alphaCutOff = oldMat.alphaCutOff) != null ? _oldMat_alphaCutOff : 0;
         } else {
-            stringTags["Cull"] = CullMode.Front;
+            newMat.floats["AlphaClip"] = 0;
+        }
+        switch(oldMat.side){
+            case spec.SideMode.BACK:
+                newMat.stringTags["RenderFace"] = spec.RenderFace.Back;
+                break;
+            case spec.SideMode.DOUBLE:
+                newMat.stringTags["RenderFace"] = spec.RenderFace.Both;
+                break;
+            default:
+                newMat.stringTags["RenderFace"] = spec.RenderFace.Front;
+        }
+        if (oldMat.type === spec.MaterialType.pbr) {
+            newMat.floats["_SpecularAA"] = oldMat.useSpecularAA ? 1 : 0;
         }
-        return stringTags;
+        var _oldMat_depthMask;
+        newMat.stringTags["ZWrite"] = String((_oldMat_depthMask = oldMat.depthMask) != null ? _oldMat_depthMask : true);
+        newMat.stringTags["ZTest"] = String(true);
     };
     _proto.getTextureData = function getTextureData(scene, floats, texIndex, texTransform) {
         var _scene_textures_texIndex_id;
@@ -12488,38 +12869,185 @@ var JSONConverter = /*#__PURE__*/ function() {
         }
         return result;
     };
+    _proto.setupBoneData = function setupBoneData(geom, skin, oldScene, treeItem, treeNodeList) {
+        var bins = oldScene.bins;
+        var joints = skin.joints, skeleton = skin.skeleton, inverseBindMatrices = skin.inverseBindMatrices;
+        if (!inverseBindMatrices) {
+            throw new Error("inverseBindMatrices is undefined " + skin);
+        }
+        var bindMatrixArray = typedArrayFromBinary(bins, inverseBindMatrices);
+        geom.inverseBindMatrices = Array.from(bindMatrixArray);
+        var id2Node = {};
+        var rootBoneItem = treeItem;
+        if (skeleton !== undefined) {
+            rootBoneItem = treeNodeList[skeleton];
+        } else {
+            console.warn("Root bone is missing");
+        }
+        joints.forEach(function(joint) {
+            var node = treeNodeList[joint];
+            if (node !== rootBoneItem && node.parentId === rootBoneItem.parentId) {
+                console.error("Find invalid node for rootBoneItem and adjust rootBoneItem");
+                rootBoneItem = treeItem;
+            }
+        });
+        treeNodeList.forEach(function(node) {
+            id2Node[node.id] = node;
+        });
+        geom.rootBoneName = rootBoneItem.name;
+        var boneNames = [];
+        joints.forEach(function(joint) {
+            var currentItem = treeNodeList[joint];
+            var nodeList = [];
+            while(currentItem && currentItem != rootBoneItem){
+                nodeList.push(currentItem.name);
+                if (currentItem.parentId) {
+                    currentItem = id2Node[currentItem.parentId];
+                } else {
+                    break;
+                }
+            }
+            boneNames.push(nodeList.reverse().join("/"));
+        });
+        geom.boneNames = boneNames;
+        return rootBoneItem;
+    };
     return JSONConverter;
 }();
+var TreeInfo = /*#__PURE__*/ function() {
+    function TreeInfo() {
+        this.tree2NodeList = {};
+        this.nodeList2Tree = {};
+        this.nodeId2Node = {};
+        this.node2Path = {};
+    }
+    var _proto = TreeInfo.prototype;
+    _proto.add = function add(treeItem, treeNodeList) {
+        var _this = this;
+        if (this.tree2NodeList[treeItem.id]) {
+            throw new Error("Find duplicate treeItem id: " + treeItem.id);
+        }
+        this.tree2NodeList[treeItem.id] = treeNodeList;
+        treeNodeList.forEach(function(node) {
+            if (_this.nodeList2Tree[node.id]) {
+                throw new Error("Find duplicate tree node id: " + node.id);
+            }
+            _this.nodeList2Tree[node.id] = treeItem;
+            _this.nodeId2Node[node.id] = node;
+        });
+        treeNodeList.forEach(function(node) {
+            _this.setNodePath(node);
+        });
+    };
+    _proto.setNodePath = function setNodePath(node) {
+        if (node.parentId) {
+            if (this.node2Path[node.parentId]) {
+                this.node2Path[node.id] = this.node2Path[node.parentId] + "/" + node.name;
+            } else if (this.nodeId2Node[node.parentId]) {
+                this.setNodePath(this.nodeId2Node[node.parentId]);
+                this.node2Path[node.id] = this.node2Path[node.parentId] + "/" + node.name;
+            } else {
+                this.node2Path[node.id] = node.name;
+            }
+        } else {
+            this.node2Path[node.id] = node.name;
+        }
+    };
+    _proto.getTreeNodeListByTreeId = function getTreeNodeListByTreeId(id) {
+        return this.tree2NodeList[id];
+    };
+    _proto.getTreeNodeListByNodeId = function getTreeNodeListByNodeId(id) {
+        var treeItem = this.nodeList2Tree[id];
+        if (!treeItem) {
+            throw new Error("Invalid id " + id);
+        }
+        return this.getTreeNodeListByTreeId(treeItem.id);
+    };
+    _proto.getTreeItemByNodeId = function getTreeItemByNodeId(id) {
+        return this.nodeList2Tree[id];
+    };
+    _proto.getTreeNode = function getTreeNode(treeId, nodeIndex) {
+        var nodeList = this.getTreeNodeListByTreeId(treeId);
+        return nodeList[nodeIndex];
+    };
+    _proto.getAllTreeNodeList = function getAllTreeNodeList() {
+        var _this = this;
+        var nodeList = [];
+        Object.keys(this.tree2NodeList).forEach(function(key) {
+            var _nodeList;
+            (_nodeList = nodeList).push.apply(_nodeList, [].concat(_this.tree2NodeList[key]));
+        });
+        return nodeList;
+    };
+    _proto.getNodePath = function getNodePath(id) {
+        return this.node2Path[id];
+    };
+    return TreeInfo;
+}();
 function getGeometryDataFromOptions(geomOptions) {
     var vertexCount = 0;
+    var verticesType = spec.VertexFormatType.Float32;
+    var verticesNormalize = false;
+    var uvsType = spec.VertexFormatType.Float32;
+    var uvsNormalize = false;
+    var normalsType = spec.VertexFormatType.Float32;
+    var normalsNormalize = false;
     var _geomOptions_name;
     var modelData = {
-        vertices: [],
-        uvs: [],
-        normals: [],
-        indices: [],
+        vertices: new Float32Array(),
+        uvs: new Float32Array(),
+        normals: new Float32Array(),
+        indices: new Float32Array(),
         name: (_geomOptions_name = geomOptions.name) != null ? _geomOptions_name : "<empty>"
     };
     for(var attrib in geomOptions.attributes){
         var attribData = geomOptions.attributes[attrib];
-        if (attrib === "a_Position") {
+        if (attrib === "aPosition") {
             // @ts-expect-error
             vertexCount = attribData.data.length / attribData.size;
             // @ts-expect-error
-            modelData.vertices = array2Number(attribData.data);
-        } else if (attrib === "a_Normal") {
+            modelData.vertices = attribData.data;
+            var _attribData_normalize;
+            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") {
             // @ts-expect-error
-            modelData.normals = array2Number(attribData.data);
-        } else if (attrib === "a_UV1") {
+            modelData.normals = attribData.data;
+            var _attribData_normalize1;
+            normalsNormalize = (_attribData_normalize1 = attribData.normalize) != null ? _attribData_normalize1 : false;
+            var _attribData_type1;
+            normalsType = glType2VertexFormatType((_attribData_type1 = attribData.type) != null ? _attribData_type1 : glContext.FLOAT);
+        } else if (attrib === "aUV1") {
             // @ts-expect-error
-            modelData.uvs = array2Number(attribData.data);
+            modelData.uvs = attribData.data;
+            var _attribData_normalize2;
+            uvsNormalize = (_attribData_normalize2 = attribData.normalize) != null ? _attribData_normalize2 : false;
+            var _attribData_type2;
+            uvsType = glType2VertexFormatType((_attribData_type2 = attribData.type) != null ? _attribData_type2 : glContext.FLOAT);
         }
     }
+    var verticesOffset = getOffset(verticesType, 3, vertexCount);
+    var uvsOffset = getOffset(uvsType, 2, vertexCount);
+    var normalsOffset = getOffset(normalsType, 3, vertexCount);
     if (geomOptions.indices) {
-        // @ts-expect-error
-        modelData.indices = array2Number(geomOptions.indices.data);
+        modelData.indices = geomOptions.indices.data;
+    } else if (vertexCount <= 65535) {
+        var indices = new Uint16Array(vertexCount);
+        for(var i = 0; i < vertexCount; i++){
+            indices[i] = i;
+        }
+        modelData.indices = indices;
     } else {
-        throw Error("indices is required");
+        var indices1 = new Uint32Array(vertexCount);
+        for(var i1 = 0; i1 < vertexCount; i1++){
+            indices1[i1] = i1;
+        }
+        modelData.indices = indices1;
+    }
+    var indicesType = spec.IndexFormatType.UInt16;
+    if (modelData.indices.BYTES_PER_ELEMENT === 4) {
+        indicesType = spec.IndexFormatType.UInt32;
     }
     var geometryData = {
         id: generateGUID(),
@@ -12528,47 +13056,185 @@ function getGeometryDataFromOptions(geomOptions) {
             vertexCount: vertexCount,
             channels: [
                 {
+                    semantic: spec.VertexBufferSemantic.Position,
                     offset: 0,
-                    format: 0,
-                    dimension: 3
+                    format: verticesType,
+                    dimension: 3,
+                    normalize: verticesNormalize
                 },
                 {
-                    offset: vertexCount * 3 * 4,
-                    format: 0,
-                    dimension: 2
+                    semantic: spec.VertexBufferSemantic.Uv,
+                    offset: verticesOffset,
+                    format: uvsType,
+                    dimension: 2,
+                    normalize: uvsNormalize
                 },
                 {
-                    offset: vertexCount * 5 * 4,
-                    format: 0,
-                    dimension: 3
+                    semantic: spec.VertexBufferSemantic.Normal,
+                    offset: verticesOffset + uvsOffset,
+                    format: normalsType,
+                    dimension: 3,
+                    normalize: normalsNormalize
                 }
             ]
         },
+        subMeshes: [],
         mode: spec.GeometryType.TRIANGLES,
-        indexFormat: 0,
-        indexOffset: vertexCount * 8 * 4,
+        indexFormat: indicesType,
+        indexOffset: verticesOffset + uvsOffset + normalsOffset,
         buffer: encodeVertexData(modelData)
     };
     return geometryData;
 }
+function getGeometryDataFromPropsList(geomPropsList) {
+    var _loop = function(i) {
+        var _geomPropsList__indices;
+        var count = getDrawCount(geomPropsList[i]);
+        var _geomPropsList_i_drawStart;
+        var offset = totalCount + ((_geomPropsList_i_drawStart = geomPropsList[i].drawStart) != null ? _geomPropsList_i_drawStart : 0);
+        var _geomPropsList__indices_data_BYTES_PER_ELEMENT;
+        var scale = (_geomPropsList__indices_data_BYTES_PER_ELEMENT = (_geomPropsList__indices = geomPropsList[0].indices) == null ? void 0 : _geomPropsList__indices.data.BYTES_PER_ELEMENT) != null ? _geomPropsList__indices_data_BYTES_PER_ELEMENT : 1;
+        subMeshes.push({
+            offset: offset * scale,
+            indexCount: count,
+            vertexCount: count
+        });
+        if (i) {
+            var geom0 = geomPropsList[0];
+            var geom1 = geomPropsList[i];
+            var isSame = true;
+            Object.keys(geom0.attributes).forEach(function(name) {
+                var attrib = geom0.attributes[name];
+                // @ts-expect-error
+                var array1 = attrib.data;
+                // @ts-expect-error
+                var array2 = geom1.attributes[name].data;
+                if (array1.length !== array2.length || array1[0] !== array2[0]) {
+                    isSame = false;
+                }
+            });
+            if (isSame) {
+                if (geom0.indices && geom1.indices) {
+                    geom0.indices.data = mergeTypedArray(geom0.indices.data, geom1.indices.data);
+                }
+            } else {
+                if (geom0.indices && geom1.indices) {
+                    var vertexCount = getVertexCount(geom0);
+                    geom0.indices.data = mergeTypedArray(geom0.indices.data, geom1.indices.data, vertexCount);
+                }
+                Object.keys(geom0.attributes).forEach(function(name) {
+                    var attrib = geom0.attributes[name];
+                    // @ts-expect-error
+                    var array1 = attrib.data;
+                    // @ts-expect-error
+                    var array2 = geom1.attributes[name].data;
+                    // @ts-expect-error
+                    attrib.data = mergeTypedArray(array1, array2);
+                });
+            }
+        }
+        totalCount = offset + count;
+    };
+    if (geomPropsList.length <= 0) {
+        return;
+    }
+    var totalCount = 0;
+    var subMeshes = [];
+    for(var i = 0; i < geomPropsList.length; i++)_loop(i);
+    return createGeometryData(geomPropsList[0], subMeshes);
+}
+function getOffset(formatType, dimension, count) {
+    switch(formatType){
+        case spec.VertexFormatType.Int8:
+        case spec.VertexFormatType.UInt8:
+            return dimension * count;
+        case spec.VertexFormatType.Int16:
+        case spec.VertexFormatType.UInt16:
+            return dimension * count * 2;
+        default:
+            return dimension * count * 4;
+    }
+}
+function createGeometryData(props, subMeshes) {
+    var totalByteLength = 0;
+    for(var attrib in props.attributes){
+        var attribData = props.attributes[attrib];
+        // @ts-expect-error
+        totalByteLength += attribData.data.byteLength;
+    }
+    if (props.indices) {
+        totalByteLength += props.indices.data.byteLength;
+    }
+    var vertexCount = 0;
+    var bufferOffset = 0;
+    var buffer = new Uint8Array(totalByteLength);
+    var vertexChannels = [];
+    for(var attrib1 in props.attributes){
+        var attribData1 = props.attributes[attrib1];
+        var semantic = vertexBufferSemanticMap[attrib1];
+        if (!semantic) {
+            throw new Error("Invalid attrib " + attrib1);
+        }
+        // @ts-expect-error
+        vertexCount = attribData1.data.length / attribData1.size;
+        var _attribData_type;
+        var vertexChannel = {
+            semantic: semantic,
+            offset: bufferOffset,
+            format: glType2VertexFormatType((_attribData_type = attribData1.type) != null ? _attribData_type : glContext.FLOAT),
+            dimension: attribData1.size,
+            normalize: attribData1.normalize
+        };
+        vertexChannels.push(vertexChannel);
+        // @ts-expect-error
+        var data = attribData1.data;
+        var subBuffer = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+        buffer.set(subBuffer, bufferOffset);
+        bufferOffset += subBuffer.byteLength;
+    }
+    var geometryData = {
+        id: generateGUID(),
+        dataType: spec.DataType.Geometry,
+        vertexData: {
+            vertexCount: vertexCount,
+            channels: vertexChannels
+        },
+        subMeshes: subMeshes,
+        mode: spec.GeometryType.TRIANGLES,
+        indexFormat: spec.IndexFormatType.UInt16,
+        indexOffset: -1,
+        buffer: ""
+    };
+    if (props.indices) {
+        var indices = props.indices.data;
+        var subBuffer1 = new Uint8Array(indices.buffer, indices.byteOffset, indices.byteLength);
+        buffer.set(subBuffer1, bufferOffset);
+        geometryData.indexOffset = bufferOffset;
+        if (_instanceof1(indices, Uint32Array)) {
+            geometryData.indexFormat = spec.IndexFormatType.UInt32;
+        }
+    }
+    geometryData.buffer = toBase64String(buffer);
+    return geometryData;
+}
 function encodeVertexData(modelData) {
-    var vertices = new Float32Array(modelData.vertices);
-    var uvs = new Float32Array(modelData.uvs);
-    var normals = new Float32Array(modelData.normals);
-    var indices = new Uint16Array(modelData.indices);
+    var vertices = new Uint8Array(modelData.vertices.buffer, modelData.vertices.byteOffset, modelData.vertices.byteLength);
+    var uvs = new Uint8Array(modelData.uvs.buffer, modelData.uvs.byteOffset, modelData.uvs.byteLength);
+    var normals = new Uint8Array(modelData.normals.buffer, modelData.normals.byteOffset, modelData.normals.byteLength);
+    var indices = new Uint8Array(modelData.indices.buffer, modelData.indices.byteOffset, modelData.indices.byteLength);
     // 计算新 ArrayBuffer 的总大小（以字节为单位）
     var totalSize = vertices.byteLength + uvs.byteLength + normals.byteLength + indices.byteLength;
     // 创建一个足够大的 ArrayBuffer 来存储两个数组的数据
     var buffer = new ArrayBuffer(totalSize);
     // 创建一个视图来按照 Float32 格式写入数据
-    var floatView = new Float32Array(buffer, 0, vertices.length);
+    var floatView = new Uint8Array(buffer, 0, vertices.byteLength);
     floatView.set(vertices);
-    floatView = new Float32Array(buffer, vertices.byteLength, uvs.length);
+    floatView = new Uint8Array(buffer, vertices.byteLength, uvs.byteLength);
     floatView.set(uvs);
-    floatView = new Float32Array(buffer, vertices.byteLength + uvs.byteLength, normals.length);
+    floatView = new Uint8Array(buffer, vertices.byteLength + uvs.byteLength, normals.byteLength);
     floatView.set(normals);
     // 创建一个视图来按照 Uint16 格式写入数据，紧接着 Float32 数据之后
-    var uint16View = new Uint16Array(buffer, vertices.byteLength + uvs.byteLength + normals.byteLength, indices.length);
+    var uint16View = new Uint8Array(buffer, vertices.byteLength + uvs.byteLength + normals.byteLength, indices.byteLength);
     uint16View.set(indices);
     // 创建一个 Uint8Array 视图以便逐字节访问 ArrayBuffer 的数据
     var uint8View = new Uint8Array(buffer);
@@ -12580,18 +13246,133 @@ function encodeVertexData(modelData) {
     // 使用 btoa 函数将二进制字符串转换为 Base64 编码的字符串
     return btoa(binaryString);
 }
-function array2Number(array) {
-    var result = [];
-    array.forEach(function(v) {
-        return result.push(v);
+function toBase64String(array) {
+    // 将 Uint8Array 转换为二进制字符串
+    var binaryString = "";
+    for(var i = 0; i < array.length; i++){
+        binaryString += String.fromCharCode(array[i]);
+    }
+    // 使用 btoa 函数将二进制字符串转换为 Base64 编码的字符串
+    return btoa(binaryString);
+}
+function getDrawCount(geomProps) {
+    if (geomProps.drawCount) {
+        return geomProps.drawCount;
+    } else if (geomProps.indices) {
+        return geomProps.indices.data.length;
+    } else {
+        var drawCount = 0;
+        // @ts-expect-error
+        geomProps.attributes.forEach(function(attrib) {
+            drawCount = attrib.data.length / attrib.size;
+        });
+        return drawCount;
+    }
+}
+function getVertexCount(geomProps) {
+    var vertexCount = 0;
+    Object.keys(geomProps.attributes).forEach(function(name) {
+        var attrib = geomProps.attributes[name];
+        // @ts-expect-error
+        vertexCount = attrib.data.length / attrib.size;
     });
-    return result;
+    return vertexCount;
+}
+function mergeTypedArray(array1, array2, offset) {
+    if (_instanceof1(array1, Float32Array)) {
+        var result = new Float32Array(array1.length + array2.length);
+        result.set(array1);
+        result.set(array2, array1.length);
+        return result;
+    } else if (_instanceof1(array1, Int32Array)) {
+        var result1 = new Int32Array(array1.length + array2.length);
+        result1.set(array1);
+        result1.set(array2, array1.length);
+        return result1;
+    } else if (_instanceof1(array1, Uint32Array)) {
+        var result2 = new Uint32Array(array1.length + array2.length);
+        result2.set(array1);
+        result2.set(array2, array1.length);
+        if (offset) {
+            for(var i = 0; i < array2.length; i++){
+                result2[array1.length + i] += offset;
+            }
+        }
+        return result2;
+    } else if (_instanceof1(array1, Int16Array)) {
+        var result3 = new Int16Array(array1.length + array2.length);
+        result3.set(array1);
+        result3.set(array2, array1.length);
+        return result3;
+    } else if (_instanceof1(array1, Uint16Array)) {
+        var result4 = new Uint16Array(array1.length + array2.length);
+        result4.set(array1);
+        result4.set(array2, array1.length);
+        if (offset) {
+            for(var i1 = 0; i1 < array2.length; i1++){
+                result4[array1.length + i1] += offset;
+            }
+        }
+        return result4;
+    } else if (_instanceof1(array1, Int8Array)) {
+        var result5 = new Int8Array(array1.length + array2.length);
+        result5.set(array1);
+        result5.set(array2, array1.length);
+        return result5;
+    } else {
+        var result6 = new Uint8Array(array1.length + array2.length);
+        result6.set(array1);
+        result6.set(array2, array1.length);
+        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"
+};
 
 registerPlugin("tree", ModelTreePlugin, VFXItem, true);
 registerPlugin("model", ModelPlugin, VFXItem);
-var version = "2.0.0-alpha.11";
+var version = "2.0.0-alpha.13";
 logger.info("plugin model version: " + version);
+if (version !== version$1) {
+    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!");
+}
 
-export { BoxMesh, CameraGestureHandlerImp, CameraGestureType, CheckerHelper, CompositionCache, CompositionHitTest, CullMode, FBOOptions, Float16ArrayWrapper, GeometryBoxProxy, HitTestingProxy, HookOGLFunc, InterpolationSampler, JSONConverter, LoaderHelper, LoaderImpl, MeshHelper, ModelCameraComponent, ModelLightComponent, ModelMeshComponent, ModelPlugin, ModelPluginComponent, ModelSkyboxComponent, ModelTreeComponent, ModelTreeItem, ModelTreePlugin, PAnimInterpType, PAnimPathType, PAnimTexture, PAnimTrack, PAnimation, PAnimationManager, PBRShaderGUID, PBlendMode, PCamera, PCameraManager, PCoordinate, PEntity, PFaceSideMode, PGeometry, PGlobalState, PLight, PLightManager, PLightType, PMaterialBase, PMaterialPBR, PMaterialSkyboxFilter, PMaterialType, PMaterialUnlit, PMesh, PMorph, PObject, PObjectType, PPrimitive, PSceneManager, PShaderManager, PShadowType, PSkin, PSkybox, PSkyboxCreator, PSkyboxType, PTextureType, PTransform, PluginHelper, RayBoxTesting, RayIntersectsBoxWithRotation, RayTriangleTesting, RenderType, TextureDataMode, ToggleItemBounding, TwoStatesSet, UnlitShaderGUID, VFX_ITEM_TYPE_3D, VertexAttribBuffer, WebGLHelper, WebHelper, createAnimationSampler, createPluginMaterial, fetchPBRShaderCode, fetchUnlitShaderCode, getDefaultEffectsGLTFLoader, getDiffuseOnlyShaderCode, getGaussianBlurShaderCodeV1, getGaussianBlurShaderCodeV2, getKawaseBlurShaderCode, getNormalVisShaderCode, getPBRPassShaderCode, getPMeshList, getQuadFilterShaderCode, getRendererGPUInfo, getSceneManager, getShadowPassShaderCode, getSimpleFilterShaderCode, getSkyBoxShaderCode, getTransparecyBaseShader, getTransparecyFilterShader, setDefaultEffectsGLTFLoader, version };
+export { AnimationComponent, BoxMesh, CameraGestureHandlerImp, CameraGestureType, CheckerHelper, CompositionCache, CompositionHitTest, CullMode, FBOOptions, Float16ArrayWrapper, GeometryBoxProxy, HitTestingProxy, HookOGLFunc, InterpolationSampler, JSONConverter, LoaderHelper, LoaderImpl, MeshHelper, ModelCameraComponent, ModelLightComponent, ModelMeshComponent, ModelPlugin, ModelPluginComponent, ModelSkyboxComponent, ModelTreeComponent, ModelTreeItem, ModelTreePlugin, PAnimInterpType, PAnimPathType, PAnimTexture, PAnimTrack, PAnimation, PAnimationManager, PBRShaderGUID, PBlendMode, PCamera, PCameraManager, PCoordinate, PEntity, PFaceSideMode, PGeometry, PGlobalState, PLight, PLightManager, PLightType, PMaterialBase, PMaterialPBR, PMaterialSkyboxFilter, PMaterialType, PMaterialUnlit, PMesh, PMorph, PObject, PObjectType, PSceneManager, PShaderManager, PShadowType, PSkin, PSkybox, PSkyboxCreator, PSkyboxType, PSubMesh, PTextureType, PTransform, PluginHelper, RayBoxTesting, RayIntersectsBoxWithRotation, RayTriangleTesting, RenderType, TextureDataMode, ToggleItemBounding, TwoStatesSet, UnlitShaderGUID, VFX_ITEM_TYPE_3D, VertexAttribBuffer, WebGLHelper, WebHelper, createAnimationSampler, createPluginMaterial, fetchPBRShaderCode, fetchUnlitShaderCode, getDefaultEffectsGLTFLoader, getDiffuseOnlyShaderCode, getGaussianBlurShaderCodeV1, getGaussianBlurShaderCodeV2, getGeometryDataFromOptions, getGeometryDataFromPropsList, getKawaseBlurShaderCode, getNormalVisShaderCode, getPBRPassShaderCode, getPMeshList, getQuadFilterShaderCode, getRendererGPUInfo, getSceneManager, getShadowPassShaderCode, getSimpleFilterShaderCode, getSkyBoxShaderCode, getTransparecyBaseShader, getTransparecyFilterShader, setDefaultEffectsGLTFLoader, version };
 //# sourceMappingURL=index.mjs.map