@galacean/engine-physics-physx 0.0.0-experimental-2.0-game.19 → 0.0.0-experimental-2.0-migrate.2

package/dist/browser.js

@@ -49,7 +49,7 @@
      */ var PhysXColliderShape = /*#__PURE__*/ function() {
         function PhysXColliderShape(physXPhysics) {
             /** @internal */ this._controllers = new engine.DisorderedArray();
-            /** @internal */ this._contractOffset = 0.02;
+            /** @internal */ this._contactOffset = 0.02;
             /** @internal */ this._worldScale = new engine.Vector3(1, 1, 1);
             /** @internal */ this._position = new engine.Vector3();
             /** @internal */ this._rotation = new engine.Vector3();
@@ -57,7 +57,7 @@
             this._physXRotation = new engine.Quaternion();
             this._shapeFlags = 2 | 1;
             this._physXPhysics = physXPhysics;
-            this._contractOffset = physXPhysics.getDefaultContactOffset();
+            this._contactOffset = physXPhysics.getDefaultContactOffset();
         }
         var _proto = PhysXColliderShape.prototype;
         /**
@@ -95,7 +95,7 @@
        * {@inheritDoc IColliderShape.setContactOffset }
        * @default 0.02f * PxTolerancesScale::length
        */ _proto.setContactOffset = function setContactOffset(offset) {
-            this._contractOffset = offset;
+            this._contactOffset = offset;
             var controllers = this._controllers;
             if (controllers.length) {
                 for(var i = 0, n = controllers.length; i < n; i++){
@@ -436,7 +436,7 @@
             this._pxManager && this._createPXController(this._pxManager, shape);
             this._shape = shape;
             shape._controllers.add(this);
-            (_this__pxController = this._pxController) == null ? void 0 : _this__pxController.setContactOffset(shape._contractOffset);
+            (_this__pxController = this._pxController) == null ? void 0 : _this__pxController.setContactOffset(shape._contactOffset);
             (_this__scene = this._scene) == null ? void 0 : _this__scene._addColliderShape(shape._id);
         };
         /**
@@ -679,7 +679,7 @@
         };
         /**
        * {@inheritDoc IDynamicCollider.setSleepThreshold }
-       * @default 1e-5f * PxTolerancesScale::speed * PxTolerancesScale::speed
+       * @default 5e-5f * PxTolerancesScale::speed * PxTolerancesScale::speed
        */ _proto.setSleepThreshold = function setSleepThreshold(value) {
             this._pxActor.setSleepThreshold(value);
         };
@@ -768,11 +768,12 @@
        * autowake=true)`，PhysX 自动唤醒（已通过 `applyForce on sleeping actor` 测试验证）。
        */ _proto.addForce = function addForce(force) {
             if (this._isKinematic) return;
-            this._pxActor.addForce({
-                x: force.x,
-                y: force.y,
-                z: force.z
-            });
+            this._pxActor.addForce(force);
+        };
+        /**
+       * {@inheritDoc IDynamicCollider.addForceAtPosition }
+       */ _proto.addForceAtPosition = function addForceAtPosition(force, position) {
+            this._pxActor.addForceAtPos(force, position);
         };
         /**
        * {@inheritDoc IDynamicCollider.addTorque }
@@ -780,11 +781,7 @@
        * 同 addForce — kinematic 提前 return，sleeping 由 PhysX autowake 自动处理。
        */ _proto.addTorque = function addTorque(torque) {
             if (this._isKinematic) return;
-            this._pxActor.addTorque({
-                x: torque.x,
-                y: torque.y,
-                z: torque.z
-            });
+            this._pxActor.addTorque(torque);
         };
         /**
        * {@inheritDoc IDynamicCollider.move }
@@ -1642,7 +1639,8 @@
             var _this;
             _this = PhysXColliderShape.call(this, physXPhysics) || this, _this._pxMesh = null;
             _this._isConvex = isConvex;
-            if (!_this._cookMesh(positions, indices, cookingFlags)) {
+            var cooked = _this._cookMesh(positions, indices, isConvex, cookingFlags);
+            if (!cooked) {
                 return _possible_constructor_return(_this);
             }
             var physX = physXPhysics._physX, physics = physXPhysics._pxPhysics;
@@ -1650,9 +1648,11 @@
             var shapeFlags = ShapeFlag.SCENE_QUERY_SHAPE | ShapeFlag.SIMULATION_SHAPE;
             var meshFlag = isConvex ? PhysXMeshColliderShape._tightBoundsFlag : 0;
             var createShapeFn = isConvex ? physX.createConvexMeshShape : physX.createTriMeshShape;
-            _this._pxShape = createShapeFn(_this._pxMesh, scaleX, scaleY, scaleZ, meshFlag, shapeFlags, material._pxMaterial, physics);
+            _this._pxShape = createShapeFn(cooked.mesh, scaleX, scaleY, scaleZ, meshFlag, shapeFlags, material._pxMaterial, physics);
             _this._id = uniqueID;
             _this._pxMaterial = material._pxMaterial;
+            _this._pxMesh = cooked.mesh;
+            _this._pxGeometry = cooked.geometry;
             _this._pxShape.setUUID(uniqueID);
             _this._setLocalPose();
             return _this;
@@ -1661,16 +1661,25 @@
         /**
        * {@inheritDoc IMeshColliderShape.setMeshData }
        */ _proto.setMeshData = function setMeshData(positions, indices, isConvex, cookingFlags) {
-            var _this__pxMesh, _this__pxGeometry;
-            (_this__pxMesh = this._pxMesh) == null ? void 0 : _this__pxMesh.release();
-            (_this__pxGeometry = this._pxGeometry) == null ? void 0 : _this__pxGeometry.delete();
-            this._pxMesh = null;
-            this._pxGeometry = null;
-            this._isConvex = isConvex;
-            if (!this._cookMesh(positions, indices, cookingFlags)) {
+            var cooked = this._cookMesh(positions, indices, isConvex, cookingFlags);
+            if (!cooked) {
                 return false;
             }
-            this._pxShape.setGeometry(this._pxGeometry);
+            var oldMesh = this._pxMesh;
+            var oldGeometry = this._pxGeometry;
+            try {
+                this._pxShape.setGeometry(cooked.geometry);
+            } catch (error) {
+                var _cooked_mesh, _cooked_geometry;
+                (_cooked_mesh = cooked.mesh) == null ? void 0 : _cooked_mesh.release();
+                (_cooked_geometry = cooked.geometry) == null ? void 0 : _cooked_geometry.delete();
+                throw error;
+            }
+            this._pxMesh = cooked.mesh;
+            this._pxGeometry = cooked.geometry;
+            this._isConvex = isConvex;
+            oldMesh == null ? void 0 : oldMesh.release();
+            oldGeometry == null ? void 0 : oldGeometry.delete();
             return true;
         };
         /**
@@ -1686,7 +1695,7 @@
             (_this__pxMesh = this._pxMesh) == null ? void 0 : _this__pxMesh.release();
             PhysXColliderShape.prototype.destroy.call(this);
         };
-        _proto._cookMesh = function _cookMesh(positions, indices, cookingFlags) {
+        _proto._cookMesh = function _cookMesh(positions, indices, isConvex, cookingFlags) {
             var _this__physXPhysics = this._physXPhysics, physX = _this__physXPhysics._physX, physics = _this__physXPhysics._pxPhysics, cooking = _this__physXPhysics._pxCooking, cookingParams = _this__physXPhysics._pxCookingParams;
             // Apply per-shape cooking flags
             var preprocessFlags = 0;
@@ -1699,33 +1708,37 @@
             physX.setCookingMeshPreprocessParams(cookingParams, preprocessFlags);
             cooking.setParams(cookingParams);
             var verticesPtr = this._allocatePositions(positions);
-            if (this._isConvex) {
-                this._pxMesh = cooking.createConvexMesh(verticesPtr, positions.length, physics);
+            var pxMesh = null;
+            if (isConvex) {
+                pxMesh = cooking.createConvexMesh(verticesPtr, positions.length, physics);
                 physX._free(verticesPtr);
-                if (!this._pxMesh) {
+                if (!pxMesh) {
                     this._logConvexCookingError(physX);
-                    return false;
+                    return null;
                 }
             } else {
                 if (!indices) {
                     physX._free(verticesPtr);
                     console.error("PhysXMeshColliderShape: Triangle mesh requires indices.");
-                    return false;
+                    return null;
                 }
                 var isU32 = _instanceof(indices, Uint32Array);
                 var indicesPtr = this._allocateIndices(indices, isU32);
-                this._pxMesh = cooking.createTriMesh(verticesPtr, positions.length, indicesPtr, indices.length / 3, !isU32, physics);
+                pxMesh = cooking.createTriMesh(verticesPtr, positions.length, indicesPtr, indices.length / 3, !isU32, physics);
                 physX._free(verticesPtr);
                 physX._free(indicesPtr);
-                if (!this._pxMesh) {
+                if (!pxMesh) {
                     this._logTriMeshCookingError(physX);
-                    return false;
+                    return null;
                 }
             }
             var _this__worldScale = this._worldScale, scaleX = _this__worldScale.x, scaleY = _this__worldScale.y, scaleZ = _this__worldScale.z;
-            var meshFlag = this._isConvex ? PhysXMeshColliderShape._tightBoundsFlag : 0;
-            this._pxGeometry = this._isConvex ? physX.createConvexMeshGeometry(this._pxMesh, scaleX, scaleY, scaleZ, meshFlag) : physX.createTriMeshGeometry(this._pxMesh, scaleX, scaleY, scaleZ, meshFlag);
-            return true;
+            var meshFlag = isConvex ? PhysXMeshColliderShape._tightBoundsFlag : 0;
+            var geometry = isConvex ? physX.createConvexMeshGeometry(pxMesh, scaleX, scaleY, scaleZ, meshFlag) : physX.createTriMeshGeometry(pxMesh, scaleX, scaleY, scaleZ, meshFlag);
+            return {
+                mesh: pxMesh,
+                geometry: geometry
+            };
         };
         _proto._logConvexCookingError = function _logConvexCookingError(physX) {
             switch(physX.getLastConvexCookingResult()){
@@ -1775,9 +1788,15 @@
             var _this__worldScale = this._worldScale, scaleX = _this__worldScale.x, scaleY = _this__worldScale.y, scaleZ = _this__worldScale.z;
             var meshFlag = this._isConvex ? PhysXMeshColliderShape._tightBoundsFlag : 0;
             var newGeometry = this._isConvex ? physX.createConvexMeshGeometry(this._pxMesh, scaleX, scaleY, scaleZ, meshFlag) : physX.createTriMeshGeometry(this._pxMesh, scaleX, scaleY, scaleZ, meshFlag);
-            this._pxGeometry.delete();
+            var oldGeometry = this._pxGeometry;
+            try {
+                this._pxShape.setGeometry(newGeometry);
+            } catch (error) {
+                newGeometry == null ? void 0 : newGeometry.delete();
+                throw error;
+            }
             this._pxGeometry = newGeometry;
-            this._pxShape.setGeometry(this._pxGeometry);
+            oldGeometry == null ? void 0 : oldGeometry.delete();
         };
         return PhysXMeshColliderShape;
     }(PhysXColliderShape);
@@ -1847,12 +1866,16 @@
             var resolvedOptions = isOptionsObject ? runtimeModeOrOptions : options;
             this._runTimeMode = runtimeMode;
             var _runtimeUrls_wasmSIMDModeUrl;
-            this._wasmSIMDModeUrl = (_runtimeUrls_wasmSIMDModeUrl = runtimeUrls == null ? void 0 : runtimeUrls.wasmSIMDModeUrl) != null ? _runtimeUrls_wasmSIMDModeUrl : "https://mdn.alipayobjects.com/rms/afts/file/A*iHrYQKBrgTAAAAAAQ4AAAAgAehQnAQ/physx.release.simd.js";
+            this._wasmSIMDModeUrl = (_runtimeUrls_wasmSIMDModeUrl = runtimeUrls == null ? void 0 : runtimeUrls.wasmSIMDModeUrl) != null ? _runtimeUrls_wasmSIMDModeUrl : "https://mdn.alipayobjects.com/rms/uri/file/as/apwallet/1781696156399/suyi/physx.release.simd.js";
             var _runtimeUrls_wasmModeUrl;
-            this._wasmModeUrl = (_runtimeUrls_wasmModeUrl = runtimeUrls == null ? void 0 : runtimeUrls.wasmModeUrl) != null ? _runtimeUrls_wasmModeUrl : "https://mdn.alipayobjects.com/rms/afts/file/A*DFuvR6Mv5C0AAAAAQ4AAAAgAehQnAQ/physx.release.js";
+            this._wasmModeUrl = (_runtimeUrls_wasmModeUrl = runtimeUrls == null ? void 0 : runtimeUrls.wasmModeUrl) != null ? _runtimeUrls_wasmModeUrl : "https://mdn.alipayobjects.com/rms/uri/file/as/apwallet/1781696156399/suyi/physx.release.js";
             this._tolerancesScaleOptions = resolvedOptions == null ? void 0 : resolvedOptions.tolerancesScale;
-            var _this__tolerancesScaleOptions_length, _this__tolerancesScaleOptions_speed;
-            this._updateScaledDefaults((_this__tolerancesScaleOptions_length = (_this__tolerancesScaleOptions = this._tolerancesScaleOptions) == null ? void 0 : _this__tolerancesScaleOptions.length) != null ? _this__tolerancesScaleOptions_length : 1, (_this__tolerancesScaleOptions_speed = (_this__tolerancesScaleOptions1 = this._tolerancesScaleOptions) == null ? void 0 : _this__tolerancesScaleOptions1.speed) != null ? _this__tolerancesScaleOptions_speed : 10);
+            var _this__tolerancesScaleOptions_length;
+            var length = (_this__tolerancesScaleOptions_length = (_this__tolerancesScaleOptions = this._tolerancesScaleOptions) == null ? void 0 : _this__tolerancesScaleOptions.length) != null ? _this__tolerancesScaleOptions_length : 1;
+            var _this__tolerancesScaleOptions_speed;
+            var speed = (_this__tolerancesScaleOptions_speed = (_this__tolerancesScaleOptions1 = this._tolerancesScaleOptions) == null ? void 0 : _this__tolerancesScaleOptions1.speed) != null ? _this__tolerancesScaleOptions_speed : 10;
+            this._validateTolerancesScale(length, speed);
+            this._updateScaledDefaults(length, speed);
         }
         var _proto = PhysXPhysics.prototype;
         /**
@@ -2035,8 +2058,7 @@
             var length = (_this__tolerancesScaleOptions_length = (_this__tolerancesScaleOptions = this._tolerancesScaleOptions) == null ? void 0 : _this__tolerancesScaleOptions.length) != null ? _this__tolerancesScaleOptions_length : tolerancesScale.length;
             var _this__tolerancesScaleOptions_speed;
             var speed = (_this__tolerancesScaleOptions_speed = (_this__tolerancesScaleOptions1 = this._tolerancesScaleOptions) == null ? void 0 : _this__tolerancesScaleOptions1.speed) != null ? _this__tolerancesScaleOptions_speed : tolerancesScale.speed;
-            this._assertPositiveFinite(length, "tolerancesScale.length");
-            this._assertPositiveFinite(speed, "tolerancesScale.speed");
+            this._validateTolerancesScale(length, speed);
             tolerancesScale.length = length;
             tolerancesScale.speed = speed;
             this._updateScaledDefaults(length, speed);
@@ -2046,6 +2068,10 @@
                 throw new Error("PhysXPhysics " + name + " must be a positive finite number.");
             }
         };
+        _proto._validateTolerancesScale = function _validateTolerancesScale(length, speed) {
+            this._assertPositiveFinite(length, "tolerancesScale.length");
+            this._assertPositiveFinite(speed, "tolerancesScale.speed");
+        };
         _proto._updateScaledDefaults = function _updateScaledDefaults(length, speed) {
             this._defaultContactOffset = 0.02 * length;
             this._defaultSleepThreshold = 5e-5 * speed * speed;
@@ -2054,7 +2080,7 @@
     }();
 
     //@ts-ignore
-    var version = "0.0.0-experimental-2.0-game.19";
+    var version = "0.0.0-experimental-2.0-migrate.2";
     console.log("Galacean Engine Physics PhysX Version: " + version);
 
     exports.PhysXPhysics = PhysXPhysics;