@galacean/engine-core 2.0.0-alpha.18 → 2.0.0-alpha.19

package/dist/main.js

@@ -13061,118 +13061,13 @@ __decorate([
         this._fixedTimeStep = 1 / 60;
         this._colliders = new DisorderedArray();
         this._gravity = new engineMath.Vector3(0, -9.81, 0);
-        this._onContactEnter = function(nativeCollision) {
-            var physicalObjectsMap = Engine._physicalObjectsMap;
-            var shape0Id = nativeCollision.shape0Id, shape1Id = nativeCollision.shape1Id;
-            var shape1 = physicalObjectsMap[shape0Id];
-            var shape2 = physicalObjectsMap[shape1Id];
-            var collision = PhysicsScene._collision;
-            collision._nativeCollision = nativeCollision;
-            shape1.collider.entity._scripts.forEach(function(element) {
-                collision.shape = shape2;
-                element.onCollisionEnter(collision);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-            shape2.collider.entity._scripts.forEach(function(element) {
-                collision.shape = shape1;
-                element.onCollisionEnter(collision);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-        };
-        this._onContactExit = function(nativeCollision) {
-            var physicalObjectsMap = Engine._physicalObjectsMap;
-            var shape0Id = nativeCollision.shape0Id, shape1Id = nativeCollision.shape1Id;
-            var shape1 = physicalObjectsMap[shape0Id];
-            var shape2 = physicalObjectsMap[shape1Id];
-            var collision = PhysicsScene._collision;
-            collision._nativeCollision = nativeCollision;
-            shape1.collider.entity._scripts.forEach(function(element) {
-                collision.shape = shape2;
-                element.onCollisionExit(collision);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-            shape2.collider.entity._scripts.forEach(function(element) {
-                collision.shape = shape1;
-                element.onCollisionExit(collision);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-        };
-        this._onContactStay = function(nativeCollision) {
-            var physicalObjectsMap = Engine._physicalObjectsMap;
-            var shape0Id = nativeCollision.shape0Id, shape1Id = nativeCollision.shape1Id;
-            var shape1 = physicalObjectsMap[shape0Id];
-            var shape2 = physicalObjectsMap[shape1Id];
-            var collision = PhysicsScene._collision;
-            collision._nativeCollision = nativeCollision;
-            shape1.collider.entity._scripts.forEach(function(element) {
-                collision.shape = shape2;
-                element.onCollisionStay(collision);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-            shape2.collider.entity._scripts.forEach(function(element) {
-                collision.shape = shape1;
-                element.onCollisionStay(collision);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-        };
-        this._onTriggerEnter = function(obj1, obj2) {
-            var physicalObjectsMap = Engine._physicalObjectsMap;
-            var shape1 = physicalObjectsMap[obj1];
-            var shape2 = physicalObjectsMap[obj2];
-            shape1.collider.entity._scripts.forEach(function(element) {
-                element.onTriggerEnter(shape2);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-            shape2.collider.entity._scripts.forEach(function(element) {
-                element.onTriggerEnter(shape1);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-        };
-        this._onTriggerExit = function(obj1, obj2) {
-            var physicalObjectsMap = Engine._physicalObjectsMap;
-            var shape1 = physicalObjectsMap[obj1];
-            var shape2 = physicalObjectsMap[obj2];
-            shape1.collider.entity._scripts.forEach(function(element) {
-                element.onTriggerExit(shape2);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-            shape2.collider.entity._scripts.forEach(function(element) {
-                element.onTriggerExit(shape1);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-        };
-        this._onTriggerStay = function(obj1, obj2) {
-            var physicalObjectsMap = Engine._physicalObjectsMap;
-            var shape1 = physicalObjectsMap[obj1];
-            var shape2 = physicalObjectsMap[obj2];
-            shape1.collider.entity._scripts.forEach(function(element) {
-                element.onTriggerStay(shape2);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-            shape2.collider.entity._scripts.forEach(function(element) {
-                element.onTriggerStay(shape1);
-            }, function(element, index) {
-                element._entityScriptsIndex = index;
-            });
-        };
         this._scene = scene;
         this._setGravity = this._setGravity.bind(this);
         //@ts-ignore
         this._gravity._onValueChanged = this._setGravity;
         var engine = scene.engine;
         if (engine._physicsInitialized) {
-            this._nativePhysicsScene = Engine._nativePhysics.createPhysicsScene(engine._nativePhysicsManager, this._onContactEnter, this._onContactExit, this._onContactStay, this._onTriggerEnter, this._onTriggerExit, this._onTriggerStay);
+            this._nativePhysicsScene = Engine._nativePhysics.createPhysicsScene(engine._nativePhysicsManager);
         }
     }
     var _proto = PhysicsScene.prototype;
@@ -13384,6 +13279,7 @@ __decorate([
             this._callColliderOnUpdate();
             nativePhysicsManager.update(fixedTimeStep);
             this._callColliderOnLateUpdate();
+            this._dispatchEvents(nativePhysicsManager.updateEvents());
         }
     };
     /**
@@ -13447,7 +13343,9 @@ __decorate([
     /**
    * @internal
    */ _proto._gc = function _gc() {
+        var _this__nativePhysicsScene;
         this._colliders.garbageCollection();
+        (_this__nativePhysicsScene = this._nativePhysicsScene) == null ? void 0 : _this__nativePhysicsScene.gc();
     };
     /**
    * @internal
@@ -13455,6 +13353,92 @@ __decorate([
         var _this__nativePhysicsScene;
         (_this__nativePhysicsScene = this._nativePhysicsScene) == null ? void 0 : _this__nativePhysicsScene.destroy();
     };
+    _proto._dispatchEvents = function _dispatchEvents(events) {
+        var _loop = function(i, n) {
+            var _shape1_collider, _shape2_collider;
+            var event = contactEvents[i];
+            var shape1 = physicalObjectsMap[event.shape0Id];
+            var shape2 = physicalObjectsMap[event.shape1Id];
+            // entity.destroy() is deferred, so shapes/colliders stay valid through the dispatch loop
+            // This guard covers synchronous removeShape()/clearShapes() which sets shape._collider = null
+            if (!(shape1 == null ? void 0 : (_shape1_collider = shape1.collider) == null ? void 0 : _shape1_collider.entity) || !(shape2 == null ? void 0 : (_shape2_collider = shape2.collider) == null ? void 0 : _shape2_collider.entity)) return "continue";
+            collision._nativeCollision = event;
+            switch(event.state){
+                case 0:
+                    shape1.collider.entity._scripts.forEach(function(element) {
+                        collision.shape = shape2;
+                        element.onCollisionEnter(collision);
+                    }, scriptIndexSetter);
+                    shape2.collider.entity._scripts.forEach(function(element) {
+                        collision.shape = shape1;
+                        element.onCollisionEnter(collision);
+                    }, scriptIndexSetter);
+                    break;
+                case 1:
+                    shape1.collider.entity._scripts.forEach(function(element) {
+                        collision.shape = shape2;
+                        element.onCollisionStay(collision);
+                    }, scriptIndexSetter);
+                    shape2.collider.entity._scripts.forEach(function(element) {
+                        collision.shape = shape1;
+                        element.onCollisionStay(collision);
+                    }, scriptIndexSetter);
+                    break;
+                case 2:
+                    shape1.collider.entity._scripts.forEach(function(element) {
+                        collision.shape = shape2;
+                        element.onCollisionExit(collision);
+                    }, scriptIndexSetter);
+                    shape2.collider.entity._scripts.forEach(function(element) {
+                        collision.shape = shape1;
+                        element.onCollisionExit(collision);
+                    }, scriptIndexSetter);
+                    break;
+            }
+        }, _loop1 = function(i1, n1) {
+            var _shape1_collider, _shape2_collider;
+            var event = triggerEvents[i1];
+            var shape1 = physicalObjectsMap[event.index1];
+            var shape2 = physicalObjectsMap[event.index2];
+            // entity.destroy() is deferred, so shapes/colliders stay valid through the dispatch loop
+            // This guard covers synchronous removeShape()/clearShapes() which sets shape._collider = null
+            if (!(shape1 == null ? void 0 : (_shape1_collider = shape1.collider) == null ? void 0 : _shape1_collider.entity) || !(shape2 == null ? void 0 : (_shape2_collider = shape2.collider) == null ? void 0 : _shape2_collider.entity)) return "continue";
+            switch(event.dispatchState){
+                case 0:
+                    shape1.collider.entity._scripts.forEach(function(element) {
+                        element.onTriggerEnter(shape2);
+                    }, scriptIndexSetter);
+                    shape2.collider.entity._scripts.forEach(function(element) {
+                        element.onTriggerEnter(shape1);
+                    }, scriptIndexSetter);
+                    break;
+                case 1:
+                    shape1.collider.entity._scripts.forEach(function(element) {
+                        element.onTriggerStay(shape2);
+                    }, scriptIndexSetter);
+                    shape2.collider.entity._scripts.forEach(function(element) {
+                        element.onTriggerStay(shape1);
+                    }, scriptIndexSetter);
+                    break;
+                case 2:
+                    shape1.collider.entity._scripts.forEach(function(element) {
+                        element.onTriggerExit(shape2);
+                    }, scriptIndexSetter);
+                    shape2.collider.entity._scripts.forEach(function(element) {
+                        element.onTriggerExit(shape1);
+                    }, scriptIndexSetter);
+                    break;
+            }
+        };
+        var physicalObjectsMap = Engine._physicalObjectsMap;
+        var collision = PhysicsScene._collision;
+        var scriptIndexSetter = PhysicsScene._scriptIndexSetter;
+        var contactEvents = events.contactEvents, contactEventCount = events.contactEventCount, triggerEvents = events.triggerEvents;
+        // Dispatch contact events
+        for(var i = 0, n = contactEventCount; i < n; i++)_loop(i);
+        // Dispatch trigger events
+        for(var i1 = 0, n1 = triggerEvents.length; i1 < n1; i1++)_loop1(i1);
+    };
     _proto._setGravity = function _setGravity() {
         this._nativePhysicsScene.setGravity(this._gravity);
     };
@@ -13514,6 +13498,9 @@ __decorate([
 }();
 PhysicsScene._collision = new Collision();
 PhysicsScene._identityQuaternion = new engineMath.Quaternion(0, 0, 0, 1);
+PhysicsScene._scriptIndexSetter = function(element, index) {
+    element._entityScriptsIndex = index;
+};
 
 /**
  * A static collider component that will not move.
@@ -27106,6 +27093,11 @@ ShaderPool.init();
         this._textSubRenderElementPool.garbageCollection();
         this._renderElementPool.garbageCollection();
         this._renderContext.garbageCollection();
+        var scenes = this._sceneManager._scenes.getLoopArray();
+        for(var i = 0, n = scenes.length; i < n; i++){
+            var _scenes_i_physics, _scenes_i;
+            (_scenes_i = scenes[i]) == null ? void 0 : (_scenes_i_physics = _scenes_i.physics) == null ? void 0 : _scenes_i_physics._gc();
+        }
     };
     _create_class(Engine, [
         {