@galacean/engine-physics-physx 2.0.0-alpha.31 → 2.0.0-alpha.33

package/dist/main.js

@@ -849,6 +849,7 @@ function _create_class(Constructor, protoProps, staticProps) {
         this._boxGeometry = null;
         this._sphereGeometry = null;
         this._capsuleGeometry = null;
+        this._currentOnQuery = null;
         this._activeTriggers = new engine.DisorderedArray();
         this._contactEvents = [];
         this._contactEventCount = 0;
@@ -863,8 +864,11 @@ function _create_class(Constructor, protoProps, staticProps) {
         this._physXManager = physicsManager;
         var physX = physXPhysics._physX;
         this._pxRaycastHit = new physX.PxRaycastHit();
+        this._pxSweepHit = new physX.PxSweepHit();
         this._pxFilterData = new physX.PxQueryFilterData();
         this._pxFilterData.flags = new physX.PxQueryFlags(1 | 2 | 4);
+        this._pxRaycastSweepFilterData = new physX.PxQueryFilterData();
+        this._pxRaycastSweepFilterData.flags = new physX.PxQueryFlags(1 | 2 | 4 | 8);
         var triggerCallback = {
             onContactBegin: function(collision) {
                 _this._bufferContactEvent(collision, 0);
@@ -899,6 +903,16 @@ function _create_class(Constructor, protoProps, staticProps) {
         var sceneDesc = physX.getDefaultSceneDesc(pxPhysics.getTolerancesScale(), 0, this._physXSimulationCallbackInstance);
         this._pxScene = pxPhysics.createScene(sceneDesc);
         sceneDesc.delete();
+        this._pxQueryCallback = physX.PxQueryFilterCallback.implement({
+            preFilter: function(_filterData, index, _actor) {
+                return _this._currentOnQuery(index) ? 2 : 0;
+            },
+            // distance <= 0 means initial overlap — drop the hit so subsequent hits can be considered.
+            // Only invoked when the query's filter data includes POST_FILTER (raycast/sweep, not overlap).
+            postFilter: function(_filterData, distance) {
+                return distance <= 0 ? 0 : 2;
+            }
+        });
     }
     var _proto = PhysXPhysicsScene.prototype;
     /**
@@ -987,18 +1001,14 @@ function _create_class(Constructor, protoProps, staticProps) {
    */ _proto.raycast = function raycast(ray, distance, onRaycast, hit) {
         var _this = this, pxHitResult = _this._pxRaycastHit;
         distance = Math.min(distance, 3.4e38); // float32 max value limit in physX raycast.
-        var raycastCallback = {
-            preFilter: function(filterData, index, actor) {
-                if (onRaycast(index)) {
-                    return 2; // eBLOCK
-                } else {
-                    return 0; // eNONE
-                }
-            }
-        };
-        var pxRaycastCallback = this._physXPhysics._physX.PxQueryFilterCallback.implement(raycastCallback);
-        var result = this._pxScene.raycastSingle(ray.origin, ray.direction, distance, pxHitResult, this._pxFilterData, pxRaycastCallback);
-        pxRaycastCallback.delete();
+        var prevOnQuery = this._currentOnQuery;
+        this._currentOnQuery = onRaycast;
+        var result;
+        try {
+            result = this._pxScene.raycastSingle(ray.origin, ray.direction, distance, pxHitResult, this._pxRaycastSweepFilterData, this._pxQueryCallback);
+        } finally{
+            this._currentOnQuery = prevOnQuery;
+        }
         if (result && hit != undefined) {
             var position = PhysXPhysicsScene._tempPosition, normal = PhysXPhysicsScene._tempNormal;
             var pxPosition = pxHitResult.position, pxNormal = pxHitResult.normal;
@@ -1109,8 +1119,12 @@ function _create_class(Constructor, protoProps, staticProps) {
         (_this__capsuleGeometry = this._capsuleGeometry) == null ? void 0 : _this__capsuleGeometry.delete();
         this._physXSimulationCallbackInstance.delete();
         this._pxRaycastHit.delete();
+        this._pxSweepHit.delete();
         this._pxFilterData.flags.delete();
         this._pxFilterData.delete();
+        this._pxRaycastSweepFilterData.flags.delete();
+        this._pxRaycastSweepFilterData.delete();
+        this._pxQueryCallback.delete();
         (_this__pxControllerManager = this._pxControllerManager) == null ? void 0 : _this__pxControllerManager.release();
         this._pxScene.release();
     };
@@ -1147,19 +1161,16 @@ function _create_class(Constructor, protoProps, staticProps) {
         delete eventMap[id];
     };
     _proto._sweepSingle = function _sweepSingle(geometry, pose, direction, distance, onSweep, outHitResult) {
+        var _this = this, pxSweepHit = _this._pxSweepHit;
         distance = Math.min(distance, 3.4e38); // float32 max value limit in physx sweep
-        var sweepCallback = {
-            preFilter: function(filterData, index, actor) {
-                if (onSweep(index)) {
-                    return 2; // eBLOCK
-                } else {
-                    return 0; // eNONE
-                }
-            }
-        };
-        var pxSweepCallback = this._physXPhysics._physX.PxQueryFilterCallback.implement(sweepCallback);
-        var pxSweepHit = new this._physXPhysics._physX.PxSweepHit();
-        var result = this._pxScene.sweepSingle(geometry, pose, direction, distance, pxSweepHit, this._pxFilterData, pxSweepCallback);
+        var prevOnQuery = this._currentOnQuery;
+        this._currentOnQuery = onSweep;
+        var result;
+        try {
+            result = this._pxScene.sweepSingle(geometry, pose, direction, distance, pxSweepHit, this._pxRaycastSweepFilterData, this._pxQueryCallback);
+        } finally{
+            this._currentOnQuery = prevOnQuery;
+        }
         if (result && outHitResult != undefined) {
             var position = PhysXPhysicsScene._tempPosition, normal = PhysXPhysicsScene._tempNormal;
             var pxPosition = pxSweepHit.position, pxNormal = pxSweepHit.normal;
@@ -1167,19 +1178,18 @@ function _create_class(Constructor, protoProps, staticProps) {
             normal.set(pxNormal.x, pxNormal.y, pxNormal.z);
             outHitResult(pxSweepHit.getShape().getUUID(), pxSweepHit.distance, position, normal);
         }
-        pxSweepCallback.delete();
-        pxSweepHit.delete();
         return result;
     };
     _proto._overlapMultiple = function _overlapMultiple(geometry, pose, onOverlap) {
-        var overlapCallback = {
-            preFilter: function(filterData, index, actor) {
-                return onOverlap(index) ? 2 : 0;
-            }
-        };
-        var pxOverlapCallback = this._physXPhysics._physX.PxQueryFilterCallback.implement(overlapCallback);
+        var prevOnQuery = this._currentOnQuery;
+        this._currentOnQuery = onOverlap;
         var maxHits = 256;
-        var hits = this._pxScene.overlapMultiple(geometry, pose, maxHits, this._pxFilterData, pxOverlapCallback);
+        var hits;
+        try {
+            hits = this._pxScene.overlapMultiple(geometry, pose, maxHits, this._pxFilterData, this._pxQueryCallback);
+        } finally{
+            this._currentOnQuery = prevOnQuery;
+        }
         var result = PhysXPhysicsScene._tempShapeIDs;
         result.length = 0;
         if (hits) {
@@ -1188,7 +1198,6 @@ function _create_class(Constructor, protoProps, staticProps) {
                 result.push(hits.get(i).getShape().getUUID());
             }
         }
-        pxOverlapCallback.delete();
         hits == null ? void 0 : hits.delete();
         return result;
     };
@@ -1769,9 +1778,9 @@ PhysXMeshColliderShape._tightBoundsFlag = 1 // eTIGHT_BOUNDS = 1 (1<<0)
         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/afts/file/A*FHYHS4_ZL5UAAAAAQ4AAAAgAehQnAQ/physx.release.simd.js";
+        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";
         var _runtimeUrls_wasmModeUrl;
-        this._wasmModeUrl = (_runtimeUrls_wasmModeUrl = runtimeUrls == null ? void 0 : runtimeUrls.wasmModeUrl) != null ? _runtimeUrls_wasmModeUrl : "https://mdn.alipayobjects.com/rms/afts/file/A*2fv0RLMK1d0AAAAAQ4AAAAgAehQnAQ/physx.release.js";
+        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";
     }
     var _proto = PhysXPhysics.prototype;
     /**
@@ -1941,7 +1950,7 @@ PhysXMeshColliderShape._tightBoundsFlag = 1 // eTIGHT_BOUNDS = 1 (1<<0)
 }();
 
 //@ts-ignore
-var version = "2.0.0-alpha.31";
+var version = "2.0.0-alpha.33";
 console.log("Galacean Engine Physics PhysX Version: " + version);
 
 exports.PhysXPhysics = PhysXPhysics;