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

package/dist/miniprogram.js

@@ -7611,13 +7611,12 @@ var SimpleSpriteAssembler = (_SimpleSpriteAssembler = /*#__PURE__*/ function() {
     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 miniprogram.Vector3());
-                uvs.push(new miniprogram.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 miniprogram.Vector3());
+            (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new miniprogram.Vector2());
         }
         verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
     };
@@ -16584,7 +16583,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
  * @internal
  */ var ShaderProgramPool = /*#__PURE__*/ function() {
     function ShaderProgramPool() {
-        this._cacheHierarchy = 1;
+        this._cacheHierarchyDepth = 1;
         this._cacheMap = Object.create(null);
     }
     var _proto = ShaderProgramPool.prototype;
@@ -16595,12 +16594,14 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
    */ _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];
@@ -16625,25 +16626,21 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
    */ _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);
             }
         }
     };
@@ -22916,17 +22913,17 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
     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 miniprogram.Vector3());
-                uvs.push(new miniprogram.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 miniprogram.Vector3());
+            (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new miniprogram.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.
@@ -23009,34 +23006,16 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
         //  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);
@@ -23044,6 +23023,63 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
     };
     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 miniprogram.Matrix();
 }(), _SlicedSpriteAssembler);
@@ -23055,8 +23091,7 @@ var _TiledSpriteAssembler;
 var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
     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;

package/dist/module.js

@@ -7606,13 +7606,12 @@ var SimpleSpriteAssembler = (_SimpleSpriteAssembler = /*#__PURE__*/ function() {
     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;
     };
@@ -16579,7 +16578,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
  * @internal
  */ var ShaderProgramPool = /*#__PURE__*/ function() {
     function ShaderProgramPool() {
-        this._cacheHierarchy = 1;
+        this._cacheHierarchyDepth = 1;
         this._cacheMap = Object.create(null);
     }
     var _proto = ShaderProgramPool.prototype;
@@ -16590,12 +16589,14 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
    */ _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];
@@ -16620,25 +16621,21 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
    */ _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);
             }
         }
     };
@@ -22911,17 +22908,17 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
     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.
@@ -23004,34 +23001,16 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
         //  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);
@@ -23039,6 +23018,63 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
     };
     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);
@@ -23050,8 +23086,7 @@ var _TiledSpriteAssembler;
 var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
     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;