@galacean/engine-core 1.3.3 → 1.3.6

package/dist/miniprogram.js

@@ -10760,6 +10760,9 @@ var SubRenderElement = /*#__PURE__*/ function() {
 __decorate([
     assignmentClone
 ], SpriteMask.prototype, "influenceLayers", void 0);
+__decorate([
+    ignoreClone
+], SpriteMask.prototype, "_renderElement", void 0);
 __decorate([
     ignoreClone
 ], SpriteMask.prototype, "_subChunk", void 0);
@@ -11170,9 +11173,12 @@ var /**
         // Safari gets data confusion through getImageData when the canvas width is not an integer.
         // The measure text width of some special invisible characters may be 0, so make sure the width is at least 1.
         // @todo: Text layout may vary from standard and not support emoji.
-        var textMetrics = context.measureText(measureString);
+        var _context_measureText = context.measureText(measureString), actualBoundingBoxLeft = _context_measureText.actualBoundingBoxLeft, actualBoundingBoxRight = _context_measureText.actualBoundingBoxRight, actualWidth = _context_measureText.width;
         // In some case (ex: " "), actualBoundingBoxRight and actualBoundingBoxLeft will be 0, so use width.
-        var width = Math.max(1, Math.round(textMetrics.actualBoundingBoxRight - textMetrics.actualBoundingBoxLeft || textMetrics.width));
+        // TODO: With testing, actualBoundingBoxLeft + actualBoundingBoxRight is the actual rendering width
+        // but the space rules between characters are unclear. Using actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft) is the closest to the native effect.
+        var width = Math.max(1, Math.round(Math.max(actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft), actualWidth)));
+        // Make sure enough width.
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
@@ -11186,7 +11192,11 @@ var /**
         context.clearRect(0, 0, width, height);
         context.textBaseline = "middle";
         context.fillStyle = "#fff";
-        context.fillText(measureString, 0, baseline);
+        if (actualBoundingBoxLeft > 0) {
+            context.fillText(measureString, actualBoundingBoxLeft, baseline);
+        } else {
+            context.fillText(measureString, 0, baseline);
+        }
         var colorData = context.getImageData(0, 0, width, height).data;
         var len = colorData.length;
         var top = -1;
@@ -11230,9 +11240,9 @@ var /**
                 y: 0,
                 w: width,
                 h: size,
-                offsetX: 0,
+                offsetX: actualBoundingBoxLeft > 0 ? actualBoundingBoxLeft : 0,
                 offsetY: (ascent - descent) * 0.5,
-                xAdvance: width,
+                xAdvance: Math.round(actualWidth),
                 uvs: [
                     new miniprogram.Vector2(),
                     new miniprogram.Vector2(),
@@ -11801,7 +11811,7 @@ var /**
                             j === firstRow && (minX = Math.min(minX, left));
                             maxX = Math.max(maxX, right);
                         }
-                        startX += charInfo.xAdvance;
+                        startX += charInfo.xAdvance + charInfo.offsetX;
                     }
                 }
                 startY -= lineHeight;
@@ -12631,8 +12641,6 @@ var BufferUtil = /*#__PURE__*/ function() {
         _this = ReferResource1.call(this, engine) || this;
         /** @internal */ _this._renderStates = [] // todo: later will as a part of shaderData when shader effect frame is OK, that is more powerful and flexible.
         ;
-        /** @internal */ _this._priority = 0 // todo: temporary resolution of submesh rendering order issue.
-        ;
         _this._shaderData = new ShaderData(ShaderDataGroup.Material);
         _this.shader = shader;
         return _this;
@@ -18882,7 +18890,7 @@ var ObjectPool = /*#__PURE__*/ function() {
  * @internal
  */ var PrimitiveChunkManager = /*#__PURE__*/ function() {
     function PrimitiveChunkManager(engine, maxVertexCount) {
-        if (maxVertexCount === void 0) maxVertexCount = PrimitiveChunkManager.MAX_VERTEX_COUNT;
+        if (maxVertexCount === void 0) maxVertexCount = 4096;
         this.engine = engine;
         this.maxVertexCount = maxVertexCount;
         this.primitiveChunks = new Array();
@@ -18923,9 +18931,6 @@ var ObjectPool = /*#__PURE__*/ function() {
     };
     return PrimitiveChunkManager;
 }();
-(function() {
-    /** The maximum number of vertex. */ PrimitiveChunkManager.MAX_VERTEX_COUNT = 4096;
-})();
 
 /**
  * @internal
@@ -20928,6 +20933,8 @@ var Collision = function Collision() {
         _this._setUpDirection = _this._setUpDirection.bind(_assert_this_initialized(_this));
         //@ts-ignore
         _this._upDirection._onValueChanged = _this._setUpDirection;
+        // sync world position to physical space
+        _this._onUpdate();
         return _this;
     }
     var _proto = CharacterController.prototype;
@@ -20938,7 +20945,9 @@ var Collision = function Collision() {
    * @param elapsedTime - Time elapsed since last call
    * @return flags - The ControllerCollisionFlag
    */ _proto.move = function move(disp, minDist, elapsedTime) {
-        return this._nativeCollider.move(disp, minDist, elapsedTime);
+        var flags = this._nativeCollider.move(disp, minDist, elapsedTime);
+        this._syncWorldPositionFromPhysicalSpace();
+        return flags;
     };
     /**
    * Add collider shape on this controller.
@@ -20974,8 +20983,7 @@ var Collision = function Collision() {
     /**
    * @internal
    */ _proto._onLateUpdate = function _onLateUpdate() {
-        var position = this.entity.transform.worldPosition;
-        this._nativeCollider.getWorldPosition(position);
+        this._syncWorldPositionFromPhysicalSpace();
         this._updateFlag.flag = false;
     };
     /**
@@ -20998,6 +21006,9 @@ var Collision = function Collision() {
             physics._removeColliderShape(shapes[i]);
         }
     };
+    _proto._syncWorldPositionFromPhysicalSpace = function _syncWorldPositionFromPhysicalSpace() {
+        this._nativeCollider.getWorldPosition(this.entity.transform.worldPosition);
+    };
     _proto._setUpDirection = function _setUpDirection() {
         this._nativeCollider.setUpDirection(this._upDirection);
     };
@@ -28682,7 +28693,9 @@ exports.AnimatorLayerBlendingMode = void 0;
         // Precalculate to get the transition
         srcPlayData.update(playDeltaTime);
         var clipTime = srcPlayData.clipTime, isForwards = srcPlayData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, layer.stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, state.transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        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);
         var playCostTime;
         if (transition) {
             var clipDuration = state.clip.length;
@@ -28766,7 +28779,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : dstPlayDeltaTime;
         }
-        var actualCostTime = dstPlaySpeed === 0 ? 0 : dstPlayCostTime / dstPlaySpeed;
+        var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
         var srcPlayCostTime = actualCostTime * srcPlaySpeed;
         srcPlayData.update(srcPlayCostTime);
         destPlayData.update(dstPlayCostTime);
@@ -28774,6 +28787,7 @@ exports.AnimatorLayerBlendingMode = void 0;
         (crossWeight >= 1.0 - miniprogram.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
+            srcPlayData.playState = AnimatorStatePlayState.Finished;
             this._preparePlayOwner(layerData, destState);
             this._evaluatePlayingState(destPlayData, weight, additive, aniUpdate);
         } else {
@@ -28828,7 +28842,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : playDeltaTime;
         }
-        var actualCostTime = playSpeed === 0 ? 0 : dstPlayCostTime / playSpeed;
+        var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
         destPlayData.update(dstPlayCostTime);
         var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
         (crossWeight >= 1.0 - miniprogram.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
@@ -28868,14 +28882,16 @@ exports.AnimatorLayerBlendingMode = void 0;
         }
     };
     _proto._updateFinishedState = function _updateFinishedState(layerIndex, layerData, layer, weight, additive, deltaTime, aniUpdate) {
-        var stateMachine = layer.stateMachine;
+        layer.stateMachine;
         var playData = layerData.srcPlayData;
         var state = playData.state;
         var actualSpeed = state.speed * this.speed;
         var actualDeltaTime = actualSpeed * deltaTime;
         playData.updateOrientation(actualDeltaTime);
         var clipTime = playData.clipTime, isForwards = playData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, state.transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        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);
         if (transition) {
             this._updateState(layerIndex, layerData, layer, deltaTime, aniUpdate);
         } else {

package/dist/module.js

@@ -10755,6 +10755,9 @@ var SubRenderElement = /*#__PURE__*/ function() {
 __decorate([
     assignmentClone
 ], SpriteMask.prototype, "influenceLayers", void 0);
+__decorate([
+    ignoreClone
+], SpriteMask.prototype, "_renderElement", void 0);
 __decorate([
     ignoreClone
 ], SpriteMask.prototype, "_subChunk", void 0);
@@ -11165,9 +11168,12 @@ var /**
         // Safari gets data confusion through getImageData when the canvas width is not an integer.
         // The measure text width of some special invisible characters may be 0, so make sure the width is at least 1.
         // @todo: Text layout may vary from standard and not support emoji.
-        var textMetrics = context.measureText(measureString);
+        var _context_measureText = context.measureText(measureString), actualBoundingBoxLeft = _context_measureText.actualBoundingBoxLeft, actualBoundingBoxRight = _context_measureText.actualBoundingBoxRight, actualWidth = _context_measureText.width;
         // In some case (ex: " "), actualBoundingBoxRight and actualBoundingBoxLeft will be 0, so use width.
-        var width = Math.max(1, Math.round(textMetrics.actualBoundingBoxRight - textMetrics.actualBoundingBoxLeft || textMetrics.width));
+        // TODO: With testing, actualBoundingBoxLeft + actualBoundingBoxRight is the actual rendering width
+        // but the space rules between characters are unclear. Using actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft) is the closest to the native effect.
+        var width = Math.max(1, Math.round(Math.max(actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft), actualWidth)));
+        // Make sure enough width.
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
@@ -11181,7 +11187,11 @@ var /**
         context.clearRect(0, 0, width, height);
         context.textBaseline = "middle";
         context.fillStyle = "#fff";
-        context.fillText(measureString, 0, baseline);
+        if (actualBoundingBoxLeft > 0) {
+            context.fillText(measureString, actualBoundingBoxLeft, baseline);
+        } else {
+            context.fillText(measureString, 0, baseline);
+        }
         var colorData = context.getImageData(0, 0, width, height).data;
         var len = colorData.length;
         var top = -1;
@@ -11225,9 +11235,9 @@ var /**
                 y: 0,
                 w: width,
                 h: size,
-                offsetX: 0,
+                offsetX: actualBoundingBoxLeft > 0 ? actualBoundingBoxLeft : 0,
                 offsetY: (ascent - descent) * 0.5,
-                xAdvance: width,
+                xAdvance: Math.round(actualWidth),
                 uvs: [
                     new Vector2(),
                     new Vector2(),
@@ -11796,7 +11806,7 @@ var /**
                             j === firstRow && (minX = Math.min(minX, left));
                             maxX = Math.max(maxX, right);
                         }
-                        startX += charInfo.xAdvance;
+                        startX += charInfo.xAdvance + charInfo.offsetX;
                     }
                 }
                 startY -= lineHeight;
@@ -12626,8 +12636,6 @@ var BufferUtil = /*#__PURE__*/ function() {
         _this = ReferResource1.call(this, engine) || this;
         /** @internal */ _this._renderStates = [] // todo: later will as a part of shaderData when shader effect frame is OK, that is more powerful and flexible.
         ;
-        /** @internal */ _this._priority = 0 // todo: temporary resolution of submesh rendering order issue.
-        ;
         _this._shaderData = new ShaderData(ShaderDataGroup.Material);
         _this.shader = shader;
         return _this;
@@ -18877,7 +18885,7 @@ var ObjectPool = /*#__PURE__*/ function() {
  * @internal
  */ var PrimitiveChunkManager = /*#__PURE__*/ function() {
     function PrimitiveChunkManager(engine, maxVertexCount) {
-        if (maxVertexCount === void 0) maxVertexCount = PrimitiveChunkManager.MAX_VERTEX_COUNT;
+        if (maxVertexCount === void 0) maxVertexCount = 4096;
         this.engine = engine;
         this.maxVertexCount = maxVertexCount;
         this.primitiveChunks = new Array();
@@ -18918,9 +18926,6 @@ var ObjectPool = /*#__PURE__*/ function() {
     };
     return PrimitiveChunkManager;
 }();
-(function() {
-    /** The maximum number of vertex. */ PrimitiveChunkManager.MAX_VERTEX_COUNT = 4096;
-})();
 
 /**
  * @internal
@@ -20923,6 +20928,8 @@ var Collision = function Collision() {
         _this._setUpDirection = _this._setUpDirection.bind(_assert_this_initialized(_this));
         //@ts-ignore
         _this._upDirection._onValueChanged = _this._setUpDirection;
+        // sync world position to physical space
+        _this._onUpdate();
         return _this;
     }
     var _proto = CharacterController.prototype;
@@ -20933,7 +20940,9 @@ var Collision = function Collision() {
    * @param elapsedTime - Time elapsed since last call
    * @return flags - The ControllerCollisionFlag
    */ _proto.move = function move(disp, minDist, elapsedTime) {
-        return this._nativeCollider.move(disp, minDist, elapsedTime);
+        var flags = this._nativeCollider.move(disp, minDist, elapsedTime);
+        this._syncWorldPositionFromPhysicalSpace();
+        return flags;
     };
     /**
    * Add collider shape on this controller.
@@ -20969,8 +20978,7 @@ var Collision = function Collision() {
     /**
    * @internal
    */ _proto._onLateUpdate = function _onLateUpdate() {
-        var position = this.entity.transform.worldPosition;
-        this._nativeCollider.getWorldPosition(position);
+        this._syncWorldPositionFromPhysicalSpace();
         this._updateFlag.flag = false;
     };
     /**
@@ -20993,6 +21001,9 @@ var Collision = function Collision() {
             physics._removeColliderShape(shapes[i]);
         }
     };
+    _proto._syncWorldPositionFromPhysicalSpace = function _syncWorldPositionFromPhysicalSpace() {
+        this._nativeCollider.getWorldPosition(this.entity.transform.worldPosition);
+    };
     _proto._setUpDirection = function _setUpDirection() {
         this._nativeCollider.setUpDirection(this._upDirection);
     };
@@ -28677,7 +28688,9 @@ var AnimatorLayerBlendingMode;
         // Precalculate to get the transition
         srcPlayData.update(playDeltaTime);
         var clipTime = srcPlayData.clipTime, isForwards = srcPlayData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, layer.stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, state.transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        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);
         var playCostTime;
         if (transition) {
             var clipDuration = state.clip.length;
@@ -28761,7 +28774,7 @@ var AnimatorLayerBlendingMode;
             playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : dstPlayDeltaTime;
         }
-        var actualCostTime = dstPlaySpeed === 0 ? 0 : dstPlayCostTime / dstPlaySpeed;
+        var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
         var srcPlayCostTime = actualCostTime * srcPlaySpeed;
         srcPlayData.update(srcPlayCostTime);
         destPlayData.update(dstPlayCostTime);
@@ -28769,6 +28782,7 @@ var AnimatorLayerBlendingMode;
         (crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
+            srcPlayData.playState = AnimatorStatePlayState.Finished;
             this._preparePlayOwner(layerData, destState);
             this._evaluatePlayingState(destPlayData, weight, additive, aniUpdate);
         } else {
@@ -28823,7 +28837,7 @@ var AnimatorLayerBlendingMode;
             playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : playDeltaTime;
         }
-        var actualCostTime = playSpeed === 0 ? 0 : dstPlayCostTime / playSpeed;
+        var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
         destPlayData.update(dstPlayCostTime);
         var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
         (crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
@@ -28863,14 +28877,16 @@ var AnimatorLayerBlendingMode;
         }
     };
     _proto._updateFinishedState = function _updateFinishedState(layerIndex, layerData, layer, weight, additive, deltaTime, aniUpdate) {
-        var stateMachine = layer.stateMachine;
+        layer.stateMachine;
         var playData = layerData.srcPlayData;
         var state = playData.state;
         var actualSpeed = state.speed * this.speed;
         var actualDeltaTime = actualSpeed * deltaTime;
         playData.updateOrientation(actualDeltaTime);
         var clipTime = playData.clipTime, isForwards = playData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, state.transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        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);
         if (transition) {
             this._updateState(layerIndex, layerData, layer, deltaTime, aniUpdate);
         } else {