@galacean/engine 1.2.0-beta.0 → 1.2.0-beta.2

package/dist/browser.js

@@ -5599,7 +5599,7 @@
             if (Utils.isBase64Url(relativeUrl)) {
                 return relativeUrl;
             }
-            return relativeUrl ? baseUrl.replace(/\/+$/, "") + "/" + relativeUrl.replace(/^\/+/, "") : baseUrl;
+            return relativeUrl ? new URL(relativeUrl, baseUrl).href : baseUrl;
         };
         /**
        * @internal
@@ -5742,14 +5742,6 @@
             });
             return result;
         };
-        Utils._formatRelativePath = function _formatRelativePath(path) {
-            // For example input is "a/b", "/a/b", "./a/b", "./a/./b", "./a/../a/b", output is "a/b"
-            return path.split("/").filter(Boolean).reduce(function(acc, cur) {
-                if (cur === "..") acc.pop();
-                else if (cur !== ".") acc.push(cur);
-                return acc;
-            }, []).join("/");
-        };
         Utils._insertionSort = function _insertionSort(a, from, to, compareFunc) {
             for(var i = from + 1; i < to; i++){
                 var j = void 0;
@@ -6630,6 +6622,7 @@
         GLCapabilityType["colorBufferHalfFloat"] = "EXT_color_buffer_half_float";
         GLCapabilityType["textureFilterAnisotropic"] = "EXT_texture_filter_anisotropic";
         GLCapabilityType["blendMinMax"] = "EXT_blend_minmax";
+        GLCapabilityType["fragDepth"] = "EXT_frag_depth";
         GLCapabilityType["astc"] = "WEBGL_compressed_texture_astc";
         GLCapabilityType["astc_webkit"] = "WEBKIT_WEBGL_compressed_texture_astc";
         GLCapabilityType["etc"] = "WEBGL_compressed_texture_etc";
@@ -8300,23 +8293,34 @@
        * @param shader - code
        * @param isFrag - Whether it is a fragment shader.
        * */ ShaderFactory.convertTo300 = function convertTo300(shader, isFrag) {
-            /** replace attribute and in */ shader = shader.replace(/\battribute\b/g, "in");
             shader = shader.replace(/\bvarying\b/g, isFrag ? "in" : "out");
-            /** replace api */ shader = shader.replace(/\btexture(2D|Cube)\b/g, "texture");
-            shader = shader.replace(/\btexture(2D|Cube)LodEXT\b/g, "textureLod");
+            shader = shader.replace(/\btexture(2D|Cube)\b/g, "texture");
+            shader = shader.replace(/\btexture2DProj\b/g, "textureProj");
             if (isFrag) {
-                var isMRT = /\bgl_FragData\[.+?\]/g.test(shader);
-                if (isMRT) {
-                    shader = shader.replace(/\bgl_FragColor\b/g, "gl_FragData[0]");
-                    var result = shader.match(/\bgl_FragData\[.+?\]/g);
-                    shader = this._replaceMRTShader(shader, result);
-                } else {
-                    shader = shader.replace(/void\s+?main\s*\(/g, "out vec4 glFragColor;\nvoid main(");
-                    shader = shader.replace(/\bgl_FragColor\b/g, "glFragColor");
+                shader = shader.replace(/\btexture(2D|Cube)LodEXT\b/g, "textureLod");
+                shader = shader.replace(/\btexture(2D|Cube)GradEXT\b/g, "textureGrad");
+                shader = shader.replace(/\btexture2DProjLodEXT\b/g, "textureProjLod");
+                shader = shader.replace(/\btexture2DProjGradEXT\b/g, "textureProjGrad");
+                shader = shader.replace(/\bgl_FragDepthEXT\b/g, "gl_FragDepth");
+                if (!ShaderFactory._has300Output(shader)) {
+                    var isMRT = /\bgl_FragData\[.+?\]/g.test(shader);
+                    if (isMRT) {
+                        shader = shader.replace(/\bgl_FragColor\b/g, "gl_FragData[0]");
+                        var result = shader.match(/\bgl_FragData\[.+?\]/g);
+                        shader = this._replaceMRTShader(shader, result);
+                    } else {
+                        shader = shader.replace(/void\s+?main\s*\(/g, "out vec4 glFragColor;\nvoid main(");
+                        shader = shader.replace(/\bgl_FragColor\b/g, "glFragColor");
+                    }
                 }
+            } else {
+                shader = shader.replace(/\battribute\b/g, "in");
             }
             return shader;
         };
+        ShaderFactory._has300Output = function _has300Output(fragmentShader) {
+            return ShaderFactory._has300OutInFragReg.test(fragmentShader);
+        };
         ShaderFactory._replaceMRTShader = function _replaceMRTShader(shader, result) {
             var declaration = "";
             var mrtIndexSet = new Set();
@@ -8338,11 +8342,16 @@
         /** @internal */ ShaderFactory._shaderExtension = [
             "GL_EXT_shader_texture_lod",
             "GL_OES_standard_derivatives",
-            "GL_EXT_draw_buffers"
+            "GL_EXT_draw_buffers",
+            "GL_EXT_frag_depth"
         ].map(function(e) {
             return "#extension " + e + " : enable\n";
         }).join("");
     })();
+    (function() {
+        ShaderFactory._has300OutInFragReg = /\bout\s+(?:\w+\s+)?(?:vec4)\s+(?:\w+)\s*;/ // [layout(location = 0)] out [highp] vec4 [color];
+        ;
+    })();
     /**
      * Shader tag key.
      */ var ShaderTagKey = /*#__PURE__*/ function() {
@@ -8626,6 +8635,10 @@
             this.materialUniformBlock = new ShaderUniformBlock();
             this.otherUniformBlock = new ShaderUniformBlock();
             /** @internal */ this._uploadRenderCount = -1;
+            /** @internal */ this._uploadSceneId = -1;
+            /** @internal */ this._uploadCameraId = -1;
+            /** @internal */ this._uploadRendererId = -1;
+            /** @internal */ this._uploadMaterialId = -1;
             this.attributeLocation = Object.create(null);
             this._activeTextureUint = 0;
             this._engine = engine;
@@ -11760,6 +11773,7 @@
             this._isContentLost = false;
         };
         _proto._onDestroy = function _onDestroy() {
+            GraphicsResource1.prototype._onDestroy.call(this);
             this._platformPrimitive.destroy();
             this._vertexElementMap = null;
         };
@@ -16244,10 +16258,8 @@
             var vertexStride = this.createVertexElements(vertexElements);
             // vertices
             var vertexBuffer = this._vertexBuffers[index] = new Buffer(engine, exports.BufferBindFlag.VertexBuffer, MAX_VERTEX_COUNT * vertexStride, exports.BufferUsage.Dynamic);
-            vertexBuffer.isGCIgnored = true;
             // indices
             var indiceBuffer = this._indiceBuffers[index] = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, MAX_VERTEX_COUNT * 6, exports.BufferUsage.Dynamic);
-            indiceBuffer.isGCIgnored = true;
             mesh.setVertexBufferBinding(vertexBuffer, vertexStride);
             mesh.setIndexBufferBinding(indiceBuffer, exports.IndexFormat.UInt16);
             mesh.setVertexElements(vertexElements);
@@ -19871,6 +19883,7 @@
                 1
             ]); // left-top
             var blitMaterial = new Material(engine, Shader.find("blit"));
+            blitMaterial._addReferCount(1);
             blitMaterial.renderState.depthState.enabled = false;
             blitMaterial.renderState.depthState.writeEnabled = false;
             this.blitMesh = this._createBlitMesh(engine, vertices);
@@ -20566,6 +20579,9 @@
             projectionParams.set(flipProjection ? -1 : 1, virtualCamera.nearClipPlane, virtualCamera.farClipPlane, 0);
             shaderData.setVector4(RenderContext._cameraProjectionProperty, projectionParams);
         };
+        _proto.garbageCollection = function garbageCollection() {
+            this.camera = null;
+        };
         return RenderContext;
     }();
     (function() {
@@ -24646,66 +24662,84 @@
     })(ParticleInstanceVertexAttribute || (ParticleInstanceVertexAttribute = {}));
     /**
      * @internal
-     */ var ParticleBufferUtils = /*#__PURE__*/ function() {
-        var ParticleBufferUtils = function ParticleBufferUtils(engine) {
-            this.billboardVertexElement = new VertexElement(ParticleBillboardVertexAttribute.cornerTextureCoordinate, 0, exports.VertexElementFormat.Vector4, 0);
-            this.instanceVertexElements = [
-                new VertexElement(ParticleInstanceVertexAttribute.ShapePositionStartLifeTime, 0, exports.VertexElementFormat.Vector4, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.DirectionTime, 16, exports.VertexElementFormat.Vector4, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.StartColor, 32, exports.VertexElementFormat.Vector4, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.StartSize, 48, exports.VertexElementFormat.Vector3, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.StartRotation0, 60, exports.VertexElementFormat.Vector3, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.StartSpeed, 72, exports.VertexElementFormat.Float, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.Random0, 76, exports.VertexElementFormat.Vector4, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.Random1, 92, exports.VertexElementFormat.Vector4, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldPosition, 108, exports.VertexElementFormat.Vector3, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldRotation, 120, exports.VertexElementFormat.Vector4, 1, 1),
-                new VertexElement(ParticleInstanceVertexAttribute.SimulationUV, 136, exports.VertexElementFormat.Vector4, 1, 1)
-            ];
-            this.instanceVertexStride = 152;
-            this.instanceVertexFloatStride = this.instanceVertexStride / 4;
-            this.startLifeTimeOffset = 3;
-            this.timeOffset = 7;
-            this.simulationUVOffset = 34;
-            this.billboardIndexCount = 6;
-            var stride = 16;
-            var billboardGeometryBuffer = new Buffer(engine, exports.BufferBindFlag.VertexBuffer, stride * 4, exports.BufferUsage.Static, false);
-            this.billboardVertexBufferBinding = new VertexBufferBinding(billboardGeometryBuffer, stride);
-            var indexBuffer = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, this.billboardIndexCount, exports.BufferUsage.Static, false);
-            this.billboardIndexBufferBinding = new IndexBufferBinding(indexBuffer, exports.IndexFormat.UInt8);
-            this.setBufferData();
-        };
-        var _proto = ParticleBufferUtils.prototype;
-        _proto.setBufferData = function setBufferData() {
-            this.billboardVertexBufferBinding.buffer.setData(new Float32Array([
-                -0.5,
-                -0.5,
-                0,
-                1,
-                0.5,
-                -0.5,
-                1,
-                1,
-                0.5,
-                0.5,
-                1,
-                0,
-                -0.5,
-                0.5,
-                0,
-                0
-            ]));
-            this.billboardIndexBufferBinding.buffer.setData(new Uint8Array([
-                0,
-                2,
-                3,
-                0,
-                1,
-                2
-            ]));
-        };
-        return ParticleBufferUtils;
-    }();
+     */ var ParticleBufferUtils = function ParticleBufferUtils(engine) {
+        this.billboardVertexElement = new VertexElement(ParticleBillboardVertexAttribute.cornerTextureCoordinate, 0, exports.VertexElementFormat.Vector4, 0);
+        this.instanceVertexElements = [
+            new VertexElement(ParticleInstanceVertexAttribute.ShapePositionStartLifeTime, 0, exports.VertexElementFormat.Vector4, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.DirectionTime, 16, exports.VertexElementFormat.Vector4, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.StartColor, 32, exports.VertexElementFormat.Vector4, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.StartSize, 48, exports.VertexElementFormat.Vector3, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.StartRotation0, 60, exports.VertexElementFormat.Vector3, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.StartSpeed, 72, exports.VertexElementFormat.Float, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.Random0, 76, exports.VertexElementFormat.Vector4, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.Random1, 92, exports.VertexElementFormat.Vector4, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldPosition, 108, exports.VertexElementFormat.Vector3, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldRotation, 120, exports.VertexElementFormat.Vector4, 1, 1),
+            new VertexElement(ParticleInstanceVertexAttribute.SimulationUV, 136, exports.VertexElementFormat.Vector4, 1, 1)
+        ];
+        this.instanceVertexStride = 152;
+        this.instanceVertexFloatStride = this.instanceVertexStride / 4;
+        this.startLifeTimeOffset = 3;
+        this.timeOffset = 7;
+        this.simulationUVOffset = 34;
+        this.billboardIndexCount = 6;
+        var stride = 16;
+        var billboardGeometryBuffer = new Buffer(engine, exports.BufferBindFlag.VertexBuffer, stride * 4, exports.BufferUsage.Static, false);
+        billboardGeometryBuffer.isGCIgnored = true;
+        this.billboardVertexBufferBinding = new VertexBufferBinding(billboardGeometryBuffer, stride);
+        var indexBuffer = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, this.billboardIndexCount, exports.BufferUsage.Static, false);
+        indexBuffer.isGCIgnored = true;
+        this.billboardIndexBufferBinding = new IndexBufferBinding(indexBuffer, exports.IndexFormat.UInt8);
+        var billboardGeometryData = new Float32Array([
+            -0.5,
+            -0.5,
+            0,
+            1,
+            0.5,
+            -0.5,
+            1,
+            1,
+            0.5,
+            0.5,
+            1,
+            0,
+            -0.5,
+            0.5,
+            0,
+            0
+        ]);
+        var indexData = new Uint8Array([
+            0,
+            2,
+            3,
+            0,
+            1,
+            2
+        ]);
+        billboardGeometryBuffer.setData(billboardGeometryData);
+        indexBuffer.setData(indexData);
+        // Register content restorer
+        engine.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
+            var _class = function _class() {
+                return ContentRestorer.call(this, billboardGeometryBuffer);
+            };
+            _inherits$2(_class, ContentRestorer);
+            var _proto = _class.prototype;
+            _proto.restoreContent = function restoreContent() {
+                billboardGeometryBuffer.setData(billboardGeometryData);
+            };
+            return _class;
+        }(ContentRestorer))());
+        engine.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
+            var _class = function _class() {
+                return ContentRestorer.call(this, indexBuffer);
+            };
+            _inherits$2(_class, ContentRestorer);
+            var _proto = _class.prototype;
+            _proto.restoreContent = function restoreContent() {};
+            return _class;
+        }(ContentRestorer))());
+    };
     var blitFs = "#define GLSLIFY 1\nuniform mediump sampler2D renderer_BlitTexture;\n#ifdef HAS_TEX_LOD\nuniform float renderer_BlitMipLevel;\n#endif\nvarying vec2 v_uv;void main(){\n#ifdef HAS_TEX_LOD\ngl_FragColor=texture2DLodEXT(renderer_BlitTexture,v_uv,renderer_BlitMipLevel);\n#else\ngl_FragColor=texture2D(renderer_BlitTexture,v_uv);\n#endif\n}"; // eslint-disable-line
     var blitVs = "#define GLSLIFY 1\nattribute vec4 POSITION_UV;varying vec2 v_uv;void main(){gl_Position=vec4(POSITION_UV.xy,0.0,1.0);v_uv=POSITION_UV.zw;}"; // eslint-disable-line
     var skyProceduralFs = "#define GLSLIFY 1\n#include <common>\nconst float MIE_G=-0.990;const float MIE_G2=0.9801;const float SKY_GROUND_THRESHOLD=0.02;uniform float material_SunSize;uniform float material_SunSizeConvergence;uniform vec4 scene_SunlightColor;uniform vec3 scene_SunlightDirection;varying vec3 v_GroundColor;varying vec3 v_SkyColor;\n#ifdef MATERIAL_SUN_HIGH_QUALITY\nvarying vec3 v_Vertex;\n#elif defined(MATERIAL_SUN_SIMPLE)\nvarying vec3 v_RayDir;\n#else\nvarying float v_SkyGroundFactor;\n#endif\n#if defined(MATERIAL_SUN_HIGH_QUALITY)||defined(MATERIAL_SUN_SIMPLE)\nvarying vec3 v_SunColor;\n#endif\n#if defined(ENGINE_IS_COLORSPACE_GAMMA)\n#define LINEAR_2_OUTPUT(color) sqrt(color)\n#endif\nfloat getMiePhase(float eyeCos,float eyeCos2){float temp=1.0+MIE_G2-2.0*MIE_G*eyeCos;temp=pow(temp,pow(material_SunSize,0.65)*10.0);temp=max(temp,1.0e-4);temp=1.5*((1.0-MIE_G2)/(2.0+MIE_G2))*(1.0+eyeCos2)/temp;return temp;}float calcSunAttenuation(vec3 lightPos,vec3 ray){\n#ifdef MATERIAL_SUN_HIGH_QUALITY\nfloat focusedEyeCos=pow(clamp(dot(lightPos,ray),0.0,1.0),material_SunSizeConvergence);return getMiePhase(-focusedEyeCos,focusedEyeCos*focusedEyeCos);\n#else\nvec3 delta=lightPos-ray;float dist=length(delta);float spot=1.0-smoothstep(0.0,material_SunSize,dist);return spot*spot;\n#endif\n}void main(){vec3 col=vec3(0.0,0.0,0.0);\n#ifdef MATERIAL_SUN_HIGH_QUALITY\nvec3 ray=normalize(v_Vertex);float y=ray.y/SKY_GROUND_THRESHOLD;\n#elif defined(MATERIAL_SUN_SIMPLE)\nvec3 ray=v_RayDir;float y=ray.y/SKY_GROUND_THRESHOLD;\n#else\nfloat y=v_SkyGroundFactor;\n#endif\ncol=mix(v_SkyColor,v_GroundColor,clamp(y,0.0,1.0));\n#if defined(MATERIAL_SUN_HIGH_QUALITY)||defined(MATERIAL_SUN_SIMPLE)\nif(y<0.0)col+=v_SunColor*calcSunAttenuation(-scene_SunlightDirection,-ray);\n#endif\n#ifdef ENGINE_IS_COLORSPACE_GAMMA\ncol=LINEAR_2_OUTPUT(col);\n#endif\ngl_FragColor=vec4(col,1.0);\n#ifndef ENGINE_IS_COLORSPACE_GAMMA\ngl_FragColor=linearToGamma(gl_FragColor);\n#endif\n}"; // eslint-disable-line
@@ -25378,7 +25412,6 @@
             resourceManager._restoreGraphicResources();
             console.log("Graphic resource restored.");
             // Restore resources content
-            this._particleBufferUtils.setBufferData();
             resourceManager._restoreResourcesContent().then(function() {
                 console.log("Graphic resource content restored.\n\n" + "Device restored.");
                 _this.dispatch("devicerestored", _this);
@@ -25393,6 +25426,7 @@
             this._spriteRenderDataPool.garbageCollection();
             this._spriteMaskRenderDataPool.garbageCollection();
             this._textRenderDataPool.garbageCollection();
+            this._renderContext.garbageCollection();
         };
         _create_class$2(Engine, [
             {
@@ -25745,7 +25779,6 @@
         };
         _proto._createPlane = function _createPlane(engine) {
             var mesh = new ModelMesh(engine);
-            mesh.isGCIgnored = true;
             var indices = new Uint8Array([
                 1,
                 2,
@@ -27712,22 +27745,6 @@
                 maskManager.postRender(renderer);
             }
         };
-        _proto.destroy = function destroy() {
-            this._batchedQueue = null;
-            var _this = this, meshes = _this._meshes, vertexBuffers = _this._vertexBuffers, indiceBuffers = _this._indiceBuffers;
-            for(var i = 0, n = meshes.length; i < n; ++i){
-                meshes[i].destroy();
-            }
-            this._meshes = null;
-            for(var i1 = 0, n1 = vertexBuffers.length; i1 < n1; ++i1){
-                vertexBuffers[i1].destroy();
-            }
-            this._vertexBuffers = null;
-            for(var i2 = 0, n2 = indiceBuffers.length; i2 < n2; ++i2){
-                indiceBuffers[i2].destroy();
-            }
-            this._indiceBuffers = null;
-        };
         return SpriteBatcher;
     }(Basic2DBatcher);
     (function() {
@@ -27752,11 +27769,10 @@
             if (elements.length === 0) {
                 return;
             }
-            var engine = camera.engine, scene = camera.scene;
+            var engine = camera.engine, cameraId = camera.instanceId, cameraData = camera.shaderData;
+            var _camera_scene = camera.scene, sceneData = _camera_scene.shaderData, sceneId = _camera_scene.instanceId;
             var renderCount = engine._renderCount;
             var rhi = engine._hardwareRenderer;
-            var sceneData = scene.shaderData;
-            var cameraData = camera.shaderData;
             var pipelineStageKey = RenderContext.pipelineStageKey;
             var renderQueueType = this._renderQueueType;
             for(var i = 0, n = elements.length; i < n; i++){
@@ -27768,9 +27784,8 @@
                     var primitive = data.primitive;
                     var renderer = data.component;
                     var material = data.material;
-                    var rendererData = renderer.shaderData;
-                    var materialData = material.shaderData;
-                    var renderStates = material.renderStates;
+                    var rendererData = renderer.shaderData, rendererId = renderer.instanceId;
+                    var materialData = material.shaderData, materialId = material.instanceId, renderStates = material.renderStates;
                     // union render global macro and material self macro.
                     ShaderMacroCollection.unionCollection(renderer._globalShaderMacro, materialData._macroCollection, compileMacros);
                     for(var j = 0, m = shaderPasses.length; j < m; j++){
@@ -27796,33 +27811,33 @@
                             program.uploadAll(program.materialUniformBlock, materialData);
                             // UnGroup textures should upload default value, texture uint maybe change by logic of texture bind.
                             program.uploadUnGroupTextures();
-                            program._uploadScene = scene;
-                            program._uploadCamera = camera;
-                            program._uploadRenderer = renderer;
-                            program._uploadMaterial = material;
+                            program._uploadSceneId = sceneId;
+                            program._uploadCameraId = cameraId;
+                            program._uploadRendererId = rendererId;
+                            program._uploadMaterialId = materialId;
                             program._uploadRenderCount = renderCount;
                         } else {
-                            if (program._uploadScene !== scene) {
+                            if (program._uploadSceneId !== sceneId) {
                                 program.uploadAll(program.sceneUniformBlock, sceneData);
-                                program._uploadScene = scene;
+                                program._uploadSceneId = sceneId;
                             } else if (switchProgram) {
                                 program.uploadTextures(program.sceneUniformBlock, sceneData);
                             }
-                            if (program._uploadCamera !== camera) {
+                            if (program._uploadCameraId !== cameraId) {
                                 program.uploadAll(program.cameraUniformBlock, cameraData);
-                                program._uploadCamera = camera;
+                                program._uploadCameraId = cameraId;
                             } else if (switchProgram) {
                                 program.uploadTextures(program.cameraUniformBlock, cameraData);
                             }
-                            if (program._uploadRenderer !== renderer) {
+                            if (program._uploadRendererId !== rendererId) {
                                 program.uploadAll(program.rendererUniformBlock, rendererData);
-                                program._uploadRenderer = renderer;
+                                program._uploadRendererId = rendererId;
                             } else if (switchProgram) {
                                 program.uploadTextures(program.rendererUniformBlock, rendererData);
                             }
-                            if (program._uploadMaterial !== material) {
+                            if (program._uploadMaterialId !== materialId) {
                                 program.uploadAll(program.materialUniformBlock, materialData);
-                                program._uploadMaterial = material;
+                                program._uploadMaterialId = materialId;
                             } else if (switchProgram) {
                                 program.uploadTextures(program.materialUniformBlock, materialData);
                             }
@@ -36604,7 +36619,7 @@
             var cap = this.capabilityList;
             var isWebGL2 = this.rhi.isWebGL2;
             var requireExtension = this.rhi.requireExtension.bind(this.rhi);
-            var shaderVertexID = exports.GLCapabilityType.shaderVertexID, standardDerivatives = exports.GLCapabilityType.standardDerivatives, shaderTextureLod = exports.GLCapabilityType.shaderTextureLod, elementIndexUint = exports.GLCapabilityType.elementIndexUint, depthTexture = exports.GLCapabilityType.depthTexture, vertexArrayObject = exports.GLCapabilityType.vertexArrayObject, instancedArrays = exports.GLCapabilityType.instancedArrays, multipleSample = exports.GLCapabilityType.multipleSample, drawBuffers = exports.GLCapabilityType.drawBuffers, blendMinMax = exports.GLCapabilityType.blendMinMax, astc = exports.GLCapabilityType.astc, astc_webkit = exports.GLCapabilityType.astc_webkit, etc = exports.GLCapabilityType.etc, etc_webkit = exports.GLCapabilityType.etc_webkit, etc1 = exports.GLCapabilityType.etc1, etc1_webkit = exports.GLCapabilityType.etc1_webkit, pvrtc = exports.GLCapabilityType.pvrtc, pvrtc_webkit = exports.GLCapabilityType.pvrtc_webkit, s3tc = exports.GLCapabilityType.s3tc, s3tc_webkit = exports.GLCapabilityType.s3tc_webkit, bptc = exports.GLCapabilityType.bptc, textureFloat = exports.GLCapabilityType.textureFloat, textureHalfFloat = exports.GLCapabilityType.textureHalfFloat, textureFloatLinear = exports.GLCapabilityType.textureFloatLinear, textureHalfFloatLinear = exports.GLCapabilityType.textureHalfFloatLinear, WEBGL_colorBufferFloat = exports.GLCapabilityType.WEBGL_colorBufferFloat, colorBufferFloat = exports.GLCapabilityType.colorBufferFloat, colorBufferHalfFloat = exports.GLCapabilityType.colorBufferHalfFloat, textureFilterAnisotropic = exports.GLCapabilityType.textureFilterAnisotropic;
+            var shaderVertexID = exports.GLCapabilityType.shaderVertexID, standardDerivatives = exports.GLCapabilityType.standardDerivatives, shaderTextureLod = exports.GLCapabilityType.shaderTextureLod, elementIndexUint = exports.GLCapabilityType.elementIndexUint, depthTexture = exports.GLCapabilityType.depthTexture, vertexArrayObject = exports.GLCapabilityType.vertexArrayObject, instancedArrays = exports.GLCapabilityType.instancedArrays, multipleSample = exports.GLCapabilityType.multipleSample, drawBuffers = exports.GLCapabilityType.drawBuffers, blendMinMax = exports.GLCapabilityType.blendMinMax, astc = exports.GLCapabilityType.astc, astc_webkit = exports.GLCapabilityType.astc_webkit, etc = exports.GLCapabilityType.etc, etc_webkit = exports.GLCapabilityType.etc_webkit, etc1 = exports.GLCapabilityType.etc1, etc1_webkit = exports.GLCapabilityType.etc1_webkit, pvrtc = exports.GLCapabilityType.pvrtc, pvrtc_webkit = exports.GLCapabilityType.pvrtc_webkit, s3tc = exports.GLCapabilityType.s3tc, s3tc_webkit = exports.GLCapabilityType.s3tc_webkit, bptc = exports.GLCapabilityType.bptc, textureFloat = exports.GLCapabilityType.textureFloat, textureHalfFloat = exports.GLCapabilityType.textureHalfFloat, textureFloatLinear = exports.GLCapabilityType.textureFloatLinear, textureHalfFloatLinear = exports.GLCapabilityType.textureHalfFloatLinear, WEBGL_colorBufferFloat = exports.GLCapabilityType.WEBGL_colorBufferFloat, colorBufferFloat = exports.GLCapabilityType.colorBufferFloat, colorBufferHalfFloat = exports.GLCapabilityType.colorBufferHalfFloat, textureFilterAnisotropic = exports.GLCapabilityType.textureFilterAnisotropic, fragDepth = exports.GLCapabilityType.fragDepth;
             cap.set(shaderVertexID, isWebGL2);
             cap.set(standardDerivatives, isWebGL2 || !!requireExtension(standardDerivatives));
             cap.set(shaderTextureLod, isWebGL2 || !!requireExtension(shaderTextureLod));
@@ -36622,6 +36637,7 @@
             cap.set(colorBufferFloat, isWebGL2 && !!requireExtension(colorBufferFloat) || !!requireExtension(WEBGL_colorBufferFloat));
             cap.set(colorBufferHalfFloat, isWebGL2 && !!requireExtension(colorBufferFloat) || !!requireExtension(colorBufferHalfFloat));
             cap.set(textureFilterAnisotropic, !!requireExtension(textureFilterAnisotropic));
+            cap.set(fragDepth, isWebGL2 || !!requireExtension(fragDepth));
             cap.set(astc, !!(requireExtension(astc) || requireExtension(astc_webkit)));
             cap.set(etc, !!(requireExtension(etc) || requireExtension(etc_webkit)));
             cap.set(etc1, !!(requireExtension(etc1) || requireExtension(etc1_webkit)));
@@ -39315,10 +39331,11 @@
             entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : entity.isActive;
             var _entityConfig_name;
             entity.name = (_entityConfig_name = entityConfig.name) != null ? _entityConfig_name : entity.name;
-            var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
+            var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale, layer = entityConfig.layer;
             if (position) entity.transform.position.copyFrom(position);
             if (rotation) entity.transform.rotation.copyFrom(rotation);
             if (scale) entity.transform.scale.copyFrom(scale);
+            if (layer) entity.layer = layer;
             return entity;
         };
         _proto._traverseAddEntityToMap = function _traverseAddEntityToMap(entity, context, path) {
@@ -40472,114 +40489,68 @@
         };
         GLTFUtils.getAccessorBuffer = function getAccessorBuffer(context, bufferViews, accessor) {
             var componentType = accessor.componentType;
-            var _accessor_bufferView;
-            var bufferViewIndex = (_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0;
-            var bufferView = bufferViews[bufferViewIndex];
-            return context.get(exports.GLTFParserType.BufferView, accessor.bufferView).then(function(bufferViewData) {
-                var bufferIndex = bufferView.buffer;
-                var _bufferViewData_byteOffset;
-                var bufferByteOffset = (_bufferViewData_byteOffset = bufferViewData.byteOffset) != null ? _bufferViewData_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;
-                var elementStride = dataElementSize * dataElementBytes;
-                var accessorCount = accessor.count;
-                var bufferStride = bufferView.byteStride;
-                var bufferInfo;
-                // According to the glTF official documentation only byteStride not undefined is allowed
-                if (bufferStride !== undefined && bufferStride !== elementStride) {
-                    var bufferSlice = Math.floor(byteOffset / bufferStride);
-                    var bufferCacheKey = bufferViewIndex + ":" + componentType + ":" + bufferSlice + ":" + accessorCount;
-                    var accessorBufferCache = context.accessorBufferCache;
-                    bufferInfo = accessorBufferCache[bufferCacheKey];
-                    if (!bufferInfo) {
-                        var offset = bufferByteOffset + bufferSlice * bufferStride;
-                        var count = accessorCount * (bufferStride / dataElementBytes);
-                        var data = new TypedArray(bufferViewData.buffer, offset, count);
-                        accessorBufferCache[bufferCacheKey] = bufferInfo = new BufferInfo(data, true, bufferStride);
-                        bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset, count));
+            var TypedArray = GLTFUtils.getComponentType(componentType);
+            var dataElementSize = GLTFUtils.getAccessorTypeSize(accessor.type);
+            var dataElementBytes = TypedArray.BYTES_PER_ELEMENT;
+            var elementStride = dataElementSize * dataElementBytes;
+            var accessorCount = accessor.count;
+            var promise;
+            if (accessor.bufferView !== undefined) {
+                var bufferViewIndex = accessor.bufferView;
+                var bufferView = bufferViews[bufferViewIndex];
+                promise = context.get(exports.GLTFParserType.BufferView, accessor.bufferView).then(function(bufferViewData) {
+                    var bufferIndex = bufferView.buffer;
+                    var _bufferViewData_byteOffset;
+                    var bufferByteOffset = (_bufferViewData_byteOffset = bufferViewData.byteOffset) != null ? _bufferViewData_byteOffset : 0;
+                    var _accessor_byteOffset;
+                    var byteOffset = (_accessor_byteOffset = accessor.byteOffset) != null ? _accessor_byteOffset : 0;
+                    var bufferStride = bufferView.byteStride;
+                    var bufferInfo;
+                    // According to the glTF official documentation only byteStride not undefined is allowed
+                    if (bufferStride !== undefined && bufferStride !== elementStride) {
+                        var bufferSlice = Math.floor(byteOffset / bufferStride);
+                        var bufferCacheKey = bufferViewIndex + ":" + componentType + ":" + bufferSlice + ":" + accessorCount;
+                        var accessorBufferCache = context.accessorBufferCache;
+                        bufferInfo = accessorBufferCache[bufferCacheKey];
+                        if (!bufferInfo) {
+                            var offset = bufferByteOffset + bufferSlice * bufferStride;
+                            var count = accessorCount * (bufferStride / dataElementBytes);
+                            var data = new TypedArray(bufferViewData.buffer, offset, count);
+                            accessorBufferCache[bufferCacheKey] = bufferInfo = new BufferInfo(data, true, bufferStride);
+                            bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset, count));
+                        }
+                    } else {
+                        var offset1 = bufferByteOffset + byteOffset;
+                        var count1 = accessorCount * dataElementSize;
+                        var data1 = new TypedArray(bufferViewData.buffer, offset1, count1);
+                        bufferInfo = new BufferInfo(data1, false, elementStride);
+                        bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset1, count1));
                     }
-                } else {
-                    var offset1 = bufferByteOffset + byteOffset;
-                    var count1 = accessorCount * dataElementSize;
-                    var data1 = new TypedArray(bufferViewData.buffer, offset1, count1);
-                    bufferInfo = new BufferInfo(data1, false, elementStride);
-                    bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset1, count1));
-                }
-                if (accessor.sparse) {
-                    return GLTFUtils.processingSparseData(context, accessor, bufferInfo).then(function() {
-                        return bufferInfo;
-                    });
-                }
-                return bufferInfo;
-            });
+                    return bufferInfo;
+                });
+            } else {
+                var count = accessorCount * dataElementSize;
+                var data = new TypedArray(count);
+                var bufferInfo = new BufferInfo(data, false, elementStride);
+                bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(undefined, TypedArray, undefined, count));
+                promise = Promise.resolve(bufferInfo);
+            }
+            return accessor.sparse ? promise.then(function(bufferInfo) {
+                return GLTFUtils.processingSparseData(context, accessor, bufferInfo).then(function() {
+                    return bufferInfo;
+                });
+            }) : promise;
         };
-        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);
+        GLTFUtils.bufferToVector3Array = function bufferToVector3Array(buffer, byteOffset, count, normalized, componentType) {
+            var baseOffset = byteOffset / buffer.BYTES_PER_ELEMENT;
+            var stride = buffer.length / count;
+            var vertices = new Array(count);
+            var factor = normalized ? GLTFUtils.getNormalizedComponentScale(componentType) : 1;
             for(var i = 0; i < count; i++){
-                var index = offset + i * stride;
-                vector3s[i] = new Vector3(data[index], data[index + 1], data[index + 2]);
+                var index = baseOffset + i * stride;
+                vertices[i] = new Vector3(buffer[index] * factor, buffer[index + 1] * factor, buffer[index + 2] * factor);
             }
-            return vector3s;
-        };
-        /**
-       * @deprecated
-       * Get accessor data.
-       */ GLTFUtils.getAccessorData = function getAccessorData(glTF, accessor, buffers) {
-            var bufferViews = glTF.bufferViews;
-            var _accessor_bufferView;
-            var bufferView = bufferViews[(_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0];
-            var arrayBuffer = buffers[bufferView.buffer];
-            var accessorByteOffset = accessor.hasOwnProperty("byteOffset") ? accessor.byteOffset : 0;
-            var bufferViewByteOffset = bufferView.hasOwnProperty("byteOffset") ? bufferView.byteOffset : 0;
-            var byteOffset = accessorByteOffset + bufferViewByteOffset;
-            var accessorTypeSize = GLTFUtils.getAccessorTypeSize(accessor.type);
-            var length = accessorTypeSize * accessor.count;
-            var _bufferView_byteStride;
-            var byteStride = (_bufferView_byteStride = bufferView.byteStride) != null ? _bufferView_byteStride : 0;
-            var arrayType = GLTFUtils.getComponentType(accessor.componentType);
-            var uint8Array;
-            if (byteStride) {
-                var accessorByteSize = accessorTypeSize * arrayType.BYTES_PER_ELEMENT;
-                uint8Array = new Uint8Array(accessor.count * accessorByteSize);
-                var originalBufferView = new Uint8Array(arrayBuffer, bufferViewByteOffset, bufferView.byteLength);
-                for(var i = 0; i < accessor.count; i++){
-                    for(var j = 0; j < accessorByteSize; j++){
-                        uint8Array[i * accessorByteSize + j] = originalBufferView[i * byteStride + accessorByteOffset + j];
-                    }
-                }
-            } else {
-                uint8Array = new Uint8Array(arrayBuffer.slice(byteOffset, byteOffset + length * arrayType.BYTES_PER_ELEMENT));
-            }
-            var typedArray = new arrayType(uint8Array.buffer);
-            if (accessor.sparse) {
-                var _accessor_sparse = accessor.sparse, count = _accessor_sparse.count, indices = _accessor_sparse.indices, values = _accessor_sparse.values;
-                var indicesBufferView = bufferViews[indices.bufferView];
-                var valuesBufferView = bufferViews[values.bufferView];
-                var indicesArrayBuffer = buffers[indicesBufferView.buffer];
-                var valuesArrayBuffer = buffers[valuesBufferView.buffer];
-                var _indices_byteOffset, _indicesBufferView_byteOffset;
-                var indicesByteOffset = ((_indices_byteOffset = indices.byteOffset) != null ? _indices_byteOffset : 0) + ((_indicesBufferView_byteOffset = indicesBufferView.byteOffset) != null ? _indicesBufferView_byteOffset : 0);
-                var indicesByteLength = indicesBufferView.byteLength;
-                var _values_byteOffset, _valuesBufferView_byteOffset;
-                var valuesByteOffset = ((_values_byteOffset = values.byteOffset) != null ? _values_byteOffset : 0) + ((_valuesBufferView_byteOffset = valuesBufferView.byteOffset) != null ? _valuesBufferView_byteOffset : 0);
-                var valuesByteLength = valuesBufferView.byteLength;
-                var indicesType = GLTFUtils.getComponentType(indices.componentType);
-                var indicesArray = new indicesType(indicesArrayBuffer, indicesByteOffset, indicesByteLength / indicesType.BYTES_PER_ELEMENT);
-                var valuesArray = new arrayType(valuesArrayBuffer, valuesByteOffset, valuesByteLength / arrayType.BYTES_PER_ELEMENT);
-                for(var i1 = 0; i1 < count; i1++){
-                    var replaceIndex = indicesArray[i1];
-                    for(var j1 = 0; j1 < accessorTypeSize; j1++){
-                        typedArray[replaceIndex * accessorTypeSize + j1] = valuesArray[i1 * accessorTypeSize + j1];
-                    }
-                }
-            }
-            return typedArray;
+            return vertices;
         };
         GLTFUtils.getBufferViewData = function getBufferViewData(bufferView, buffers) {
             var _bufferView_byteOffset = bufferView.byteOffset, byteOffset = _bufferView_byteOffset === void 0 ? 0 : _bufferView_byteOffset;
@@ -41883,16 +41854,16 @@
                                 var frame = restoreInfo.blendShape.frames[0];
                                 var position = restoreInfo.position;
                                 var positionData = _this._getBufferData(buffers, position.buffer);
-                                frame.deltaPositions = GLTFUtils.bufferToVector3Array(positionData, position.stride, position.byteOffset, position.count);
+                                frame.deltaPositions = GLTFUtils.bufferToVector3Array(positionData, position.byteOffset, position.count, position.normalized, position.componentType);
                                 if (restoreInfo.normal) {
                                     var normal = restoreInfo.normal;
                                     var normalData = _this._getBufferData(buffers, normal.buffer);
-                                    frame.deltaNormals = GLTFUtils.bufferToVector3Array(normalData, normal.stride, normal.byteOffset, normal.count);
+                                    frame.deltaNormals = GLTFUtils.bufferToVector3Array(normalData, normal.byteOffset, normal.count, normal.normalized, normal.componentType);
                                 }
                                 if (restoreInfo.tangent) {
                                     var tangent = restoreInfo.tangent;
                                     var tangentData = _this._getBufferData(buffers, tangent.buffer);
-                                    frame.deltaTangents = GLTFUtils.bufferToVector3Array(tangentData, tangent.stride, tangent.byteOffset, tangent.count);
+                                    frame.deltaTangents = GLTFUtils.bufferToVector3Array(tangentData, tangent.byteOffset, tangent.count, tangent.normalized, tangent.componentType);
                                 }
                             }
                             mesh.uploadData(true);
@@ -41904,8 +41875,13 @@
         };
         _proto._getBufferData = function _getBufferData(buffers, restoreInfo) {
             var main = restoreInfo.main;
-            var buffer = buffers[main.bufferIndex];
-            var data = new main.TypedArray(buffer, main.byteOffset, main.length);
+            var data;
+            if (main) {
+                var buffer = buffers[main.bufferIndex];
+                data = new main.TypedArray(buffer, main.byteOffset, main.length);
+            } else {
+                data = new main.TypedArray(main.length);
+            }
             var sparseCount = restoreInfo.sparseCount;
             if (sparseCount) {
                 var sparseIndex = restoreInfo.sparseIndices;
@@ -41978,11 +41954,12 @@
     };
     /**
      * @internal
-     */ var BlendShapeDataRestoreInfo = function BlendShapeDataRestoreInfo(buffer, stride, byteOffset, count) {
+     */ var BlendShapeDataRestoreInfo = function BlendShapeDataRestoreInfo(buffer, byteOffset, count, normalized, componentType) {
         this.buffer = buffer;
-        this.stride = stride;
         this.byteOffset = byteOffset;
         this.count = count;
+        this.normalized = normalized;
+        this.componentType = componentType;
     };
     /**
      * Base class of glTF extension parser.
@@ -42599,23 +42576,7 @@
                         var meshRestoreInfo = new ModelMeshRestoreInfo();
                         meshRestoreInfo.mesh = mesh1;
                         context.contentRestorer.meshes.push(meshRestoreInfo);
-                        exports.GLTFMeshParser._parseMeshFromGLTFPrimitive(context, mesh1, meshRestoreInfo, meshInfo, gltfPrimitive, glTF, function(attributeSemantic) {
-                            return null;
-                        }, function(attributeName, shapeIndex) {
-                            var shapeAccessorIdx = gltfPrimitive.targets[shapeIndex];
-                            var attributeAccessorIdx = shapeAccessorIdx[attributeName];
-                            if (attributeAccessorIdx) {
-                                var accessor = glTF.accessors[attributeAccessorIdx];
-                                return GLTFUtils.getAccessorBuffer(context, context.glTF.bufferViews, accessor);
-                            } else {
-                                return null;
-                            }
-                        }, function() {
-                            var indexAccessor = glTF.accessors[gltfPrimitive.indices];
-                            return context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
-                                return GLTFUtils.getAccessorData(glTF, indexAccessor, buffers);
-                            });
-                        }, context.params.keepMeshData).then(resolve);
+                        exports.GLTFMeshParser._parseMeshFromGLTFPrimitive(context, mesh1, meshRestoreInfo, meshInfo, gltfPrimitive, glTF, context.params.keepMeshData).then(resolve);
                     }
                 });
             };
@@ -42628,7 +42589,7 @@
         };
         /**
        * @internal
-       */ GLTFMeshParser1._parseMeshFromGLTFPrimitive = function _parseMeshFromGLTFPrimitive(context, mesh, meshRestoreInfo, gltfMesh, gltfPrimitive, gltf, getVertexBufferData, getBlendShapeData, getIndexBufferData, keepMeshData) {
+       */ GLTFMeshParser1._parseMeshFromGLTFPrimitive = function _parseMeshFromGLTFPrimitive(context, mesh, meshRestoreInfo, gltfMesh, gltfPrimitive, gltf, keepMeshData) {
             var _loop = function _loop(attribute) {
                 var accessor = accessors[attributes[attribute]];
                 var promise = GLTFUtils.getAccessorBuffer(context, gltf.bufferViews, accessor).then(function(accessorBuffer) {
@@ -42723,61 +42684,68 @@
                 }
                 // BlendShapes
                 if (targets) {
-                    promises.push(exports.GLTFMeshParser._createBlendShape(mesh, meshRestoreInfo, gltfMesh, accessors, targets, getBlendShapeData));
+                    promises.push(exports.GLTFMeshParser._createBlendShape(context, mesh, meshRestoreInfo, gltfMesh, gltfPrimitive, targets));
                 }
                 return Promise.all(promises).then(function() {
                     mesh.uploadData(!keepMeshData);
-                    return Promise.resolve(mesh);
+                    return mesh;
                 });
             });
         };
+        GLTFMeshParser1._getBlendShapeData = function _getBlendShapeData(context, glTF, accessor) {
+            return GLTFUtils.getAccessorBuffer(context, glTF.bufferViews, accessor).then(function(bufferInfo) {
+                var buffer = bufferInfo.data;
+                var _accessor_byteOffset;
+                var byteOffset = bufferInfo.interleaved ? ((_accessor_byteOffset = accessor.byteOffset) != null ? _accessor_byteOffset : 0) % bufferInfo.stride : 0;
+                var count = accessor.count, normalized = accessor.normalized, componentType = accessor.componentType;
+                var vertices = GLTFUtils.bufferToVector3Array(buffer, byteOffset, count, normalized, componentType);
+                var restoreInfo = new BlendShapeDataRestoreInfo(bufferInfo.restoreInfo, byteOffset, count, normalized, componentType);
+                return {
+                    vertices: vertices,
+                    restoreInfo: restoreInfo
+                };
+            });
+        };
         /**
        * @internal
-       */ GLTFMeshParser1._createBlendShape = function _createBlendShape(mesh, meshRestoreInfo, glTFMesh, accessors, glTFTargets, getBlendShapeData) {
-            var _loop = function _loop(i, n) {
+       */ GLTFMeshParser1._createBlendShape = function _createBlendShape(context, mesh, meshRestoreInfo, glTFMesh, gltfPrimitive, glTFTargets) {
+            var _this = this, _loop = function _loop(i) {
+                var blendShapeData = {};
+                blendShapeCollection[i] = blendShapeData;
                 var name = blendShapeNames ? blendShapeNames[i] : "blendShape" + i;
+                var targets = gltfPrimitive.targets[i];
+                var normalTarget = targets["NORMAL"];
+                var tangentTarget = targets["TANGENT"];
+                var hasNormal = normalTarget !== undefined;
+                var hasTangent = tangentTarget !== undefined;
                 var promise = Promise.all([
-                    getBlendShapeData("POSITION", i),
-                    getBlendShapeData("NORMAL", i),
-                    getBlendShapeData("TANGENT", i)
-                ]).then(function(infos) {
-                    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);
-                    }
+                    _this._getBlendShapeData(context, glTF, accessors[targets["POSITION"]]),
+                    hasNormal ? _this._getBlendShapeData(context, glTF, accessors[normalTarget]) : null,
+                    hasTangent ? _this._getBlendShapeData(context, glTF, accessors[tangentTarget]) : null
+                ]).then(function(vertices) {
+                    var _tangentData;
+                    var positionData = vertices[0], normalData = vertices[1], tangentData = vertices[2];
                     var blendShape = new BlendShape(name);
-                    blendShape.addFrame(1.0, positions, normals, tangents);
-                    mesh.addBlendShape(blendShape);
-                    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));
+                    blendShape.addFrame(1.0, positionData.vertices, hasNormal ? normalData.vertices : null, hasTangent ? tangentData.vertices : null);
+                    blendShapeData.blendShape = blendShape;
+                    blendShapeData.restoreInfo = new BlendShapeRestoreInfo(blendShape, positionData.restoreInfo, hasNormal ? normalData.restoreInfo : null, hasTangent ? (_tangentData = tangentData) == null ? void 0 : _tangentData.restoreInfo : null);
                 });
                 promises.push(promise);
             };
+            var glTF = context.glTF;
+            var accessors = glTF.accessors;
             var blendShapeNames = glTFMesh.extras ? glTFMesh.extras.targetNames : null;
             var promises = new Array();
-            for(var i = 0, n = glTFTargets.length; i < n; i++)_loop(i);
-            return Promise.all(promises);
+            var blendShapeCount = glTFTargets.length;
+            var blendShapeCollection = new Array(blendShapeCount);
+            for(var i = 0; i < blendShapeCount; i++)_loop(i);
+            return Promise.all(promises).then(function() {
+                for(var _iterator = _create_for_of_iterator_helper_loose(blendShapeCollection), _step; !(_step = _iterator()).done;){
+                    var blendShape = _step.value;
+                    mesh.addBlendShape(blendShape.blendShape);
+                    meshRestoreInfo.blendShapes.push(blendShape.restoreInfo);
+                }
+            });
         };
         return GLTFMeshParser1;
     }(GLTFParser), function() {
@@ -44989,7 +44957,7 @@
     ], KHR_materials_anisotropy);
 
     //@ts-ignore
-    var version = "1.2.0-beta.0";
+    var version = "1.2.0-beta.2";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);