@galacean/engine 1.3.3 → 1.3.6

package/dist/browser.js

@@ -15560,6 +15560,9 @@
     __decorate$1([
         assignmentClone
     ], SpriteMask.prototype, "influenceLayers", void 0);
+    __decorate$1([
+        ignoreClone
+    ], SpriteMask.prototype, "_renderElement", void 0);
     __decorate$1([
         ignoreClone
     ], SpriteMask.prototype, "_subChunk", void 0);
@@ -15967,9 +15970,12 @@
             // 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;
@@ -15983,7 +15989,11 @@
             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;
@@ -16027,9 +16037,9 @@
                     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(),
@@ -16594,7 +16604,7 @@
                                 j === firstRow && (minX = Math.min(minX, left));
                                 maxX = Math.max(maxX, right);
                             }
-                            startX += charInfo.xAdvance;
+                            startX += charInfo.xAdvance + charInfo.offsetX;
                         }
                     }
                     startY -= lineHeight;
@@ -17411,8 +17421,6 @@
             _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;
@@ -23619,12 +23627,12 @@
     /**
      * @internal
      */ var PrimitiveChunkManager = /*#__PURE__*/ function() {
-        function PrimitiveChunkManager(engine, maxVertexCount) {
-            if (maxVertexCount === void 0) maxVertexCount = PrimitiveChunkManager.MAX_VERTEX_COUNT;
+        var PrimitiveChunkManager = function PrimitiveChunkManager(engine, maxVertexCount) {
+            if (maxVertexCount === void 0) maxVertexCount = 4096;
             this.engine = engine;
             this.maxVertexCount = maxVertexCount;
             this.primitiveChunks = new Array();
-        }
+        };
         var _proto = PrimitiveChunkManager.prototype;
         _proto.allocateSubChunk = function allocateSubChunk(vertexCount) {
             var _primitiveChunks, _length;
@@ -23661,9 +23669,6 @@
         };
         return PrimitiveChunkManager;
     }();
-    (function() {
-        /** The maximum number of vertex. */ PrimitiveChunkManager.MAX_VERTEX_COUNT = 4096;
-    })();
     /**
      * @internal
      */ var BatcherManager = /*#__PURE__*/ function() {
@@ -25643,6 +25648,8 @@
             _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;
         };
         _inherits$2(CharacterController, Collider1);
@@ -25654,7 +25661,9 @@
        * @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.
@@ -25690,8 +25699,7 @@
         /**
        * @internal
        */ _proto._onLateUpdate = function _onLateUpdate() {
-            var position = this.entity.transform.worldPosition;
-            this._nativeCollider.getWorldPosition(position);
+            this._syncWorldPositionFromPhysicalSpace();
             this._updateFlag.flag = false;
         };
         /**
@@ -25714,6 +25722,9 @@
                 physics._removeColliderShape(shapes[i]);
             }
         };
+        _proto._syncWorldPositionFromPhysicalSpace = function _syncWorldPositionFromPhysicalSpace() {
+            this._nativeCollider.getWorldPosition(this.entity.transform.worldPosition);
+        };
         _proto._setUpDirection = function _setUpDirection() {
             this._nativeCollider.setUpDirection(this._upDirection);
         };
@@ -33268,7 +33279,9 @@
             // 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;
@@ -33350,7 +33363,7 @@
                 dstPlayCostTime = // > transition: The time that will be played is enough to finish the transition
                 playedTime - dstPlayDeltaTime > transitionDuration ? 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);
@@ -33358,6 +33371,7 @@
             (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 {
@@ -33410,7 +33424,7 @@
                 dstPlayCostTime = // > transition: The time that will be played is enough to finish the transition
                 playedTime - playDeltaTime > transitionDuration ? 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);
@@ -33450,14 +33464,16 @@
             }
         };
         _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 {
@@ -48070,7 +48086,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.3.3";
+    var version = "1.3.6";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);