@galacean/engine-core 0.0.0-experimental-double11.10 → 0.0.0-experimental-double11.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.
- package/dist/main.js +89 -54
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +89 -54
- package/dist/module.js +89 -54
- 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
|
};
|
|
@@ -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
|
};
|
|
@@ -22915,17 +22912,17 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
22915
22912
|
SlicedSpriteAssembler1.resetData = function resetData(renderer) {
|
|
22916
22913
|
var verticesData = renderer._verticesData;
|
|
22917
22914
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
22918
|
-
|
|
22919
|
-
|
|
22920
|
-
|
|
22921
|
-
|
|
22922
|
-
|
|
22915
|
+
verticesData.vertexCount = positions.length = uvs.length = 16;
|
|
22916
|
+
for(var i = 0; i < 16; i++){
|
|
22917
|
+
var _positions, _i, _uvs, _i1;
|
|
22918
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new engineMath.Vector3());
|
|
22919
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new engineMath.Vector2());
|
|
22923
22920
|
}
|
|
22924
|
-
verticesData.triangles =
|
|
22921
|
+
verticesData.triangles = SlicedSpriteAssembler._rectangleTriangles;
|
|
22925
22922
|
};
|
|
22926
22923
|
SlicedSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
22927
22924
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite;
|
|
22928
|
-
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs
|
|
22925
|
+
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs;
|
|
22929
22926
|
var border = sprite.border;
|
|
22930
22927
|
var spriteUVs = sprite._getUVs();
|
|
22931
22928
|
// Update local positions.
|
|
@@ -23008,34 +23005,16 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
23008
23005
|
// 0 - 4 - 8 - 12
|
|
23009
23006
|
// ------------------------
|
|
23010
23007
|
// Assemble position and uv.
|
|
23011
|
-
var vertexCount = 0;
|
|
23012
|
-
var realICount = 0;
|
|
23013
23008
|
for(var i = 0; i < 4; i++){
|
|
23014
23009
|
var rowValue = row[i];
|
|
23015
23010
|
var rowU = spriteUVs[i].x;
|
|
23016
23011
|
for(var j = 0; j < 4; j++){
|
|
23017
23012
|
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;
|
|
23013
|
+
var idx = i * 4 + j;
|
|
23014
|
+
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]);
|
|
23015
|
+
uvs[idx].set(rowU, spriteUVs[j].y);
|
|
23016
|
+
}
|
|
23017
|
+
}
|
|
23039
23018
|
var _renderer__bounds = renderer._bounds, min = _renderer__bounds.min, max = _renderer__bounds.max;
|
|
23040
23019
|
min.set(row[0], column[0], 0);
|
|
23041
23020
|
max.set(row[3], column[3], 0);
|
|
@@ -23043,6 +23022,63 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
23043
23022
|
};
|
|
23044
23023
|
SlicedSpriteAssembler1.updateUVs = function updateUVs(renderer) {};
|
|
23045
23024
|
return SlicedSpriteAssembler1;
|
|
23025
|
+
}(), function() {
|
|
23026
|
+
_SlicedSpriteAssembler._rectangleTriangles = [
|
|
23027
|
+
0,
|
|
23028
|
+
1,
|
|
23029
|
+
4,
|
|
23030
|
+
1,
|
|
23031
|
+
5,
|
|
23032
|
+
4,
|
|
23033
|
+
1,
|
|
23034
|
+
2,
|
|
23035
|
+
5,
|
|
23036
|
+
2,
|
|
23037
|
+
6,
|
|
23038
|
+
5,
|
|
23039
|
+
2,
|
|
23040
|
+
3,
|
|
23041
|
+
6,
|
|
23042
|
+
3,
|
|
23043
|
+
7,
|
|
23044
|
+
6,
|
|
23045
|
+
4,
|
|
23046
|
+
5,
|
|
23047
|
+
8,
|
|
23048
|
+
5,
|
|
23049
|
+
9,
|
|
23050
|
+
8,
|
|
23051
|
+
5,
|
|
23052
|
+
6,
|
|
23053
|
+
9,
|
|
23054
|
+
6,
|
|
23055
|
+
10,
|
|
23056
|
+
9,
|
|
23057
|
+
6,
|
|
23058
|
+
7,
|
|
23059
|
+
10,
|
|
23060
|
+
7,
|
|
23061
|
+
11,
|
|
23062
|
+
10,
|
|
23063
|
+
8,
|
|
23064
|
+
9,
|
|
23065
|
+
12,
|
|
23066
|
+
9,
|
|
23067
|
+
13,
|
|
23068
|
+
12,
|
|
23069
|
+
9,
|
|
23070
|
+
10,
|
|
23071
|
+
13,
|
|
23072
|
+
10,
|
|
23073
|
+
14,
|
|
23074
|
+
13,
|
|
23075
|
+
10,
|
|
23076
|
+
11,
|
|
23077
|
+
14,
|
|
23078
|
+
11,
|
|
23079
|
+
15,
|
|
23080
|
+
14
|
|
23081
|
+
];
|
|
23046
23082
|
}(), function() {
|
|
23047
23083
|
_SlicedSpriteAssembler._worldMatrix = new engineMath.Matrix();
|
|
23048
23084
|
}(), _SlicedSpriteAssembler);
|
|
@@ -23054,8 +23090,7 @@ var _TiledSpriteAssembler;
|
|
|
23054
23090
|
var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
|
|
23055
23091
|
function TiledSpriteAssembler1() {}
|
|
23056
23092
|
TiledSpriteAssembler1.resetData = function resetData(renderer) {
|
|
23057
|
-
|
|
23058
|
-
(_renderer__verticesData = renderer._verticesData).triangles || (_renderer__verticesData.triangles = []);
|
|
23093
|
+
renderer._verticesData.triangles = [];
|
|
23059
23094
|
};
|
|
23060
23095
|
TiledSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
23061
23096
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite, tileMode = renderer.tileMode, threshold = renderer.tiledAdaptiveThreshold;
|