@galacean/engine 1.1.0-beta.13 → 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/browser.js +91 -64
- package/dist/browser.min.js +1 -1
- package/dist/main.js +1 -1
- package/dist/miniprogram.js +1 -1
- package/dist/module.js +1 -1
- package/package.json +5 -5
package/dist/browser.js
CHANGED
|
@@ -12424,13 +12424,12 @@
|
|
|
12424
12424
|
var SimpleSpriteAssembler1 = function SimpleSpriteAssembler1() {};
|
|
12425
12425
|
SimpleSpriteAssembler1.resetData = function resetData(renderer) {
|
|
12426
12426
|
var verticesData = renderer._verticesData;
|
|
12427
|
-
var vertexCount = verticesData.vertexCount = 4;
|
|
12428
12427
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
12429
|
-
|
|
12430
|
-
|
|
12431
|
-
|
|
12432
|
-
|
|
12433
|
-
|
|
12428
|
+
verticesData.vertexCount = positions.length = uvs.length = 4;
|
|
12429
|
+
for(var i = 0; i < 4; i++){
|
|
12430
|
+
var _positions, _i, _uvs, _i1;
|
|
12431
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new Vector3());
|
|
12432
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new Vector2());
|
|
12434
12433
|
}
|
|
12435
12434
|
verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
|
|
12436
12435
|
};
|
|
@@ -17902,7 +17901,7 @@
|
|
|
17902
17901
|
var objects = Utils.objectValues(this._referResourcePool);
|
|
17903
17902
|
for(var i = 0, len = objects.length; i < len; i++){
|
|
17904
17903
|
if (!objects[i].isGCIgnored || forceDestroy) {
|
|
17905
|
-
objects[i].destroy();
|
|
17904
|
+
objects[i].destroy(forceDestroy);
|
|
17906
17905
|
}
|
|
17907
17906
|
}
|
|
17908
17907
|
};
|
|
@@ -21523,9 +21522,6 @@
|
|
|
21523
21522
|
_proto._destroy = function _destroy() {
|
|
21524
21523
|
this._sceneManager._destroyAllScene();
|
|
21525
21524
|
this._resourceManager._destroy();
|
|
21526
|
-
this._whiteTexture2D.destroy(true);
|
|
21527
|
-
this._magentaTexture2D.destroy(true);
|
|
21528
|
-
this._magentaTextureCube.destroy(true);
|
|
21529
21525
|
this._textDefaultFont = null;
|
|
21530
21526
|
this._fontMap = null;
|
|
21531
21527
|
this.inputManager._destroy();
|
|
@@ -27548,17 +27544,17 @@
|
|
|
27548
27544
|
SlicedSpriteAssembler1.resetData = function resetData(renderer) {
|
|
27549
27545
|
var verticesData = renderer._verticesData;
|
|
27550
27546
|
var positions = verticesData.positions, uvs = verticesData.uvs;
|
|
27551
|
-
|
|
27552
|
-
|
|
27553
|
-
|
|
27554
|
-
|
|
27555
|
-
|
|
27547
|
+
verticesData.vertexCount = positions.length = uvs.length = 16;
|
|
27548
|
+
for(var i = 0; i < 16; i++){
|
|
27549
|
+
var _positions, _i, _uvs, _i1;
|
|
27550
|
+
(_positions = positions)[_i = i] || (_positions[_i] = new Vector3());
|
|
27551
|
+
(_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new Vector2());
|
|
27556
27552
|
}
|
|
27557
|
-
verticesData.triangles =
|
|
27553
|
+
verticesData.triangles = SlicedSpriteAssembler._rectangleTriangles;
|
|
27558
27554
|
};
|
|
27559
27555
|
SlicedSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
27560
27556
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite;
|
|
27561
|
-
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs
|
|
27557
|
+
var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs;
|
|
27562
27558
|
var border = sprite.border;
|
|
27563
27559
|
var spriteUVs = sprite._getUVs();
|
|
27564
27560
|
// Update local positions.
|
|
@@ -27641,34 +27637,16 @@
|
|
|
27641
27637
|
// 0 - 4 - 8 - 12
|
|
27642
27638
|
// ------------------------
|
|
27643
27639
|
// Assemble position and uv.
|
|
27644
|
-
var vertexCount = 0;
|
|
27645
|
-
var realICount = 0;
|
|
27646
27640
|
for(var i = 0; i < 4; i++){
|
|
27647
27641
|
var rowValue = row[i];
|
|
27648
27642
|
var rowU = spriteUVs[i].x;
|
|
27649
27643
|
for(var j = 0; j < 4; j++){
|
|
27650
27644
|
var columnValue = column[j];
|
|
27651
|
-
|
|
27652
|
-
|
|
27653
|
-
|
|
27654
|
-
}
|
|
27655
|
-
|
|
27656
|
-
}
|
|
27657
|
-
var realJCount = vertexCount / realICount;
|
|
27658
|
-
var indexOffset = 0;
|
|
27659
|
-
for(var i1 = 0; i1 < realICount - 1; ++i1){
|
|
27660
|
-
for(var j1 = 0; j1 < realJCount - 1; ++j1){
|
|
27661
|
-
var start = i1 * realJCount + j1;
|
|
27662
|
-
triangles[indexOffset++] = start;
|
|
27663
|
-
triangles[indexOffset++] = start + 1;
|
|
27664
|
-
triangles[indexOffset++] = start + realJCount;
|
|
27665
|
-
triangles[indexOffset++] = start + 1;
|
|
27666
|
-
triangles[indexOffset++] = start + realJCount + 1;
|
|
27667
|
-
triangles[indexOffset++] = start + realJCount;
|
|
27668
|
-
}
|
|
27669
|
-
}
|
|
27670
|
-
renderer._verticesData.vertexCount = realICount * realJCount;
|
|
27671
|
-
triangles.length = (realICount - 1) * (realJCount - 1) * 6;
|
|
27645
|
+
var idx = i * 4 + j;
|
|
27646
|
+
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]);
|
|
27647
|
+
uvs[idx].set(rowU, spriteUVs[j].y);
|
|
27648
|
+
}
|
|
27649
|
+
}
|
|
27672
27650
|
var _renderer__bounds = renderer._bounds, min = _renderer__bounds.min, max = _renderer__bounds.max;
|
|
27673
27651
|
min.set(row[0], column[0], 0);
|
|
27674
27652
|
max.set(row[3], column[3], 0);
|
|
@@ -27676,6 +27654,63 @@
|
|
|
27676
27654
|
};
|
|
27677
27655
|
SlicedSpriteAssembler1.updateUVs = function updateUVs(renderer) {};
|
|
27678
27656
|
return SlicedSpriteAssembler1;
|
|
27657
|
+
}(), function() {
|
|
27658
|
+
_SlicedSpriteAssembler._rectangleTriangles = [
|
|
27659
|
+
0,
|
|
27660
|
+
1,
|
|
27661
|
+
4,
|
|
27662
|
+
1,
|
|
27663
|
+
5,
|
|
27664
|
+
4,
|
|
27665
|
+
1,
|
|
27666
|
+
2,
|
|
27667
|
+
5,
|
|
27668
|
+
2,
|
|
27669
|
+
6,
|
|
27670
|
+
5,
|
|
27671
|
+
2,
|
|
27672
|
+
3,
|
|
27673
|
+
6,
|
|
27674
|
+
3,
|
|
27675
|
+
7,
|
|
27676
|
+
6,
|
|
27677
|
+
4,
|
|
27678
|
+
5,
|
|
27679
|
+
8,
|
|
27680
|
+
5,
|
|
27681
|
+
9,
|
|
27682
|
+
8,
|
|
27683
|
+
5,
|
|
27684
|
+
6,
|
|
27685
|
+
9,
|
|
27686
|
+
6,
|
|
27687
|
+
10,
|
|
27688
|
+
9,
|
|
27689
|
+
6,
|
|
27690
|
+
7,
|
|
27691
|
+
10,
|
|
27692
|
+
7,
|
|
27693
|
+
11,
|
|
27694
|
+
10,
|
|
27695
|
+
8,
|
|
27696
|
+
9,
|
|
27697
|
+
12,
|
|
27698
|
+
9,
|
|
27699
|
+
13,
|
|
27700
|
+
12,
|
|
27701
|
+
9,
|
|
27702
|
+
10,
|
|
27703
|
+
13,
|
|
27704
|
+
10,
|
|
27705
|
+
14,
|
|
27706
|
+
13,
|
|
27707
|
+
10,
|
|
27708
|
+
11,
|
|
27709
|
+
14,
|
|
27710
|
+
11,
|
|
27711
|
+
15,
|
|
27712
|
+
14
|
|
27713
|
+
];
|
|
27679
27714
|
}(), function() {
|
|
27680
27715
|
_SlicedSpriteAssembler._worldMatrix = new Matrix();
|
|
27681
27716
|
}(), _SlicedSpriteAssembler);
|
|
@@ -27686,8 +27721,7 @@
|
|
|
27686
27721
|
var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
|
|
27687
27722
|
var TiledSpriteAssembler1 = function TiledSpriteAssembler1() {};
|
|
27688
27723
|
TiledSpriteAssembler1.resetData = function resetData(renderer) {
|
|
27689
|
-
|
|
27690
|
-
(_renderer__verticesData = renderer._verticesData).triangles || (_renderer__verticesData.triangles = []);
|
|
27724
|
+
renderer._verticesData.triangles = [];
|
|
27691
27725
|
};
|
|
27692
27726
|
TiledSpriteAssembler1.updatePositions = function updatePositions(renderer) {
|
|
27693
27727
|
var width = renderer.width, height = renderer.height, sprite = renderer.sprite, tileMode = renderer.tileMode, threshold = renderer.tiledAdaptiveThreshold;
|
|
@@ -37553,7 +37587,7 @@
|
|
|
37553
37587
|
var encodedMeshData = JSON.parse(jsonDataString);
|
|
37554
37588
|
// @ts-ignore Vector3 is not compatible with {x: number, y: number, z: number}.
|
|
37555
37589
|
encodedMeshData.bounds && modelMesh.bounds.copyFrom(encodedMeshData.bounds);
|
|
37556
|
-
var offset = Math.ceil(bufferReader.
|
|
37590
|
+
var offset = Math.ceil(bufferReader.position / 4) * 4;
|
|
37557
37591
|
var buffer = bufferReader.data.buffer;
|
|
37558
37592
|
var byteOffset = bufferReader.data.byteOffset;
|
|
37559
37593
|
var float32Array = new Float32Array(buffer, encodedMeshData.positions.start + offset + byteOffset, (encodedMeshData.positions.end - encodedMeshData.positions.start) / 4);
|
|
@@ -39469,7 +39503,7 @@
|
|
|
39469
39503
|
alphaSliceByteLength: sgdReader.nextUint32()
|
|
39470
39504
|
};
|
|
39471
39505
|
}
|
|
39472
|
-
var endpointsByteOffset = sgdByteOffset + sgdReader.
|
|
39506
|
+
var endpointsByteOffset = sgdByteOffset + sgdReader.position;
|
|
39473
39507
|
var selectorsByteOffset = endpointsByteOffset + endpointsByteLength;
|
|
39474
39508
|
var tablesByteOffset = selectorsByteOffset + selectorsByteLength;
|
|
39475
39509
|
var extendedByteOffset = tablesByteOffset + tablesByteLength;
|
|
@@ -40120,6 +40154,7 @@
|
|
|
40120
40154
|
_proto.initialize = function initialize(engine, configuration) {
|
|
40121
40155
|
if (configuration.ktx2Loader) {
|
|
40122
40156
|
var options = configuration.ktx2Loader;
|
|
40157
|
+
if (options.priorityFormats) exports.KTX2Loader._priorityFormats = options.priorityFormats;
|
|
40123
40158
|
if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
|
|
40124
40159
|
return exports.KTX2Loader._getKhronosTranscoder(options.workerCount).init();
|
|
40125
40160
|
} else {
|
|
@@ -40148,17 +40183,7 @@
|
|
|
40148
40183
|
exports.KTX2TargetFormat.PVRTC,
|
|
40149
40184
|
exports.KTX2TargetFormat.R8G8B8A8
|
|
40150
40185
|
];
|
|
40151
|
-
|
|
40152
|
-
if (Array.isArray(priorityFormats[0])) {
|
|
40153
|
-
for(var i = 0; i < priorityFormats.length; i++){
|
|
40154
|
-
supportedList.push(exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats[i]));
|
|
40155
|
-
}
|
|
40156
|
-
} else {
|
|
40157
|
-
supportedList.push(exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats));
|
|
40158
|
-
}
|
|
40159
|
-
return supportedList.every(function(format) {
|
|
40160
|
-
return KhronosTranscoder.transcoderMap[format];
|
|
40161
|
-
});
|
|
40186
|
+
return !!KhronosTranscoder.transcoderMap[exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats)];
|
|
40162
40187
|
};
|
|
40163
40188
|
/**
|
|
40164
40189
|
* Destroy ktx2 transcoder worker.
|
|
@@ -40172,7 +40197,8 @@
|
|
|
40172
40197
|
/** @internal */ KTX2Loader1._parseBuffer = function _parseBuffer(buffer, engine, params) {
|
|
40173
40198
|
var _params;
|
|
40174
40199
|
var ktx2Container = new KTX2Container(buffer);
|
|
40175
|
-
var
|
|
40200
|
+
var _params_priorityFormats;
|
|
40201
|
+
var formatPriorities = (_params_priorityFormats = (_params = params) == null ? void 0 : _params.priorityFormats) != null ? _params_priorityFormats : exports.KTX2Loader._priorityFormats;
|
|
40176
40202
|
var targetFormat = exports.KTX2Loader._decideTargetFormat(engine, ktx2Container, formatPriorities);
|
|
40177
40203
|
var transcodeResultPromise;
|
|
40178
40204
|
if (exports.KTX2Loader._isBinomialInit || !KhronosTranscoder.transcoderMap[targetFormat] || !ktx2Container.isUASTC) {
|
|
@@ -40239,13 +40265,6 @@
|
|
|
40239
40265
|
return targetFormat;
|
|
40240
40266
|
};
|
|
40241
40267
|
KTX2Loader1._detectSupportedFormat = function _detectSupportedFormat(renderer, priorityFormats) {
|
|
40242
|
-
if (priorityFormats === void 0) priorityFormats = [
|
|
40243
|
-
exports.KTX2TargetFormat.ASTC,
|
|
40244
|
-
exports.KTX2TargetFormat.ETC,
|
|
40245
|
-
exports.KTX2TargetFormat.BC7,
|
|
40246
|
-
exports.KTX2TargetFormat.BC1_BC3,
|
|
40247
|
-
exports.KTX2TargetFormat.PVRTC
|
|
40248
|
-
];
|
|
40249
40268
|
for(var i = 0; i < priorityFormats.length; i++){
|
|
40250
40269
|
var capabilities = this._supportedMap[priorityFormats[i]];
|
|
40251
40270
|
for(var j = 0; j < capabilities.length; j++){
|
|
@@ -40287,6 +40306,14 @@
|
|
|
40287
40306
|
return KTX2Loader1;
|
|
40288
40307
|
}(Loader), function() {
|
|
40289
40308
|
_KTX2Loader._isBinomialInit = false;
|
|
40309
|
+
}(), function() {
|
|
40310
|
+
_KTX2Loader._priorityFormats = [
|
|
40311
|
+
exports.KTX2TargetFormat.BC7,
|
|
40312
|
+
exports.KTX2TargetFormat.ASTC,
|
|
40313
|
+
exports.KTX2TargetFormat.BC1_BC3,
|
|
40314
|
+
exports.KTX2TargetFormat.ETC,
|
|
40315
|
+
exports.KTX2TargetFormat.PVRTC
|
|
40316
|
+
];
|
|
40290
40317
|
}(), function() {
|
|
40291
40318
|
var _obj;
|
|
40292
40319
|
_KTX2Loader._supportedMap = (_obj = {}, _obj[exports.KTX2TargetFormat.ASTC] = [
|
|
@@ -43297,7 +43324,7 @@
|
|
|
43297
43324
|
], GALACEAN_animation_event);
|
|
43298
43325
|
|
|
43299
43326
|
//@ts-ignore
|
|
43300
|
-
var version = "1.1.0-beta.
|
|
43327
|
+
var version = "1.1.0-beta.14";
|
|
43301
43328
|
console.log("Galacean engine version: " + version);
|
|
43302
43329
|
for(var key in CoreObjects){
|
|
43303
43330
|
Loader.registerClass(key, CoreObjects[key]);
|