@galacean/engine-core 1.1.0-beta.11 → 1.1.0-beta.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/main.js +14 -16
  2. package/dist/main.js.map +1 -1
  3. package/dist/miniprogram.js +14 -16
  4. package/dist/module.js +14 -16
  5. package/dist/module.js.map +1 -1
  6. package/package.json +3 -3
package/dist/miniprogram.js CHANGED
@@ -16567,7 +16567,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
16567
16567
  * @internal
16568
16568
  */ var ShaderProgramPool = /*#__PURE__*/ function() {
16569
16569
  function ShaderProgramPool() {
16570
- this._cacheHierarchy = 1;
16570
+ this._cacheHierarchyDepth = 1;
16571
16571
  this._cacheMap = Object.create(null);
16572
16572
  }
16573
16573
  var _proto = ShaderProgramPool.prototype;
@@ -16578,12 +16578,14 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
16578
16578
  */ _proto.get = function get(macros) {
16579
16579
  var cacheMap = this._cacheMap;
16580
16580
  var maskLength = macros._length;
16581
- if (maskLength > this._cacheHierarchy) {
16582
- this._resizeCacheMapHierarchy(cacheMap, 0, maskLength);
16581
+ var cacheHierarchyDepth = this._cacheHierarchyDepth;
16582
+ if (maskLength > cacheHierarchyDepth) {
16583
+ this._resizeCacheMapHierarchy(cacheMap, 0, cacheHierarchyDepth, maskLength - cacheHierarchyDepth);
16584
+ this._cacheHierarchyDepth = maskLength;
16583
16585
  }
16584
16586
  var mask = macros._mask;
16585
16587
  var endIndex = macros._length - 1;
16586
- var maxEndIndex = this._cacheHierarchy - 1;
16588
+ var maxEndIndex = this._cacheHierarchyDepth - 1;
16587
16589
  for(var i = 0; i < maxEndIndex; i++){
16588
16590
  var subMask = endIndex < i ? 0 : mask[i];
16589
16591
  var subCacheShaders = cacheMap[subMask];
@@ -16608,25 +16610,21 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
16608
16610
  */ _proto.cache = function cache(shaderProgram) {
16609
16611
  this._lastQueryMap[this._lastQueryKey] = shaderProgram;
16610
16612
  };
16611
- _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, resizeLength) {
16612
- // only expand but not shrink.
16613
- var end = this._cacheHierarchy - 1;
16614
- if (hierarchy == end) {
16613
+ _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, currentHierarchy, increaseHierarchy) {
16614
+ // Only expand but not shrink
16615
+ if (hierarchy == currentHierarchy - 1) {
16615
16616
  for(var k in cacheMap){
16616
16617
  var shader = cacheMap[k];
16617
16618
  var subCacheMap = cacheMap;
16618
- for(var i = 0, n = resizeLength - end; i < n; i++){
16619
- if (i == n - 1) {
16620
- subCacheMap[0] = shader;
16621
- } else {
16622
- subCacheMap = subCacheMap[i == 0 ? k : 0] = Object.create(null);
16623
- }
16619
+ for(var i = 0; i < increaseHierarchy; i++){
16620
+ subCacheMap[i == 0 ? k : 0] = subCacheMap = Object.create(null);
16624
16621
  }
16622
+ subCacheMap[0] = shader;
16625
16623
  }
16626
- this._cacheHierarchy = resizeLength;
16627
16624
  } else {
16625
+ hierarchy++;
16628
16626
  for(var k1 in cacheMap){
16629
- this._resizeCacheMapHierarchy(cacheMap[k1], ++hierarchy, resizeLength);
16627
+ this._resizeCacheMapHierarchy(cacheMap[k1], hierarchy, currentHierarchy, increaseHierarchy);
16630
16628
  }
16631
16629
  }
16632
16630
  };
package/dist/module.js CHANGED
@@ -16562,7 +16562,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
16562
16562
  * @internal
16563
16563
  */ var ShaderProgramPool = /*#__PURE__*/ function() {
16564
16564
  function ShaderProgramPool() {
16565
- this._cacheHierarchy = 1;
16565
+ this._cacheHierarchyDepth = 1;
16566
16566
  this._cacheMap = Object.create(null);
16567
16567
  }
16568
16568
  var _proto = ShaderProgramPool.prototype;
@@ -16573,12 +16573,14 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
16573
16573
  */ _proto.get = function get(macros) {
16574
16574
  var cacheMap = this._cacheMap;
16575
16575
  var maskLength = macros._length;
16576
- if (maskLength > this._cacheHierarchy) {
16577
- this._resizeCacheMapHierarchy(cacheMap, 0, maskLength);
16576
+ var cacheHierarchyDepth = this._cacheHierarchyDepth;
16577
+ if (maskLength > cacheHierarchyDepth) {
16578
+ this._resizeCacheMapHierarchy(cacheMap, 0, cacheHierarchyDepth, maskLength - cacheHierarchyDepth);
16579
+ this._cacheHierarchyDepth = maskLength;
16578
16580
  }
16579
16581
  var mask = macros._mask;
16580
16582
  var endIndex = macros._length - 1;
16581
- var maxEndIndex = this._cacheHierarchy - 1;
16583
+ var maxEndIndex = this._cacheHierarchyDepth - 1;
16582
16584
  for(var i = 0; i < maxEndIndex; i++){
16583
16585
  var subMask = endIndex < i ? 0 : mask[i];
16584
16586
  var subCacheShaders = cacheMap[subMask];
@@ -16603,25 +16605,21 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
16603
16605
  */ _proto.cache = function cache(shaderProgram) {
16604
16606
  this._lastQueryMap[this._lastQueryKey] = shaderProgram;
16605
16607
  };
16606
- _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, resizeLength) {
16607
- // only expand but not shrink.
16608
- var end = this._cacheHierarchy - 1;
16609
- if (hierarchy == end) {
16608
+ _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, currentHierarchy, increaseHierarchy) {
16609
+ // Only expand but not shrink
16610
+ if (hierarchy == currentHierarchy - 1) {
16610
16611
  for(var k in cacheMap){
16611
16612
  var shader = cacheMap[k];
16612
16613
  var subCacheMap = cacheMap;
16613
- for(var i = 0, n = resizeLength - end; i < n; i++){
16614
- if (i == n - 1) {
16615
- subCacheMap[0] = shader;
16616
- } else {
16617
- subCacheMap = subCacheMap[i == 0 ? k : 0] = Object.create(null);
16618
- }
16614
+ for(var i = 0; i < increaseHierarchy; i++){
16615
+ subCacheMap[i == 0 ? k : 0] = subCacheMap = Object.create(null);
16619
16616
  }
16617
+ subCacheMap[0] = shader;
16620
16618
  }
16621
- this._cacheHierarchy = resizeLength;
16622
16619
  } else {
16620
+ hierarchy++;
16623
16621
  for(var k1 in cacheMap){
16624
- this._resizeCacheMapHierarchy(cacheMap[k1], ++hierarchy, resizeLength);
16622
+ this._resizeCacheMapHierarchy(cacheMap[k1], hierarchy, currentHierarchy, increaseHierarchy);
16625
16623
  }
16626
16624
  }
16627
16625
  };