@galacean/engine-core 1.1.0-beta.12 → 1.1.0-beta.14
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 +76 -42
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +76 -42
- package/dist/module.js +76 -42
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
package/dist/miniprogram.js
CHANGED
|
@@ -7611,13 +7611,12 @@ var SimpleSpriteAssembler = (_SimpleSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
7611
7611
|
function SimpleSpriteAssembler1() {}
|
|
7612
7612
|
SimpleSpriteAssembler1.resetData = function resetData(renderer) {
|
|
7613
7613
|
var verticesData = renderer._verticesData;
|
|
7614
|
-
var vertexCount = verticesData.vertexCount = 4;
|
|
7615
7614
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
7616
|
-
|
|
7617
|
-
|
|
7618
|
-
|
|
7619
|
-
|
|
7620
|
-
|
|
7615
|
+
verticesData.vertexCount = positions.length = uvs.length = 4;
|
|
7616
|
+
for(var i = 0; i < 4; i++){
|
|
7617
|
+
var _positions, _i, _uvs, _i1;
|
|
7618
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new miniprogram.Vector3());
|
|
7619
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new miniprogram.Vector2());
|
|
7621
7620
|
}
|
|
7622
7621
|
verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
|
|
7623
7622
|
};
|
|
@@ -13135,7 +13134,7 @@ var /** @internal */ PromiseState;
|
|
|
13135
13134
|
var objects = Utils.objectValues(this._referResourcePool);
|
|
13136
13135
|
for(var i = 0, len = objects.length; i < len; i++){
|
|
13137
13136
|
if (!objects[i].isGCIgnored || forceDestroy) {
|
|
13138
|
-
objects[i].destroy();
|
|
13137
|
+
objects[i].destroy(forceDestroy);
|
|
13139
13138
|
}
|
|
13140
13139
|
}
|
|
13141
13140
|
};
|
|
@@ -16822,9 +16821,6 @@ ShaderPool.init();
|
|
|
16822
16821
|
_proto._destroy = function _destroy() {
|
|
16823
16822
|
this._sceneManager._destroyAllScene();
|
|
16824
16823
|
this._resourceManager._destroy();
|
|
16825
|
-
this._whiteTexture2D.destroy(true);
|
|
16826
|
-
this._magentaTexture2D.destroy(true);
|
|
16827
|
-
this._magentaTextureCube.destroy(true);
|
|
16828
16824
|
this._textDefaultFont = null;
|
|
16829
16825
|
this._fontMap = null;
|
|
16830
16826
|
this.inputManager._destroy();
|
|
@@ -22897,17 +22893,17 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
22897
22893
|
SlicedSpriteAssembler1.resetData = function resetData(renderer) {
|
|
22898
22894
|
var verticesData = renderer._verticesData;
|
|
22899
22895
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
22900
|
-
|
|
22901
|
-
|
|
22902
|
-
|
|
22903
|
-
|
|
22904
|
-
|
|
22896
|
+
verticesData.vertexCount = positions.length = uvs.length = 16;
|
|
22897
|
+
for(var i = 0; i < 16; i++){
|
|
22898
|
+
var _positions, _i, _uvs, _i1;
|
|
22899
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new miniprogram.Vector3());
|
|
22900
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new miniprogram.Vector2());
|
|
22905
22901
|
}
|
|
22906
|
-
verticesData.triangles =
|
|
22902
|
+
verticesData.triangles = SlicedSpriteAssembler._rectangleTriangles;
|
|
22907
22903
|
};
|
|
22908
22904
|
SlicedSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
22909
22905
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite;
|
|
22910
|
-
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs
|
|
22906
|
+
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs;
|
|
22911
22907
|
var border = sprite.border;
|
|
22912
22908
|
var spriteUVs = sprite._getUVs();
|
|
22913
22909
|
// Update local positions.
|
|
@@ -22990,34 +22986,16 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
22990
22986
|
// 0 - 4 - 8 - 12
|
|
22991
22987
|
// ------------------------
|
|
22992
22988
|
// Assemble position and uv.
|
|
22993
|
-
var vertexCount = 0;
|
|
22994
|
-
var realICount = 0;
|
|
22995
22989
|
for(var i = 0; i < 4; i++){
|
|
22996
22990
|
var rowValue = row[i];
|
|
22997
22991
|
var rowU = spriteUVs[i].x;
|
|
22998
22992
|
for(var j = 0; j < 4; j++){
|
|
22999
22993
|
var columnValue = column[j];
|
|
23000
|
-
|
|
23001
|
-
|
|
23002
|
-
|
|
23003
|
-
}
|
|
23004
|
-
|
|
23005
|
-
}
|
|
23006
|
-
var realJCount = vertexCount / realICount;
|
|
23007
|
-
var indexOffset = 0;
|
|
23008
|
-
for(var i1 = 0; i1 < realICount - 1; ++i1){
|
|
23009
|
-
for(var j1 = 0; j1 < realJCount - 1; ++j1){
|
|
23010
|
-
var start = i1 * realJCount + j1;
|
|
23011
|
-
triangles[indexOffset++] = start;
|
|
23012
|
-
triangles[indexOffset++] = start + 1;
|
|
23013
|
-
triangles[indexOffset++] = start + realJCount;
|
|
23014
|
-
triangles[indexOffset++] = start + 1;
|
|
23015
|
-
triangles[indexOffset++] = start + realJCount + 1;
|
|
23016
|
-
triangles[indexOffset++] = start + realJCount;
|
|
23017
|
-
}
|
|
23018
|
-
}
|
|
23019
|
-
renderer._verticesData.vertexCount = realICount * realJCount;
|
|
23020
|
-
triangles.length = (realICount - 1) * (realJCount - 1) * 6;
|
|
22994
|
+
var idx = i * 4 + j;
|
|
22995
|
+
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]);
|
|
22996
|
+
uvs[idx].set(rowU, spriteUVs[j].y);
|
|
22997
|
+
}
|
|
22998
|
+
}
|
|
23021
22999
|
var _renderer__bounds = renderer._bounds, min = _renderer__bounds.min, max = _renderer__bounds.max;
|
|
23022
23000
|
min.set(row[0], column[0], 0);
|
|
23023
23001
|
max.set(row[3], column[3], 0);
|
|
@@ -23025,6 +23003,63 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
23025
23003
|
};
|
|
23026
23004
|
SlicedSpriteAssembler1.updateUVs = function updateUVs(renderer) {};
|
|
23027
23005
|
return SlicedSpriteAssembler1;
|
|
23006
|
+
}(), function() {
|
|
23007
|
+
_SlicedSpriteAssembler._rectangleTriangles = [
|
|
23008
|
+
0,
|
|
23009
|
+
1,
|
|
23010
|
+
4,
|
|
23011
|
+
1,
|
|
23012
|
+
5,
|
|
23013
|
+
4,
|
|
23014
|
+
1,
|
|
23015
|
+
2,
|
|
23016
|
+
5,
|
|
23017
|
+
2,
|
|
23018
|
+
6,
|
|
23019
|
+
5,
|
|
23020
|
+
2,
|
|
23021
|
+
3,
|
|
23022
|
+
6,
|
|
23023
|
+
3,
|
|
23024
|
+
7,
|
|
23025
|
+
6,
|
|
23026
|
+
4,
|
|
23027
|
+
5,
|
|
23028
|
+
8,
|
|
23029
|
+
5,
|
|
23030
|
+
9,
|
|
23031
|
+
8,
|
|
23032
|
+
5,
|
|
23033
|
+
6,
|
|
23034
|
+
9,
|
|
23035
|
+
6,
|
|
23036
|
+
10,
|
|
23037
|
+
9,
|
|
23038
|
+
6,
|
|
23039
|
+
7,
|
|
23040
|
+
10,
|
|
23041
|
+
7,
|
|
23042
|
+
11,
|
|
23043
|
+
10,
|
|
23044
|
+
8,
|
|
23045
|
+
9,
|
|
23046
|
+
12,
|
|
23047
|
+
9,
|
|
23048
|
+
13,
|
|
23049
|
+
12,
|
|
23050
|
+
9,
|
|
23051
|
+
10,
|
|
23052
|
+
13,
|
|
23053
|
+
10,
|
|
23054
|
+
14,
|
|
23055
|
+
13,
|
|
23056
|
+
10,
|
|
23057
|
+
11,
|
|
23058
|
+
14,
|
|
23059
|
+
11,
|
|
23060
|
+
15,
|
|
23061
|
+
14
|
|
23062
|
+
];
|
|
23028
23063
|
}(), function() {
|
|
23029
23064
|
_SlicedSpriteAssembler._worldMatrix = new miniprogram.Matrix();
|
|
23030
23065
|
}(), _SlicedSpriteAssembler);
|
|
@@ -23036,8 +23071,7 @@ var _TiledSpriteAssembler;
|
|
|
23036
23071
|
var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
|
|
23037
23072
|
function TiledSpriteAssembler1() {}
|
|
23038
23073
|
TiledSpriteAssembler1.resetData = function resetData(renderer) {
|
|
23039
|
-
|
|
23040
|
-
(_renderer__verticesData = renderer._verticesData).triangles || (_renderer__verticesData.triangles = []);
|
|
23074
|
+
renderer._verticesData.triangles = [];
|
|
23041
23075
|
};
|
|
23042
23076
|
TiledSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
23043
23077
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite, tileMode = renderer.tileMode, threshold = renderer.tiledAdaptiveThreshold;
|
package/dist/module.js
CHANGED
|
@@ -7606,13 +7606,12 @@ var SimpleSpriteAssembler = (_SimpleSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
7606
7606
|
function SimpleSpriteAssembler1() {}
|
|
7607
7607
|
SimpleSpriteAssembler1.resetData = function resetData(renderer) {
|
|
7608
7608
|
var verticesData = renderer._verticesData;
|
|
7609
|
-
var vertexCount = verticesData.vertexCount = 4;
|
|
7610
7609
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
7611
|
-
|
|
7612
|
-
|
|
7613
|
-
|
|
7614
|
-
|
|
7615
|
-
|
|
7610
|
+
verticesData.vertexCount = positions.length = uvs.length = 4;
|
|
7611
|
+
for(var i = 0; i < 4; i++){
|
|
7612
|
+
var _positions, _i, _uvs, _i1;
|
|
7613
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new Vector3());
|
|
7614
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new Vector2());
|
|
7616
7615
|
}
|
|
7617
7616
|
verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
|
|
7618
7617
|
};
|
|
@@ -13130,7 +13129,7 @@ var /** @internal */ PromiseState;
|
|
|
13130
13129
|
var objects = Utils.objectValues(this._referResourcePool);
|
|
13131
13130
|
for(var i = 0, len = objects.length; i < len; i++){
|
|
13132
13131
|
if (!objects[i].isGCIgnored || forceDestroy) {
|
|
13133
|
-
objects[i].destroy();
|
|
13132
|
+
objects[i].destroy(forceDestroy);
|
|
13134
13133
|
}
|
|
13135
13134
|
}
|
|
13136
13135
|
};
|
|
@@ -16817,9 +16816,6 @@ ShaderPool.init();
|
|
|
16817
16816
|
_proto._destroy = function _destroy() {
|
|
16818
16817
|
this._sceneManager._destroyAllScene();
|
|
16819
16818
|
this._resourceManager._destroy();
|
|
16820
|
-
this._whiteTexture2D.destroy(true);
|
|
16821
|
-
this._magentaTexture2D.destroy(true);
|
|
16822
|
-
this._magentaTextureCube.destroy(true);
|
|
16823
16819
|
this._textDefaultFont = null;
|
|
16824
16820
|
this._fontMap = null;
|
|
16825
16821
|
this.inputManager._destroy();
|
|
@@ -22892,17 +22888,17 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
22892
22888
|
SlicedSpriteAssembler1.resetData = function resetData(renderer) {
|
|
22893
22889
|
var verticesData = renderer._verticesData;
|
|
22894
22890
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
22895
|
-
|
|
22896
|
-
|
|
22897
|
-
|
|
22898
|
-
|
|
22899
|
-
|
|
22891
|
+
verticesData.vertexCount = positions.length = uvs.length = 16;
|
|
22892
|
+
for(var i = 0; i < 16; i++){
|
|
22893
|
+
var _positions, _i, _uvs, _i1;
|
|
22894
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new Vector3());
|
|
22895
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new Vector2());
|
|
22900
22896
|
}
|
|
22901
|
-
verticesData.triangles =
|
|
22897
|
+
verticesData.triangles = SlicedSpriteAssembler._rectangleTriangles;
|
|
22902
22898
|
};
|
|
22903
22899
|
SlicedSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
22904
22900
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite;
|
|
22905
|
-
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs
|
|
22901
|
+
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs;
|
|
22906
22902
|
var border = sprite.border;
|
|
22907
22903
|
var spriteUVs = sprite._getUVs();
|
|
22908
22904
|
// Update local positions.
|
|
@@ -22985,34 +22981,16 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
22985
22981
|
// 0 - 4 - 8 - 12
|
|
22986
22982
|
// ------------------------
|
|
22987
22983
|
// Assemble position and uv.
|
|
22988
|
-
var vertexCount = 0;
|
|
22989
|
-
var realICount = 0;
|
|
22990
22984
|
for(var i = 0; i < 4; i++){
|
|
22991
22985
|
var rowValue = row[i];
|
|
22992
22986
|
var rowU = spriteUVs[i].x;
|
|
22993
22987
|
for(var j = 0; j < 4; j++){
|
|
22994
22988
|
var columnValue = column[j];
|
|
22995
|
-
|
|
22996
|
-
|
|
22997
|
-
|
|
22998
|
-
}
|
|
22999
|
-
|
|
23000
|
-
}
|
|
23001
|
-
var realJCount = vertexCount / realICount;
|
|
23002
|
-
var indexOffset = 0;
|
|
23003
|
-
for(var i1 = 0; i1 < realICount - 1; ++i1){
|
|
23004
|
-
for(var j1 = 0; j1 < realJCount - 1; ++j1){
|
|
23005
|
-
var start = i1 * realJCount + j1;
|
|
23006
|
-
triangles[indexOffset++] = start;
|
|
23007
|
-
triangles[indexOffset++] = start + 1;
|
|
23008
|
-
triangles[indexOffset++] = start + realJCount;
|
|
23009
|
-
triangles[indexOffset++] = start + 1;
|
|
23010
|
-
triangles[indexOffset++] = start + realJCount + 1;
|
|
23011
|
-
triangles[indexOffset++] = start + realJCount;
|
|
23012
|
-
}
|
|
23013
|
-
}
|
|
23014
|
-
renderer._verticesData.vertexCount = realICount * realJCount;
|
|
23015
|
-
triangles.length = (realICount - 1) * (realJCount - 1) * 6;
|
|
22989
|
+
var idx = i * 4 + j;
|
|
22990
|
+
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]);
|
|
22991
|
+
uvs[idx].set(rowU, spriteUVs[j].y);
|
|
22992
|
+
}
|
|
22993
|
+
}
|
|
23016
22994
|
var _renderer__bounds = renderer._bounds, min = _renderer__bounds.min, max = _renderer__bounds.max;
|
|
23017
22995
|
min.set(row[0], column[0], 0);
|
|
23018
22996
|
max.set(row[3], column[3], 0);
|
|
@@ -23020,6 +22998,63 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
|
|
|
23020
22998
|
};
|
|
23021
22999
|
SlicedSpriteAssembler1.updateUVs = function updateUVs(renderer) {};
|
|
23022
23000
|
return SlicedSpriteAssembler1;
|
|
23001
|
+
}(), function() {
|
|
23002
|
+
_SlicedSpriteAssembler._rectangleTriangles = [
|
|
23003
|
+
0,
|
|
23004
|
+
1,
|
|
23005
|
+
4,
|
|
23006
|
+
1,
|
|
23007
|
+
5,
|
|
23008
|
+
4,
|
|
23009
|
+
1,
|
|
23010
|
+
2,
|
|
23011
|
+
5,
|
|
23012
|
+
2,
|
|
23013
|
+
6,
|
|
23014
|
+
5,
|
|
23015
|
+
2,
|
|
23016
|
+
3,
|
|
23017
|
+
6,
|
|
23018
|
+
3,
|
|
23019
|
+
7,
|
|
23020
|
+
6,
|
|
23021
|
+
4,
|
|
23022
|
+
5,
|
|
23023
|
+
8,
|
|
23024
|
+
5,
|
|
23025
|
+
9,
|
|
23026
|
+
8,
|
|
23027
|
+
5,
|
|
23028
|
+
6,
|
|
23029
|
+
9,
|
|
23030
|
+
6,
|
|
23031
|
+
10,
|
|
23032
|
+
9,
|
|
23033
|
+
6,
|
|
23034
|
+
7,
|
|
23035
|
+
10,
|
|
23036
|
+
7,
|
|
23037
|
+
11,
|
|
23038
|
+
10,
|
|
23039
|
+
8,
|
|
23040
|
+
9,
|
|
23041
|
+
12,
|
|
23042
|
+
9,
|
|
23043
|
+
13,
|
|
23044
|
+
12,
|
|
23045
|
+
9,
|
|
23046
|
+
10,
|
|
23047
|
+
13,
|
|
23048
|
+
10,
|
|
23049
|
+
14,
|
|
23050
|
+
13,
|
|
23051
|
+
10,
|
|
23052
|
+
11,
|
|
23053
|
+
14,
|
|
23054
|
+
11,
|
|
23055
|
+
15,
|
|
23056
|
+
14
|
|
23057
|
+
];
|
|
23023
23058
|
}(), function() {
|
|
23024
23059
|
_SlicedSpriteAssembler._worldMatrix = new Matrix();
|
|
23025
23060
|
}(), _SlicedSpriteAssembler);
|
|
@@ -23031,8 +23066,7 @@ var _TiledSpriteAssembler;
|
|
|
23031
23066
|
var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
|
|
23032
23067
|
function TiledSpriteAssembler1() {}
|
|
23033
23068
|
TiledSpriteAssembler1.resetData = function resetData(renderer) {
|
|
23034
|
-
|
|
23035
|
-
(_renderer__verticesData = renderer._verticesData).triangles || (_renderer__verticesData.triangles = []);
|
|
23069
|
+
renderer._verticesData.triangles = [];
|
|
23036
23070
|
};
|
|
23037
23071
|
TiledSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
23038
23072
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite, tileMode = renderer.tileMode, threshold = renderer.tiledAdaptiveThreshold;
|