@galacean/engine-physics-physx 2.0.0-alpha.40 → 2.0.0-alpha.43

package/dist/browser.js

@@ -676,44 +676,27 @@
             this._pxActor.setSolverIterationCounts(value, 1);
         };
         /**
-       * {@inheritDoc IDynamicCollider.setCollisionDetectionMode }
-       */ _proto.setCollisionDetectionMode = function setCollisionDetectionMode(value) {
-            var physX = this._physXPhysics._physX;
-            switch(value){
-                case 1:
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD, true);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD_FRICTION, false);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_SPECULATIVE_CCD, false);
-                    break;
-                case 2:
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD, true);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD_FRICTION, true);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_SPECULATIVE_CCD, false);
-                    break;
-                case 3:
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD, false);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD_FRICTION, false);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_SPECULATIVE_CCD, true);
-                    break;
-                case 0:
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD, false);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_CCD_FRICTION, false);
-                    this._pxActor.setRigidBodyFlag(physX.PxRigidBodyFlag.eENABLE_SPECULATIVE_CCD, false);
-                    break;
-            }
-        };
-        /**
        * {@inheritDoc IDynamicCollider.setUseGravity }
        */ _proto.setUseGravity = function setUseGravity(value) {
             this._pxActor.setActorFlag(this._physXPhysics._physX.PxActorFlag.eDISABLE_GRAVITY, !value);
         };
         /**
-       * {@inheritDoc IDynamicCollider.setIsKinematic }
-       */ _proto.setIsKinematic = function setIsKinematic(value) {
-            if (value) {
-                this._pxActor.setRigidBodyFlag(this._physXPhysics._physX.PxRigidBodyFlag.eKINEMATIC, true);
-            } else {
-                this._pxActor.setRigidBodyFlag(this._physXPhysics._physX.PxRigidBodyFlag.eKINEMATIC, false);
+       * {@inheritDoc IDynamicCollider.setMotionState }
+       */ _proto.setMotionState = function setMotionState(isKinematic, collisionDetectionMode) {
+            var PxRigidBodyFlag = this._physXPhysics._physX.PxRigidBodyFlag;
+            // PhysX 4.1 does not support sweep-based CCD on kinematic bodies
+            var useSpeculativeCCD = collisionDetectionMode === 3 || isKinematic && collisionDetectionMode !== 0;
+            this._pxActor.setRigidBodyFlag(PxRigidBodyFlag.eENABLE_CCD, false);
+            this._pxActor.setRigidBodyFlag(PxRigidBodyFlag.eENABLE_CCD_FRICTION, false);
+            this._pxActor.setRigidBodyFlag(PxRigidBodyFlag.eENABLE_SPECULATIVE_CCD, false);
+            this._pxActor.setRigidBodyFlag(PxRigidBodyFlag.eKINEMATIC, isKinematic);
+            if (useSpeculativeCCD) {
+                this._pxActor.setRigidBodyFlag(PxRigidBodyFlag.eENABLE_SPECULATIVE_CCD, true);
+            } else if (collisionDetectionMode !== 0) {
+                this._pxActor.setRigidBodyFlag(PxRigidBodyFlag.eENABLE_CCD, true);
+                if (collisionDetectionMode === 2) {
+                    this._pxActor.setRigidBodyFlag(PxRigidBodyFlag.eENABLE_CCD_FRICTION, true);
+                }
             }
         };
         /**
@@ -974,6 +957,14 @@
             this._fetchResults();
         };
         /**
+       * {@inheritDoc IPhysicsScene.setContactEventEnabled }
+       */ _proto.setContactEventEnabled = function setContactEventEnabled(enabled) {
+            this._physXPhysics._physX.setContactEventEnabled(this._physXSimulationCallbackInstance, enabled);
+            if (!enabled) {
+                this._contactEventCount = 0;
+            }
+        };
+        /**
        * {@inheritDoc IPhysicsScene.updateEvents }
        */ _proto.updateEvents = function updateEvents() {
             var physicsEvents = this._physicsEvents;
@@ -1777,9 +1768,9 @@
             this._initializeState = 0;
             this._runTimeMode = runtimeMode;
             var _runtimeUrls_wasmSIMDModeUrl;
-            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";
+            this._wasmSIMDModeUrl = (_runtimeUrls_wasmSIMDModeUrl = runtimeUrls == null ? void 0 : runtimeUrls.wasmSIMDModeUrl) != null ? _runtimeUrls_wasmSIMDModeUrl : "https://mdn.alipayobjects.com/rms/uri/file/as/apwallet/1787063975729/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/uri/file/as/apwallet/1781696156399/suyi/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/1787063975729/suyi/physx.release.js";
         }
         var _proto = PhysXPhysics.prototype;
         /**
@@ -1949,7 +1940,7 @@
     }();
 
     //@ts-ignore
-    var version = "2.0.0-alpha.40";
+    var version = "2.0.0-alpha.43";
     console.log("Galacean Engine Physics PhysX Version: " + version);
 
     exports.PhysXPhysics = PhysXPhysics;