@galacean/engine-physics-physx 0.9.1 → 0.9.3

package/dist/miniprogram.js

@@ -12766,6 +12766,7 @@ var VertexChangedFlags;
     var MeshRenderer = function MeshRenderer(entity) {
         var _this;
         _this = Renderer.call(this, entity) || this;
+        _this._enableVertexColor = false;
         _this._onMeshChanged = _this._onMeshChanged.bind(_assert_this_initialized(_this));
         return _this;
     };
@@ -12828,7 +12829,7 @@ var VertexChangedFlags;
                             shaderData.enableMacro(MeshRenderer._tangentMacro);
                             break;
                         case "COLOR_0":
-                            shaderData.enableMacro(MeshRenderer._vertexColorMacro);
+                            this.enableVertexColor && shaderData.enableMacro(MeshRenderer._vertexColorMacro);
                             break;
                     }
                 }
@@ -12883,6 +12884,20 @@ var VertexChangedFlags;
                     this._setMesh(value);
                 }
             }
+        },
+        {
+            key: "enableVertexColor",
+            get: /**
+   * Whether enable vertex color.
+   */ function get() {
+                return this._enableVertexColor;
+            },
+            set: function set(value) {
+                if (value !== this._enableVertexColor) {
+                    this._dirtyUpdateFlag |= 0x2;
+                    this._enableVertexColor = value;
+                }
+            }
         }
     ]);
     return MeshRenderer;
@@ -12989,6 +13004,7 @@ var rePropName = RegExp("[^.[\\]]+" + "|" + // Or match property names within br
     var SkinnedMeshRenderer = function SkinnedMeshRenderer(entity) {
         var _this;
         _this = MeshRenderer.call(this, entity) || this;
+        _this._supportSkinning = false;
         _this._hasInitSkin = false;
         _this._jointDataCreateCache = new miniprogram$7.Vector2(-1, -1);
         _this._localBounds = new miniprogram$7.BoundingBox();
@@ -12998,7 +13014,7 @@ var rePropName = RegExp("[^.[\\]]+" + "|" + // Or match property names within br
         // 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;
@@ -13017,9 +13033,8 @@ var rePropName = RegExp("[^.[\\]]+" + "|" + // Or match property names within br
             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--){
@@ -13038,8 +13053,6 @@ var rePropName = RegExp("[^.[\\]]+" + "|" + // Or match property names within br
    * @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;
@@ -13066,12 +13079,18 @@ var rePropName = RegExp("[^.[\\]]+" + "|" + // Or match property names within br
                         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);
@@ -13082,6 +13101,8 @@ var rePropName = RegExp("[^.[\\]]+" + "|" + // Or match property names within br
                 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);
     };
@@ -13276,6 +13297,9 @@ var rePropName = RegExp("[^.[\\]]+" + "|" + // Or match property names within br
 (function() {
     SkinnedMeshRenderer._jointMatrixProperty = Shader.getPropertyByName("u_jointMatrix");
 })();
+__decorate$1([
+    ignoreClone
+], SkinnedMeshRenderer.prototype, "_supportSkinning", void 0);
 __decorate$1([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_hasInitSkin", void 0);
@@ -26577,6 +26601,12 @@ var SceneParser$1 = /*#__PURE__*/ function(Parser1) {
             } else {
                 var material = (materials == null ? void 0 : materials[materialIndex]) || SceneParser._getDefaultMaterial(engine);
                 renderer.setMaterial(material);
+                // Enable vertex color if mesh has COLOR_0 vertex element
+                mesh.vertexElements.forEach(function(element) {
+                    if (element.semantic === "COLOR_0") {
+                        renderer.enableVertexColor = true;
+                    }
+                });
             }
             var _gltfMeshPrimitives_i = gltfMeshPrimitives[i], _gltfMeshPrimitives_i_extensions = _gltfMeshPrimitives_i.extensions, extensions = _gltfMeshPrimitives_i_extensions === void 0 ? {} : _gltfMeshPrimitives_i_extensions;
             var KHR_materials_variants = extensions.KHR_materials_variants;
@@ -35339,7 +35369,8 @@ exports.WebGLMode = void 0;
             webGLMode: 0,
             alpha: false,
             stencil: true,
-            _forceFlush: false
+            _forceFlush: false,
+            _maxAllowSkinUniformVectorCount: 256
         }, initializeOptions);
         if (miniprogram$1$1.SystemInfo.platform === miniprogram$1$1.Platform.IPhone || miniprogram$1$1.SystemInfo.platform === miniprogram$1$1.Platform.IPad) {
             var version = miniprogram$1$1.SystemInfo.operatingSystem.match(/(\d+).?(\d+)?.?(\d+)?/);
@@ -35644,7 +35675,7 @@ function _interopNamespace(e) {
 }
 var CoreObjects__namespace = /*#__PURE__*/ _interopNamespace(CoreObjects);
 //@ts-ignore
-var version = "0.9.1";
+var version = "0.9.3";
 console.log("Galacean engine version: " + version);
 for(var key in CoreObjects__namespace){
     CoreObjects.Loader.registerClass(key, CoreObjects__namespace[key]);