@galacean/engine-physics-physx 1.1.0-beta.5 → 1.1.0-beta.50

package/dist/miniprogram.js

@@ -94,7 +94,6 @@ var ShapeFlag;
         this._axis = null;
         this._physXRotation = new miniprogram.Quaternion();
         this._shapeFlags = 2 | 1;
-        /** @internal */ this._pxMaterials = new Array(1);
         this._physXPhysics = physXPhysics;
     }
     var _proto = PhysXColliderShape.prototype;
@@ -115,7 +114,7 @@ var ShapeFlag;
         }
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
+            controllers.get(i)._updateShapePosition(this._position, this._worldScale);
         }
         this._setLocalPose();
     };
@@ -126,7 +125,7 @@ var ShapeFlag;
         this._setLocalPose();
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
+            controllers.get(i)._updateShapePosition(this._position, this._worldScale);
         }
     };
     /**
@@ -142,8 +141,8 @@ var ShapeFlag;
     /**
    * {@inheritDoc IColliderShape.setMaterial }
    */ _proto.setMaterial = function setMaterial(value) {
-        this._pxMaterials[0] = value._pxMaterial;
-        this._pxShape.setMaterials(this._pxMaterials);
+        this._pxMaterial = value._pxMaterial;
+        this._pxShape.setMaterial(this._pxMaterial);
     };
     /**
    * {@inheritDoc IColliderShape.setIsTrigger }
@@ -171,7 +170,7 @@ var ShapeFlag;
     };
     _proto._initialize = function _initialize(material, id) {
         this._id = id;
-        this._pxMaterials[0] = material._pxMaterial;
+        this._pxMaterial = material._pxMaterial;
         this._pxShape = this._physXPhysics._pxPhysics.createShape(this._pxGeometry, material._pxMaterial, true, new this._physXPhysics._physX.PxShapeFlags(this._shapeFlags));
         this._pxShape.setUUID(id);
     };
@@ -370,8 +369,8 @@ var /**
  * Base class for character controllers.
  */ var PhysXCharacterController = /*#__PURE__*/ function() {
     function PhysXCharacterController(physXPhysics) {
-        this._scaledOffset = new miniprogram.Vector3();
-        this._position = null;
+        this._shapeScaledPosition = new miniprogram.Vector3();
+        this._worldPosition = null;
         this._physXPhysics = physXPhysics;
     }
     var _proto = PhysXCharacterController.prototype;
@@ -385,18 +384,15 @@ var /**
     /**
    * {@inheritDoc ICharacterController.setWorldPosition }
    */ _proto.setWorldPosition = function setWorldPosition(position) {
-        this._position = position;
-        if (this._pxController) {
-            miniprogram.Vector3.add(position, this._scaledOffset, PhysXCharacterController._tempVec);
-            this._pxController.setPosition(PhysXCharacterController._tempVec);
-        }
+        this._worldPosition = position;
+        this._updateNativePosition();
     };
     /**
    * {@inheritDoc ICharacterController.getWorldPosition }
    */ _proto.getWorldPosition = function getWorldPosition(position) {
         if (this._pxController) {
             position.copyFrom(this._pxController.getPosition());
-            position.subtract(this._scaledOffset);
+            position.subtract(this._shapeScaledPosition);
         }
     };
     /**
@@ -459,7 +455,7 @@ var /**
         } else {
             throw "unsupported shape type";
         }
-        desc.setMaterial(shape._pxMaterials[0]);
+        desc.setMaterial(shape._pxMaterial);
         this._pxController = pxManager._getControllerManager().createController(desc);
         this._pxController.setUUID(shape._id);
     };
@@ -473,9 +469,16 @@ var /**
     };
     /**
    * @internal
-   */ _proto._setLocalPosition = function _setLocalPosition(position, scale) {
-        miniprogram.Vector3.multiply(position, scale, this._scaledOffset);
-        this.setWorldPosition(position);
+   */ _proto._updateShapePosition = function _updateShapePosition(shapePosition, worldScale) {
+        miniprogram.Vector3.multiply(shapePosition, worldScale, this._shapeScaledPosition);
+        this._updateNativePosition();
+    };
+    _proto._updateNativePosition = function _updateNativePosition() {
+        var worldPosition = this._worldPosition;
+        if (this._pxController && worldPosition) {
+            miniprogram.Vector3.add(worldPosition, this._shapeScaledPosition, PhysXCharacterController._tempVec);
+            this._pxController.setPosition(PhysXCharacterController._tempVec);
+        }
     };
     return PhysXCharacterController;
 }();
@@ -823,15 +826,21 @@ var /**
    * {@inheritDoc IPhysicsManager.removeColliderShape }
    */ _proto.removeColliderShape = function removeColliderShape(colliderShape) {
         var _this = this, eventPool = _this._eventPool, currentEvents = _this._currentEvents;
-        var shapeID = colliderShape._id;
+        var id = colliderShape._id;
+        var _this__physXManager = this._physXManager, eventMap = _this__physXManager._eventMap;
         for(var i = currentEvents.length - 1; i >= 0; i--){
             var event = currentEvents.get(i);
-            if (event.index1 == shapeID || event.index2 == shapeID) {
+            if (event.index1 == id) {
+                currentEvents.deleteByIndex(i);
+                eventPool.push(event);
+            } else if (event.index2 == id) {
                 currentEvents.deleteByIndex(i);
                 eventPool.push(event);
+                // If the shape is big index, should clear from the small index shape subMap
+                eventMap[event.index1][id] = undefined;
             }
         }
-        delete this._physXManager._eventMap[shapeID];
+        delete eventMap[id];
     };
     /**
    * {@inheritDoc IPhysicsManager.addCollider }
@@ -1094,7 +1103,6 @@ var /**
         _this = PhysXJoint1.call(this, physXPhysics) || this;
         _this._axisRotationQuaternion = new miniprogram.Quaternion();
         _this._swingOffset = new miniprogram.Vector3();
-        _this._velocity = new miniprogram.Vector3();
         _this._collider = collider;
         _this._pxJoint = physXPhysics._pxPhysics.createRevoluteJoint(null, PhysXJoint._defaultVec, PhysXJoint._defaultQuat, collider._pxActor, PhysXJoint._defaultVec, PhysXJoint._defaultQuat);
         return _this;
@@ -1126,9 +1134,7 @@ var /**
     /**
    * {@inheritDoc IHingeJoint.getVelocity }
    */ _proto.getVelocity = function getVelocity() {
-        var velocity = this._velocity;
-        velocity.copyFrom(this._pxJoint.getVelocity());
-        return velocity;
+        return this._pxJoint.getVelocity();
     };
     /**
    * {@inheritDoc IHingeJoint.setHardLimitCone }
@@ -1142,8 +1148,9 @@ var /**
     };
     /**
    * {@inheritDoc IHingeJoint.setDriveVelocity }
-   */ _proto.setDriveVelocity = function setDriveVelocity(velocity) {
-        this._pxJoint.setDriveVelocity(velocity);
+   */ _proto.setDriveVelocity = function setDriveVelocity(velocity, autowake) {
+        if (autowake === void 0) autowake = true;
+        this._pxJoint.setDriveVelocity(velocity, autowake);
     };
     /**
    * {@inheritDoc IHingeJoint.setDriveForceLimit }
@@ -1307,9 +1314,9 @@ var /**
                 }
             }
             if (runtimeMode == exports.PhysXRuntimeMode.JavaScript) {
-                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + miniprogram.version + "/libs/physx.release.js.js";
+                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*rnDeR58NNGoAAAAAAAAAAAAAARQnAQ/physx.release.js.js";
             } else if (runtimeMode == exports.PhysXRuntimeMode.WebAssembly) {
-                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + miniprogram.version + "/libs/physx.release.js";
+                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*nA97QLQehRMAAAAAAAAAAAAAARQnAQ/physx.release.js";
             }
         });
         var initializePromise = new Promise(function(resolve, reject) {
@@ -1423,7 +1430,7 @@ var InitializeState;
 })(InitializeState || (InitializeState = {}));
 
 //@ts-ignore
-var version = "1.1.0-beta.5";
+var version = "1.1.0-beta.50";
 console.log("Galacean PhysX version: " + version);
 
 exports.PhysXPhysics = PhysXPhysics;

package/dist/module.js

@@ -1,4 +1,4 @@
-import { Vector3, Quaternion, version as version$1 } from '@galacean/engine';
+import { Vector3, Quaternion } from '@galacean/engine';
 
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
@@ -89,7 +89,6 @@ var ShapeFlag;
         this._axis = null;
         this._physXRotation = new Quaternion();
         this._shapeFlags = 2 | 1;
-        /** @internal */ this._pxMaterials = new Array(1);
         this._physXPhysics = physXPhysics;
     }
     var _proto = PhysXColliderShape.prototype;
@@ -110,7 +109,7 @@ var ShapeFlag;
         }
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
+            controllers.get(i)._updateShapePosition(this._position, this._worldScale);
         }
         this._setLocalPose();
     };
@@ -121,7 +120,7 @@ var ShapeFlag;
         this._setLocalPose();
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
+            controllers.get(i)._updateShapePosition(this._position, this._worldScale);
         }
     };
     /**
@@ -137,8 +136,8 @@ var ShapeFlag;
     /**
    * {@inheritDoc IColliderShape.setMaterial }
    */ _proto.setMaterial = function setMaterial(value) {
-        this._pxMaterials[0] = value._pxMaterial;
-        this._pxShape.setMaterials(this._pxMaterials);
+        this._pxMaterial = value._pxMaterial;
+        this._pxShape.setMaterial(this._pxMaterial);
     };
     /**
    * {@inheritDoc IColliderShape.setIsTrigger }
@@ -166,7 +165,7 @@ var ShapeFlag;
     };
     _proto._initialize = function _initialize(material, id) {
         this._id = id;
-        this._pxMaterials[0] = material._pxMaterial;
+        this._pxMaterial = material._pxMaterial;
         this._pxShape = this._physXPhysics._pxPhysics.createShape(this._pxGeometry, material._pxMaterial, true, new this._physXPhysics._physX.PxShapeFlags(this._shapeFlags));
         this._pxShape.setUUID(id);
     };
@@ -365,8 +364,8 @@ var /**
  * Base class for character controllers.
  */ var PhysXCharacterController = /*#__PURE__*/ function() {
     function PhysXCharacterController(physXPhysics) {
-        this._scaledOffset = new Vector3();
-        this._position = null;
+        this._shapeScaledPosition = new Vector3();
+        this._worldPosition = null;
         this._physXPhysics = physXPhysics;
     }
     var _proto = PhysXCharacterController.prototype;
@@ -380,18 +379,15 @@ var /**
     /**
    * {@inheritDoc ICharacterController.setWorldPosition }
    */ _proto.setWorldPosition = function setWorldPosition(position) {
-        this._position = position;
-        if (this._pxController) {
-            Vector3.add(position, this._scaledOffset, PhysXCharacterController._tempVec);
-            this._pxController.setPosition(PhysXCharacterController._tempVec);
-        }
+        this._worldPosition = position;
+        this._updateNativePosition();
     };
     /**
    * {@inheritDoc ICharacterController.getWorldPosition }
    */ _proto.getWorldPosition = function getWorldPosition(position) {
         if (this._pxController) {
             position.copyFrom(this._pxController.getPosition());
-            position.subtract(this._scaledOffset);
+            position.subtract(this._shapeScaledPosition);
         }
     };
     /**
@@ -454,7 +450,7 @@ var /**
         } else {
             throw "unsupported shape type";
         }
-        desc.setMaterial(shape._pxMaterials[0]);
+        desc.setMaterial(shape._pxMaterial);
         this._pxController = pxManager._getControllerManager().createController(desc);
         this._pxController.setUUID(shape._id);
     };
@@ -468,9 +464,16 @@ var /**
     };
     /**
    * @internal
-   */ _proto._setLocalPosition = function _setLocalPosition(position, scale) {
-        Vector3.multiply(position, scale, this._scaledOffset);
-        this.setWorldPosition(position);
+   */ _proto._updateShapePosition = function _updateShapePosition(shapePosition, worldScale) {
+        Vector3.multiply(shapePosition, worldScale, this._shapeScaledPosition);
+        this._updateNativePosition();
+    };
+    _proto._updateNativePosition = function _updateNativePosition() {
+        var worldPosition = this._worldPosition;
+        if (this._pxController && worldPosition) {
+            Vector3.add(worldPosition, this._shapeScaledPosition, PhysXCharacterController._tempVec);
+            this._pxController.setPosition(PhysXCharacterController._tempVec);
+        }
     };
     return PhysXCharacterController;
 }();
@@ -818,15 +821,21 @@ var /**
    * {@inheritDoc IPhysicsManager.removeColliderShape }
    */ _proto.removeColliderShape = function removeColliderShape(colliderShape) {
         var _this = this, eventPool = _this._eventPool, currentEvents = _this._currentEvents;
-        var shapeID = colliderShape._id;
+        var id = colliderShape._id;
+        var _this__physXManager = this._physXManager, eventMap = _this__physXManager._eventMap;
         for(var i = currentEvents.length - 1; i >= 0; i--){
             var event = currentEvents.get(i);
-            if (event.index1 == shapeID || event.index2 == shapeID) {
+            if (event.index1 == id) {
+                currentEvents.deleteByIndex(i);
+                eventPool.push(event);
+            } else if (event.index2 == id) {
                 currentEvents.deleteByIndex(i);
                 eventPool.push(event);
+                // If the shape is big index, should clear from the small index shape subMap
+                eventMap[event.index1][id] = undefined;
             }
         }
-        delete this._physXManager._eventMap[shapeID];
+        delete eventMap[id];
     };
     /**
    * {@inheritDoc IPhysicsManager.addCollider }
@@ -1089,7 +1098,6 @@ var /**
         _this = PhysXJoint1.call(this, physXPhysics) || this;
         _this._axisRotationQuaternion = new Quaternion();
         _this._swingOffset = new Vector3();
-        _this._velocity = new Vector3();
         _this._collider = collider;
         _this._pxJoint = physXPhysics._pxPhysics.createRevoluteJoint(null, PhysXJoint._defaultVec, PhysXJoint._defaultQuat, collider._pxActor, PhysXJoint._defaultVec, PhysXJoint._defaultQuat);
         return _this;
@@ -1121,9 +1129,7 @@ var /**
     /**
    * {@inheritDoc IHingeJoint.getVelocity }
    */ _proto.getVelocity = function getVelocity() {
-        var velocity = this._velocity;
-        velocity.copyFrom(this._pxJoint.getVelocity());
-        return velocity;
+        return this._pxJoint.getVelocity();
     };
     /**
    * {@inheritDoc IHingeJoint.setHardLimitCone }
@@ -1137,8 +1143,9 @@ var /**
     };
     /**
    * {@inheritDoc IHingeJoint.setDriveVelocity }
-   */ _proto.setDriveVelocity = function setDriveVelocity(velocity) {
-        this._pxJoint.setDriveVelocity(velocity);
+   */ _proto.setDriveVelocity = function setDriveVelocity(velocity, autowake) {
+        if (autowake === void 0) autowake = true;
+        this._pxJoint.setDriveVelocity(velocity, autowake);
     };
     /**
    * {@inheritDoc IHingeJoint.setDriveForceLimit }
@@ -1302,9 +1309,9 @@ var /**
                 }
             }
             if (runtimeMode == PhysXRuntimeMode.JavaScript) {
-                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + version$1 + "/libs/physx.release.js.js";
+                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*rnDeR58NNGoAAAAAAAAAAAAAARQnAQ/physx.release.js.js";
             } else if (runtimeMode == PhysXRuntimeMode.WebAssembly) {
-                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + version$1 + "/libs/physx.release.js";
+                script.src = "https://mdn.alipayobjects.com/rms/afts/file/A*nA97QLQehRMAAAAAAAAAAAAAARQnAQ/physx.release.js";
             }
         });
         var initializePromise = new Promise(function(resolve, reject) {
@@ -1418,7 +1425,7 @@ var InitializeState;
 })(InitializeState || (InitializeState = {}));
 
 //@ts-ignore
-var version = "1.1.0-beta.5";
+var version = "1.1.0-beta.50";
 console.log("Galacean PhysX version: " + version);
 
 export { PhysXPhysics, PhysXRuntimeMode, version };