@galacean/effects-plugin-model 2.2.3 → 2.2.5

package/dist/weapp.mjs

@@ -1291,7 +1291,6 @@ function GetNum2GLName(ctx) {
    */ _proto.update = function update(modelMatrix, viewProjMatrix, positions, lineColor) {
         var material = this.mesh.material;
         material.setMatrix("effects_ObjectToWorld", modelMatrix);
-        material.setMatrix("effects_MatrixVP", viewProjMatrix);
         for(var i = 0; i < positions.length; i += 3){
             material.setVector3("_PositionList[" + i / 3 + "]", Vector3.fromArray(positions, i));
         }
@@ -8626,7 +8625,6 @@ function _assert_this_initialized(self) {
     };
     _proto.updateUniformsByScene = function updateUniformsByScene(sceneStates) {
         var material = this.getEffectsMaterial();
-        material.setMatrix("effects_MatrixVP", sceneStates.viewProjectionMatrix);
         material.setVector3("_Camera", sceneStates.cameraPosition);
         //
         if (!this.isUnlitMaterial()) {
@@ -9514,6 +9512,7 @@ var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
    * 组件初始化，初始化场景管理器并更新合成相机
    * @param sceneParams - 场景参数
    */ _proto.initial = function initial(sceneParams) {
+        var _this_item_composition;
         var _sceneParams_runtimeEnv;
         this.runtimeEnv = (_sceneParams_runtimeEnv = sceneParams["runtimeEnv"]) != null ? _sceneParams_runtimeEnv : this.runtimeEnv;
         var _sceneParams_compatibleMode;
@@ -9531,6 +9530,7 @@ var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
         var _sceneParams_renderMode3DUVGridSize;
         this.renderMode3DUVGridSize = (_sceneParams_renderMode3DUVGridSize = sceneParams["renderMode3DUVGridSize"]) != null ? _sceneParams_renderMode3DUVGridSize : this.renderMode3DUVGridSize;
         var component = this.item.composition;
+        var _this_item_composition_items;
         this.scene.initial({
             componentName: "" + component.id,
             renderer: this.engine.renderer,
@@ -9543,7 +9543,7 @@ var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
             renderMode3DUVGridSize: this.renderMode3DUVGridSize,
             renderSkybox: this.renderSkybox,
             lightItemCount: this.getLightItemCount(),
-            maxJointCount: this.getMaxJointCount()
+            maxJointCount: this.getMaxJointCount((_this_item_composition_items = (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.items) != null ? _this_item_composition_items : [])
         });
         this.updateSceneCamera(component);
     };
@@ -9567,11 +9567,9 @@ var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
         });
         return lightItemCount;
     };
-    _proto.getMaxJointCount = function getMaxJointCount() {
-        var _this_item_composition;
+    _proto.getMaxJointCount = function getMaxJointCount(items) {
+        var _this = this;
         var maxJointCount = 0;
-        var _this_item_composition_items;
-        var items = (_this_item_composition_items = (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.items) != null ? _this_item_composition_items : [];
         items.forEach(function(item) {
             var meshComp = item.getComponent(ModelMeshComponent);
             if (meshComp && meshComp.data) {
@@ -9583,6 +9581,9 @@ var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
                     }
                 }
             }
+            if (item.children.length !== 0) {
+                maxJointCount = Math.max(_this.getMaxJointCount(item.children), maxJointCount);
+            }
         });
         return maxJointCount;
     };
@@ -13263,7 +13264,7 @@ var GLTFHelper = /*#__PURE__*/ function() {
 registerPlugin("model", ModelPlugin, VFXItem);
 /**
  * 插件版本号
- */ var version = "2.2.3";
+ */ var version = "2.2.5";
 logger.info("Plugin model version: " + version + ".");
 if (version !== EFFECTS.version) {
     console.error("注意：请统一 Model 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Model plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");