@galacean/engine-core 0.0.0-experimental-double11.10 → 0.0.0-experimental-double11.13
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.
- package/dist/main.js +90 -58
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +90 -58
- package/dist/module.js +90 -58
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
package/dist/main.js
CHANGED
|
@@ -7610,13 +7610,12 @@ var SimpleSpriteAssembler = (_SimpleSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
7610
7610
|
function SimpleSpriteAssembler1() {}
|
|
7611
7611
|
SimpleSpriteAssembler1.resetData = function resetData(renderer) {
|
|
7612
7612
|
var verticesData = renderer._verticesData;
|
|
7613
|
-
var vertexCount = verticesData.vertexCount = 4;
|
|
7614
7613
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
7615
|
-
|
|
7616
|
-
|
|
7617
|
-
|
|
7618
|
-
|
|
7619
|
-
|
|
7614
|
+
verticesData.vertexCount = positions.length = uvs.length = 4;
|
|
7615
|
+
for(var i = 0; i < 4; i++){
|
|
7616
|
+
var _positions, _i, _uvs, _i1;
|
|
7617
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new engineMath.Vector3());
|
|
7618
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new engineMath.Vector2());
|
|
7620
7619
|
}
|
|
7621
7620
|
verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
|
|
7622
7621
|
};
|
|
@@ -13134,7 +13133,7 @@ var /** @internal */ PromiseState;
|
|
|
13134
13133
|
var objects = Utils.objectValues(this._referResourcePool);
|
|
13135
13134
|
for(var i = 0, len = objects.length; i < len; i++){
|
|
13136
13135
|
if (!objects[i].isGCIgnored || forceDestroy) {
|
|
13137
|
-
objects[i].destroy();
|
|
13136
|
+
objects[i].destroy(forceDestroy);
|
|
13138
13137
|
}
|
|
13139
13138
|
}
|
|
13140
13139
|
};
|
|
@@ -16583,7 +16582,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
|
|
|
16583
16582
|
* @internal
|
|
16584
16583
|
*/ var ShaderProgramPool = /*#__PURE__*/ function() {
|
|
16585
16584
|
function ShaderProgramPool() {
|
|
16586
|
-
this.
|
|
16585
|
+
this._cacheHierarchyDepth = 1;
|
|
16587
16586
|
this._cacheMap = Object.create(null);
|
|
16588
16587
|
}
|
|
16589
16588
|
var _proto = ShaderProgramPool.prototype;
|
|
@@ -16594,12 +16593,14 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
|
|
|
16594
16593
|
*/ _proto.get = function get(macros) {
|
|
16595
16594
|
var cacheMap = this._cacheMap;
|
|
16596
16595
|
var maskLength = macros._length;
|
|
16597
|
-
|
|
16598
|
-
|
|
16596
|
+
var cacheHierarchyDepth = this._cacheHierarchyDepth;
|
|
16597
|
+
if (maskLength > cacheHierarchyDepth) {
|
|
16598
|
+
this._resizeCacheMapHierarchy(cacheMap, 0, cacheHierarchyDepth, maskLength - cacheHierarchyDepth);
|
|
16599
|
+
this._cacheHierarchyDepth = maskLength;
|
|
16599
16600
|
}
|
|
16600
16601
|
var mask = macros._mask;
|
|
16601
16602
|
var endIndex = macros._length - 1;
|
|
16602
|
-
var maxEndIndex = this.
|
|
16603
|
+
var maxEndIndex = this._cacheHierarchyDepth - 1;
|
|
16603
16604
|
for(var i = 0; i < maxEndIndex; i++){
|
|
16604
16605
|
var subMask = endIndex < i ? 0 : mask[i];
|
|
16605
16606
|
var subCacheShaders = cacheMap[subMask];
|
|
@@ -16624,25 +16625,21 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
|
|
|
16624
16625
|
*/ _proto.cache = function cache(shaderProgram) {
|
|
16625
16626
|
this._lastQueryMap[this._lastQueryKey] = shaderProgram;
|
|
16626
16627
|
};
|
|
16627
|
-
_proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy,
|
|
16628
|
-
//
|
|
16629
|
-
|
|
16630
|
-
if (hierarchy == end) {
|
|
16628
|
+
_proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, currentHierarchy, increaseHierarchy) {
|
|
16629
|
+
// Only expand but not shrink
|
|
16630
|
+
if (hierarchy == currentHierarchy - 1) {
|
|
16631
16631
|
for(var k in cacheMap){
|
|
16632
16632
|
var shader = cacheMap[k];
|
|
16633
16633
|
var subCacheMap = cacheMap;
|
|
16634
|
-
for(var i = 0
|
|
16635
|
-
|
|
16636
|
-
subCacheMap[0] = shader;
|
|
16637
|
-
} else {
|
|
16638
|
-
subCacheMap = subCacheMap[i == 0 ? k : 0] = Object.create(null);
|
|
16639
|
-
}
|
|
16634
|
+
for(var i = 0; i < increaseHierarchy; i++){
|
|
16635
|
+
subCacheMap[i == 0 ? k : 0] = subCacheMap = Object.create(null);
|
|
16640
16636
|
}
|
|
16637
|
+
subCacheMap[0] = shader;
|
|
16641
16638
|
}
|
|
16642
|
-
this._cacheHierarchy = resizeLength;
|
|
16643
16639
|
} else {
|
|
16640
|
+
hierarchy++;
|
|
16644
16641
|
for(var k1 in cacheMap){
|
|
16645
|
-
this._resizeCacheMapHierarchy(cacheMap[k1],
|
|
16642
|
+
this._resizeCacheMapHierarchy(cacheMap[k1], hierarchy, currentHierarchy, increaseHierarchy);
|
|
16646
16643
|
}
|
|
16647
16644
|
}
|
|
16648
16645
|
};
|
|
@@ -16840,9 +16837,6 @@ ShaderPool.init();
|
|
|
16840
16837
|
_proto._destroy = function _destroy() {
|
|
16841
16838
|
this._sceneManager._destroyAllScene();
|
|
16842
16839
|
this._resourceManager._destroy();
|
|
16843
|
-
this._whiteTexture2D.destroy(true);
|
|
16844
|
-
this._magentaTexture2D.destroy(true);
|
|
16845
|
-
this._magentaTextureCube.destroy(true);
|
|
16846
16840
|
this._textDefaultFont = null;
|
|
16847
16841
|
this._fontMap = null;
|
|
16848
16842
|
this.inputManager._destroy();
|
|
@@ -22915,17 +22909,17 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
22915
22909
|
SlicedSpriteAssembler1.resetData = function resetData(renderer) {
|
|
22916
22910
|
var verticesData = renderer._verticesData;
|
|
22917
22911
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
22918
|
-
|
|
22919
|
-
|
|
22920
|
-
|
|
22921
|
-
|
|
22922
|
-
|
|
22912
|
+
verticesData.vertexCount = positions.length = uvs.length = 16;
|
|
22913
|
+
for(var i = 0; i < 16; i++){
|
|
22914
|
+
var _positions, _i, _uvs, _i1;
|
|
22915
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new engineMath.Vector3());
|
|
22916
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new engineMath.Vector2());
|
|
22923
22917
|
}
|
|
22924
|
-
verticesData.triangles =
|
|
22918
|
+
verticesData.triangles = SlicedSpriteAssembler._rectangleTriangles;
|
|
22925
22919
|
};
|
|
22926
22920
|
SlicedSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
22927
22921
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite;
|
|
22928
|
-
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs
|
|
22922
|
+
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs;
|
|
22929
22923
|
var border = sprite.border;
|
|
22930
22924
|
var spriteUVs = sprite._getUVs();
|
|
22931
22925
|
// Update local positions.
|
|
@@ -23008,34 +23002,16 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
23008
23002
|
// 0 - 4 - 8 - 12
|
|
23009
23003
|
// ------------------------
|
|
23010
23004
|
// Assemble position and uv.
|
|
23011
|
-
var vertexCount = 0;
|
|
23012
|
-
var realICount = 0;
|
|
23013
23005
|
for(var i = 0; i < 4; i++){
|
|
23014
23006
|
var rowValue = row[i];
|
|
23015
23007
|
var rowU = spriteUVs[i].x;
|
|
23016
23008
|
for(var j = 0; j < 4; j++){
|
|
23017
23009
|
var columnValue = column[j];
|
|
23018
|
-
|
|
23019
|
-
|
|
23020
|
-
|
|
23021
|
-
}
|
|
23022
|
-
|
|
23023
|
-
}
|
|
23024
|
-
var realJCount = vertexCount / realICount;
|
|
23025
|
-
var indexOffset = 0;
|
|
23026
|
-
for(var i1 = 0; i1 < realICount - 1; ++i1){
|
|
23027
|
-
for(var j1 = 0; j1 < realJCount - 1; ++j1){
|
|
23028
|
-
var start = i1 * realJCount + j1;
|
|
23029
|
-
triangles[indexOffset++] = start;
|
|
23030
|
-
triangles[indexOffset++] = start + 1;
|
|
23031
|
-
triangles[indexOffset++] = start + realJCount;
|
|
23032
|
-
triangles[indexOffset++] = start + 1;
|
|
23033
|
-
triangles[indexOffset++] = start + realJCount + 1;
|
|
23034
|
-
triangles[indexOffset++] = start + realJCount;
|
|
23035
|
-
}
|
|
23036
|
-
}
|
|
23037
|
-
renderer._verticesData.vertexCount = realICount * realJCount;
|
|
23038
|
-
triangles.length = (realICount - 1) * (realJCount - 1) * 6;
|
|
23010
|
+
var idx = i * 4 + j;
|
|
23011
|
+
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]);
|
|
23012
|
+
uvs[idx].set(rowU, spriteUVs[j].y);
|
|
23013
|
+
}
|
|
23014
|
+
}
|
|
23039
23015
|
var _renderer__bounds = renderer._bounds, min = _renderer__bounds.min, max = _renderer__bounds.max;
|
|
23040
23016
|
min.set(row[0], column[0], 0);
|
|
23041
23017
|
max.set(row[3], column[3], 0);
|
|
@@ -23043,6 +23019,63 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
23043
23019
|
};
|
|
23044
23020
|
SlicedSpriteAssembler1.updateUVs = function updateUVs(renderer) {};
|
|
23045
23021
|
return SlicedSpriteAssembler1;
|
|
23022
|
+
}(), function() {
|
|
23023
|
+
_SlicedSpriteAssembler._rectangleTriangles = [
|
|
23024
|
+
0,
|
|
23025
|
+
1,
|
|
23026
|
+
4,
|
|
23027
|
+
1,
|
|
23028
|
+
5,
|
|
23029
|
+
4,
|
|
23030
|
+
1,
|
|
23031
|
+
2,
|
|
23032
|
+
5,
|
|
23033
|
+
2,
|
|
23034
|
+
6,
|
|
23035
|
+
5,
|
|
23036
|
+
2,
|
|
23037
|
+
3,
|
|
23038
|
+
6,
|
|
23039
|
+
3,
|
|
23040
|
+
7,
|
|
23041
|
+
6,
|
|
23042
|
+
4,
|
|
23043
|
+
5,
|
|
23044
|
+
8,
|
|
23045
|
+
5,
|
|
23046
|
+
9,
|
|
23047
|
+
8,
|
|
23048
|
+
5,
|
|
23049
|
+
6,
|
|
23050
|
+
9,
|
|
23051
|
+
6,
|
|
23052
|
+
10,
|
|
23053
|
+
9,
|
|
23054
|
+
6,
|
|
23055
|
+
7,
|
|
23056
|
+
10,
|
|
23057
|
+
7,
|
|
23058
|
+
11,
|
|
23059
|
+
10,
|
|
23060
|
+
8,
|
|
23061
|
+
9,
|
|
23062
|
+
12,
|
|
23063
|
+
9,
|
|
23064
|
+
13,
|
|
23065
|
+
12,
|
|
23066
|
+
9,
|
|
23067
|
+
10,
|
|
23068
|
+
13,
|
|
23069
|
+
10,
|
|
23070
|
+
14,
|
|
23071
|
+
13,
|
|
23072
|
+
10,
|
|
23073
|
+
11,
|
|
23074
|
+
14,
|
|
23075
|
+
11,
|
|
23076
|
+
15,
|
|
23077
|
+
14
|
|
23078
|
+
];
|
|
23046
23079
|
}(), function() {
|
|
23047
23080
|
_SlicedSpriteAssembler._worldMatrix = new engineMath.Matrix();
|
|
23048
23081
|
}(), _SlicedSpriteAssembler);
|
|
@@ -23054,8 +23087,7 @@ var _TiledSpriteAssembler;
|
|
|
23054
23087
|
var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
|
|
23055
23088
|
function TiledSpriteAssembler1() {}
|
|
23056
23089
|
TiledSpriteAssembler1.resetData = function resetData(renderer) {
|
|
23057
|
-
|
|
23058
|
-
(_renderer__verticesData = renderer._verticesData).triangles || (_renderer__verticesData.triangles = []);
|
|
23090
|
+
renderer._verticesData.triangles = [];
|
|
23059
23091
|
};
|
|
23060
23092
|
TiledSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
23061
23093
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite, tileMode = renderer.tileMode, threshold = renderer.tiledAdaptiveThreshold;
|