@galacean/engine 1.4.0-beta.2 → 1.4.1

package/dist/browser.js

@@ -10868,8 +10868,6 @@
             //@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;
@@ -15137,7 +15135,6 @@
                 var material = materials[i];
                 material && this._addResourceReferCount(material, -1);
             }
-            this._entity = null;
             this._globalShaderMacro = null;
             this._bounds = null;
             this._materials = null;
@@ -22443,7 +22440,6 @@
                 this._setParent(null);
             }
             this.isActive = false;
-            this._updateFlagManager = null;
         };
         /**
        * @internal
@@ -25558,7 +25554,7 @@
      * 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();
     };
     /**
@@ -25575,7 +25571,8 @@
        * 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++){
@@ -26625,9 +26622,9 @@
             _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
@@ -26673,6 +26670,8 @@
             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);
@@ -26682,6 +26681,16 @@
                 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) {
@@ -26761,25 +26770,12 @@
        * @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);
                     }
                 }
             },
@@ -26900,7 +26896,7 @@
     ], exports.Joint.prototype, "_nativeJoint", void 0);
     __decorate$1([
         ignoreClone
-    ], exports.Joint.prototype, "_updateConnectedActualAnchor", void 0);
+    ], exports.Joint.prototype, "_handleConnectedAnchorChanged", null);
     __decorate$1([
         ignoreClone
     ], exports.Joint.prototype, "_onSelfTransformChanged", null);
@@ -26959,6 +26955,9 @@
             _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;
@@ -27007,20 +27006,27 @@
                 }
             }
         };
+        _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$2(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);
                     }
                 }
             },
@@ -27144,6 +27150,9 @@
     __decorate$1([
         ignoreClone
     ], HingeJoint.prototype, "_onLimitsChanged", null);
+    __decorate$1([
+        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.
      */ var SpringJoint = /*#__PURE__*/ function(Joint) {
@@ -28131,6 +28140,8 @@
                 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){
@@ -29298,11 +29309,16 @@
     }();
     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;
@@ -29310,8 +29326,8 @@
             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;
@@ -29327,6 +29343,14 @@
         };
         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.
      */ var XRManager = /*#__PURE__*/ function() {
@@ -29651,25 +29675,25 @@
                 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;
@@ -49945,7 +49969,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.4.0-beta.2";
+    var version = "1.4.1";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);