@galacean/engine-core 1.4.0-beta.1 → 1.4.0

package/dist/main.js

@@ -5865,8 +5865,6 @@ exports.Camera = /*#__PURE__*/ function(Component) {
         //@ts-ignore
         this._viewport._onValueChanged = null;
         this.engine.canvas._sizeUpdateFlagManager.removeListener(this._onPixelViewportChanged);
-        this._updateFlagManager = null;
-        this._entity = null;
         this._globalShaderMacro = null;
         this._frustum = null;
         this._renderPipeline = null;
@@ -10263,7 +10261,6 @@ exports.Renderer = /*#__PURE__*/ function(Component) {
             var material = materials[i];
             material && this._addResourceReferCount(material, -1);
         }
-        this._entity = null;
         this._globalShaderMacro = null;
         this._bounds = null;
         this._materials = null;
@@ -17620,7 +17617,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
             this._setParent(null);
         }
         this.isActive = false;
-        this._updateFlagManager = null;
     };
     /**
    * @internal
@@ -20765,7 +20761,7 @@ exports.Collider = __decorate([
  * Describes a contact point where the collision occurs.
  */ var ContactPoint = function ContactPoint() {
     /** The position of the contact point between the shapes, in world space. */ this.position = new engineMath.Vector3();
-    /** The normal of the contacting surfaces at the contact point. The normal direction points from the second shape to the first shape. */ this.normal = new engineMath.Vector3();
+    /** The normal of the contacting surfaces at the contact point. The normal direction points from the other shape to the self shape. */ this.normal = new engineMath.Vector3();
     /** The impulse applied at the contact point, in world space. Divide by the simulation time step to get a force value. */ this.impulse = new engineMath.Vector3();
 };
 
@@ -20783,7 +20779,8 @@ exports.Collider = __decorate([
    * You need to obtain the actual number of contact points from the function's return value.
    */ _proto.getContacts = function getContacts(outContacts) {
         var nativeCollision = this._nativeCollision;
-        var factor = nativeCollision.shape0Id < nativeCollision.shape1Id ? 1 : -1;
+        var smallerShapeId = Math.min(nativeCollision.shape0Id, nativeCollision.shape1Id);
+        var factor = this.shape.id === smallerShapeId ? 1 : -1;
         var nativeContactPoints = nativeCollision.getContacts();
         var length = nativeContactPoints.size();
         for(var i = 0; i < length; i++){
@@ -23364,6 +23361,8 @@ PointerEventEmitter._tempRay = new engineMath.Ray();
             var currY = (latestEvent.clientY - top) * heightPixelRatio;
             pointer.deltaPosition.set(currX - position.x, currY - position.y);
             position.set(currX, currY);
+            pointer.button = _pointerDec2BinMap[latestEvent.button] || PointerButton.None;
+            pointer.pressedButtons = latestEvent.buttons;
             for(var i = 0; i < length; i++){
                 var event = events[i];
                 switch(event.type){
@@ -24586,11 +24585,16 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
 
 var UIUtils = /*#__PURE__*/ function() {
     function UIUtils() {}
-    UIUtils.renderOverlay = function renderOverlay(engine, uiCanvases) {
+    UIUtils.renderOverlay = function renderOverlay(engine, scene, uiCanvases) {
+        var canvas = engine.canvas, rhi = engine._hardwareRenderer, renderContext = engine._renderContext, batcherManager = engine._batcherManager;
         var uiRenderQueue = this._renderQueue || (this._renderQueue = new RenderQueue(RenderQueueType.Transparent));
         var virtualCamera = this._virtualCamera || (this._virtualCamera = new VirtualCamera());
         var viewport = this._viewport || (this._viewport = new engineMath.Vector4(0, 0, 1, 1));
-        var canvas = engine.canvas, rhi = engine._hardwareRenderer, renderContext = engine._renderContext, batcherManager = engine._batcherManager;
+        // @ts-ignore
+        var camera = this._overlayCamera || (this._overlayCamera = new OverlayCamera());
+        camera.engine = engine;
+        camera.scene = scene;
+        renderContext.camera = camera;
         var _virtualCamera_projectionMatrix = virtualCamera.projectionMatrix, projectE = _virtualCamera_projectionMatrix.elements;
         var _virtualCamera_viewMatrix = virtualCamera.viewMatrix, viewE = _virtualCamera_viewMatrix.elements;
         projectE[0] = 2 / canvas.width, projectE[5] = 2 / canvas.height, projectE[10] = 0;
@@ -24598,8 +24602,8 @@ var UIUtils = /*#__PURE__*/ function() {
         for(var i = 0, n = uiCanvases.length; i < n; i++){
             var uiCanvas = uiCanvases.get(i);
             if (uiCanvas) {
-                var transform = uiCanvas.entity.transform;
-                viewE[12] = -transform.position.x, viewE[13] = -transform.position.y;
+                var position = uiCanvas.entity.transform.position;
+                viewE[12] = -position.x, viewE[13] = -position.y;
                 engineMath.Matrix.multiply(virtualCamera.projectionMatrix, virtualCamera.viewMatrix, virtualCamera.viewProjectionMatrix);
                 renderContext.applyVirtualCamera(virtualCamera, false);
                 renderContext.rendererUpdateFlag |= ContextRendererUpdateFlag.ProjectionMatrix;
@@ -24615,6 +24619,14 @@ var UIUtils = /*#__PURE__*/ function() {
     };
     return UIUtils;
 }();
+var OverlayCamera = function OverlayCamera() {
+    // @ts-ignore
+    this.instanceId = ++EngineObject._instanceIdCounter;
+    this.shaderData = new ShaderData(ShaderDataGroup.Camera);
+    this.enableFrustumCulling = true;
+    this.cullingMask = Layer.Everything;
+    this._globalShaderMacro = new ShaderMacroCollection();
+};
 
 /**
  * XRManager located in the main package, its implementation logic is XRManagerExtended in the sub-package engine-xr.
@@ -24941,25 +24953,25 @@ ShaderPool.init();
             var cameras = componentsManager._activeCameras;
             if (cameras.length === 0) {
                 Logger.debug("No active camera in scene.");
-                return "continue";
-            }
-            cameras.forEach(function(camera) {
-                componentsManager.callCameraOnBeginRender(camera);
-                // Update post process manager
-                scene.postProcessManager._update(camera);
-                camera.render();
-                componentsManager.callCameraOnEndRender(camera);
-                // Temp solution for webgl implement bug
-                if (_this1._hardwareRenderer._options._forceFlush) {
-                    _this1._hardwareRenderer.flush();
-                }
-            }, function(camera, index) {
-                camera._cameraIndex = index;
-            });
+            } else {
+                cameras.forEach(function(camera) {
+                    componentsManager.callCameraOnBeginRender(camera);
+                    // Update post process manager
+                    scene.postProcessManager._update(camera);
+                    camera.render();
+                    componentsManager.callCameraOnEndRender(camera);
+                    // Temp solution for webgl implement bug
+                    if (_this1._hardwareRenderer._options._forceFlush) {
+                        _this1._hardwareRenderer.flush();
+                    }
+                }, function(camera, index) {
+                    camera._cameraIndex = index;
+                });
+            }
             var uiCanvas = componentsManager._overlayCanvases;
             if (uiCanvas.length > 0) {
                 componentsManager.sortOverlayUICanvases();
-                UIUtils.renderOverlay(_this, uiCanvas);
+                UIUtils.renderOverlay(_this, scene, uiCanvas);
             }
         };
         var _this1 = this;
@@ -30135,11 +30147,7 @@ function _type_of(obj) {
             if (transition.mute) continue;
             if (transitionCollection.isSoloMode && !transition.solo) continue;
             if (this._checkConditions(transition)) {
-                if (this._applyTransition(layerData, transition, aniUpdate)) {
-                    return transition;
-                } else {
-                    return null;
-                }
+                return this._applyTransition(layerData, transition, aniUpdate);
             }
         }
     };
@@ -30159,13 +30167,11 @@ function _type_of(obj) {
         return true;
     };
     _proto._applyTransition = function _applyTransition(layerData, transition, aniUpdate) {
-        // Need prepare first, it should crossFade when to exit
-        var success = this._prepareCrossFadeByTransition(transition, layerData.layerIndex);
         if (transition.isExit) {
             this._checkAnyAndEntryState(layerData, 0, aniUpdate);
-            return transition;
+            return null;
         }
-        return success ? transition : null;
+        return this._prepareCrossFadeByTransition(transition, layerData.layerIndex) ? transition : null;
     };
     _proto._checkConditions = function _checkConditions(transition) {
         var conditions = transition.conditions;