@galacean/engine-core 1.3.5 → 1.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +22 -8
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +22 -8
- package/dist/module.js +22 -8
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
- package/types/physics/CharacterController.d.ts +1 -0
package/dist/miniprogram.js
CHANGED
|
@@ -10760,6 +10760,9 @@ var SubRenderElement = /*#__PURE__*/ function() {
|
|
|
10760
10760
|
__decorate([
|
|
10761
10761
|
assignmentClone
|
|
10762
10762
|
], SpriteMask.prototype, "influenceLayers", void 0);
|
|
10763
|
+
__decorate([
|
|
10764
|
+
ignoreClone
|
|
10765
|
+
], SpriteMask.prototype, "_renderElement", void 0);
|
|
10763
10766
|
__decorate([
|
|
10764
10767
|
ignoreClone
|
|
10765
10768
|
], SpriteMask.prototype, "_subChunk", void 0);
|
|
@@ -20930,6 +20933,8 @@ var Collision = function Collision() {
|
|
|
20930
20933
|
_this._setUpDirection = _this._setUpDirection.bind(_assert_this_initialized(_this));
|
|
20931
20934
|
//@ts-ignore
|
|
20932
20935
|
_this._upDirection._onValueChanged = _this._setUpDirection;
|
|
20936
|
+
// sync world position to physical space
|
|
20937
|
+
_this._onUpdate();
|
|
20933
20938
|
return _this;
|
|
20934
20939
|
}
|
|
20935
20940
|
var _proto = CharacterController.prototype;
|
|
@@ -20940,7 +20945,9 @@ var Collision = function Collision() {
|
|
|
20940
20945
|
* @param elapsedTime - Time elapsed since last call
|
|
20941
20946
|
* @return flags - The ControllerCollisionFlag
|
|
20942
20947
|
*/ _proto.move = function move(disp, minDist, elapsedTime) {
|
|
20943
|
-
|
|
20948
|
+
var flags = this._nativeCollider.move(disp, minDist, elapsedTime);
|
|
20949
|
+
this._syncWorldPositionFromPhysicalSpace();
|
|
20950
|
+
return flags;
|
|
20944
20951
|
};
|
|
20945
20952
|
/**
|
|
20946
20953
|
* Add collider shape on this controller.
|
|
@@ -20976,8 +20983,7 @@ var Collision = function Collision() {
|
|
|
20976
20983
|
/**
|
|
20977
20984
|
* @internal
|
|
20978
20985
|
*/ _proto._onLateUpdate = function _onLateUpdate() {
|
|
20979
|
-
|
|
20980
|
-
this._nativeCollider.getWorldPosition(position);
|
|
20986
|
+
this._syncWorldPositionFromPhysicalSpace();
|
|
20981
20987
|
this._updateFlag.flag = false;
|
|
20982
20988
|
};
|
|
20983
20989
|
/**
|
|
@@ -21000,6 +21006,9 @@ var Collision = function Collision() {
|
|
|
21000
21006
|
physics._removeColliderShape(shapes[i]);
|
|
21001
21007
|
}
|
|
21002
21008
|
};
|
|
21009
|
+
_proto._syncWorldPositionFromPhysicalSpace = function _syncWorldPositionFromPhysicalSpace() {
|
|
21010
|
+
this._nativeCollider.getWorldPosition(this.entity.transform.worldPosition);
|
|
21011
|
+
};
|
|
21003
21012
|
_proto._setUpDirection = function _setUpDirection() {
|
|
21004
21013
|
this._nativeCollider.setUpDirection(this._upDirection);
|
|
21005
21014
|
};
|
|
@@ -28684,7 +28693,9 @@ exports.AnimatorLayerBlendingMode = void 0;
|
|
|
28684
28693
|
// Precalculate to get the transition
|
|
28685
28694
|
srcPlayData.update(playDeltaTime);
|
|
28686
28695
|
var clipTime = srcPlayData.clipTime, isForwards = srcPlayData.isForwards;
|
|
28687
|
-
var
|
|
28696
|
+
var transitions = state.transitions;
|
|
28697
|
+
var anyStateTransitions = layer.stateMachine.anyStateTransitions;
|
|
28698
|
+
var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
|
|
28688
28699
|
var playCostTime;
|
|
28689
28700
|
if (transition) {
|
|
28690
28701
|
var clipDuration = state.clip.length;
|
|
@@ -28768,7 +28779,7 @@ exports.AnimatorLayerBlendingMode = void 0;
|
|
|
28768
28779
|
playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
|
|
28769
28780
|
playedTime - transitionDuration : dstPlayDeltaTime;
|
|
28770
28781
|
}
|
|
28771
|
-
var actualCostTime = dstPlaySpeed === 0 ?
|
|
28782
|
+
var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
|
|
28772
28783
|
var srcPlayCostTime = actualCostTime * srcPlaySpeed;
|
|
28773
28784
|
srcPlayData.update(srcPlayCostTime);
|
|
28774
28785
|
destPlayData.update(dstPlayCostTime);
|
|
@@ -28776,6 +28787,7 @@ exports.AnimatorLayerBlendingMode = void 0;
|
|
|
28776
28787
|
(crossWeight >= 1.0 - miniprogram.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
|
|
28777
28788
|
var crossFadeFinished = crossWeight === 1.0;
|
|
28778
28789
|
if (crossFadeFinished) {
|
|
28790
|
+
srcPlayData.playState = AnimatorStatePlayState.Finished;
|
|
28779
28791
|
this._preparePlayOwner(layerData, destState);
|
|
28780
28792
|
this._evaluatePlayingState(destPlayData, weight, additive, aniUpdate);
|
|
28781
28793
|
} else {
|
|
@@ -28830,7 +28842,7 @@ exports.AnimatorLayerBlendingMode = void 0;
|
|
|
28830
28842
|
playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
|
|
28831
28843
|
playedTime - transitionDuration : playDeltaTime;
|
|
28832
28844
|
}
|
|
28833
|
-
var actualCostTime = playSpeed === 0 ?
|
|
28845
|
+
var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
|
|
28834
28846
|
destPlayData.update(dstPlayCostTime);
|
|
28835
28847
|
var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
|
|
28836
28848
|
(crossWeight >= 1.0 - miniprogram.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
|
|
@@ -28870,14 +28882,16 @@ exports.AnimatorLayerBlendingMode = void 0;
|
|
|
28870
28882
|
}
|
|
28871
28883
|
};
|
|
28872
28884
|
_proto._updateFinishedState = function _updateFinishedState(layerIndex, layerData, layer, weight, additive, deltaTime, aniUpdate) {
|
|
28873
|
-
|
|
28885
|
+
layer.stateMachine;
|
|
28874
28886
|
var playData = layerData.srcPlayData;
|
|
28875
28887
|
var state = playData.state;
|
|
28876
28888
|
var actualSpeed = state.speed * this.speed;
|
|
28877
28889
|
var actualDeltaTime = actualSpeed * deltaTime;
|
|
28878
28890
|
playData.updateOrientation(actualDeltaTime);
|
|
28879
28891
|
var clipTime = playData.clipTime, isForwards = playData.isForwards;
|
|
28880
|
-
var
|
|
28892
|
+
var transitions = state.transitions;
|
|
28893
|
+
var anyStateTransitions = layer.stateMachine.anyStateTransitions;
|
|
28894
|
+
var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
|
|
28881
28895
|
if (transition) {
|
|
28882
28896
|
this._updateState(layerIndex, layerData, layer, deltaTime, aniUpdate);
|
|
28883
28897
|
} else {
|
package/dist/module.js
CHANGED
|
@@ -10755,6 +10755,9 @@ var SubRenderElement = /*#__PURE__*/ function() {
|
|
|
10755
10755
|
__decorate([
|
|
10756
10756
|
assignmentClone
|
|
10757
10757
|
], SpriteMask.prototype, "influenceLayers", void 0);
|
|
10758
|
+
__decorate([
|
|
10759
|
+
ignoreClone
|
|
10760
|
+
], SpriteMask.prototype, "_renderElement", void 0);
|
|
10758
10761
|
__decorate([
|
|
10759
10762
|
ignoreClone
|
|
10760
10763
|
], SpriteMask.prototype, "_subChunk", void 0);
|
|
@@ -20925,6 +20928,8 @@ var Collision = function Collision() {
|
|
|
20925
20928
|
_this._setUpDirection = _this._setUpDirection.bind(_assert_this_initialized(_this));
|
|
20926
20929
|
//@ts-ignore
|
|
20927
20930
|
_this._upDirection._onValueChanged = _this._setUpDirection;
|
|
20931
|
+
// sync world position to physical space
|
|
20932
|
+
_this._onUpdate();
|
|
20928
20933
|
return _this;
|
|
20929
20934
|
}
|
|
20930
20935
|
var _proto = CharacterController.prototype;
|
|
@@ -20935,7 +20940,9 @@ var Collision = function Collision() {
|
|
|
20935
20940
|
* @param elapsedTime - Time elapsed since last call
|
|
20936
20941
|
* @return flags - The ControllerCollisionFlag
|
|
20937
20942
|
*/ _proto.move = function move(disp, minDist, elapsedTime) {
|
|
20938
|
-
|
|
20943
|
+
var flags = this._nativeCollider.move(disp, minDist, elapsedTime);
|
|
20944
|
+
this._syncWorldPositionFromPhysicalSpace();
|
|
20945
|
+
return flags;
|
|
20939
20946
|
};
|
|
20940
20947
|
/**
|
|
20941
20948
|
* Add collider shape on this controller.
|
|
@@ -20971,8 +20978,7 @@ var Collision = function Collision() {
|
|
|
20971
20978
|
/**
|
|
20972
20979
|
* @internal
|
|
20973
20980
|
*/ _proto._onLateUpdate = function _onLateUpdate() {
|
|
20974
|
-
|
|
20975
|
-
this._nativeCollider.getWorldPosition(position);
|
|
20981
|
+
this._syncWorldPositionFromPhysicalSpace();
|
|
20976
20982
|
this._updateFlag.flag = false;
|
|
20977
20983
|
};
|
|
20978
20984
|
/**
|
|
@@ -20995,6 +21001,9 @@ var Collision = function Collision() {
|
|
|
20995
21001
|
physics._removeColliderShape(shapes[i]);
|
|
20996
21002
|
}
|
|
20997
21003
|
};
|
|
21004
|
+
_proto._syncWorldPositionFromPhysicalSpace = function _syncWorldPositionFromPhysicalSpace() {
|
|
21005
|
+
this._nativeCollider.getWorldPosition(this.entity.transform.worldPosition);
|
|
21006
|
+
};
|
|
20998
21007
|
_proto._setUpDirection = function _setUpDirection() {
|
|
20999
21008
|
this._nativeCollider.setUpDirection(this._upDirection);
|
|
21000
21009
|
};
|
|
@@ -28679,7 +28688,9 @@ var AnimatorLayerBlendingMode;
|
|
|
28679
28688
|
// Precalculate to get the transition
|
|
28680
28689
|
srcPlayData.update(playDeltaTime);
|
|
28681
28690
|
var clipTime = srcPlayData.clipTime, isForwards = srcPlayData.isForwards;
|
|
28682
|
-
var
|
|
28691
|
+
var transitions = state.transitions;
|
|
28692
|
+
var anyStateTransitions = layer.stateMachine.anyStateTransitions;
|
|
28693
|
+
var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
|
|
28683
28694
|
var playCostTime;
|
|
28684
28695
|
if (transition) {
|
|
28685
28696
|
var clipDuration = state.clip.length;
|
|
@@ -28763,7 +28774,7 @@ var AnimatorLayerBlendingMode;
|
|
|
28763
28774
|
playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
|
|
28764
28775
|
playedTime - transitionDuration : dstPlayDeltaTime;
|
|
28765
28776
|
}
|
|
28766
|
-
var actualCostTime = dstPlaySpeed === 0 ?
|
|
28777
|
+
var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
|
|
28767
28778
|
var srcPlayCostTime = actualCostTime * srcPlaySpeed;
|
|
28768
28779
|
srcPlayData.update(srcPlayCostTime);
|
|
28769
28780
|
destPlayData.update(dstPlayCostTime);
|
|
@@ -28771,6 +28782,7 @@ var AnimatorLayerBlendingMode;
|
|
|
28771
28782
|
(crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
|
|
28772
28783
|
var crossFadeFinished = crossWeight === 1.0;
|
|
28773
28784
|
if (crossFadeFinished) {
|
|
28785
|
+
srcPlayData.playState = AnimatorStatePlayState.Finished;
|
|
28774
28786
|
this._preparePlayOwner(layerData, destState);
|
|
28775
28787
|
this._evaluatePlayingState(destPlayData, weight, additive, aniUpdate);
|
|
28776
28788
|
} else {
|
|
@@ -28825,7 +28837,7 @@ var AnimatorLayerBlendingMode;
|
|
|
28825
28837
|
playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
|
|
28826
28838
|
playedTime - transitionDuration : playDeltaTime;
|
|
28827
28839
|
}
|
|
28828
|
-
var actualCostTime = playSpeed === 0 ?
|
|
28840
|
+
var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
|
|
28829
28841
|
destPlayData.update(dstPlayCostTime);
|
|
28830
28842
|
var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
|
|
28831
28843
|
(crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
|
|
@@ -28865,14 +28877,16 @@ var AnimatorLayerBlendingMode;
|
|
|
28865
28877
|
}
|
|
28866
28878
|
};
|
|
28867
28879
|
_proto._updateFinishedState = function _updateFinishedState(layerIndex, layerData, layer, weight, additive, deltaTime, aniUpdate) {
|
|
28868
|
-
|
|
28880
|
+
layer.stateMachine;
|
|
28869
28881
|
var playData = layerData.srcPlayData;
|
|
28870
28882
|
var state = playData.state;
|
|
28871
28883
|
var actualSpeed = state.speed * this.speed;
|
|
28872
28884
|
var actualDeltaTime = actualSpeed * deltaTime;
|
|
28873
28885
|
playData.updateOrientation(actualDeltaTime);
|
|
28874
28886
|
var clipTime = playData.clipTime, isForwards = playData.isForwards;
|
|
28875
|
-
var
|
|
28887
|
+
var transitions = state.transitions;
|
|
28888
|
+
var anyStateTransitions = layer.stateMachine.anyStateTransitions;
|
|
28889
|
+
var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
|
|
28876
28890
|
if (transition) {
|
|
28877
28891
|
this._updateState(layerIndex, layerData, layer, deltaTime, aniUpdate);
|
|
28878
28892
|
} else {
|