@galacean/engine-core 1.0.0-beta.16 → 1.0.0-beta.18

package/dist/main.js

@@ -1598,6 +1598,11 @@ var Logger = {
         subFont.nativeFontString = fontString;
         for(var i = 0, n = subTexts.length; i < n; i++){
             var subText = subTexts[i];
+            // If subText is empty, push an empty line directly
+            if (subText.length === 0) {
+                this._pushLine(lines, lineWidths, lineMaxSizes, "", 0, 0, 0);
+                continue;
+            }
             var word = "";
             var wordWidth = 0;
             var wordMaxAscent = 0;
@@ -1625,7 +1630,10 @@ var Logger = {
                     // If it is a word before, need to handle the previous word and line
                     if (word.length > 0) {
                         if (lineWidth + wordWidth > wrapWidth) {
-                            this._pushLine(lines, lineWidths, lineMaxSizes, line, lineWidth, lineMaxAscent, lineMaxDescent);
+                            // Push if before line is not empty
+                            if (lineWidth > 0) {
+                                this._pushLine(lines, lineWidths, lineMaxSizes, line, lineWidth, lineMaxAscent, lineMaxDescent);
+                            }
                             textWidth = Math.max(textWidth, lineWidth);
                             notFirstLine = true;
                             line = word;
@@ -1670,7 +1678,10 @@ var Logger = {
                             line = "";
                             lineWidth = lineMaxAscent = lineMaxDescent = 0;
                         }
-                        this._pushLine(lines, lineWidths, lineMaxSizes, word, wordWidth, wordMaxAscent, wordMaxDescent);
+                        // Push if before word is not empty
+                        if (wordWidth > 0) {
+                            this._pushLine(lines, lineWidths, lineMaxSizes, word, wordWidth, wordMaxAscent, wordMaxDescent);
+                        }
                         textWidth = Math.max(textWidth, wordWidth);
                         notFirstLine = true;
                         word = char;
@@ -1689,11 +1700,15 @@ var Logger = {
                 // If the total width from line and word exceed wrap width
                 if (lineWidth + wordWidth > wrapWidth) {
                     // Push chars to a single line
-                    this._pushLine(lines, lineWidths, lineMaxSizes, line, lineWidth, lineMaxAscent, lineMaxDescent);
+                    if (lineWidth > 0) {
+                        this._pushLine(lines, lineWidths, lineMaxSizes, line, lineWidth, lineMaxAscent, lineMaxDescent);
+                    }
                     textWidth = Math.max(textWidth, lineWidth);
                     lineWidth = 0;
                     // Push word to a single line
-                    this._pushLine(lines, lineWidths, lineMaxSizes, word, wordWidth, wordMaxAscent, wordMaxDescent);
+                    if (wordWidth > 0) {
+                        this._pushLine(lines, lineWidths, lineMaxSizes, word, wordWidth, wordMaxAscent, wordMaxDescent);
+                    }
                     textWidth = Math.max(textWidth, wordWidth);
                 } else {
                     // Merge to chars
@@ -1725,23 +1740,20 @@ var Logger = {
         var subFont = renderer._subFont;
         var fontString = subFont.nativeFontString;
         var fontSizeInfo = TextUtils.measureFont(fontString);
-        var lines = renderer.text.split(/(?:\r\n|\r|\n)/);
-        var lineCount = lines.length;
+        var subTexts = renderer.text.split(/(?:\r\n|\r|\n)/);
+        var textCount = subTexts.length;
+        var lines = new Array();
         var lineWidths = new Array();
         var lineMaxSizes = new Array();
         var _pixelsPerUnit = Engine._pixelsPerUnit;
         var lineHeight = fontSizeInfo.size + renderer.lineSpacing * _pixelsPerUnit;
         var width = 0;
-        var height = renderer.height * _pixelsPerUnit;
-        if (renderer.overflowMode === exports.OverflowMode.Overflow) {
-            height = lineHeight * lineCount;
-        }
         subFont.nativeFontString = fontString;
-        for(var i = 0; i < lineCount; ++i){
-            var line = lines[i];
+        for(var i = 0; i < textCount; ++i){
+            var line = subTexts[i];
             var curWidth = 0;
-            var maxAscent = -1;
-            var maxDescent = -1;
+            var maxAscent = 0;
+            var maxDescent = 0;
             for(var j = 0, m = line.length; j < m; ++j){
                 var charInfo = TextUtils._getCharInfo(line[j], fontString, subFont);
                 curWidth += charInfo.xAdvance;
@@ -1752,16 +1764,15 @@ var Logger = {
                 maxAscent < ascent && (maxAscent = ascent);
                 maxDescent < descent && (maxDescent = descent);
             }
-            lineWidths[i] = curWidth;
-            lineMaxSizes[i] = {
-                ascent: maxAscent,
-                descent: maxDescent,
-                size: maxAscent + maxDescent
-            };
-            if (curWidth > width) {
-                width = curWidth;
+            if (curWidth > 0) {
+                this._pushLine(lines, lineWidths, lineMaxSizes, line, curWidth, maxAscent, maxDescent);
+                width = Math.max(width, curWidth);
             }
         }
+        var height = renderer.height * _pixelsPerUnit;
+        if (renderer.overflowMode === exports.OverflowMode.Overflow) {
+            height = lineHeight * lines.length;
+        }
         return {
             width: width,
             height: height,
@@ -2614,7 +2625,6 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
     function EventDispatcher() {
         this._events = Object.create(null);
         this._eventCount = 0;
-        this._dispatchingListeners = [];
     }
     var _proto = EventDispatcher.prototype;
     /**
@@ -2654,7 +2664,8 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
         if (Array.isArray(listeners)) {
             var count = listeners.length;
             // cloning list to avoid structure breaking
-            var dispatchingListeners = this._dispatchingListeners;
+            var pool = EventDispatcher._dispatchingListenersPool;
+            var dispatchingListeners = pool.length > 0 ? pool.pop() : [];
             dispatchingListeners.length = count;
             for(var i = 0; i < count; i++){
                 dispatchingListeners[i] = listeners[i];
@@ -2668,6 +2679,7 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
             }
             // remove hooked function to avoid gc problem
             dispatchingListeners.length = 0;
+            pool.push(dispatchingListeners);
         } else {
             if (listeners.once) this.off(event, listeners.fn);
             listeners.fn(data);
@@ -2768,6 +2780,9 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
     };
     return EventDispatcher;
 }();
+(function() {
+    EventDispatcher._dispatchingListenersPool = [];
+})();
 
 /**
  * Shader property.
@@ -4767,6 +4782,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
             cloneEntity._hookResource = hookResource;
             hookResource._addReferCount(1);
         }
+        cloneEntity.layer = this.layer;
         cloneEntity._isActive = this._isActive;
         cloneEntity.transform.localMatrix = this.transform.localMatrix;
         var children = this._children;
@@ -13734,6 +13750,15 @@ var VertexChangedFlags;
     };
     /**
    * @internal
+   */ _proto._prepareRender = function _prepareRender(context) {
+        if (!this._mesh) {
+            Logger.error("mesh is null.");
+            return;
+        }
+        Renderer.prototype._prepareRender.call(this, context);
+    };
+    /**
+   * @internal
    */ _proto._cloneTo = function _cloneTo(target) {
         Renderer.prototype._cloneTo.call(this, target);
         target.mesh = this._mesh;
@@ -13755,49 +13780,45 @@ var VertexChangedFlags;
    * @internal
    */ _proto._render = function _render(context) {
         var mesh = this._mesh;
-        if (mesh) {
-            if (this._dirtyUpdateFlag & 0x2) {
-                var shaderData = this.shaderData;
-                var vertexElements = mesh._vertexElements;
-                shaderData.disableMacro(MeshRenderer._uvMacro);
-                shaderData.disableMacro(MeshRenderer._uv1Macro);
-                shaderData.disableMacro(MeshRenderer._normalMacro);
-                shaderData.disableMacro(MeshRenderer._tangentMacro);
-                shaderData.disableMacro(MeshRenderer._enableVertexColorMacro);
-                for(var i = 0, n = vertexElements.length; i < n; i++){
-                    switch(vertexElements[i].semantic){
-                        case "TEXCOORD_0":
-                            shaderData.enableMacro(MeshRenderer._uvMacro);
-                            break;
-                        case "TEXCOORD_1":
-                            shaderData.enableMacro(MeshRenderer._uv1Macro);
-                            break;
-                        case "NORMAL":
-                            shaderData.enableMacro(MeshRenderer._normalMacro);
-                            break;
-                        case "TANGENT":
-                            shaderData.enableMacro(MeshRenderer._tangentMacro);
-                            break;
-                        case "COLOR_0":
-                            this._enableVertexColor && shaderData.enableMacro(MeshRenderer._enableVertexColorMacro);
-                            break;
-                    }
+        if (this._dirtyUpdateFlag & 0x2) {
+            var shaderData = this.shaderData;
+            var vertexElements = mesh._vertexElements;
+            shaderData.disableMacro(MeshRenderer._uvMacro);
+            shaderData.disableMacro(MeshRenderer._uv1Macro);
+            shaderData.disableMacro(MeshRenderer._normalMacro);
+            shaderData.disableMacro(MeshRenderer._tangentMacro);
+            shaderData.disableMacro(MeshRenderer._enableVertexColorMacro);
+            for(var i = 0, n = vertexElements.length; i < n; i++){
+                switch(vertexElements[i].semantic){
+                    case "TEXCOORD_0":
+                        shaderData.enableMacro(MeshRenderer._uvMacro);
+                        break;
+                    case "TEXCOORD_1":
+                        shaderData.enableMacro(MeshRenderer._uv1Macro);
+                        break;
+                    case "NORMAL":
+                        shaderData.enableMacro(MeshRenderer._normalMacro);
+                        break;
+                    case "TANGENT":
+                        shaderData.enableMacro(MeshRenderer._tangentMacro);
+                        break;
+                    case "COLOR_0":
+                        this._enableVertexColor && shaderData.enableMacro(MeshRenderer._enableVertexColorMacro);
+                        break;
                 }
-                this._dirtyUpdateFlag &= ~0x2;
             }
-            var materials = this._materials;
-            var subMeshes = mesh.subMeshes;
-            var renderPipeline = context.camera._renderPipeline;
-            var meshRenderDataPool = this._engine._meshRenderDataPool;
-            for(var i1 = 0, n1 = subMeshes.length; i1 < n1; i1++){
-                var material = materials[i1];
-                if (!material) continue;
-                var renderData = meshRenderDataPool.getFromPool();
-                renderData.set(this, material, mesh, subMeshes[i1]);
-                renderPipeline.pushRenderData(context, renderData);
-            }
-        } else {
-            Logger.error("mesh is null.");
+            this._dirtyUpdateFlag &= ~0x2;
+        }
+        var materials = this._materials;
+        var subMeshes = mesh.subMeshes;
+        var renderPipeline = context.camera._renderPipeline;
+        var meshRenderDataPool = this._engine._meshRenderDataPool;
+        for(var i1 = 0, n1 = subMeshes.length; i1 < n1; i1++){
+            var material = materials[i1];
+            if (!material) continue;
+            var renderData = meshRenderDataPool.getFromPool();
+            renderData.set(this, material, mesh, subMeshes[i1]);
+            renderPipeline.pushRenderData(context, renderData);
         }
     };
     _proto._setMesh = function _setMesh(mesh) {
@@ -19556,18 +19577,10 @@ var defaultInterval = 500;
         var _config_type;
         config.type = (_config_type = config.type) != null ? _config_type : getMimeTypeFromUrl(url);
         var realRequest = config.type === "image" ? requestImage : requestRes;
-        var lastError;
         var executor = new MultiExecutor(function() {
-            return realRequest(url, config).onProgress(setProgress).then(function(res) {
-                resolve(res);
-                executor.stop();
-            }).catch(function(err) {
-                return lastError = err;
-            });
+            return realRequest(url, config).onProgress(setProgress);
         }, retryCount, retryInterval);
-        executor.start(function() {
-            reject(lastError);
-        });
+        executor.start().onError(reject).onComplete(resolve);
     });
 }
 function requestImage(url, config) {
@@ -19654,23 +19667,33 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this.exec = this.exec.bind(this);
     }
     var _proto = MultiExecutor.prototype;
-    _proto.start = function start(done) {
-        this.done = done;
+    _proto.start = function start() {
         this.exec();
+        return this;
     };
-    _proto.stop = function stop() {
-        clearTimeout(this._timeoutId);
+    _proto.onComplete = function onComplete(func) {
+        this._onComplete = func;
+        return this;
+    };
+    _proto.onError = function onError(func) {
+        this._onError = func;
+        return this;
+    };
+    _proto.cancel = function cancel() {
+        window.clearTimeout(this._timeoutId);
     };
     _proto.exec = function exec() {
         var _this = this;
         if (this._currentCount >= this.totalCount) {
-            this.done && this.done();
+            this._onError && this._onError(this._error);
             return;
         }
         this._currentCount++;
-        this.execFunc(this._currentCount).then(function() {
-            //@ts-ignore
-            _this._timeoutId = setTimeout(_this.exec, _this.interval);
+        this.execFunc(this._currentCount).then(function(result) {
+            return _this._onComplete && _this._onComplete(result);
+        }).catch(function(e) {
+            _this._error = e;
+            _this._timeoutId = window.setTimeout(_this.exec, _this.interval);
         });
     };
     return MultiExecutor;
@@ -22303,92 +22326,97 @@ var /**
         }
     };
     _proto._updateLocalData = function _updateLocalData() {
-        var _this = this, color = _this.color, horizontalAlignment = _this.horizontalAlignment, verticalAlignment = _this.verticalAlignment, charRenderDatas = _this._charRenderDatas;
+        var _this = this, color = _this.color, charRenderDatas = _this._charRenderDatas, charFont = _this._subFont;
         var _this__localBounds = this._localBounds, min = _this__localBounds.min, max = _this__localBounds.max;
-        var _pixelsPerUnit = Engine._pixelsPerUnit;
-        var pixelsPerUnitReciprocal = 1.0 / _pixelsPerUnit;
-        var charFont = this._subFont;
-        var rendererWidth = this.width * _pixelsPerUnit;
-        var halfRendererWidth = rendererWidth * 0.5;
-        var rendererHeight = this.height * _pixelsPerUnit;
         var textMetrics = this.enableWrapping ? TextUtils.measureTextWithWrap(this) : TextUtils.measureTextWithoutWrap(this);
         var height = textMetrics.height, lines = textMetrics.lines, lineWidths = textMetrics.lineWidths, lineHeight = textMetrics.lineHeight, lineMaxSizes = textMetrics.lineMaxSizes;
         var charRenderDataPool = TextRenderer._charRenderDataPool;
-        var halfLineHeight = lineHeight * 0.5;
         var linesLen = lines.length;
-        var startY = 0;
-        var topDiff = lineHeight * 0.5 - lineMaxSizes[0].ascent;
-        var bottomDiff = lineHeight * 0.5 - lineMaxSizes[linesLen - 1].descent - 1;
-        switch(verticalAlignment){
-            case exports.TextVerticalAlignment.Top:
-                startY = rendererHeight * 0.5 - halfLineHeight + topDiff;
-                break;
-            case exports.TextVerticalAlignment.Center:
-                startY = height * 0.5 - halfLineHeight - (bottomDiff - topDiff) * 0.5;
-                break;
-            case exports.TextVerticalAlignment.Bottom:
-                startY = height - rendererHeight * 0.5 - halfLineHeight - bottomDiff;
-                break;
-        }
         var renderDataCount = 0;
-        var firstLine = -1;
-        var minX = Number.MAX_SAFE_INTEGER;
-        var minY = Number.MAX_SAFE_INTEGER;
-        var maxX = Number.MIN_SAFE_INTEGER;
-        var maxY = Number.MIN_SAFE_INTEGER;
-        for(var i = 0; i < linesLen; ++i){
-            var lineWidth = lineWidths[i];
-            if (lineWidth > 0) {
-                var line = lines[i];
-                var startX = 0;
-                var firstRow = -1;
-                if (firstLine < 0) {
-                    firstLine = i;
-                }
-                switch(horizontalAlignment){
-                    case exports.TextHorizontalAlignment.Left:
-                        startX = -halfRendererWidth;
-                        break;
-                    case exports.TextHorizontalAlignment.Center:
-                        startX = -lineWidth * 0.5;
-                        break;
-                    case exports.TextHorizontalAlignment.Right:
-                        startX = halfRendererWidth - lineWidth;
-                        break;
-                }
-                for(var j = 0, n = line.length; j < n; ++j){
-                    var char = line[j];
-                    var charInfo = charFont._getCharInfo(char);
-                    if (charInfo.h > 0) {
-                        var _charRenderDatas, _ref;
-                        firstRow < 0 && (firstRow = j);
-                        var charRenderData = (_charRenderDatas = charRenderDatas)[_ref = renderDataCount++] || (_charRenderDatas[_ref] = charRenderDataPool.get());
-                        var renderData = charRenderData.renderData, localPositions = charRenderData.localPositions;
-                        charRenderData.texture = charFont._getTextureByIndex(charInfo.index);
-                        renderData.color = color;
-                        renderData.uvs = charInfo.uvs;
-                        var w = charInfo.w, ascent = charInfo.ascent, descent = charInfo.descent;
-                        var left = startX * pixelsPerUnitReciprocal;
-                        var right = (startX + w) * pixelsPerUnitReciprocal;
-                        var top = (startY + ascent) * pixelsPerUnitReciprocal;
-                        var bottom = (startY - descent + 1) * pixelsPerUnitReciprocal;
-                        localPositions.set(left, top, right, bottom);
-                        i === firstLine && (maxY = Math.max(maxY, top));
-                        minY = Math.min(minY, bottom);
-                        j === firstRow && (minX = Math.min(minX, left));
-                        maxX = Math.max(maxX, right);
+        if (linesLen > 0) {
+            var _pixelsPerUnit = Engine._pixelsPerUnit;
+            var horizontalAlignment = this.horizontalAlignment;
+            var pixelsPerUnitReciprocal = 1.0 / _pixelsPerUnit;
+            var rendererWidth = this.width * _pixelsPerUnit;
+            var halfRendererWidth = rendererWidth * 0.5;
+            var rendererHeight = this.height * _pixelsPerUnit;
+            var halfLineHeight = lineHeight * 0.5;
+            var startY = 0;
+            var topDiff = lineHeight * 0.5 - lineMaxSizes[0].ascent;
+            var bottomDiff = lineHeight * 0.5 - lineMaxSizes[linesLen - 1].descent - 1;
+            switch(this.verticalAlignment){
+                case exports.TextVerticalAlignment.Top:
+                    startY = rendererHeight * 0.5 - halfLineHeight + topDiff;
+                    break;
+                case exports.TextVerticalAlignment.Center:
+                    startY = height * 0.5 - halfLineHeight - (bottomDiff - topDiff) * 0.5;
+                    break;
+                case exports.TextVerticalAlignment.Bottom:
+                    startY = height - rendererHeight * 0.5 - halfLineHeight - bottomDiff;
+                    break;
+            }
+            var firstLine = -1;
+            var minX = Number.MAX_SAFE_INTEGER;
+            var minY = Number.MAX_SAFE_INTEGER;
+            var maxX = Number.MIN_SAFE_INTEGER;
+            var maxY = Number.MIN_SAFE_INTEGER;
+            for(var i = 0; i < linesLen; ++i){
+                var lineWidth = lineWidths[i];
+                if (lineWidth > 0) {
+                    var line = lines[i];
+                    var startX = 0;
+                    var firstRow = -1;
+                    if (firstLine < 0) {
+                        firstLine = i;
+                    }
+                    switch(horizontalAlignment){
+                        case exports.TextHorizontalAlignment.Left:
+                            startX = -halfRendererWidth;
+                            break;
+                        case exports.TextHorizontalAlignment.Center:
+                            startX = -lineWidth * 0.5;
+                            break;
+                        case exports.TextHorizontalAlignment.Right:
+                            startX = halfRendererWidth - lineWidth;
+                            break;
+                    }
+                    for(var j = 0, n = line.length; j < n; ++j){
+                        var char = line[j];
+                        var charInfo = charFont._getCharInfo(char);
+                        if (charInfo.h > 0) {
+                            var _charRenderDatas, _ref;
+                            firstRow < 0 && (firstRow = j);
+                            var charRenderData = (_charRenderDatas = charRenderDatas)[_ref = renderDataCount++] || (_charRenderDatas[_ref] = charRenderDataPool.get());
+                            var renderData = charRenderData.renderData, localPositions = charRenderData.localPositions;
+                            charRenderData.texture = charFont._getTextureByIndex(charInfo.index);
+                            renderData.color = color;
+                            renderData.uvs = charInfo.uvs;
+                            var w = charInfo.w, ascent = charInfo.ascent, descent = charInfo.descent;
+                            var left = startX * pixelsPerUnitReciprocal;
+                            var right = (startX + w) * pixelsPerUnitReciprocal;
+                            var top = (startY + ascent) * pixelsPerUnitReciprocal;
+                            var bottom = (startY - descent + 1) * pixelsPerUnitReciprocal;
+                            localPositions.set(left, top, right, bottom);
+                            i === firstLine && (maxY = Math.max(maxY, top));
+                            minY = Math.min(minY, bottom);
+                            j === firstRow && (minX = Math.min(minX, left));
+                            maxX = Math.max(maxX, right);
+                        }
+                        startX += charInfo.xAdvance;
                     }
-                    startX += charInfo.xAdvance;
                 }
+                startY -= lineHeight;
             }
-            startY -= lineHeight;
-        }
-        if (firstLine < 0) {
+            if (firstLine < 0) {
+                min.set(0, 0, 0);
+                max.set(0, 0, 0);
+            } else {
+                min.set(minX, minY, 0);
+                max.set(maxX, maxY, 0);
+            }
+        } else {
             min.set(0, 0, 0);
             max.set(0, 0, 0);
-        } else {
-            min.set(minX, minY, 0);
-            max.set(maxX, maxY, 0);
         }
         // Revert excess render data to pool.
         var lastRenderDataCount = charRenderDatas.length;
@@ -24404,7 +24432,8 @@ exports.AnimatorLayerBlendingMode = void 0;
     };
     _proto._saveAnimatorEventHandlers = function _saveAnimatorEventHandlers(state, animatorStateData) {
         var eventHandlerPool = this._animationEventHandlerPool;
-        var scripts = this._entity._scripts;
+        var scripts = [];
+        this._entity.getComponents(Script, scripts);
         var scriptCount = scripts.length;
         var eventHandlers = animatorStateData.eventHandlers;
         var events = state.clip.events;
@@ -24417,7 +24446,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             eventHandler.event = event;
             handlers.length = 0;
             for(var j = scriptCount - 1; j >= 0; j--){
-                var handler = scripts.get(j)[funcName];
+                var handler = scripts[j][funcName];
                 handler && handlers.push(handler);
             }
             eventHandlers.push(eventHandler);