@galacean/engine-core 1.4.0 → 1.4.1

package/dist/main.js

@@ -21841,9 +21841,9 @@ exports.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
@@ -21889,6 +21889,8 @@ exports.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;
             engineMath.Vector3.subtract(selfPos, connectedPos, Joint._tempVector3);
@@ -21898,6 +21900,16 @@ exports.Joint = /*#__PURE__*/ function(Component) {
             engineMath.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) {
@@ -21977,25 +21989,12 @@ exports.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);
                 }
             }
         },
@@ -22116,7 +22115,7 @@ __decorate([
 ], exports.Joint.prototype, "_nativeJoint", void 0);
 __decorate([
     ignoreClone
-], exports.Joint.prototype, "_updateConnectedActualAnchor", void 0);
+], exports.Joint.prototype, "_handleConnectedAnchorChanged", null);
 __decorate([
     ignoreClone
 ], exports.Joint.prototype, "_onSelfTransformChanged", null);
@@ -22178,6 +22177,9 @@ __decorate([
         _this = Joint.call(this, entity) || this, _this._axis = new engineMath.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;
@@ -22226,20 +22228,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);
                 }
             }
         },
@@ -22363,6 +22372,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.