@galacean/engine-physics-physx 0.9.0 → 0.9.2

package/dist/miniprogram.js

@@ -12989,6 +12989,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 +12999,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 +13018,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 +13038,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 +13064,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 +13086,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 +13282,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);
@@ -26229,21 +26238,31 @@ var MeshParser = /*#__PURE__*/ function(Parser1) {
         var vertexCount;
         var bufferBindIndex = 0;
         var positions;
-        keepMeshData && (positions = new Array(vertexCount));
+        var boneIndices;
+        var boneWeights;
+        if (keepMeshData) {
+            positions = new Array(vertexCount);
+            boneIndices = new Array(vertexCount);
+            boneWeights = new Array(vertexCount);
+        }
         for(var attribute in attributes){
             var accessor = accessors[attributes[attribute]];
             var accessorBuffer = GLTFUtil.getAccessorBuffer(context, gltf, accessor);
-            var dataElmentSize = GLTFUtil.getAccessorTypeSize(accessor.type);
-            var attributeCount = accessor.count;
+            var dataElementSize = GLTFUtil.getAccessorTypeSize(accessor.type);
+            var accessorCount = accessor.count;
             var vertices = accessorBuffer.data;
             var vertexElement = void 0;
             var meshId = mesh.instanceId;
             var vertexBindingInfos = accessorBuffer.vertexBindingInfos;
-            var elementFormat = GLTFUtil.getElementFormat(accessor.componentType, dataElmentSize, accessor.normalized);
+            var elementNormalized = accessor.normalized;
+            var elementFormat = GLTFUtil.getElementFormat(accessor.componentType, dataElementSize, elementNormalized);
+            var scaleFactor = void 0;
+            elementNormalized && (scaleFactor = GLTFUtil.getNormalizedComponentScale(accessor.componentType));
+            var elementOffset = void 0;
             if (accessorBuffer.interleaved) {
                 var byteOffset = accessor.byteOffset || 0;
                 var stride = accessorBuffer.stride;
-                var elementOffset = byteOffset % stride;
+                elementOffset = byteOffset % stride;
                 if (vertexBindingInfos[meshId] === undefined) {
                     vertexElement = new miniprogram$5.VertexElement(attribute, elementOffset, elementFormat, bufferBindIndex);
                     var vertexBuffer = accessorBuffer.vertexBuffer;
@@ -26258,7 +26277,8 @@ var MeshParser = /*#__PURE__*/ function(Parser1) {
                     vertexElement = new miniprogram$5.VertexElement(attribute, elementOffset, elementFormat, vertexBindingInfos[meshId]);
                 }
             } else {
-                vertexElement = new miniprogram$5.VertexElement(attribute, 0, elementFormat, bufferBindIndex);
+                elementOffset = 0;
+                vertexElement = new miniprogram$5.VertexElement(attribute, elementOffset, elementFormat, bufferBindIndex);
                 var vertexBuffer1 = new miniprogram$5.Buffer(engine, miniprogram$5.BufferBindFlag.VertexBuffer, vertices.byteLength, miniprogram$5.BufferUsage.Static);
                 vertexBuffer1.setData(vertices);
                 mesh.setVertexBufferBinding(vertexBuffer1, accessorBuffer.stride, bufferBindIndex);
@@ -26266,35 +26286,60 @@ var MeshParser = /*#__PURE__*/ function(Parser1) {
             }
             vertexElements.push(vertexElement);
             if (attribute === "POSITION") {
-                vertexCount = attributeCount;
+                vertexCount = accessorCount;
                 var _mesh_bounds = mesh.bounds, min = _mesh_bounds.min, max = _mesh_bounds.max;
                 if (accessor.min && accessor.max) {
                     min.copyFromArray(accessor.min);
                     max.copyFromArray(accessor.max);
                     if (keepMeshData) {
-                        var stride1 = vertices.length / attributeCount;
-                        for(var j = 0; j < attributeCount; j++){
-                            var offset = j * stride1;
-                            positions[j] = new miniprogram$1$2.Vector3(vertices[offset], vertices[offset + 1], vertices[offset + 2]);
+                        var baseOffset = elementOffset / vertices.BYTES_PER_ELEMENT;
+                        var stride1 = vertices.length / accessorCount;
+                        for(var j = 0; j < accessorCount; j++){
+                            var offset = baseOffset + j * stride1;
+                            var position = new miniprogram$1$2.Vector3(vertices[offset], vertices[offset + 1], vertices[offset + 2]);
+                            elementNormalized && position.scale(scaleFactor);
+                            positions[j] = position;
                         }
                     }
                 } else {
-                    var position = MeshParser._tempVector3;
+                    var position1 = MeshParser._tempVector3;
                     min.set(Number.MAX_VALUE, Number.MAX_VALUE, Number.MAX_VALUE);
                     max.set(-Number.MAX_VALUE, -Number.MAX_VALUE, -Number.MAX_VALUE);
-                    var stride2 = vertices.length / attributeCount;
-                    for(var j1 = 0; j1 < attributeCount; j1++){
-                        var offset1 = j1 * stride2;
-                        position.copyFromArray(vertices, offset1);
-                        miniprogram$1$2.Vector3.min(min, position, min);
-                        miniprogram$1$2.Vector3.max(max, position, max);
-                        keepMeshData && (positions[j1] = position.clone());
+                    var baseOffset1 = elementOffset / vertices.BYTES_PER_ELEMENT;
+                    var stride2 = vertices.length / accessorCount;
+                    for(var j1 = 0; j1 < accessorCount; j1++){
+                        var offset1 = baseOffset1 + j1 * stride2;
+                        position1.copyFromArray(vertices, offset1);
+                        miniprogram$1$2.Vector3.min(min, position1, min);
+                        miniprogram$1$2.Vector3.max(max, position1, max);
+                        if (keepMeshData) {
+                            var clonePosition = position1.clone();
+                            elementNormalized && clonePosition.scale(scaleFactor);
+                            positions[j1] = clonePosition;
+                        }
                     }
                 }
-                if (accessor.normalized) {
-                    var sacleFactor = GLTFUtil.getNormalizedComponentScale(accessor.componentType);
-                    min.scale(sacleFactor);
-                    max.scale(sacleFactor);
+                if (elementNormalized) {
+                    min.scale(scaleFactor);
+                    max.scale(scaleFactor);
+                }
+            } else if (attribute === "JOINTS_0" && keepMeshData) {
+                var baseOffset2 = elementOffset / vertices.BYTES_PER_ELEMENT;
+                var stride3 = vertices.length / accessorCount;
+                for(var j2 = 0; j2 < accessorCount; j2++){
+                    var offset2 = baseOffset2 + j2 * stride3;
+                    var boneIndex = new miniprogram$1$2.Vector4(vertices[offset2], vertices[offset2 + 1], vertices[offset2 + 2], vertices[offset2 + 3]);
+                    elementNormalized && boneIndex.scale(scaleFactor);
+                    boneIndices[j2] = boneIndex;
+                }
+            } else if (attribute === "WEIGHTS_0" && keepMeshData) {
+                var baseOffset3 = elementOffset / vertices.BYTES_PER_ELEMENT;
+                var stride4 = vertices.length / accessorCount;
+                for(var j3 = 0; j3 < accessorCount; j3++){
+                    var offset3 = baseOffset3 + j3 * stride4;
+                    var boneWeight = new miniprogram$1$2.Vector4(vertices[offset3], vertices[offset3 + 1], vertices[offset3 + 2], vertices[offset3 + 3]);
+                    elementNormalized && boneWeight.scale(scaleFactor);
+                    boneWeights[j3] = boneWeight;
                 }
             }
         }
@@ -26313,6 +26358,10 @@ var MeshParser = /*#__PURE__*/ function(Parser1) {
         mesh.uploadData(!keepMeshData);
         //@ts-ignore
         mesh._positions = positions;
+        //@ts-ignore
+        mesh._boneIndices = boneIndices;
+        //@ts-ignore
+        mesh._boneWeights = boneWeights;
         return Promise.resolve(mesh);
     };
     _proto._createBlendShape = function _createBlendShape(mesh, glTFMesh, glTFTargets, getBlendShapeData) {
@@ -35299,7 +35348,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+)?/);
@@ -35604,7 +35654,7 @@ function _interopNamespace(e) {
 }
 var CoreObjects__namespace = /*#__PURE__*/ _interopNamespace(CoreObjects);
 //@ts-ignore
-var version = "0.9.0";
+var version = "0.9.2";
 console.log("Galacean engine version: " + version);
 for(var key in CoreObjects__namespace){
     CoreObjects.Loader.registerClass(key, CoreObjects__namespace[key]);