@galacean/engine 1.0.0-beta.17 → 1.0.0-beta.18

package/dist/browser.js

@@ -6483,6 +6483,11 @@
             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;
@@ -6510,7 +6515,10 @@
                         // 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;
@@ -6555,7 +6563,10 @@
                                 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;
@@ -6574,11 +6585,15 @@
                     // 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
@@ -6610,23 +6625,20 @@
             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;
@@ -6637,16 +6649,15 @@
                     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,
@@ -7492,7 +7503,6 @@
         var EventDispatcher = function EventDispatcher() {
             this._events = Object.create(null);
             this._eventCount = 0;
-            this._dispatchingListeners = [];
         };
         var _proto = EventDispatcher.prototype;
         /**
@@ -7532,7 +7542,8 @@
             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];
@@ -7546,6 +7557,7 @@
                 }
                 // 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);
@@ -7646,6 +7658,9 @@
         };
         return EventDispatcher;
     }();
+    (function() {
+        EventDispatcher._dispatchingListenersPool = [];
+    })();
     /**
      * Shader property.
      */ var ShaderProperty = /*#__PURE__*/ function() {
@@ -18429,6 +18444,15 @@
         };
         /**
        * @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;
@@ -18450,49 +18474,45 @@
        * @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) {
@@ -24189,18 +24209,10 @@
             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) {
@@ -24287,23 +24299,33 @@
             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;
@@ -26914,92 +26936,97 @@
             }
         };
         _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;
@@ -28982,7 +29009,8 @@
         };
         _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;
@@ -28995,7 +29023,7 @@
                 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);
@@ -34038,15 +34066,18 @@
                             for(var _iterator2 = _create_for_of_iterator_helper_loose(meshInfo.blendShapes), _step2; !(_step2 = _iterator2()).done;){
                                 var restoreInfo = _step2.value;
                                 var frame = restoreInfo.blendShape.frames[0];
-                                var positionData = _this._getBufferData(buffers, restoreInfo.position);
-                                frame.deltaPositions = GLTFUtils.floatBufferToVector3Array(positionData);
+                                var position = restoreInfo.position;
+                                var positionData = _this._getBufferData(buffers, position.buffer);
+                                frame.deltaPositions = GLTFUtils.bufferToVector3Array(positionData, position.stride, position.byteOffset, position.count);
                                 if (restoreInfo.normal) {
-                                    var normalData = _this._getBufferData(buffers, restoreInfo.normal);
-                                    frame.deltaNormals = GLTFUtils.floatBufferToVector3Array(normalData);
+                                    var normal = restoreInfo.normal;
+                                    var normalData = _this._getBufferData(buffers, normal.buffer);
+                                    frame.deltaNormals = GLTFUtils.bufferToVector3Array(normalData, normal.stride, normal.byteOffset, normal.count);
                                 }
                                 if (restoreInfo.tangent) {
-                                    var tangentData = _this._getBufferData(buffers, restoreInfo.tangent);
-                                    frame.deltaTangents = GLTFUtils.floatBufferToVector3Array(tangentData);
+                                    var tangent = restoreInfo.tangent;
+                                    var tangentData = _this._getBufferData(buffers, tangent.buffer);
+                                    frame.deltaTangents = GLTFUtils.bufferToVector3Array(tangentData, tangent.stride, tangent.byteOffset, tangent.count);
                                 }
                             }
                             mesh.uploadData(true);
@@ -34130,6 +34161,14 @@
         this.normal = normal;
         this.tangent = tangent;
     };
+    /**
+     * @internal
+     */ var BlendShapeDataRestoreInfo = function BlendShapeDataRestoreInfo(buffer, stride, byteOffset, count) {
+        this.buffer = buffer;
+        this.stride = stride;
+        this.byteOffset = byteOffset;
+        this.count = count;
+    };
     /**
      * Module for glTF 2.0 Interface
      */ var AccessorComponentType;
@@ -34428,8 +34467,10 @@
             return context.getBuffers().then(function(buffers) {
                 var bufferIndex = bufferView.buffer;
                 var buffer = buffers[bufferIndex];
-                var bufferByteOffset = bufferView.byteOffset || 0;
-                var byteOffset = accessor.byteOffset || 0;
+                var _bufferView_byteOffset;
+                var bufferByteOffset = (_bufferView_byteOffset = bufferView.byteOffset) != null ? _bufferView_byteOffset : 0;
+                var _accessor_byteOffset;
+                var byteOffset = (_accessor_byteOffset = accessor.byteOffset) != null ? _accessor_byteOffset : 0;
                 var TypedArray = GLTFUtils.getComponentType(componentType);
                 var dataElementSize = GLTFUtils.getAccessorTypeSize(accessor.type);
                 var dataElementBytes = TypedArray.BYTES_PER_ELEMENT;
@@ -34463,6 +34504,17 @@
                 return bufferInfo;
             });
         };
+        GLTFUtils.bufferToVector3Array = function bufferToVector3Array(data, byteStride, accessorByteOffset, count) {
+            var bytesPerElement = data.BYTES_PER_ELEMENT;
+            var offset = accessorByteOffset % byteStride / bytesPerElement;
+            var stride = byteStride / bytesPerElement;
+            var vector3s = new Array(count);
+            for(var i = 0; i < count; i++){
+                var index = offset + i * stride;
+                vector3s[i] = new Vector3(data[index], data[index + 1], data[index + 2]);
+            }
+            return vector3s;
+        };
         /**
        * @deprecated
        * Get accessor data.
@@ -35556,7 +35608,7 @@
                 }
                 // BlendShapes
                 if (targets) {
-                    promises.push(GLTFMeshParser._createBlendShape(mesh, meshRestoreInfo, gltfMesh, targets, getBlendShapeData));
+                    promises.push(GLTFMeshParser._createBlendShape(mesh, meshRestoreInfo, gltfMesh, accessors, targets, getBlendShapeData));
                 }
                 return Promise.all(promises).then(function() {
                     mesh.uploadData(!keepMeshData);
@@ -35572,7 +35624,7 @@
         };
         /**
        * @internal
-       */ GLTFMeshParser._createBlendShape = function _createBlendShape(mesh, meshRestoreInfo, glTFMesh, glTFTargets, getBlendShapeData) {
+       */ GLTFMeshParser._createBlendShape = function _createBlendShape(mesh, meshRestoreInfo, glTFMesh, accessors, glTFTargets, getBlendShapeData) {
             var _loop = function _loop(i, n) {
                 var name = blendShapeNames ? blendShapeNames[i] : "blendShape" + i;
                 var promise = Promise.all([
@@ -35580,16 +35632,36 @@
                     getBlendShapeData("NORMAL", i),
                     getBlendShapeData("TANGENT", i)
                 ]).then(function(infos) {
-                    var deltaPosBufferInfo = infos[0];
-                    var deltaNorBufferInfo = infos[1];
-                    var deltaTanBufferInfo = infos[2];
-                    var deltaPositions = deltaPosBufferInfo.data ? GLTFUtils.floatBufferToVector3Array(deltaPosBufferInfo.data) : null;
-                    var deltaNormals = (deltaNorBufferInfo == null ? void 0 : deltaNorBufferInfo.data) ? GLTFUtils.floatBufferToVector3Array(deltaNorBufferInfo == null ? void 0 : deltaNorBufferInfo.data) : null;
-                    var deltaTangents = (deltaTanBufferInfo == null ? void 0 : deltaTanBufferInfo.data) ? GLTFUtils.floatBufferToVector3Array(deltaTanBufferInfo == null ? void 0 : deltaTanBufferInfo.data) : null;
+                    var posBufferInfo = infos[0];
+                    var norBufferInfo = infos[1];
+                    var tanBufferInfo = infos[2];
+                    var target = glTFTargets[i];
+                    var posAccessor;
+                    var norAccessor;
+                    var tanAccessor;
+                    var positions = null;
+                    if (posBufferInfo) {
+                        posAccessor = accessors[target["POSITION"]];
+                        var _posAccessor_byteOffset;
+                        positions = GLTFUtils.bufferToVector3Array(posBufferInfo.data, posBufferInfo.stride, (_posAccessor_byteOffset = posAccessor.byteOffset) != null ? _posAccessor_byteOffset : 0, posAccessor.count);
+                    }
+                    var normals = null;
+                    if (norBufferInfo) {
+                        norAccessor = accessors[target["NORMAL"]];
+                        var _norAccessor_byteOffset;
+                        normals = GLTFUtils.bufferToVector3Array(norBufferInfo.data, norBufferInfo.stride, (_norAccessor_byteOffset = norAccessor.byteOffset) != null ? _norAccessor_byteOffset : 0, norAccessor.count);
+                    }
+                    var tangents = null;
+                    if (tanBufferInfo) {
+                        tanAccessor = accessors[target["NORMAL"]];
+                        var _tanAccessor_byteOffset;
+                        tangents = GLTFUtils.bufferToVector3Array(tanBufferInfo.data, tanBufferInfo.stride, (_tanAccessor_byteOffset = tanAccessor.byteOffset) != null ? _tanAccessor_byteOffset : 0, tanAccessor.count);
+                    }
                     var blendShape = new BlendShape(name);
-                    blendShape.addFrame(1.0, deltaPositions, deltaNormals, deltaTangents);
+                    blendShape.addFrame(1.0, positions, normals, tangents);
                     mesh.addBlendShape(blendShape);
-                    meshRestoreInfo.blendShapes.push(new BlendShapeRestoreInfo(blendShape, deltaPosBufferInfo.restoreInfo, deltaNorBufferInfo == null ? void 0 : deltaNorBufferInfo.restoreInfo, deltaTanBufferInfo == null ? void 0 : deltaTanBufferInfo.restoreInfo));
+                    var _posAccessor_byteOffset1, _norAccessor_byteOffset1, _tanAccessor_byteOffset1;
+                    meshRestoreInfo.blendShapes.push(new BlendShapeRestoreInfo(blendShape, new BlendShapeDataRestoreInfo(posBufferInfo.restoreInfo, posBufferInfo.stride, (_posAccessor_byteOffset1 = posAccessor.byteOffset) != null ? _posAccessor_byteOffset1 : 0, posAccessor.count), norBufferInfo ? new BlendShapeDataRestoreInfo(norBufferInfo.restoreInfo, norBufferInfo.stride, (_norAccessor_byteOffset1 = norAccessor.byteOffset) != null ? _norAccessor_byteOffset1 : 0, norAccessor.count) : null, tanBufferInfo ? new BlendShapeDataRestoreInfo(tanBufferInfo.restoreInfo, tanBufferInfo.stride, (_tanAccessor_byteOffset1 = tanAccessor.byteOffset) != null ? _tanAccessor_byteOffset1 : 0, tanAccessor.count) : null));
                 });
                 promises.push(promise);
             };
@@ -35916,13 +35988,13 @@
         };
         _proto._parseSampler = function _parseSampler(texture, samplerInfo) {
             var filterMode = samplerInfo.filterMode, wrapModeU = samplerInfo.wrapModeU, wrapModeV = samplerInfo.wrapModeV;
-            if (filterMode) {
+            if (filterMode !== undefined) {
                 texture.filterMode = filterMode;
             }
-            if (wrapModeU) {
+            if (wrapModeU !== undefined) {
                 texture.wrapModeU = wrapModeU;
             }
-            if (wrapModeV) {
+            if (wrapModeV !== undefined) {
                 texture.wrapModeV = wrapModeV;
             }
         };
@@ -36056,7 +36128,7 @@
                 resourceManager.addContentRestorer(restorer);
                 masterPromiseInfo.resolve(glTFResource);
             }).catch(function(e) {
-                var msg = "Error loading glTF model from " + url + " .";
+                var msg = "Error loading glTF model from " + url + " : " + e;
                 Logger.error(msg);
                 masterPromiseInfo.reject(msg);
                 context.defaultSceneRootPromiseInfo.reject(e);
@@ -38251,7 +38323,7 @@
                 mesh.addSubMesh(0, vertexCount, mode);
             }
             // BlendShapes
-            targets && GLTFMeshParser._createBlendShape(mesh, null, gltfMesh, targets, getBlendShapeData);
+            targets && GLTFMeshParser._createBlendShape(mesh, null, gltfMesh, accessors, targets, getBlendShapeData);
             mesh.uploadData(!keepMeshData);
             return Promise.resolve(mesh);
         };
@@ -38477,7 +38549,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.0.0-beta.17";
+    var version = "1.0.0-beta.18";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);