@galacean/engine-physics-physx 1.5.0-alpha.1 → 1.5.0-beta.0

package/dist/main.js

@@ -42,8 +42,8 @@ function _inherits(subClass, superClass) {
     function PhysXColliderShape(physXPhysics) {
         /** @internal */ this._controllers = new engine.DisorderedArray();
         /** @internal */ this._contractOffset = 0.02;
-        this._worldScale = new engine.Vector3(1, 1, 1);
-        this._position = new engine.Vector3();
+        /** @internal */ this._worldScale = new engine.Vector3(1, 1, 1);
+        /** @internal */ this._position = new engine.Vector3();
         this._rotation = new engine.Vector3();
         this._axis = null;
         this._physXRotation = new engine.Quaternion();
@@ -123,12 +123,15 @@ function _inherits(subClass, superClass) {
    * {@inheritDoc IColliderShape.destroy }
    */ _proto.destroy = function destroy() {
         this._pxShape.release();
+        this._pxGeometry.delete();
     };
     /**
    *  @internal
    */ _proto._setShapeFlags = function _setShapeFlags(flags) {
         this._shapeFlags = flags;
-        this._pxShape.setFlags(new this._physXPhysics._physX.PxShapeFlags(this._shapeFlags));
+        var shapeFlags = new this._physXPhysics._physX.PxShapeFlags(this._shapeFlags);
+        this._pxShape.setFlags(shapeFlags);
+        shapeFlags.delete();
     };
     _proto._setLocalPose = function _setLocalPose() {
         var transform = PhysXColliderShape.transform;
@@ -139,7 +142,9 @@ function _inherits(subClass, superClass) {
     _proto._initialize = function _initialize(material, id) {
         this._id = id;
         this._pxMaterial = material._pxMaterial;
-        this._pxShape = this._physXPhysics._pxPhysics.createShape(this._pxGeometry, material._pxMaterial, true, new this._physXPhysics._physX.PxShapeFlags(this._shapeFlags));
+        var shapeFlags = new this._physXPhysics._physX.PxShapeFlags(this._shapeFlags);
+        this._pxShape = this._physXPhysics._pxPhysics.createShape(this._pxGeometry, material._pxMaterial, true, shapeFlags);
+        shapeFlags.delete();
         this._pxShape.setUUID(id);
     };
     _proto._modifyFlag = function _modifyFlag(flag, value) {
@@ -388,6 +393,8 @@ PhysXBoxColliderShape._tempHalfExtents = new engine.Vector3();
    * {@inheritDoc ICharacterController.addShape }
    */ _proto.addShape = function addShape(shape) {
         var _this__pxController, _this__scene;
+        // Add shape should sync latest position and world scale to pxController
+        this._updateShapePosition(shape._position, shape._worldScale);
         // When CharacterController is disabled, set shape property need check pxController whether exist because of this._pxManager is null and won't create pxController
         this._pxManager && this._createPXController(this._pxManager, shape);
         this._shape = shape;
@@ -405,6 +412,15 @@ PhysXBoxColliderShape._tempHalfExtents = new engine.Vector3();
         (_this__scene = this._scene) == null ? void 0 : _this__scene._removeColliderShape(shape._id);
     };
     /**
+   * {@inheritDoc ICollider.setCollisionLayer }
+   */ _proto.setCollisionLayer = function setCollisionLayer(layer) {
+        var _this__pxController;
+        var actor = (_this__pxController = this._pxController) == null ? void 0 : _this__pxController.getActor();
+        if (actor) {
+            this._physXPhysics._physX.setGroup(actor, layer);
+        }
+    };
+    /**
    * {@inheritDoc ICharacterController.destroy }
    */ _proto.destroy = function destroy() {
         this._destroyPXController();
@@ -428,7 +444,9 @@ PhysXBoxColliderShape._tempHalfExtents = new engine.Vector3();
         }
         desc.setMaterial(shape._pxMaterial);
         this._pxController = pxManager._getControllerManager().createController(desc);
+        desc.delete();
         this._pxController.setUUID(shape._id);
+        this._updateNativePosition();
     };
     /**
    * @internal
@@ -494,6 +512,11 @@ PhysXCharacterController._tempVec = new engine.Vector3();
         outRotation.set(transform.rotation.x, transform.rotation.y, transform.rotation.z, transform.rotation.w);
     };
     /**
+   * {@inheritDoc ICollider.setCollisionLayer }
+   */ _proto.setCollisionLayer = function setCollisionLayer(layer) {
+        this._physXPhysics._physX.setGroup(this._pxActor, layer);
+    };
+    /**
    * {@inheritDoc ICollider.destroy }
    */ _proto.destroy = function destroy() {
         this._pxActor.release();
@@ -805,18 +828,19 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
             }
         };
         var pxPhysics = physXPhysics._pxPhysics;
-        var physXSimulationCallbackInstance = physX.PxSimulationEventCallback.implement(triggerCallback);
-        var sceneDesc = physX.getDefaultSceneDesc(pxPhysics.getTolerancesScale(), 0, physXSimulationCallbackInstance);
+        this._physXSimulationCallbackInstance = physX.PxSimulationEventCallback.implement(triggerCallback);
+        var sceneDesc = physX.getDefaultSceneDesc(pxPhysics.getTolerancesScale(), 0, this._physXSimulationCallbackInstance);
         this._pxScene = pxPhysics.createScene(sceneDesc);
+        sceneDesc.delete();
     }
     var _proto = PhysXPhysicsScene.prototype;
     /**
-   * {@inheritDoc IPhysicsManager.setGravity }
+   * {@inheritDoc IPhysicsScene.setGravity }
    */ _proto.setGravity = function setGravity(value) {
         this._pxScene.setGravity(value);
     };
     /**
-   * {@inheritDoc IPhysicsManager.addCollider }
+   * {@inheritDoc IPhysicsScene.addCollider }
    */ _proto.addCollider = function addCollider(collider) {
         collider._scene = this;
         this._pxScene.addActor(collider._pxActor, null);
@@ -826,7 +850,7 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
         }
     };
     /**
-   * {@inheritDoc IPhysicsManager.removeCollider }
+   * {@inheritDoc IPhysicsScene.removeCollider }
    */ _proto.removeCollider = function removeCollider(collider) {
         collider._scene = null;
         this._pxScene.removeActor(collider._pxActor, true);
@@ -836,7 +860,7 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
         }
     };
     /**
-   * {@inheritDoc IPhysicsManager.addCharacterController }
+   * {@inheritDoc IPhysicsScene.addCharacterController }
    */ _proto.addCharacterController = function addCharacterController(characterController) {
         characterController._scene = this;
         // Physx have no API to remove/readd cct into scene.
@@ -854,7 +878,7 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
         characterController._pxManager = this;
     };
     /**
-   * {@inheritDoc IPhysicsManager.removeCharacterController }
+   * {@inheritDoc IPhysicsScene.removeCharacterController }
    */ _proto.removeCharacterController = function removeCharacterController(characterController) {
         characterController._scene = null;
         characterController._pxManager = null;
@@ -863,14 +887,14 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
         shape && this._removeColliderShape(shape._id);
     };
     /**
-   * {@inheritDoc IPhysicsManager.update }
+   * {@inheritDoc IPhysicsScene.update }
    */ _proto.update = function update(elapsedTime) {
         this._simulate(elapsedTime);
         this._fetchResults();
         this._fireEvent();
     };
     /**
-   * {@inheritDoc IPhysicsManager.raycast }
+   * {@inheritDoc IPhysicsScene.raycast }
    */ _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.
@@ -884,7 +908,9 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
             },
             postFilter: function(filterData, hit) {}
         };
-        var result = this._pxScene.raycastSingle(ray.origin, ray.direction, distance, pxHitResult, this._pxFilterData, this._physXPhysics._physX.PxQueryFilterCallback.implement(raycastCallback));
+        var pxRaycastCallback = this._physXPhysics._physX.PxQueryFilterCallback.implement(raycastCallback);
+        var result = this._pxScene.raycastSingle(ray.origin, ray.direction, distance, pxHitResult, this._pxFilterData, pxRaycastCallback);
+        pxRaycastCallback.delete();
         if (result && hit != undefined) {
             var position = PhysXPhysicsScene._tempPosition, normal = PhysXPhysicsScene._tempNormal;
             var pxPosition = pxHitResult.position, pxNormal = pxHitResult.normal;
@@ -895,6 +921,17 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
         return result;
     };
     /**
+   * {@inheritDoc IPhysicsScene.destroy }
+   */ _proto.destroy = function destroy() {
+        var _this__pxControllerManager;
+        this._pxScene.release();
+        this._physXSimulationCallbackInstance.delete();
+        this._pxRaycastHit.delete();
+        this._pxFilterData.flags.delete();
+        this._pxFilterData.delete();
+        (_this__pxControllerManager = this._pxControllerManager) == null ? void 0 : _this__pxControllerManager.release();
+    };
+    /**
    * @internal
    */ _proto._getControllerManager = function _getControllerManager() {
         var pxControllerManager = this._pxControllerManager;
@@ -906,7 +943,7 @@ var PhysXPhysicsManager = function PhysXPhysicsManager() {
     /**
    * @internal
    */ _proto._addColliderShape = function _addColliderShape(id) {
-        this._physXManager._eventMap[id] = {};
+        this._physXManager._eventMap[id] = Object.create(null);
     };
     /**
    * @internal
@@ -1064,7 +1101,6 @@ PhysXPhysicsScene._tempNormal = new engine.Vector3();
    */ _proto.destroy = function destroy() {
         if (!this._pxJoint) return;
         this._pxJoint.release();
-        this._pxJoint = null;
         this._collider = null;
     };
     /**
@@ -1317,9 +1353,9 @@ PhysXHingeJoint._xAxis = new engine.Vector3(1, 0, 0);
                 }
             }
             if (runtimeMode == PhysXRuntimeMode.JavaScript) {
-                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*PXxaQrGL0XsAAAAAAAAAAAAAARQnAQ/physx.release.downgrade.js";
+                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*V4pqRqM65UMAAAAAAAAAAAAAARQnAQ/physx.release.downgrade.js";
             } else if (runtimeMode == PhysXRuntimeMode.WebAssembly) {
-                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*0Qq8Rob3_5oAAAAAAAAAAAAAARQnAQ/physx.release.js";
+                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*nL1PSrCPoZ0AAAAAAAAAAAAAARQnAQ/physx.release.js";
             }
         });
         var initializePromise = new Promise(function(resolve, reject) {
@@ -1342,9 +1378,9 @@ PhysXHingeJoint._xAxis = new engine.Vector3(1, 0, 0);
         this._physX.PxCloseExtensions();
         this._pxPhysics.release();
         this._pxFoundation.release();
-        this._physX = null;
-        this._pxFoundation = null;
-        this._pxPhysics = null;
+        this._defaultErrorCallback.delete();
+        this._allocator.delete();
+        this._tolerancesScale.delete();
     };
     /**
    * {@inheritDoc IPhysics.createPhysicsManager }
@@ -1354,8 +1390,8 @@ PhysXHingeJoint._xAxis = new engine.Vector3(1, 0, 0);
     /**
    * {@inheritDoc IPhysics.createPhysicsScene }
    */ _proto.createPhysicsScene = function createPhysicsScene(physicsManager, onContactBegin, onContactEnd, onContactStay, onTriggerBegin, onTriggerEnd, onTriggerStay) {
-        var manager = new PhysXPhysicsScene(this, physicsManager, onContactBegin, onContactEnd, onContactStay, onTriggerBegin, onTriggerEnd, onTriggerStay);
-        return manager;
+        var scene = new PhysXPhysicsScene(this, physicsManager, onContactBegin, onContactEnd, onContactStay, onTriggerBegin, onTriggerEnd, onTriggerStay);
+        return scene;
     };
     /**
    * {@inheritDoc IPhysics.createStaticCollider }
@@ -1412,22 +1448,36 @@ PhysXHingeJoint._xAxis = new engine.Vector3(1, 0, 0);
    */ _proto.createSpringJoint = function createSpringJoint(collider) {
         return new PhysXSpringJoint(this, collider);
     };
+    /**
+   * {@inheritDoc IPhysics.getColliderLayerCollision }
+   */ _proto.getColliderLayerCollision = function getColliderLayerCollision(layer1, layer2) {
+        return this._physX.getGroupCollisionFlag(layer1, layer2);
+    };
+    /**
+   * {@inheritDoc IPhysics.setColliderLayerCollision }
+   */ _proto.setColliderLayerCollision = function setColliderLayerCollision(layer1, layer2, isCollide) {
+        this._physX.setGroupCollisionFlag(layer1, layer2, isCollide);
+    };
     _proto._init = function _init(physX) {
         var version = physX.PX_PHYSICS_VERSION;
         var defaultErrorCallback = new physX.PxDefaultErrorCallback();
         var allocator = new physX.PxDefaultAllocator();
         var pxFoundation = physX.PxCreateFoundation(version, allocator, defaultErrorCallback);
-        var pxPhysics = physX.PxCreatePhysics(version, pxFoundation, new physX.PxTolerancesScale(), false, null);
+        var tolerancesScale = new physX.PxTolerancesScale();
+        var pxPhysics = physX.PxCreatePhysics(version, pxFoundation, tolerancesScale, false, null);
         physX.PxInitExtensions(pxPhysics, null);
         this._physX = physX;
         this._pxFoundation = pxFoundation;
         this._pxPhysics = pxPhysics;
+        this._defaultErrorCallback = defaultErrorCallback;
+        this._allocator = allocator;
+        this._tolerancesScale = tolerancesScale;
     };
     return PhysXPhysics;
 }();
 
 //@ts-ignore
-var version = "1.5.0-alpha.1";
+var version = "1.5.0-beta.0";
 console.log("Galacean Engine Physics PhysX Version: " + version);
 
 exports.PhysXPhysics = PhysXPhysics;