@galacean/engine-physics-lite 2.0.0-alpha.17 → 2.0.0-alpha.19

package/dist/browser.js

@@ -916,21 +916,21 @@
     /**
      * A manager is a collection of colliders and constraints which can interact.
      */ var LitePhysicsScene = /*#__PURE__*/ function() {
-        function LitePhysicsScene(physics, onContactEnter, onContactExit, onContactStay, onTriggerEnter, onTriggerExit, onTriggerStay) {
+        function LitePhysicsScene(physics) {
             this._staticColliders = [];
             this._dynamicColliders = [];
             this._sphere = new engine.BoundingSphere();
             this._box = new engine.BoundingBox();
-            this._currentEvents = new engine.DisorderedArray();
+            this._activeTriggers = new engine.DisorderedArray();
             this._eventMap = {};
-            this._eventPool = [];
+            this._triggerEventPool = [];
+            this._triggerEvents = [];
+            this._physicsEvents = {
+                contactEvents: [],
+                contactEventCount: 0,
+                triggerEvents: []
+            };
             this._physics = physics;
-            this._onContactEnter = onContactEnter;
-            this._onContactExit = onContactExit;
-            this._onContactStay = onContactStay;
-            this._onTriggerEnter = onTriggerEnter;
-            this._onTriggerExit = onTriggerExit;
-            this._onTriggerStay = onTriggerStay;
         }
         var _proto = LitePhysicsScene.prototype;
         _proto.overlapBox = function overlapBox(center, orientation, halfExtents, onOverlap, outHitResult) {
@@ -979,7 +979,29 @@
                 this._collisionDetection(collider, this._staticColliders);
                 this._collisionDetection(collider, dynamicColliders);
             }
-            this._fireEvent();
+        };
+        /**
+       * {@inheritDoc IPhysicsScene.updateEvents }
+       */ _proto.updateEvents = function updateEvents() {
+            var _this = this;
+            var _this1 = this, triggerEventPool = _this1._triggerEventPool, activeTriggers = _this1._activeTriggers, triggerEvents = _this1._triggerEvents, physicsEvents = _this1._physicsEvents;
+            triggerEvents.length = 0;
+            activeTriggers.forEach(function(event, i) {
+                if (!event.alreadyInvoked) {
+                    event.dispatchState = event.state;
+                    triggerEvents.push(event);
+                    event.alreadyInvoked = true;
+                } else {
+                    event.state = 2;
+                    event.dispatchState = 2;
+                    _this._eventMap[event.index1][event.index2] = undefined;
+                    activeTriggers.deleteByIndex(i);
+                    triggerEvents.push(event);
+                    triggerEventPool.push(event);
+                }
+            });
+            physicsEvents.triggerEvents = triggerEvents;
+            return physicsEvents;
         };
         /**
        * {@inheritDoc IPhysicsScene.raycast }
@@ -1046,6 +1068,9 @@
             throw new Error("Physics-lite doesn't support overlapCapsuleAll. Use Physics-PhysX instead!");
         };
         /**
+       * {@inheritDoc IPhysicsScene.gc }
+       */ _proto.gc = function gc() {};
+        /**
        * {@inheritDoc IPhysicsScene.destroy }
        */ _proto.destroy = function destroy() {};
         /**
@@ -1056,15 +1081,15 @@
         /**
        * @internal
        */ _proto._removeColliderShape = function _removeColliderShape(colliderShape) {
-            var _this = this, eventPool = _this._eventPool, currentEvents = _this._currentEvents, eventMap = _this._eventMap;
+            var _this = this, triggerEventPool = _this._triggerEventPool, activeTriggers = _this._activeTriggers, eventMap = _this._eventMap;
             var id = colliderShape._id;
-            currentEvents.forEach(function(event, i) {
+            activeTriggers.forEach(function(event, i) {
                 if (event.index1 == id) {
-                    currentEvents.deleteByIndex(i);
-                    eventPool.push(event);
+                    activeTriggers.deleteByIndex(i);
+                    triggerEventPool.push(event);
                 } else if (event.index2 == id) {
-                    currentEvents.deleteByIndex(i);
-                    eventPool.push(event);
+                    activeTriggers.deleteByIndex(i);
+                    triggerEventPool.push(event);
                     // If the shape is big index, should clear from the small index shape subMap
                     eventMap[event.index1][id] = undefined;
                 }
@@ -1073,8 +1098,8 @@
         };
         _proto._getTrigger = function _getTrigger(index1, index2) {
             var event;
-            if (this._eventPool.length) {
-                event = this._eventPool.pop();
+            if (this._triggerEventPool.length) {
+                event = this._triggerEventPool.pop();
                 event.index1 = index1;
                 event.index2 = index2;
             } else {
@@ -1109,7 +1134,7 @@
                                     var event1 = index1 < index2 ? this._getTrigger(index1, index2) : this._getTrigger(index2, index1);
                                     event1.state = 0;
                                     event1.alreadyInvoked = false;
-                                    this._currentEvents.add(event1);
+                                    this._activeTriggers.add(event1);
                                 } else if (event.state === 0) {
                                     event.state = 1;
                                     event.alreadyInvoked = false;
@@ -1141,7 +1166,7 @@
                                     var event3 = index11 < index21 ? this._getTrigger(index11, index21) : this._getTrigger(index21, index11);
                                     event3.state = 0;
                                     event3.alreadyInvoked = false;
-                                    this._currentEvents.add(event3);
+                                    this._activeTriggers.add(event3);
                                 } else if (event2.state === 0) {
                                     event2.state = 1;
                                     event2.alreadyInvoked = false;
@@ -1154,27 +1179,6 @@
                 }
             }
         };
-        _proto._fireEvent = function _fireEvent() {
-            var _this = this;
-            var _this1 = this, eventPool = _this1._eventPool, currentEvents = _this1._currentEvents;
-            currentEvents.forEach(function(event, i) {
-                if (!event.alreadyInvoked) {
-                    if (event.state == 0) {
-                        _this._onTriggerEnter(event.index1, event.index2);
-                        event.alreadyInvoked = true;
-                    } else if (event.state == 1) {
-                        _this._onTriggerStay(event.index1, event.index2);
-                        event.alreadyInvoked = true;
-                    }
-                } else {
-                    event.state = 2;
-                    _this._eventMap[event.index1][event.index2] = undefined;
-                    currentEvents.deleteByIndex(i);
-                    _this._onTriggerExit(event.index1, event.index2);
-                    eventPool.push(event);
-                }
-            });
-        };
         _proto._boxCollision = function _boxCollision(other) {
             if (_instanceof(other, LiteBoxColliderShape)) {
                 var box = LitePhysicsScene._tempBox;
@@ -1290,8 +1294,8 @@
         };
         /**
        * {@inheritDoc IPhysics.createPhysicsScene }
-       */ _proto.createPhysicsScene = function createPhysicsScene(physicsManager, onContactBegin, onContactEnd, onContactPersist, onTriggerBegin, onTriggerEnd, onTriggerPersist) {
-            return new LitePhysicsScene(this, onContactBegin, onContactEnd, onContactPersist, onTriggerBegin, onTriggerEnd, onTriggerPersist);
+       */ _proto.createPhysicsScene = function createPhysicsScene(physicsManager) {
+            return new LitePhysicsScene(this);
         };
         /**
        * {@inheritDoc IPhysics.createStaticCollider }
@@ -1394,7 +1398,7 @@
     }();
 
     //@ts-ignore
-    var version = "2.0.0-alpha.17";
+    var version = "2.0.0-alpha.19";
     console.log("Galacean Engine Physics Lite Version: " + version);
 
     exports.LitePhysics = LitePhysics;