@galacean/engine-core 1.4.3 → 1.4.5

package/dist/main.js

@@ -21316,7 +21316,16 @@ __decorate([
    */ _proto._onLateUpdate = function _onLateUpdate() {
         var transform = this.entity.transform;
         var worldPosition = transform.worldPosition, worldRotationQuaternion = transform.worldRotationQuaternion;
-        this._nativeCollider.getWorldTransform(worldPosition, worldRotationQuaternion);
+        var outPosition = DynamicCollider._tempVector3;
+        var outRotation = DynamicCollider._tempQuat;
+        this._nativeCollider.getWorldTransform(outPosition, outRotation);
+        // To resolve the issue where onValueChanged is triggered even though the values are equal
+        if (!engineMath.Vector3.equals(outPosition, worldPosition)) {
+            worldPosition.copyFrom(outPosition);
+        }
+        if (!engineMath.Quaternion.equals(outRotation, worldRotationQuaternion)) {
+            worldRotationQuaternion.copyFrom(outRotation);
+        }
         this._updateFlag.flag = false;
     };
     /**
@@ -21651,6 +21660,8 @@ __decorate([
     ]);
     return DynamicCollider;
 }(exports.Collider);
+DynamicCollider._tempVector3 = new engineMath.Vector3();
+DynamicCollider._tempQuat = new engineMath.Quaternion();
 __decorate([
     ignoreClone
 ], DynamicCollider.prototype, "_linearVelocity", void 0);
@@ -21865,6 +21876,7 @@ exports.Joint = /*#__PURE__*/ function(Component) {
    */ _proto._onEnableInScene = function _onEnableInScene() {
         this._createJoint();
         this._syncNative();
+        this._updateRotation();
     };
     /**
    * @internal
@@ -21893,20 +21905,19 @@ exports.Joint = /*#__PURE__*/ function(Component) {
     _proto._calculateConnectedAnchor = function _calculateConnectedAnchor() {
         var colliderInfo = this._colliderInfo;
         var connectedColliderInfo = this._connectedColliderInfo;
-        var _this_entity_transform = this.entity.transform, selfPos = _this_entity_transform.worldPosition;
-        var selfActualAnchor = colliderInfo.actualAnchor;
         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);
-            engineMath.Vector3.add(Joint._tempVector3, selfActualAnchor, connectedActualAnchor);
-            engineMath.Vector3.divide(connectedActualAnchor, connectedWorldScale, connectedAnchor);
+            var tempVector3 = Joint._tempVector3;
+            var tempMatrix = Joint._tempMatrix;
+            engineMath.Vector3.transformCoordinate(colliderInfo.anchor, this.entity.transform.worldMatrix, tempVector3);
+            engineMath.Matrix.invert(connectedCollider.entity.transform.worldMatrix, tempMatrix);
+            engineMath.Vector3.transformCoordinate(tempVector3, tempMatrix, connectedAnchor);
         } else {
-            engineMath.Vector3.add(selfPos, selfActualAnchor, connectedActualAnchor);
+            engineMath.Vector3.transformCoordinate(colliderInfo.anchor, this.entity.transform.worldMatrix, connectedActualAnchor);
             connectedAnchor.copyFrom(connectedActualAnchor);
         }
         // @ts-ignore
@@ -21930,6 +21941,17 @@ exports.Joint = /*#__PURE__*/ function(Component) {
             this._updateActualAnchor(2);
         }
     };
+    _proto._updateRotation = function _updateRotation() {
+        var _this__nativeJoint;
+        var quat = Joint._tempQuat;
+        var connectedColliderInfo = this._connectedColliderInfo;
+        var connectedCollider = connectedColliderInfo.collider;
+        if (connectedCollider) {
+            engineMath.Quaternion.invert(connectedCollider.entity.transform.worldRotationQuaternion, quat);
+        }
+        engineMath.Quaternion.multiply(quat, this.entity.transform.worldRotationQuaternion, quat);
+        (_this__nativeJoint = this._nativeJoint) == null ? void 0 : _this__nativeJoint.setRotation(quat);
+    };
     _proto._updateActualAnchor = function _updateActualAnchor(flag) {
         if (flag & 1) {
             var _this__nativeJoint;
@@ -21967,6 +21989,7 @@ exports.Joint = /*#__PURE__*/ function(Component) {
                     value == null ? void 0 : value.entity._updateFlagManager.addListener(this._onConnectedTransformChanged);
                     this._connectedColliderInfo.collider = value;
                     (_this__nativeJoint = this._nativeJoint) == null ? void 0 : _this__nativeJoint.setConnectedCollider(value == null ? void 0 : value._nativeCollider);
+                    this._updateRotation();
                     if (this._automaticConnectedAnchor) {
                         this._calculateConnectedAnchor();
                     } else {
@@ -22113,6 +22136,8 @@ exports.Joint = /*#__PURE__*/ function(Component) {
     return Joint;
 }(Component);
 exports.Joint._tempVector3 = new engineMath.Vector3();
+exports.Joint._tempQuat = new engineMath.Quaternion();
+exports.Joint._tempMatrix = new engineMath.Matrix();
 __decorate([
     deepClone
 ], exports.Joint.prototype, "_colliderInfo", void 0);