@galacean/engine 0.0.0-experimental-animator-additive.1 → 0.0.0-experimental-animator-additive.3

package/dist/browser.js

@@ -17730,6 +17730,7 @@
         var SkinnedMeshRenderer = function SkinnedMeshRenderer(entity) {
             var _this;
             _this = MeshRenderer.call(this, entity) || this;
+            _this._supportSkinning = false;
             _this._hasInitSkin = false;
             _this._jointDataCreateCache = new Vector2(-1, -1);
             _this._localBounds = new BoundingBox();
@@ -17739,7 +17740,7 @@
             // Limit size to 256 to avoid some problem:
             // For renderer is "Apple GPU", when uniform is large than 256 the skeleton matrix array access in shader very slow in Safari or WKWebview. This may be a apple bug, Chrome and Firefox is OK!
             // For renderer is "ANGLE (AMD, AMD Radeon(TM) Graphics Direct3011 vs_5_0 ps_5_0, D3011)", compile shader si very slow because of max uniform is 4096.
-            maxVertexUniformVectors = Math.min(maxVertexUniformVectors, 256);
+            maxVertexUniformVectors = Math.min(maxVertexUniformVectors, rhi._options._maxAllowSkinUniformVectorCount);
             _this._maxVertexUniformVectors = maxVertexUniformVectors;
             _this._onLocalBoundsChanged = _this._onLocalBoundsChanged.bind(_assert_this_initialized(_this));
             var localBounds = _this._localBounds;
@@ -17758,9 +17759,8 @@
                 this._initSkin();
                 this._hasInitSkin = true;
             }
-            var skin = this._skin;
-            if (skin) {
-                var ibms = skin.inverseBindMatrices;
+            if (this._supportSkinning) {
+                var ibms = this._skin.inverseBindMatrices;
                 var worldToLocal = this._rootBone.getInvModelMatrix();
                 var _this = this, joints = _this._jointEntities, jointMatrices = _this._jointMatrices;
                 for(var i = joints.length - 1; i >= 0; i--){
@@ -17779,8 +17779,6 @@
        * @override
        */ _proto._updateShaderData = function _updateShaderData(context) {
             var entity = this.entity;
-            var worldMatrix = this._rootBone ? this._rootBone.transform.worldMatrix : entity.transform.worldMatrix;
-            this._updateTransformShaderData(context, worldMatrix);
             var shaderData = this.shaderData;
             var mesh = this.mesh;
             var blendShapeManager = mesh._blendShapeManager;
@@ -17807,12 +17805,18 @@
                             shaderData.disableMacro("O3_JOINTS_NUM");
                             shaderData.enableMacro("O3_USE_JOINT_TEXTURE");
                             shaderData.setTexture(SkinnedMeshRenderer._jointSamplerProperty, this._jointTexture);
+                            this._supportSkinning = true;
                         } else {
-                            Logger.error("component's joints count(" + jointCount + ") greater than device's MAX_VERTEX_UNIFORM_VECTORS number " + this._maxVertexUniformVectors + ", and don't support jointTexture in this device. suggest joint count less than " + remainUniformJointCount + ".", this);
+                            var _this__jointTexture1;
+                            this._supportSkinning = false;
+                            (_this__jointTexture1 = this._jointTexture) == null ? void 0 : _this__jointTexture1.destroy();
+                            shaderData.disableMacro("O3_HAS_SKIN");
+                            Logger.warn("component's joints count(" + jointCount + ") greater than device's MAX_VERTEX_UNIFORM_VECTORS number " + this._maxVertexUniformVectors + ", and don't support jointTexture in this device. suggest joint count less than " + remainUniformJointCount + ".", this);
                         }
                     } else {
-                        var _this__jointTexture1;
-                        (_this__jointTexture1 = this._jointTexture) == null ? void 0 : _this__jointTexture1.destroy();
+                        var _this__jointTexture2;
+                        this._supportSkinning = true;
+                        (_this__jointTexture2 = this._jointTexture) == null ? void 0 : _this__jointTexture2.destroy();
                         shaderData.disableMacro("O3_USE_JOINT_TEXTURE");
                         shaderData.enableMacro("O3_JOINTS_NUM", remainUniformJointCount.toString());
                         shaderData.setFloatArray(SkinnedMeshRenderer._jointMatrixProperty, this._jointMatrices);
@@ -17823,6 +17827,8 @@
                     this._jointTexture.setPixelBuffer(this._jointMatrices);
                 }
             }
+            var worldMatrix = this._supportSkinning && this._rootBone ? this._rootBone.transform.worldMatrix : entity.transform.worldMatrix;
+            this._updateTransformShaderData(context, worldMatrix);
             var layer = entity.layer;
             this._rendererLayer.set(layer & 65535, layer >>> 16 & 65535, 0, 0);
         };
@@ -18017,6 +18023,9 @@
     (function() {
         SkinnedMeshRenderer._jointMatrixProperty = Shader.getPropertyByName("u_jointMatrix");
     })();
+    __decorate$1([
+        ignoreClone
+    ], SkinnedMeshRenderer.prototype, "_supportSkinning", void 0);
     __decorate$1([
         ignoreClone
     ], SkinnedMeshRenderer.prototype, "_hasInitSkin", void 0);
@@ -27016,7 +27025,13 @@
                 var _this__animatorLayersData_i = this._animatorLayersData[i1], srcPlayData = _this__animatorLayersData_i.srcPlayData, destPlayData = _this__animatorLayersData_i.destPlayData;
                 this._revertCurveOwners(srcPlayData == null ? void 0 : (_srcPlayData_stateData = srcPlayData.stateData) == null ? void 0 : _srcPlayData_stateData.curveOwners);
                 this._revertCurveOwners(destPlayData == null ? void 0 : (_destPlayData_stateData = destPlayData.stateData) == null ? void 0 : _destPlayData_stateData.curveOwners);
-                this._updateLayer(i1, i1 === 0, deltaTime / 1000, animationUpdate);
+            }
+            for(var i2 = 0, n2 = animatorController.layers.length; i2 < n2; i2++){
+                var animatorLayerData1 = this._getAnimatorLayerData(i2);
+                if (animatorLayerData1.layerState === LayerState.Standby) {
+                    continue;
+                }
+                this._updateLayer(i2, i2 === 0, deltaTime / 1000, animationUpdate);
             }
         };
         /**
@@ -31052,7 +31067,8 @@
                 webGLMode: 0,
                 alpha: false,
                 stencil: true,
-                _forceFlush: false
+                _forceFlush: false,
+                _maxAllowSkinUniformVectorCount: 256
             }, initializeOptions);
             if (SystemInfo.platform === exports.Platform.IPhone || SystemInfo.platform === exports.Platform.IPad) {
                 var version = SystemInfo.operatingSystem.match(/(\d+).?(\d+)?.?(\d+)?/);
@@ -35789,7 +35805,7 @@
     }));
 
     //@ts-ignore
-    var version = "0.0.0-experimental-animator-additive.1";
+    var version = "0.0.0-experimental-animator-additive.3";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);