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

package/dist/bundled.module.js

@@ -17940,118 +17940,13 @@ __decorate$1([
         this._fixedTimeStep = 1 / 60;
         this._colliders = new DisorderedArray();
         this._gravity = new 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;
@@ -18263,6 +18158,7 @@ __decorate$1([
             this._callColliderOnUpdate();
             nativePhysicsManager.update(fixedTimeStep);
             this._callColliderOnLateUpdate();
+            this._dispatchEvents(nativePhysicsManager.updateEvents());
         }
     };
     /**
@@ -18326,7 +18222,9 @@ __decorate$1([
     /**
    * @internal
    */ _proto._gc = function _gc() {
+        var _this__nativePhysicsScene;
         this._colliders.garbageCollection();
+        (_this__nativePhysicsScene = this._nativePhysicsScene) == null ? void 0 : _this__nativePhysicsScene.gc();
     };
     /**
    * @internal
@@ -18334,6 +18232,92 @@ __decorate$1([
         var _this__nativePhysicsScene;
         (_this__nativePhysicsScene = this._nativePhysicsScene) == null ? void 0 : _this__nativePhysicsScene.destroy();
     };
+    _proto._dispatchEvents = function _dispatchEvents(events) {
+        var _loop = function _loop(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 _loop1(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);
     };
@@ -18393,6 +18377,9 @@ __decorate$1([
 }();
 PhysicsScene._collision = new Collision();
 PhysicsScene._identityQuaternion = new Quaternion(0, 0, 0, 1);
+PhysicsScene._scriptIndexSetter = function(element, index) {
+    element._entityScriptsIndex = index;
+};
 /**
  * A static collider component that will not move.
  * @remarks Mostly used for object which always stays at the same place and never moves around.
@@ -31826,6 +31813,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$2(Engine, [
         {
@@ -45844,7 +45836,9 @@ var GLBuffer = /*#__PURE__*/ function() {
     _proto._bindMainFBO = function _bindMainFBO() {
         var gl = this._gl;
         var isWebGL2 = this._isWebGL2;
-        /** @ts-ignore */ var _this__target = this._target, _depth = _this__target._depth, colorTextureCount = _this__target.colorTextureCount, width = _this__target.width, height = _this__target.height;
+        /** @ts-ignore */ var _this__target = this._target, _depth = _this__target._depth, colorTextureCount = _this__target.colorTextureCount;
+        _this__target.width;
+        _this__target.height;
         var drawBuffers = new Array(colorTextureCount);
         gl.bindFramebuffer(gl.FRAMEBUFFER, this._frameBuffer);
         /** color render buffer */ for(var i = 0; i < colorTextureCount; i++){
@@ -45866,11 +45860,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                 gl.framebufferTexture2D(gl.FRAMEBUFFER, platformTexture._formatDetail.attachment, gl.TEXTURE_2D, platformTexture._glTexture, 0);
             } else if (this._target.antiAliasing <= 1) {
                 var _GLTexture__getRenderBufferDepthFormatDetail = GLTexture._getRenderBufferDepthFormatDetail(_depth, gl, isWebGL2), internalFormat = _GLTexture__getRenderBufferDepthFormatDetail.internalFormat, attachment1 = _GLTexture__getRenderBufferDepthFormatDetail.attachment;
-                var depthRenderBuffer = gl.createRenderbuffer();
-                this._depthRenderBuffer = depthRenderBuffer;
-                gl.bindRenderbuffer(gl.RENDERBUFFER, depthRenderBuffer);
-                gl.renderbufferStorage(gl.RENDERBUFFER, internalFormat, width, height);
-                gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment1, gl.RENDERBUFFER, depthRenderBuffer);
+                this._depthRenderBuffer = this._createRenderBuffer(internalFormat, attachment1);
             }
         }
         gl.bindFramebuffer(gl.FRAMEBUFFER, null);
@@ -45879,32 +45869,38 @@ var GLBuffer = /*#__PURE__*/ function() {
     _proto._bindMSAAFBO = function _bindMSAAFBO() {
         var gl = this._gl;
         var isWebGL2 = this._isWebGL2;
-        var MSAADepthRenderBuffer = gl.createRenderbuffer();
-        /** @ts-ignore */ var _this__target = this._target, _depth = _this__target._depth, colorTextureCount = _this__target.colorTextureCount, antiAliasing = _this__target.antiAliasing, width = _this__target.width, height = _this__target.height;
+        /** @ts-ignore */ var _this__target = this._target, _depth = _this__target._depth, colorTextureCount = _this__target.colorTextureCount;
         this._blitDrawBuffers = new Array(colorTextureCount);
-        this._MSAADepthRenderBuffer = MSAADepthRenderBuffer;
         gl.bindFramebuffer(gl.FRAMEBUFFER, this._MSAAFrameBuffer);
         // prepare MRT+MSAA color RBOs
         for(var i = 0; i < colorTextureCount; i++){
-            var MSAAColorRenderBuffer = gl.createRenderbuffer();
-            this._MSAAColorRenderBuffers[i] = MSAAColorRenderBuffer;
             this._blitDrawBuffers[i] = gl.NONE;
-            gl.bindRenderbuffer(gl.RENDERBUFFER, MSAAColorRenderBuffer);
-            gl.renderbufferStorageMultisample(gl.RENDERBUFFER, antiAliasing, /** @ts-ignore */ this._target.getColorTexture(i)._platformTexture._formatDetail.internalFormat, width, height);
-            gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0 + i, gl.RENDERBUFFER, MSAAColorRenderBuffer);
+            var internalFormat = /** @ts-ignore */ this._target.getColorTexture(i)._platformTexture._formatDetail.internalFormat;
+            this._MSAAColorRenderBuffers[i] = this._createRenderBuffer(internalFormat, gl.COLOR_ATTACHMENT0 + i);
         }
         gl.drawBuffers(this._oriDrawBuffers);
         // prepare MSAA depth RBO
         if (_depth !== null) {
-            var _ref = _instanceof1$1(_depth, Texture) ? /** @ts-ignore */ _depth._platformTexture._formatDetail : GLTexture._getRenderBufferDepthFormatDetail(_depth, gl, isWebGL2), internalFormat = _ref.internalFormat, attachment = _ref.attachment;
-            gl.bindRenderbuffer(gl.RENDERBUFFER, MSAADepthRenderBuffer);
-            gl.renderbufferStorageMultisample(gl.RENDERBUFFER, antiAliasing, internalFormat, width, height);
-            gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, MSAADepthRenderBuffer);
+            var _ref = _instanceof1$1(_depth, Texture) ? /** @ts-ignore */ _depth._platformTexture._formatDetail : GLTexture._getRenderBufferDepthFormatDetail(_depth, gl, isWebGL2), internalFormat1 = _ref.internalFormat, attachment = _ref.attachment;
+            this._MSAADepthRenderBuffer = this._createRenderBuffer(internalFormat1, attachment);
         }
         this._checkFrameBuffer();
         gl.bindFramebuffer(gl.FRAMEBUFFER, null);
         gl.bindRenderbuffer(gl.RENDERBUFFER, null);
     };
+    _proto._createRenderBuffer = function _createRenderBuffer(internalFormat, attachment) {
+        var gl = this._gl;
+        var _this__target = this._target, width = _this__target.width, height = _this__target.height, antiAliasing = _this__target.antiAliasing;
+        var renderBuffer = gl.createRenderbuffer();
+        gl.bindRenderbuffer(gl.RENDERBUFFER, renderBuffer);
+        if (antiAliasing > 1) {
+            gl.renderbufferStorageMultisample(gl.RENDERBUFFER, antiAliasing, internalFormat, width, height);
+        } else {
+            gl.renderbufferStorage(gl.RENDERBUFFER, internalFormat, width, height);
+        }
+        gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, renderBuffer);
+        return renderBuffer;
+    };
     _proto._checkFrameBuffer = function _checkFrameBuffer() {
         var gl = this._gl;
         var e = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
@@ -54053,7 +54049,7 @@ EXT_texture_webp = __decorate([
 ], EXT_texture_webp);
 
 //@ts-ignore
-var version = "2.0.0-alpha.18";
+var version = "2.0.0-alpha.19";
 console.log("Galacean Engine Version: " + version);
 for(var key in CoreObjects){
     Loader.registerClass(key, CoreObjects[key]);