@galacean/engine 0.0.0-experimental-double11.10 → 0.0.0-experimental-double11.12

package/dist/browser.js

@@ -12424,13 +12424,12 @@
         var SimpleSpriteAssembler1 = function SimpleSpriteAssembler1() {};
         SimpleSpriteAssembler1.resetData = function resetData(renderer) {
             var verticesData = renderer._verticesData;
-            var vertexCount = verticesData.vertexCount = 4;
             var positions = verticesData.positions, uvs = verticesData.uvs;
-            if (positions.length < vertexCount) {
-                for(var i = positions.length; i < vertexCount; i++){
-                    positions.push(new Vector3());
-                    uvs.push(new Vector2());
-                }
+            verticesData.vertexCount = positions.length = uvs.length = 4;
+            for(var i = 0; i < 4; i++){
+                var _positions, _i, _uvs, _i1;
+                (_positions = positions)[_i = i] || (_positions[_i] = new Vector3());
+                (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new Vector2());
             }
             verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
         };
@@ -21286,7 +21285,7 @@
      * @internal
      */ var ShaderProgramPool = /*#__PURE__*/ function() {
         var ShaderProgramPool = function ShaderProgramPool() {
-            this._cacheHierarchy = 1;
+            this._cacheHierarchyDepth = 1;
             this._cacheMap = Object.create(null);
         };
         var _proto = ShaderProgramPool.prototype;
@@ -21297,12 +21296,14 @@
        */ _proto.get = function get(macros) {
             var cacheMap = this._cacheMap;
             var maskLength = macros._length;
-            if (maskLength > this._cacheHierarchy) {
-                this._resizeCacheMapHierarchy(cacheMap, 0, maskLength);
+            var cacheHierarchyDepth = this._cacheHierarchyDepth;
+            if (maskLength > cacheHierarchyDepth) {
+                this._resizeCacheMapHierarchy(cacheMap, 0, cacheHierarchyDepth, maskLength - cacheHierarchyDepth);
+                this._cacheHierarchyDepth = maskLength;
             }
             var mask = macros._mask;
             var endIndex = macros._length - 1;
-            var maxEndIndex = this._cacheHierarchy - 1;
+            var maxEndIndex = this._cacheHierarchyDepth - 1;
             for(var i = 0; i < maxEndIndex; i++){
                 var subMask = endIndex < i ? 0 : mask[i];
                 var subCacheShaders = cacheMap[subMask];
@@ -21327,25 +21328,21 @@
        */ _proto.cache = function cache(shaderProgram) {
             this._lastQueryMap[this._lastQueryKey] = shaderProgram;
         };
-        _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, resizeLength) {
-            // only expand but not shrink.
-            var end = this._cacheHierarchy - 1;
-            if (hierarchy == end) {
+        _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, currentHierarchy, increaseHierarchy) {
+            // Only expand but not shrink
+            if (hierarchy == currentHierarchy - 1) {
                 for(var k in cacheMap){
                     var shader = cacheMap[k];
                     var subCacheMap = cacheMap;
-                    for(var i = 0, n = resizeLength - end; i < n; i++){
-                        if (i == n - 1) {
-                            subCacheMap[0] = shader;
-                        } else {
-                            subCacheMap = subCacheMap[i == 0 ? k : 0] = Object.create(null);
-                        }
+                    for(var i = 0; i < increaseHierarchy; i++){
+                        subCacheMap[i == 0 ? k : 0] = subCacheMap = Object.create(null);
                     }
+                    subCacheMap[0] = shader;
                 }
-                this._cacheHierarchy = resizeLength;
             } else {
+                hierarchy++;
                 for(var k1 in cacheMap){
-                    this._resizeCacheMapHierarchy(cacheMap[k1], ++hierarchy, resizeLength);
+                    this._resizeCacheMapHierarchy(cacheMap[k1], hierarchy, currentHierarchy, increaseHierarchy);
                 }
             }
         };
@@ -27567,17 +27564,17 @@
         SlicedSpriteAssembler1.resetData = function resetData(renderer) {
             var verticesData = renderer._verticesData;
             var positions = verticesData.positions, uvs = verticesData.uvs;
-            if (positions.length < 16) {
-                for(var i = positions.length; i < 16; i++){
-                    positions.push(new Vector3());
-                    uvs.push(new Vector2());
-                }
+            verticesData.vertexCount = positions.length = uvs.length = 16;
+            for(var i = 0; i < 16; i++){
+                var _positions, _i, _uvs, _i1;
+                (_positions = positions)[_i = i] || (_positions[_i] = new Vector3());
+                (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new Vector2());
             }
-            verticesData.triangles = [];
+            verticesData.triangles = SlicedSpriteAssembler._rectangleTriangles;
         };
         SlicedSpriteAssembler1.updatePositions = function updatePositions(renderer) {
             var width = renderer.width, height = renderer.height, sprite = renderer.sprite;
-            var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs, triangles = _renderer__verticesData.triangles;
+            var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs;
             var border = sprite.border;
             var spriteUVs = sprite._getUVs();
             // Update local positions.
@@ -27660,34 +27657,16 @@
             //  0 - 4 - 8  - 12
             // ------------------------
             // Assemble position and uv.
-            var vertexCount = 0;
-            var realICount = 0;
             for(var i = 0; i < 4; i++){
                 var rowValue = row[i];
                 var rowU = spriteUVs[i].x;
                 for(var j = 0; j < 4; j++){
                     var columnValue = column[j];
-                    positions[vertexCount].set(wE[0] * rowValue + wE[4] * columnValue + wE[12], wE[1] * rowValue + wE[5] * columnValue + wE[13], wE[2] * rowValue + wE[6] * columnValue + wE[14]);
-                    uvs[vertexCount].set(rowU, spriteUVs[j].y);
-                    ++vertexCount;
-                }
-                ++realICount;
-            }
-            var realJCount = vertexCount / realICount;
-            var indexOffset = 0;
-            for(var i1 = 0; i1 < realICount - 1; ++i1){
-                for(var j1 = 0; j1 < realJCount - 1; ++j1){
-                    var start = i1 * realJCount + j1;
-                    triangles[indexOffset++] = start;
-                    triangles[indexOffset++] = start + 1;
-                    triangles[indexOffset++] = start + realJCount;
-                    triangles[indexOffset++] = start + 1;
-                    triangles[indexOffset++] = start + realJCount + 1;
-                    triangles[indexOffset++] = start + realJCount;
-                }
-            }
-            renderer._verticesData.vertexCount = realICount * realJCount;
-            triangles.length = (realICount - 1) * (realJCount - 1) * 6;
+                    var idx = i * 4 + j;
+                    positions[idx].set(wE[0] * rowValue + wE[4] * columnValue + wE[12], wE[1] * rowValue + wE[5] * columnValue + wE[13], wE[2] * rowValue + wE[6] * columnValue + wE[14]);
+                    uvs[idx].set(rowU, spriteUVs[j].y);
+                }
+            }
             var _renderer__bounds = renderer._bounds, min = _renderer__bounds.min, max = _renderer__bounds.max;
             min.set(row[0], column[0], 0);
             max.set(row[3], column[3], 0);
@@ -27695,6 +27674,63 @@
         };
         SlicedSpriteAssembler1.updateUVs = function updateUVs(renderer) {};
         return SlicedSpriteAssembler1;
+    }(), function() {
+        _SlicedSpriteAssembler._rectangleTriangles = [
+            0,
+            1,
+            4,
+            1,
+            5,
+            4,
+            1,
+            2,
+            5,
+            2,
+            6,
+            5,
+            2,
+            3,
+            6,
+            3,
+            7,
+            6,
+            4,
+            5,
+            8,
+            5,
+            9,
+            8,
+            5,
+            6,
+            9,
+            6,
+            10,
+            9,
+            6,
+            7,
+            10,
+            7,
+            11,
+            10,
+            8,
+            9,
+            12,
+            9,
+            13,
+            12,
+            9,
+            10,
+            13,
+            10,
+            14,
+            13,
+            10,
+            11,
+            14,
+            11,
+            15,
+            14
+        ];
     }(), function() {
         _SlicedSpriteAssembler._worldMatrix = new Matrix();
     }(), _SlicedSpriteAssembler);
@@ -27705,8 +27741,7 @@
     var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
         var TiledSpriteAssembler1 = function TiledSpriteAssembler1() {};
         TiledSpriteAssembler1.resetData = function resetData(renderer) {
-            var _renderer__verticesData;
-            (_renderer__verticesData = renderer._verticesData).triangles || (_renderer__verticesData.triangles = []);
+            renderer._verticesData.triangles = [];
         };
         TiledSpriteAssembler1.updatePositions = function updatePositions(renderer) {
             var width = renderer.width, height = renderer.height, sprite = renderer.sprite, tileMode = renderer.tileMode, threshold = renderer.tiledAdaptiveThreshold;
@@ -37572,7 +37607,7 @@
                 var encodedMeshData = JSON.parse(jsonDataString);
                 // @ts-ignore Vector3 is not compatible with {x: number, y: number, z: number}.
                 encodedMeshData.bounds && modelMesh.bounds.copyFrom(encodedMeshData.bounds);
-                var offset = Math.ceil(bufferReader.offset / 4) * 4;
+                var offset = Math.ceil(bufferReader.position / 4) * 4;
                 var buffer = bufferReader.data.buffer;
                 var byteOffset = bufferReader.data.byteOffset;
                 var float32Array = new Float32Array(buffer, encodedMeshData.positions.start + offset + byteOffset, (encodedMeshData.positions.end - encodedMeshData.positions.start) / 4);
@@ -38789,10 +38824,10 @@
     /**
      * @internal
      */ var GLTFParserContext = /*#__PURE__*/ function() {
-        var GLTFParserContext = function GLTFParserContext(glTFResource, resourceManager, keepMeshData) {
+        var GLTFParserContext = function GLTFParserContext(glTFResource, resourceManager, params) {
             this.glTFResource = glTFResource;
             this.resourceManager = resourceManager;
-            this.keepMeshData = keepMeshData;
+            this.params = params;
             this.accessorBufferCache = {};
             this._resourceCache = new Map();
             this.contentRestorer = new GLTFContentRestorer(glTFResource);
@@ -39488,7 +39523,7 @@
                     alphaSliceByteLength: sgdReader.nextUint32()
                 };
             }
-            var endpointsByteOffset = sgdByteOffset + sgdReader.offset;
+            var endpointsByteOffset = sgdByteOffset + sgdReader.position;
             var selectorsByteOffset = endpointsByteOffset + endpointsByteLength;
             var tablesByteOffset = selectorsByteOffset + selectorsByteLength;
             var extendedByteOffset = tablesByteOffset + tablesByteLength;
@@ -41107,7 +41142,7 @@
                             return context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
                                 return GLTFUtils.getAccessorData(glTF, indexAccessor, buffers);
                             });
-                        }, context.keepMeshData).then(resolve);
+                        }, context.params.keepMeshData).then(resolve);
                     }
                 });
             };
@@ -41287,6 +41322,7 @@
             var _this = this;
             var _context_glTF = context.glTF, scenes = _context_glTF.scenes, _context_glTF_scene = _context_glTF.scene, scene = _context_glTF_scene === void 0 ? 0 : _context_glTF_scene, glTFResource = context.glTFResource;
             var sceneInfo = scenes[index];
+            var sceneExtensions = sceneInfo.extensions;
             var engine = glTFResource.engine;
             var isDefaultScene = scene === index;
             var sceneNodes = sceneInfo.nodes;
@@ -41312,6 +41348,7 @@
                 promises.push(this._parseEntityComponent(context, sceneNodes[i1]));
             }
             return Promise.all(promises).then(function() {
+                GLTFParser.executeExtensionsAdditiveAndParse(sceneExtensions, context, sceneRoot, sceneInfo);
                 if (isDefaultScene) {
                     return Promise.all([
                         context.get(exports.GLTFParserType.Skin),
@@ -41684,11 +41721,12 @@
         _inherits(GLTFLoader, Loader1);
         var _proto = GLTFLoader.prototype;
         _proto.load = function load(item, resourceManager) {
-            var _params;
             var url = item.url;
             var params = item.params;
             var glTFResource = new GLTFResource(resourceManager.engine, url);
-            var context = new GLTFParserContext(glTFResource, resourceManager, !!((_params = params) == null ? void 0 : _params.keepMeshData));
+            var context = new GLTFParserContext(glTFResource, resourceManager, _extends({
+                keepMeshData: false
+            }, params));
             return context.parse();
         };
         return GLTFLoader;
@@ -42879,7 +42917,7 @@
                         throw "BlendShape animation is not supported when using draco.";
                     }, function() {
                         return decodedGeometry.index.array;
-                    }, context.keepMeshData);
+                    }, context.params.keepMeshData);
                 });
             });
         };
@@ -43314,7 +43352,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "0.0.0-experimental-double11.10";
+    var version = "0.0.0-experimental-double11.12";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);