@galacean/engine-core 1.4.0-beta.2 → 1.4.1

package/dist/module.js

@@ -5861,8 +5861,6 @@ var 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;
@@ -10259,7 +10257,6 @@ var 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;
@@ -17616,7 +17613,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
             this._setParent(null);
         }
         this.isActive = false;
-        this._updateFlagManager = null;
     };
     /**
    * @internal
@@ -20761,7 +20757,7 @@ 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 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 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 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 Vector3();
 };
 
@@ -20779,7 +20775,8 @@ 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++){
@@ -21840,9 +21837,9 @@ var Joint = /*#__PURE__*/ function(Component) {
         _this = Component.call(this, entity) || this, _this._colliderInfo = new JointColliderInfo(), _this._connectedColliderInfo = new JointColliderInfo(), _this._force = Infinity, _this._torque = Infinity, _this._automaticConnectedAnchor = true;
         //@ts-ignore
         _this._colliderInfo.anchor._onValueChanged = _this._updateActualAnchor.bind(_this, 1);
-        _this._updateConnectedActualAnchor = _this._updateActualAnchor.bind(_this, 2);
+        _this._handleConnectedAnchorChanged = _this._handleConnectedAnchorChanged.bind(_this);
         //@ts-ignore
-        _this._connectedColliderInfo.anchor._onValueChanged = _this._updateConnectedActualAnchor;
+        _this._connectedColliderInfo.anchor._onValueChanged = _this._handleConnectedAnchorChanged.bind(_this);
         _this._onSelfTransformChanged = _this._onSelfTransformChanged.bind(_this);
         _this._onConnectedTransformChanged = _this._onConnectedTransformChanged.bind(_this);
         // @ts-ignore
@@ -21888,6 +21885,8 @@ var Joint = /*#__PURE__*/ function(Component) {
         var connectedAnchor = connectedColliderInfo.anchor;
         var connectedActualAnchor = connectedColliderInfo.actualAnchor;
         var connectedCollider = connectedColliderInfo.collider;
+        // @ts-ignore
+        connectedAnchor._onValueChanged = null;
         if (connectedCollider) {
             var _connectedCollider_entity_transform = connectedCollider.entity.transform, connectedPos = _connectedCollider_entity_transform.worldPosition, connectedWorldScale = _connectedCollider_entity_transform.lossyWorldScale;
             Vector3.subtract(selfPos, connectedPos, Joint._tempVector3);
@@ -21897,6 +21896,16 @@ var Joint = /*#__PURE__*/ function(Component) {
             Vector3.add(selfPos, selfActualAnchor, connectedActualAnchor);
             connectedAnchor.copyFrom(connectedActualAnchor);
         }
+        // @ts-ignore
+        connectedAnchor._onValueChanged = this._handleConnectedAnchorChanged;
+        this._updateActualAnchor(2);
+    };
+    _proto._handleConnectedAnchorChanged = function _handleConnectedAnchorChanged() {
+        if (this._automaticConnectedAnchor) {
+            console.warn("Cannot set connectedAnchor when automaticConnectedAnchor is true.");
+        } else {
+            this._updateActualAnchor(2);
+        }
     };
     _proto._onSelfTransformChanged = function _onSelfTransformChanged(type) {
         if (type & TransformModifyFlags.WorldScale) {
@@ -21976,25 +21985,12 @@ var Joint = /*#__PURE__*/ function(Component) {
    * @remarks If connectedCollider is set, this anchor is relative offset, or the anchor is world position.
    * The connectedAnchor is automatically calculated, if you want to set it manually, please set automaticConnectedAnchor to false
    */ function get() {
-                var connectedColliderAnchor = this._connectedColliderInfo.anchor;
-                if (this._automaticConnectedAnchor) {
-                    //@ts-ignore
-                    connectedColliderAnchor._onValueChanged = null;
-                    this._calculateConnectedAnchor();
-                    //@ts-ignore
-                    connectedColliderAnchor._onValueChanged = this._updateConnectedActualAnchor;
-                }
-                return connectedColliderAnchor;
+                return this._connectedColliderInfo.anchor;
             },
             set: function set(value) {
-                if (this._automaticConnectedAnchor) {
-                    console.warn("Cannot set connectedAnchor when automaticConnectedAnchor is true.");
-                    return;
-                }
                 var connectedAnchor = this._connectedColliderInfo.anchor;
                 if (value !== connectedAnchor) {
                     connectedAnchor.copyFrom(value);
-                    this._updateActualAnchor(2);
                 }
             }
         },
@@ -22115,7 +22111,7 @@ __decorate([
 ], Joint.prototype, "_nativeJoint", void 0);
 __decorate([
     ignoreClone
-], Joint.prototype, "_updateConnectedActualAnchor", void 0);
+], Joint.prototype, "_handleConnectedAnchorChanged", null);
 __decorate([
     ignoreClone
 ], Joint.prototype, "_onSelfTransformChanged", null);
@@ -22177,6 +22173,9 @@ __decorate([
         _this = Joint.call(this, entity) || this, _this._axis = new Vector3(1, 0, 0), _this._hingeFlags = HingeJointFlag.None, _this._useSpring = false, _this._angle = 0, _this._velocity = 0;
         _this._onMotorChanged = _this._onMotorChanged.bind(_this);
         _this._onLimitsChanged = _this._onLimitsChanged.bind(_this);
+        _this._onAxisChanged = _this._onAxisChanged.bind(_this);
+        //@ts-ignore
+        _this._axis._onValueChanged = _this._onAxisChanged;
         return _this;
     }
     var _proto = HingeJoint.prototype;
@@ -22225,20 +22224,27 @@ __decorate([
             }
         }
     };
+    _proto._onAxisChanged = function _onAxisChanged() {
+        var _this__nativeJoint;
+        //@ts-ignore
+        this._axis._onValueChanged = null;
+        this._axis.normalize();
+        (_this__nativeJoint = this._nativeJoint) == null ? void 0 : _this__nativeJoint.setAxis(this._axis);
+        //@ts-ignore
+        this._axis._onValueChanged = this._onAxisChanged;
+    };
     _create_class(HingeJoint, [
         {
             key: "axis",
             get: /**
-   * The anchor rotation.
+   * The Direction of the axis around which the hingeJoint.
    */ function get() {
                 return this._axis;
             },
             set: function set(value) {
                 var axis = this._axis;
                 if (value !== axis) {
-                    var _this__nativeJoint;
                     axis.copyFrom(value);
-                    (_this__nativeJoint = this._nativeJoint) == null ? void 0 : _this__nativeJoint.setAxis(axis);
                 }
             }
         },
@@ -22362,6 +22368,9 @@ __decorate([
 __decorate([
     ignoreClone
 ], HingeJoint.prototype, "_onLimitsChanged", null);
+__decorate([
+    ignoreClone
+], HingeJoint.prototype, "_onAxisChanged", null);
 
 /**
  * A joint that maintains an upper or lower bound (or both) on the distance between two points on different objects.
@@ -23360,6 +23369,8 @@ PointerEventEmitter._tempRay = new 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){
@@ -24582,11 +24593,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 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;
@@ -24594,8 +24610,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;
                 Matrix.multiply(virtualCamera.projectionMatrix, virtualCamera.viewMatrix, virtualCamera.viewProjectionMatrix);
                 renderContext.applyVirtualCamera(virtualCamera, false);
                 renderContext.rendererUpdateFlag |= ContextRendererUpdateFlag.ProjectionMatrix;
@@ -24611,6 +24627,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.
@@ -24937,25 +24961,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;