@galacean/effects 1.3.0 → 1.3.2
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/index.js +140 -133
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +3 -3
- package/dist/index.min.js.map +1 -1
- package/dist/index.mjs +140 -133
- package/dist/index.mjs.map +1 -1
- package/dist/weapp.js +139 -132
- package/dist/weapp.js.map +1 -1
- package/dist/weapp.mjs +139 -132
- package/dist/weapp.mjs.map +1 -1
- package/package.json +3 -3
package/dist/index.mjs
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Description: Galacean Effects runtime player for the web
|
|
4
4
|
* Author: Ant Group CO., Ltd.
|
|
5
5
|
* Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
|
|
6
|
-
* Version: v1.3.
|
|
6
|
+
* Version: v1.3.2
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
/******************************************************************************
|
|
@@ -7126,9 +7126,9 @@ var Float16ArrayWrapper = /** @class */ (function () {
|
|
|
7126
7126
|
this.data = new Uint16Array(num);
|
|
7127
7127
|
}
|
|
7128
7128
|
else if (num && typeof num === 'object' && Number.isInteger(num.length)) {
|
|
7129
|
-
var
|
|
7130
|
-
for (var i = 0; i <
|
|
7131
|
-
|
|
7129
|
+
var data = this.data = new Uint16Array(num.length);
|
|
7130
|
+
for (var i = 0; i < data.length; i++) {
|
|
7131
|
+
data[i] = toHalf(num[i]);
|
|
7132
7132
|
}
|
|
7133
7133
|
}
|
|
7134
7134
|
}
|
|
@@ -7501,9 +7501,9 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7501
7501
|
CurveValue.getAllData = function (meta, halfFloat) {
|
|
7502
7502
|
var ret = new (halfFloat ? Float16ArrayWrapper : Float32Array)(meta.index * 4);
|
|
7503
7503
|
for (var i = 0, cursor = 0, curves = meta.curves; i < curves.length; i++) {
|
|
7504
|
-
var
|
|
7505
|
-
ret.set(
|
|
7506
|
-
cursor +=
|
|
7504
|
+
var data = curves[i].toData();
|
|
7505
|
+
ret.set(data, cursor);
|
|
7506
|
+
cursor += data.length;
|
|
7507
7507
|
}
|
|
7508
7508
|
return halfFloat ? ret.data : ret;
|
|
7509
7509
|
};
|
|
@@ -7512,17 +7512,17 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7512
7512
|
var max = -Infinity;
|
|
7513
7513
|
//formatted number
|
|
7514
7514
|
if (Number.isFinite(props[0]) && Number.isFinite(props[1])) {
|
|
7515
|
-
var
|
|
7515
|
+
var keys = [];
|
|
7516
7516
|
for (var i = 2; i < props.length; i++) {
|
|
7517
7517
|
// FIXME
|
|
7518
|
-
|
|
7518
|
+
keys.push(props[i].slice(0, 4));
|
|
7519
7519
|
}
|
|
7520
|
-
this.keys =
|
|
7520
|
+
this.keys = keys;
|
|
7521
7521
|
this.min = props[0];
|
|
7522
7522
|
this.dist = props[1] - props[0];
|
|
7523
7523
|
}
|
|
7524
7524
|
else {
|
|
7525
|
-
var
|
|
7525
|
+
var keys = props.map(function (item) {
|
|
7526
7526
|
if (isArray(item)) {
|
|
7527
7527
|
min = Math.min(min, item[1]);
|
|
7528
7528
|
max = Math.max(max, item[1]);
|
|
@@ -7537,22 +7537,22 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7537
7537
|
throw new Error('invalid keyframe');
|
|
7538
7538
|
});
|
|
7539
7539
|
var dist = max - min;
|
|
7540
|
-
this.keys =
|
|
7540
|
+
this.keys = keys;
|
|
7541
7541
|
if (dist !== 0) {
|
|
7542
|
-
for (var i = 0; i <
|
|
7543
|
-
var key =
|
|
7542
|
+
for (var i = 0; i < keys.length; i++) {
|
|
7543
|
+
var key = keys[i];
|
|
7544
7544
|
key[1] = (key[1] - min) / dist;
|
|
7545
7545
|
}
|
|
7546
7546
|
}
|
|
7547
|
-
var key0 =
|
|
7547
|
+
var key0 = keys[0];
|
|
7548
7548
|
if (key0[0] > 0) {
|
|
7549
7549
|
key0[2] = 0;
|
|
7550
|
-
|
|
7550
|
+
keys.unshift([0, key0[1], 0, 0]);
|
|
7551
7551
|
}
|
|
7552
|
-
var key1 =
|
|
7552
|
+
var key1 = keys[keys.length - 1];
|
|
7553
7553
|
if (key1[0] < 1) {
|
|
7554
7554
|
key1[3] = 0;
|
|
7555
|
-
|
|
7555
|
+
keys.push([1, key1[1], 0, 0]);
|
|
7556
7556
|
}
|
|
7557
7557
|
this.min = min;
|
|
7558
7558
|
this.dist = dist;
|
|
@@ -7927,14 +7927,14 @@ function curveValueIntegrateByTime(t1, keyframe0, keyframe1) {
|
|
|
7927
7927
|
function getKeyFrameMetaByRawValue(meta, value) {
|
|
7928
7928
|
if (value) {
|
|
7929
7929
|
var type = value[0];
|
|
7930
|
-
var
|
|
7930
|
+
var keys = value[1];
|
|
7931
7931
|
if (type === ValueType$1.CURVE) {
|
|
7932
|
-
meta.curves.push(
|
|
7933
|
-
var keyLen =
|
|
7934
|
-
if (
|
|
7932
|
+
meta.curves.push(keys);
|
|
7933
|
+
var keyLen = keys.length;
|
|
7934
|
+
if (keys[0][0] > 0) {
|
|
7935
7935
|
keyLen++;
|
|
7936
7936
|
}
|
|
7937
|
-
if (
|
|
7937
|
+
if (keys[keys.length - 1][0] < 1) {
|
|
7938
7938
|
keyLen++;
|
|
7939
7939
|
}
|
|
7940
7940
|
meta.index += keyLen;
|
|
@@ -7942,19 +7942,19 @@ function getKeyFrameMetaByRawValue(meta, value) {
|
|
|
7942
7942
|
meta.curveCount += keyLen;
|
|
7943
7943
|
}
|
|
7944
7944
|
else if (type === ValueType$1.LINE) {
|
|
7945
|
-
var keyLen =
|
|
7946
|
-
if (keyLen === 2 &&
|
|
7945
|
+
var keyLen = keys.length;
|
|
7946
|
+
if (keyLen === 2 && keys[0][0] === 0 && keys[1][0] === 1) {
|
|
7947
7947
|
return;
|
|
7948
7948
|
}
|
|
7949
|
-
if (
|
|
7949
|
+
if (keys[0][0] > 0) {
|
|
7950
7950
|
keyLen++;
|
|
7951
7951
|
}
|
|
7952
|
-
if (
|
|
7952
|
+
if (keys[keys.length - 1][0] < 1) {
|
|
7953
7953
|
keyLen++;
|
|
7954
7954
|
}
|
|
7955
7955
|
var uniformCount = Math.ceil(keyLen / 2);
|
|
7956
7956
|
meta.lineSegCount += uniformCount;
|
|
7957
|
-
meta.curves.push(
|
|
7957
|
+
meta.curves.push(keys);
|
|
7958
7958
|
meta.index += uniformCount;
|
|
7959
7959
|
meta.max = Math.max(meta.max, uniformCount);
|
|
7960
7960
|
}
|
|
@@ -10435,9 +10435,9 @@ var KTXTexture = /** @class */ (function () {
|
|
|
10435
10435
|
for (var level = 0; level < mipmapCount; level++) {
|
|
10436
10436
|
var imageSize = new Int32Array(this.arrayBuffer, this.baseOffset + dataOffset, 1)[0]; // size per face, since not supporting array cubemaps
|
|
10437
10437
|
for (var face = 0; face < this.numberOfFaces; face++) {
|
|
10438
|
-
var
|
|
10438
|
+
var data = new Uint8Array(this.arrayBuffer, this.baseOffset + dataOffset + 4, imageSize);
|
|
10439
10439
|
mipmaps.push({
|
|
10440
|
-
data:
|
|
10440
|
+
data: data,
|
|
10441
10441
|
width: width,
|
|
10442
10442
|
height: height,
|
|
10443
10443
|
});
|
|
@@ -13266,16 +13266,16 @@ var InteractVFXItem = /** @class */ (function (_super) {
|
|
|
13266
13266
|
var nx = position[0] - width;
|
|
13267
13267
|
var ny = position[1] - height;
|
|
13268
13268
|
if (options.dxRange) {
|
|
13269
|
-
var _d = __read$3(options.dxRange, 2),
|
|
13270
|
-
nx = clamp$1(nx,
|
|
13271
|
-
if (nx !==
|
|
13269
|
+
var _d = __read$3(options.dxRange, 2), min = _d[0], max = _d[1];
|
|
13270
|
+
nx = clamp$1(nx, min, max);
|
|
13271
|
+
if (nx !== min && nx !== max && min !== max) {
|
|
13272
13272
|
(_a = event.origin) === null || _a === void 0 ? void 0 : _a.preventDefault();
|
|
13273
13273
|
}
|
|
13274
13274
|
}
|
|
13275
13275
|
if (options.dyRange) {
|
|
13276
|
-
var _e = __read$3(options.dyRange, 2),
|
|
13277
|
-
ny = clamp$1(ny,
|
|
13278
|
-
if (ny !==
|
|
13276
|
+
var _e = __read$3(options.dyRange, 2), min = _e[0], max = _e[1];
|
|
13277
|
+
ny = clamp$1(ny, min, max);
|
|
13278
|
+
if (ny !== min && ny !== max && min !== max) {
|
|
13279
13279
|
(_b = event.origin) === null || _b === void 0 ? void 0 : _b.preventDefault();
|
|
13280
13280
|
}
|
|
13281
13281
|
}
|
|
@@ -13389,11 +13389,11 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13389
13389
|
var item = items[i];
|
|
13390
13390
|
var texture = item === null || item === void 0 ? void 0 : item.renderer.texture;
|
|
13391
13391
|
var textureIndex = texture ? textures.indexOf(texture) : -1;
|
|
13392
|
-
var
|
|
13393
|
-
aPointLen +=
|
|
13394
|
-
indexLen +=
|
|
13395
|
-
datas.push(
|
|
13396
|
-
pointCount +=
|
|
13392
|
+
var data = this.getItemInitData(item, i, pointCount, textureIndex);
|
|
13393
|
+
aPointLen += data.aPoint.length;
|
|
13394
|
+
indexLen += data.index.length;
|
|
13395
|
+
datas.push(data);
|
|
13396
|
+
pointCount += data.aPoint.length / 6;
|
|
13397
13397
|
this.updateItem(item, true);
|
|
13398
13398
|
}
|
|
13399
13399
|
var bundle = {
|
|
@@ -13405,10 +13405,10 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13405
13405
|
index: 0,
|
|
13406
13406
|
};
|
|
13407
13407
|
var _loop_1 = function (i) {
|
|
13408
|
-
var
|
|
13408
|
+
var data = datas[i];
|
|
13409
13409
|
Object.keys(bundle).forEach(function (name) {
|
|
13410
13410
|
var arr = bundle[name];
|
|
13411
|
-
var ta =
|
|
13411
|
+
var ta = data[name];
|
|
13412
13412
|
arr.set(ta, cursor[name]);
|
|
13413
13413
|
cursor[name] += ta.length;
|
|
13414
13414
|
});
|
|
@@ -13675,14 +13675,14 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13675
13675
|
for (var y = 0; y < row; y++) {
|
|
13676
13676
|
var base = (y * 2 + x) * 4;
|
|
13677
13677
|
// @ts-expect-error
|
|
13678
|
-
var
|
|
13679
|
-
var texOffset =
|
|
13678
|
+
var split = textureSheetAnimation ? [0, 0, 1, 1, splits[0][4]] : splits[y * 2 + x];
|
|
13679
|
+
var texOffset = split[4] ? [0, 0, 1, 0, 0, 1, 1, 1] : [0, 1, 0, 0, 1, 1, 1, 0];
|
|
13680
13680
|
var dw = ((x + x + 1) / col - 1) / 2;
|
|
13681
13681
|
var dh = ((y + y + 1) / row - 1) / 2;
|
|
13682
|
-
var tox =
|
|
13683
|
-
var toy =
|
|
13684
|
-
var tsx =
|
|
13685
|
-
var tsy =
|
|
13682
|
+
var tox = split[0];
|
|
13683
|
+
var toy = split[1];
|
|
13684
|
+
var tsx = split[4] ? split[3] : split[2];
|
|
13685
|
+
var tsy = split[4] ? split[2] : split[3];
|
|
13686
13686
|
var origin_1 = [
|
|
13687
13687
|
originData[0] / col + dw,
|
|
13688
13688
|
originData[1] / row + dh,
|
|
@@ -13779,13 +13779,13 @@ function generateFeatureTexture(engine, feather) {
|
|
|
13779
13779
|
}
|
|
13780
13780
|
else {
|
|
13781
13781
|
var len = 128;
|
|
13782
|
-
var
|
|
13782
|
+
var data = new Uint8Array(len);
|
|
13783
13783
|
for (var i = 0, s = len - 1; i < len; i++) {
|
|
13784
13784
|
var p = i / s;
|
|
13785
13785
|
var val = feather.getValue(p);
|
|
13786
|
-
|
|
13786
|
+
data[i] = Math.round(val * 255);
|
|
13787
13787
|
}
|
|
13788
|
-
tex = Texture.createWithData(engine, { width: len, height: 1, data:
|
|
13788
|
+
tex = Texture.createWithData(engine, { width: len, height: 1, data: data }, {
|
|
13789
13789
|
name: 'feather',
|
|
13790
13790
|
format: glContext.LUMINANCE,
|
|
13791
13791
|
minFilter: glContext.LINEAR,
|
|
@@ -13943,22 +13943,22 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
13943
13943
|
* 需要则添加到meshToModify数组
|
|
13944
13944
|
*/
|
|
13945
13945
|
for (var i = 0; i < splits.length; i++) {
|
|
13946
|
-
var
|
|
13946
|
+
var split = splits[i];
|
|
13947
13947
|
// @ts-expect-error
|
|
13948
|
-
var spriteMesh =
|
|
13949
|
-
if (
|
|
13948
|
+
var spriteMesh = split.spriteMesh;
|
|
13949
|
+
if (split.items.length === 0) {
|
|
13950
13950
|
throw new Error('split not combined');
|
|
13951
13951
|
}
|
|
13952
|
-
if (
|
|
13953
|
-
var priority =
|
|
13952
|
+
if (split.dirty) {
|
|
13953
|
+
var priority = split.indexStart;
|
|
13954
13954
|
if (spriteMesh.mesh.priority !== priority) {
|
|
13955
13955
|
spriteMesh.mesh.priority = priority;
|
|
13956
13956
|
meshToModify.push(spriteMesh.mesh);
|
|
13957
13957
|
}
|
|
13958
|
-
spriteMesh.setItems(
|
|
13958
|
+
spriteMesh.setItems(split.items.map(function (item) { return item.content; }));
|
|
13959
13959
|
}
|
|
13960
13960
|
spriteMesh.applyChange();
|
|
13961
|
-
|
|
13961
|
+
split.dirty = false;
|
|
13962
13962
|
}
|
|
13963
13963
|
/**
|
|
13964
13964
|
* 有需要移除的meshSplit 则废弃对应的mesh 保留material
|
|
@@ -13966,8 +13966,8 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
13966
13966
|
*/
|
|
13967
13967
|
if (splitsToRemove.length) {
|
|
13968
13968
|
for (var i = 0; i < splitsToRemove.length; i++) {
|
|
13969
|
-
var
|
|
13970
|
-
var sp =
|
|
13969
|
+
var split = splitsToRemove[i];
|
|
13970
|
+
var sp = split.spriteMesh;
|
|
13971
13971
|
// @ts-expect-error
|
|
13972
13972
|
var mesh = sp.mesh;
|
|
13973
13973
|
mesh.dispose({ material: { textures: DestroyOptions.keep } });
|
|
@@ -14084,7 +14084,7 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14084
14084
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14085
14085
|
if (isSprite(item)) {
|
|
14086
14086
|
var content = item.createContent();
|
|
14087
|
-
var
|
|
14087
|
+
var split = {
|
|
14088
14088
|
indexStart: item.listIndex,
|
|
14089
14089
|
indexEnd: item.listIndex,
|
|
14090
14090
|
items: [item],
|
|
@@ -14092,21 +14092,21 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14092
14092
|
cacheId: content.renderInfo.cacheId,
|
|
14093
14093
|
textures: [item.content.renderer.texture],
|
|
14094
14094
|
};
|
|
14095
|
-
splits.unshift(
|
|
14096
|
-
return [
|
|
14095
|
+
splits.unshift(split);
|
|
14096
|
+
return [split];
|
|
14097
14097
|
}
|
|
14098
14098
|
return [];
|
|
14099
14099
|
}
|
|
14100
14100
|
var _loop_2 = function (i) {
|
|
14101
|
-
var
|
|
14101
|
+
var split = splits[i];
|
|
14102
14102
|
var listIndex = item.listIndex;
|
|
14103
14103
|
if (isSprite(item)) {
|
|
14104
14104
|
// @ts-expect-error
|
|
14105
|
-
if (listIndex <=
|
|
14105
|
+
if (listIndex <= split.indexEnd) {
|
|
14106
14106
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14107
14107
|
var itemIndex_1 = items.indexOf(item);
|
|
14108
|
-
var indexStart = Math.min(itemIndex_1, items.indexOf(
|
|
14109
|
-
var indexEnd = Math.max(itemIndex_1, items.indexOf(
|
|
14108
|
+
var indexStart = Math.min(itemIndex_1, items.indexOf(split.items[0]));
|
|
14109
|
+
var indexEnd = Math.max(itemIndex_1, items.indexOf(split.items[split.items.length - 1]));
|
|
14110
14110
|
var neoSplits_1 = this_2.getMeshSplits(items, indexStart, indexEnd);
|
|
14111
14111
|
var neoSplitIndex_1 = neoSplits_1.findIndex(function (split) { return split.items.includes(item); });
|
|
14112
14112
|
if (neoSplits_1.length === 2) {
|
|
@@ -14114,14 +14114,14 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14114
14114
|
//1 or 0
|
|
14115
14115
|
Object.keys(neoSplits_1[1 - neoSplitIndex_1]).forEach(function (key) {
|
|
14116
14116
|
// @ts-expect-error
|
|
14117
|
-
|
|
14117
|
+
split[key] = neoSplits_1[1 - neoSplitIndex_1][key];
|
|
14118
14118
|
});
|
|
14119
14119
|
return { value: [neoSplits_1[neoSplitIndex_1]] };
|
|
14120
14120
|
}
|
|
14121
14121
|
else if (neoSplits_1.length === 3) {
|
|
14122
14122
|
Object.keys(neoSplits_1[0]).forEach(function (key) {
|
|
14123
14123
|
// @ts-expect-error
|
|
14124
|
-
|
|
14124
|
+
split[key] = neoSplits_1[0][key];
|
|
14125
14125
|
});
|
|
14126
14126
|
splits.splice(i + 1, 0, neoSplits_1[1], neoSplits_1[2]);
|
|
14127
14127
|
if (neoSplitIndex_1 !== 1) {
|
|
@@ -14135,25 +14135,25 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14135
14135
|
//todo add case
|
|
14136
14136
|
Object.keys(neoSplits_1[0]).forEach(function (key) {
|
|
14137
14137
|
// @ts-expect-error
|
|
14138
|
-
|
|
14138
|
+
split[key] = neoSplits_1[0][key];
|
|
14139
14139
|
});
|
|
14140
14140
|
return { value: [] };
|
|
14141
14141
|
}
|
|
14142
14142
|
}
|
|
14143
14143
|
else {
|
|
14144
|
-
if (listIndex <
|
|
14144
|
+
if (listIndex < split.indexStart || listIndex === split.indexEnd) {
|
|
14145
14145
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14146
14146
|
return { value: [] };
|
|
14147
14147
|
// @ts-expect-error
|
|
14148
14148
|
}
|
|
14149
|
-
else if (listIndex <
|
|
14149
|
+
else if (listIndex < split.indexEnd) {
|
|
14150
14150
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14151
|
-
var lastItem =
|
|
14151
|
+
var lastItem = split.items[split.items.length - 1];
|
|
14152
14152
|
var endIndex = items.indexOf(lastItem);
|
|
14153
|
-
var neoSplits_2 = this_2.getMeshSplits(items, items.indexOf(
|
|
14153
|
+
var neoSplits_2 = this_2.getMeshSplits(items, items.indexOf(split.items[0]), endIndex);
|
|
14154
14154
|
Object.keys(neoSplits_2[0]).forEach(function (key) {
|
|
14155
14155
|
// @ts-expect-error
|
|
14156
|
-
|
|
14156
|
+
split[key] = neoSplits_2[0][key];
|
|
14157
14157
|
});
|
|
14158
14158
|
if (neoSplits_2.length === 2) {
|
|
14159
14159
|
splits.splice(i + 1, 0, neoSplits_2[1]);
|
|
@@ -14214,10 +14214,10 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14214
14214
|
* 遍历this.meshSplits,找到元素的listIndex在split的indexStart和indexEnd范围内的第一个meshSplit
|
|
14215
14215
|
*/
|
|
14216
14216
|
for (var i = 0; i < splits.length; i++) {
|
|
14217
|
-
var
|
|
14217
|
+
var split = splits[i];
|
|
14218
14218
|
// @ts-expect-error
|
|
14219
|
-
if (
|
|
14220
|
-
targetSplit =
|
|
14219
|
+
if (split.indexStart <= item.listIndex && split.indexEnd >= item.listIndex) {
|
|
14220
|
+
targetSplit = split;
|
|
14221
14221
|
targetSplitIndex = i;
|
|
14222
14222
|
break;
|
|
14223
14223
|
}
|
|
@@ -14327,8 +14327,8 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14327
14327
|
// FIXME: 可选性
|
|
14328
14328
|
var targetSplitIndex = void 0;
|
|
14329
14329
|
for (var i = 0; i < splits.length; i++) {
|
|
14330
|
-
var
|
|
14331
|
-
if (
|
|
14330
|
+
var split = splits[i];
|
|
14331
|
+
if (split.items.includes(item)) {
|
|
14332
14332
|
targetSplitIndex = i;
|
|
14333
14333
|
break;
|
|
14334
14334
|
}
|
|
@@ -15479,10 +15479,10 @@ var ParticleMesh = /** @class */ (function () {
|
|
|
15479
15479
|
var index = geometry.getIndexData();
|
|
15480
15480
|
for (var i = 0; i < names.length; i++) {
|
|
15481
15481
|
var name_1 = names[i];
|
|
15482
|
-
var
|
|
15483
|
-
if (
|
|
15482
|
+
var data = geometry.getAttributeData(name_1);
|
|
15483
|
+
if (data) {
|
|
15484
15484
|
// @ts-expect-error
|
|
15485
|
-
geometry.setAttributeData(name_1, new
|
|
15485
|
+
geometry.setAttributeData(name_1, new data.constructor(0));
|
|
15486
15486
|
}
|
|
15487
15487
|
}
|
|
15488
15488
|
// @ts-expect-error
|
|
@@ -16857,10 +16857,10 @@ function getGeometryTriangles(geometry, options) {
|
|
|
16857
16857
|
var segment = segments[i];
|
|
16858
16858
|
var p0 = points[i];
|
|
16859
16859
|
var p1 = points[i + 1] || points[0];
|
|
16860
|
-
var
|
|
16860
|
+
var keys = segment;
|
|
16861
16861
|
var point = [0, 0];
|
|
16862
|
-
for (var j = 0; j <
|
|
16863
|
-
var key =
|
|
16862
|
+
for (var j = 0; j < keys.length - 1; j++) {
|
|
16863
|
+
var key = keys[j];
|
|
16864
16864
|
getBezier2DValue(point, key, p0, p1, p0[4], p0[5], p1[2], p1[3]);
|
|
16865
16865
|
setPoint(point[0], point[1]);
|
|
16866
16866
|
}
|
|
@@ -16919,11 +16919,11 @@ function getGeometryByShape(shape, uvTransform) {
|
|
|
16919
16919
|
var index = 0;
|
|
16920
16920
|
for (var i = 0; i < geometries.length; i++) {
|
|
16921
16921
|
var geometry = geometries[i];
|
|
16922
|
-
var
|
|
16923
|
-
indexBase +=
|
|
16924
|
-
datas.push(
|
|
16925
|
-
aPoint +=
|
|
16926
|
-
index +=
|
|
16922
|
+
var data = getGeometryTriangles(geometry, { indexBase: indexBase, uvTransform: uvTransform });
|
|
16923
|
+
indexBase += data.aPoint.length / 5;
|
|
16924
|
+
datas.push(data);
|
|
16925
|
+
aPoint += data.aPoint.length;
|
|
16926
|
+
index += data.index.length;
|
|
16927
16927
|
}
|
|
16928
16928
|
if (datas.length === 1) {
|
|
16929
16929
|
return datas[0];
|
|
@@ -16932,11 +16932,11 @@ function getGeometryByShape(shape, uvTransform) {
|
|
|
16932
16932
|
var indexData = new Uint16Array(index);
|
|
16933
16933
|
// @ts-expect-error
|
|
16934
16934
|
for (var i = 0, pointIndex = 0, idx = 0; i < datas[i]; i++) {
|
|
16935
|
-
var
|
|
16936
|
-
aPointData.set(
|
|
16937
|
-
pointIndex +=
|
|
16938
|
-
indexData.set(
|
|
16939
|
-
idx +=
|
|
16935
|
+
var data = datas[i];
|
|
16936
|
+
aPointData.set(data.aPoint, pointIndex);
|
|
16937
|
+
pointIndex += data.aPoint.length;
|
|
16938
|
+
indexData.set(data.index, idx);
|
|
16939
|
+
idx += data.index.length;
|
|
16940
16940
|
}
|
|
16941
16941
|
return {
|
|
16942
16942
|
aPoint: aPointData,
|
|
@@ -17247,10 +17247,10 @@ var TrailMesh = /** @class */ (function () {
|
|
|
17247
17247
|
var pointCountPerTrail = this.pointCountPerTrail;
|
|
17248
17248
|
if (index >= 0 && index < pointCountPerTrail) {
|
|
17249
17249
|
var startIndex = (trail * pointCountPerTrail + index) * 24 + 8;
|
|
17250
|
-
var
|
|
17251
|
-
out.x =
|
|
17252
|
-
out.y =
|
|
17253
|
-
out.z =
|
|
17250
|
+
var data = this.geometry.getAttributeData('aColor');
|
|
17251
|
+
out.x = data[startIndex];
|
|
17252
|
+
out.y = data[1 + startIndex];
|
|
17253
|
+
out.z = data[2 + startIndex];
|
|
17254
17254
|
return out;
|
|
17255
17255
|
}
|
|
17256
17256
|
};
|
|
@@ -18656,14 +18656,14 @@ var TextMesh = /** @class */ (function (_super) {
|
|
|
18656
18656
|
for (var y_1 = 0; y_1 < row; y_1++) {
|
|
18657
18657
|
var base = (y_1 * 2 + x_1) * 4;
|
|
18658
18658
|
// @ts-expect-error
|
|
18659
|
-
var
|
|
18660
|
-
var texOffset =
|
|
18659
|
+
var split = textureSheetAnimation ? [0, 0, 1, 1, splits[0][4]] : splits[y_1 * 2 + x_1];
|
|
18660
|
+
var texOffset = split[4] ? [0, 0, 1, 0, 0, 1, 1, 1] : [0, 1, 0, 0, 1, 1, 1, 0];
|
|
18661
18661
|
var dw = ((x_1 + x_1 + 1) / col - 1) / 2;
|
|
18662
18662
|
var dh = ((y_1 + y_1 + 1) / row - 1) / 2;
|
|
18663
|
-
var tox =
|
|
18664
|
-
var toy =
|
|
18665
|
-
var tsx =
|
|
18666
|
-
var tsy =
|
|
18663
|
+
var tox = split[0];
|
|
18664
|
+
var toy = split[1];
|
|
18665
|
+
var tsx = split[4] ? split[3] : split[2];
|
|
18666
|
+
var tsy = split[4] ? split[2] : split[3];
|
|
18667
18667
|
var origin_1 = [
|
|
18668
18668
|
originData[0] / col + dw,
|
|
18669
18669
|
originData[1] / row + dh,
|
|
@@ -23343,13 +23343,13 @@ var CompositionSourceManager = /** @class */ (function () {
|
|
|
23343
23343
|
if (renderContent.renderer) {
|
|
23344
23344
|
renderContent.renderer = _this.changeTex(renderContent.renderer);
|
|
23345
23345
|
_this.processMask(renderContent.renderer);
|
|
23346
|
-
var
|
|
23346
|
+
var split = renderContent.splits && !renderContent.textureSheetAnimation && renderContent.splits[0];
|
|
23347
23347
|
if (Number.isInteger(renderContent.renderer.shape)) {
|
|
23348
23348
|
// TODO: scene.shapes 类型问题?
|
|
23349
|
-
renderContent.renderer.shape = getGeometryByShape((_a = _this.jsonScene) === null || _a === void 0 ? void 0 : _a.shapes[renderContent.renderer.shape],
|
|
23349
|
+
renderContent.renderer.shape = getGeometryByShape((_a = _this.jsonScene) === null || _a === void 0 ? void 0 : _a.shapes[renderContent.renderer.shape], split);
|
|
23350
23350
|
}
|
|
23351
23351
|
else if (renderContent.renderer.shape && isObject(renderContent.renderer.shape)) {
|
|
23352
|
-
renderContent.renderer.shape = getGeometryByShape(renderContent.renderer.shape,
|
|
23352
|
+
renderContent.renderer.shape = getGeometryByShape(renderContent.renderer.shape, split);
|
|
23353
23353
|
}
|
|
23354
23354
|
}
|
|
23355
23355
|
else {
|
|
@@ -23361,14 +23361,14 @@ var CompositionSourceManager = /** @class */ (function () {
|
|
|
23361
23361
|
if (renderContent.filter) {
|
|
23362
23362
|
renderContent.filter = __assign$1({}, renderContent.filter);
|
|
23363
23363
|
}
|
|
23364
|
-
var name_1 = item.name, _b = item.delay, delay = _b === void 0 ? 0 : _b,
|
|
23364
|
+
var name_1 = item.name, _b = item.delay, delay = _b === void 0 ? 0 : _b, id = item.id, parentId = item.parentId, duration = item.duration, endBehavior = item.endBehavior, pluginName = item.pluginName, pn = item.pn, transform = item.transform;
|
|
23365
23365
|
// FIXME: specification 下定义的 Item 不存在 refCount 类型定义
|
|
23366
23366
|
// @ts-expect-error
|
|
23367
23367
|
var refCount = item.refCount;
|
|
23368
23368
|
var _c = _this.jsonScene.plugins, plugins = _c === void 0 ? [] : _c;
|
|
23369
23369
|
option.name = name_1;
|
|
23370
23370
|
option.delay = delay;
|
|
23371
|
-
option.id =
|
|
23371
|
+
option.id = id;
|
|
23372
23372
|
if (parentId) {
|
|
23373
23373
|
option.parentId = parentId;
|
|
23374
23374
|
}
|
|
@@ -23830,8 +23830,8 @@ var AssetManager = /** @class */ (function () {
|
|
|
23830
23830
|
return [2 /*return*/, resultImage];
|
|
23831
23831
|
case 3:
|
|
23832
23832
|
// 如果是加载图片且是数组,设置变量,视频情况下不需要
|
|
23833
|
-
if (background &&
|
|
23834
|
-
variables[background.name] =
|
|
23833
|
+
if (background && Array.isArray(url_1) && variables) {
|
|
23834
|
+
variables[background.name] = resultImage.src;
|
|
23835
23835
|
}
|
|
23836
23836
|
return [4 /*yield*/, combineImageTemplate(resultImage, template, variables, this.options, img.oriY === -1)];
|
|
23837
23837
|
case 4: return [2 /*return*/, _b.sent()];
|
|
@@ -23979,14 +23979,14 @@ var AssetManager = /** @class */ (function () {
|
|
|
23979
23979
|
}());
|
|
23980
23980
|
function fixOldImageUsage(usedImages, compositions, imgUsage, images, renderLevel) {
|
|
23981
23981
|
for (var i = 0; i < compositions.length; i++) {
|
|
23982
|
-
var
|
|
23983
|
-
var ids = imgUsage[
|
|
23982
|
+
var id = compositions[i].id;
|
|
23983
|
+
var ids = imgUsage[id];
|
|
23984
23984
|
if (ids) {
|
|
23985
23985
|
for (var j = 0; j < ids.length; j++) {
|
|
23986
|
-
var
|
|
23987
|
-
var tag = images[
|
|
23986
|
+
var id_1 = ids[j];
|
|
23987
|
+
var tag = images[id_1].renderLevel;
|
|
23988
23988
|
if (passRenderLevel(tag, renderLevel)) {
|
|
23989
|
-
usedImages[
|
|
23989
|
+
usedImages[id_1] = true;
|
|
23990
23990
|
}
|
|
23991
23991
|
}
|
|
23992
23992
|
}
|
|
@@ -24092,18 +24092,14 @@ var CompVFXItem = /** @class */ (function (_super) {
|
|
|
24092
24092
|
// 设置预合成作为元素时的时长、结束行为和渲染延时
|
|
24093
24093
|
if (Item.isComposition(itemProps)) {
|
|
24094
24094
|
var refId = itemProps.content.options.refId;
|
|
24095
|
-
|
|
24096
|
-
if (!props) {
|
|
24097
|
-
throw new Error("\u5F15\u7528\u7684Id: ".concat(refId, " \u7684\u9884\u5408\u6210\u4E0D\u5B58\u5728"));
|
|
24098
|
-
}
|
|
24099
|
-
props.content = itemProps.content;
|
|
24100
|
-
item = new CompVFXItem(__assign$1(__assign$1({}, props), { refId: refId, delay: itemProps.delay, id: itemProps.id, name: itemProps.name, duration: itemProps.duration, endBehavior: itemProps.endBehavior, parentId: itemProps.parentId, transform: itemProps.transform }), this.composition);
|
|
24095
|
+
item = new CompVFXItem(__assign$1({ refId: refId }, itemProps), this.composition);
|
|
24101
24096
|
item.contentProps = itemProps.content;
|
|
24102
24097
|
item.transform.parentTransform = this.transform;
|
|
24103
24098
|
this.composition.refContent.push(item);
|
|
24104
24099
|
if (item.endBehavior === END_BEHAVIOR_RESTART$1) {
|
|
24105
24100
|
this.composition.autoRefTex = false;
|
|
24106
24101
|
}
|
|
24102
|
+
item.createContent();
|
|
24107
24103
|
}
|
|
24108
24104
|
else {
|
|
24109
24105
|
item = createVFXItem(this.itemProps[i], this.composition);
|
|
@@ -24235,6 +24231,17 @@ var CompVFXItem = /** @class */ (function (_super) {
|
|
|
24235
24231
|
CompVFXItem.prototype.handleVisibleChanged = function (visible) {
|
|
24236
24232
|
this.items.forEach(function (item) { return item.setVisible(visible); });
|
|
24237
24233
|
};
|
|
24234
|
+
CompVFXItem.prototype.setScale = function (x, y, z) {
|
|
24235
|
+
if (this.content) {
|
|
24236
|
+
this.content.startSize = new Vector3(x, y, z);
|
|
24237
|
+
}
|
|
24238
|
+
};
|
|
24239
|
+
CompVFXItem.prototype.scale = function (x, y, z) {
|
|
24240
|
+
if (this.content) {
|
|
24241
|
+
var startSize = this.content.startSize.clone();
|
|
24242
|
+
this.content.startSize = new Vector3(x * startSize.x, y * startSize.y, z * startSize.z);
|
|
24243
|
+
}
|
|
24244
|
+
};
|
|
24238
24245
|
CompVFXItem.prototype.getUpdateTime = function (t) {
|
|
24239
24246
|
var startTime = this.startTimeInms;
|
|
24240
24247
|
var now = this.timeInms;
|
|
@@ -25757,10 +25764,10 @@ var GLTexture = /** @class */ (function (_super) {
|
|
|
25757
25764
|
var target = this.target;
|
|
25758
25765
|
var gl = this.pipelineContext.gl;
|
|
25759
25766
|
if (gl && this.textureBuffer) {
|
|
25760
|
-
var
|
|
25767
|
+
var data = new Uint8Array([255]);
|
|
25761
25768
|
this.bind();
|
|
25762
25769
|
if (target === gl.TEXTURE_2D) {
|
|
25763
|
-
gl.texImage2D(target, 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE,
|
|
25770
|
+
gl.texImage2D(target, 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE, data);
|
|
25764
25771
|
}
|
|
25765
25772
|
else if (target === gl.TEXTURE_CUBE_MAP) {
|
|
25766
25773
|
var faces = [
|
|
@@ -25772,7 +25779,7 @@ var GLTexture = /** @class */ (function (_super) {
|
|
|
25772
25779
|
gl.TEXTURE_CUBE_MAP_POSITIVE_Z,
|
|
25773
25780
|
];
|
|
25774
25781
|
for (var i = 0; i < faces.length; i++) {
|
|
25775
|
-
gl.texImage2D(faces[i], 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE,
|
|
25782
|
+
gl.texImage2D(faces[i], 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE, data);
|
|
25776
25783
|
}
|
|
25777
25784
|
}
|
|
25778
25785
|
// rewrite mipmap
|
|
@@ -29757,10 +29764,10 @@ var Player = /** @class */ (function () {
|
|
|
29757
29764
|
}
|
|
29758
29765
|
else if (gl) {
|
|
29759
29766
|
this.canvas = gl.canvas;
|
|
29760
|
-
var
|
|
29761
|
-
if (framework !==
|
|
29762
|
-
logger.error("The gl context(".concat(
|
|
29763
|
-
framework =
|
|
29767
|
+
var version = gl instanceof WebGLRenderingContext ? 'webgl' : 'webgl2';
|
|
29768
|
+
if (framework !== version) {
|
|
29769
|
+
logger.error("The gl context(".concat(version, ") is inconsistent with renderFramework or default version(").concat(framework, ")"));
|
|
29770
|
+
framework = version;
|
|
29764
29771
|
}
|
|
29765
29772
|
}
|
|
29766
29773
|
else {
|
|
@@ -30466,7 +30473,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
|
|
|
30466
30473
|
Engine.create = function (gl) {
|
|
30467
30474
|
return new GLEngine(gl);
|
|
30468
30475
|
};
|
|
30469
|
-
var version = "1.3.
|
|
30476
|
+
var version = "1.3.2";
|
|
30470
30477
|
logger.info('player version: ' + version);
|
|
30471
30478
|
|
|
30472
30479
|
export { AbstractPlugin, AssetManager, BYTES_TYPE_MAP, BezierSegments, COMPRESSED_TEXTURE, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateItem, CalculateLoader, CalculateVFXItem, Camera, CameraController, CameraVFXItem, CameraVFXItemLoader, Composition, CompositionSourceManager, CurveValue, DEFAULT_FONTS, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, Engine, EventSystem, FILTER_NAME_NONE, FilterMode, FilterSpriteVFXItem, Float16ArrayWrapper, FrameBuffer, GLEngine, GLGeometry, GLRenderer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK$1 as HELP_LINK, HitTestType, InteractBehavior$1 as InteractBehavior, InteractItem, InteractLoader, InteractMesh, InteractVFXItem, Item, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, Mesh, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleLoader, ParticleMesh, ParticleSystem, ParticleVFXItem, PassTextureCache, PathSegments, Player, PluginSystem, QCanvasViewer, QText, QTextWrapMode, RENDER_PASS_NAME_PREFIX, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RenderBuffer, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, RenderTextureFormat, Renderer, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_0, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_SIZE_0, SEMANTIC_PRE_COLOR_ATTACHMENT_0, SEMANTIC_PRE_COLOR_ATTACHMENT_SIZE_0, SPRITE_VERTEX_STRIDE, SemanticMap, Shader, ShaderCompileResultStatus, ShaderType, SpriteItem, SpriteLoader, SpriteMesh, SpriteVFXItem, StaticValue, TEMPLATE_USE_OFFSCREEN_CANVAS, TextItem, TextLoader, TextMesh, TextVFXItem, Texture, TextureFactory, TextureLoadAction, TextureSourceType, TextureStoreAction, Ticker, TimelineComponent, Transform, VFXItem, ValueGetter, addByOrder, addItem, addItemWithOrder, alphaFrameFrag, alphaMaskFrag, assertExist, asserts, blend, bloomMixVert, bloomThresholdVert, calculateTranslation, cameraMove_frag as cameraMoveFrag, cameraMoveVert, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, combineImageTemplate1, combineImageTemplate1Async, combineImageTemplate2, combineImageTemplate2Async, combineImageTemplateAsync, compatible_frag as compatibleFrag, compatible_vert as compatibleVert, convertAnchor, copyFrag, createCopyShader, createFilter, createFilterShaders, createGLContext, createKeyFrameMeta, createShaderWithMarcos, createShape, createVFXItem, createValueGetter, deepClone, defaultGlobalVolume, defaultPlugins, delayFrag, deserializeMipmapTexture, disableAllPlayer, distortionFrag, distortionVert, earcut, enlargeBuffer, ensureVec3, filters, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateHalfFloatTexture, getActivePlayers, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTemplateCanvasPool, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getImageItemRenderInfo, getKTXTextureOptions, getKeyFrameMetaByRawValue, getParticleMeshShader, getPixelRatio, getPlayerByCanvas, getPreMultiAlpha, getStandardComposition, getStandardImage, getStandardItem, getStandardJSON, getTextureSize, glContext, gpuTimer, imageDataFromColor, imageDataFromGradient, initErrors, initGLContext, integrate, interpolateColor, isAndroid, isArray, isCanvasUsedByPlayer, isFunction, isIOS, isObject, isScene, isSceneWithOptions, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isWebGL2, item_define as itemDefine, itemFrag, itemFrameFrag, itemVert, loadBinary, loadBlob, loadImage, loadMedia, loadVideo, loadWebPOptional, logger, index as math, maxSpriteMeshItemCount, maxSpriteTextureCount, modifyMaxKeyframeShader, nearestPowerOfTwo, noop, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap, particleVert, pluginLoaderMap, random, registerFilter, registerFilters, registerPlugin, removeItem, requestAsync, rotateVec2, screenMeshVert, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setMaxSpriteMeshItemCount, setRayFromCamera, setSideMode, setSpriteMeshMaxFragmentTextures, setSpriteMeshMaxItemCountByGPU, sortByOrder, index$1 as spec, spriteMeshShaderFromFilter, spriteMeshShaderFromRenderInfo, spriteMeshShaderIdFromRenderInfo, thresholdFrag, throwDestroyedError$1 as throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecAssign, vecFill, vecMulCombine, vecNormalize, version };
|