@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/weapp.mjs
CHANGED
|
@@ -7120,9 +7120,9 @@ var Float16ArrayWrapper = /** @class */ (function () {
|
|
|
7120
7120
|
this.data = new Uint16Array(num);
|
|
7121
7121
|
}
|
|
7122
7122
|
else if (num && typeof num === 'object' && Number.isInteger(num.length)) {
|
|
7123
|
-
var
|
|
7124
|
-
for (var i = 0; i <
|
|
7125
|
-
|
|
7123
|
+
var data = this.data = new Uint16Array(num.length);
|
|
7124
|
+
for (var i = 0; i < data.length; i++) {
|
|
7125
|
+
data[i] = toHalf(num[i]);
|
|
7126
7126
|
}
|
|
7127
7127
|
}
|
|
7128
7128
|
}
|
|
@@ -7495,9 +7495,9 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7495
7495
|
CurveValue.getAllData = function (meta, halfFloat) {
|
|
7496
7496
|
var ret = new (halfFloat ? Float16ArrayWrapper : Float32Array)(meta.index * 4);
|
|
7497
7497
|
for (var i = 0, cursor = 0, curves = meta.curves; i < curves.length; i++) {
|
|
7498
|
-
var
|
|
7499
|
-
ret.set(
|
|
7500
|
-
cursor +=
|
|
7498
|
+
var data = curves[i].toData();
|
|
7499
|
+
ret.set(data, cursor);
|
|
7500
|
+
cursor += data.length;
|
|
7501
7501
|
}
|
|
7502
7502
|
return halfFloat ? ret.data : ret;
|
|
7503
7503
|
};
|
|
@@ -7506,17 +7506,17 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7506
7506
|
var max = -Infinity;
|
|
7507
7507
|
//formatted number
|
|
7508
7508
|
if (Number.isFinite(props[0]) && Number.isFinite(props[1])) {
|
|
7509
|
-
var
|
|
7509
|
+
var keys = [];
|
|
7510
7510
|
for (var i = 2; i < props.length; i++) {
|
|
7511
7511
|
// FIXME
|
|
7512
|
-
|
|
7512
|
+
keys.push(props[i].slice(0, 4));
|
|
7513
7513
|
}
|
|
7514
|
-
this.keys =
|
|
7514
|
+
this.keys = keys;
|
|
7515
7515
|
this.min = props[0];
|
|
7516
7516
|
this.dist = props[1] - props[0];
|
|
7517
7517
|
}
|
|
7518
7518
|
else {
|
|
7519
|
-
var
|
|
7519
|
+
var keys = props.map(function (item) {
|
|
7520
7520
|
if (isArray(item)) {
|
|
7521
7521
|
min = Math.min(min, item[1]);
|
|
7522
7522
|
max = Math.max(max, item[1]);
|
|
@@ -7531,22 +7531,22 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7531
7531
|
throw new Error('invalid keyframe');
|
|
7532
7532
|
});
|
|
7533
7533
|
var dist = max - min;
|
|
7534
|
-
this.keys =
|
|
7534
|
+
this.keys = keys;
|
|
7535
7535
|
if (dist !== 0) {
|
|
7536
|
-
for (var i = 0; i <
|
|
7537
|
-
var key =
|
|
7536
|
+
for (var i = 0; i < keys.length; i++) {
|
|
7537
|
+
var key = keys[i];
|
|
7538
7538
|
key[1] = (key[1] - min) / dist;
|
|
7539
7539
|
}
|
|
7540
7540
|
}
|
|
7541
|
-
var key0 =
|
|
7541
|
+
var key0 = keys[0];
|
|
7542
7542
|
if (key0[0] > 0) {
|
|
7543
7543
|
key0[2] = 0;
|
|
7544
|
-
|
|
7544
|
+
keys.unshift([0, key0[1], 0, 0]);
|
|
7545
7545
|
}
|
|
7546
|
-
var key1 =
|
|
7546
|
+
var key1 = keys[keys.length - 1];
|
|
7547
7547
|
if (key1[0] < 1) {
|
|
7548
7548
|
key1[3] = 0;
|
|
7549
|
-
|
|
7549
|
+
keys.push([1, key1[1], 0, 0]);
|
|
7550
7550
|
}
|
|
7551
7551
|
this.min = min;
|
|
7552
7552
|
this.dist = dist;
|
|
@@ -7921,14 +7921,14 @@ function curveValueIntegrateByTime(t1, keyframe0, keyframe1) {
|
|
|
7921
7921
|
function getKeyFrameMetaByRawValue(meta, value) {
|
|
7922
7922
|
if (value) {
|
|
7923
7923
|
var type = value[0];
|
|
7924
|
-
var
|
|
7924
|
+
var keys = value[1];
|
|
7925
7925
|
if (type === ValueType$1.CURVE) {
|
|
7926
|
-
meta.curves.push(
|
|
7927
|
-
var keyLen =
|
|
7928
|
-
if (
|
|
7926
|
+
meta.curves.push(keys);
|
|
7927
|
+
var keyLen = keys.length;
|
|
7928
|
+
if (keys[0][0] > 0) {
|
|
7929
7929
|
keyLen++;
|
|
7930
7930
|
}
|
|
7931
|
-
if (
|
|
7931
|
+
if (keys[keys.length - 1][0] < 1) {
|
|
7932
7932
|
keyLen++;
|
|
7933
7933
|
}
|
|
7934
7934
|
meta.index += keyLen;
|
|
@@ -7936,19 +7936,19 @@ function getKeyFrameMetaByRawValue(meta, value) {
|
|
|
7936
7936
|
meta.curveCount += keyLen;
|
|
7937
7937
|
}
|
|
7938
7938
|
else if (type === ValueType$1.LINE) {
|
|
7939
|
-
var keyLen =
|
|
7940
|
-
if (keyLen === 2 &&
|
|
7939
|
+
var keyLen = keys.length;
|
|
7940
|
+
if (keyLen === 2 && keys[0][0] === 0 && keys[1][0] === 1) {
|
|
7941
7941
|
return;
|
|
7942
7942
|
}
|
|
7943
|
-
if (
|
|
7943
|
+
if (keys[0][0] > 0) {
|
|
7944
7944
|
keyLen++;
|
|
7945
7945
|
}
|
|
7946
|
-
if (
|
|
7946
|
+
if (keys[keys.length - 1][0] < 1) {
|
|
7947
7947
|
keyLen++;
|
|
7948
7948
|
}
|
|
7949
7949
|
var uniformCount = Math.ceil(keyLen / 2);
|
|
7950
7950
|
meta.lineSegCount += uniformCount;
|
|
7951
|
-
meta.curves.push(
|
|
7951
|
+
meta.curves.push(keys);
|
|
7952
7952
|
meta.index += uniformCount;
|
|
7953
7953
|
meta.max = Math.max(meta.max, uniformCount);
|
|
7954
7954
|
}
|
|
@@ -10429,9 +10429,9 @@ var KTXTexture = /** @class */ (function () {
|
|
|
10429
10429
|
for (var level = 0; level < mipmapCount; level++) {
|
|
10430
10430
|
var imageSize = new Int32Array(this.arrayBuffer, this.baseOffset + dataOffset, 1)[0]; // size per face, since not supporting array cubemaps
|
|
10431
10431
|
for (var face = 0; face < this.numberOfFaces; face++) {
|
|
10432
|
-
var
|
|
10432
|
+
var data = new Uint8Array(this.arrayBuffer, this.baseOffset + dataOffset + 4, imageSize);
|
|
10433
10433
|
mipmaps.push({
|
|
10434
|
-
data:
|
|
10434
|
+
data: data,
|
|
10435
10435
|
width: width,
|
|
10436
10436
|
height: height,
|
|
10437
10437
|
});
|
|
@@ -13260,16 +13260,16 @@ var InteractVFXItem = /** @class */ (function (_super) {
|
|
|
13260
13260
|
var nx = position[0] - width;
|
|
13261
13261
|
var ny = position[1] - height;
|
|
13262
13262
|
if (options.dxRange) {
|
|
13263
|
-
var _d = __read$3(options.dxRange, 2),
|
|
13264
|
-
nx = clamp$1(nx,
|
|
13265
|
-
if (nx !==
|
|
13263
|
+
var _d = __read$3(options.dxRange, 2), min = _d[0], max = _d[1];
|
|
13264
|
+
nx = clamp$1(nx, min, max);
|
|
13265
|
+
if (nx !== min && nx !== max && min !== max) {
|
|
13266
13266
|
(_a = event.origin) === null || _a === void 0 ? void 0 : _a.preventDefault();
|
|
13267
13267
|
}
|
|
13268
13268
|
}
|
|
13269
13269
|
if (options.dyRange) {
|
|
13270
|
-
var _e = __read$3(options.dyRange, 2),
|
|
13271
|
-
ny = clamp$1(ny,
|
|
13272
|
-
if (ny !==
|
|
13270
|
+
var _e = __read$3(options.dyRange, 2), min = _e[0], max = _e[1];
|
|
13271
|
+
ny = clamp$1(ny, min, max);
|
|
13272
|
+
if (ny !== min && ny !== max && min !== max) {
|
|
13273
13273
|
(_b = event.origin) === null || _b === void 0 ? void 0 : _b.preventDefault();
|
|
13274
13274
|
}
|
|
13275
13275
|
}
|
|
@@ -13383,11 +13383,11 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13383
13383
|
var item = items[i];
|
|
13384
13384
|
var texture = item === null || item === void 0 ? void 0 : item.renderer.texture;
|
|
13385
13385
|
var textureIndex = texture ? textures.indexOf(texture) : -1;
|
|
13386
|
-
var
|
|
13387
|
-
aPointLen +=
|
|
13388
|
-
indexLen +=
|
|
13389
|
-
datas.push(
|
|
13390
|
-
pointCount +=
|
|
13386
|
+
var data = this.getItemInitData(item, i, pointCount, textureIndex);
|
|
13387
|
+
aPointLen += data.aPoint.length;
|
|
13388
|
+
indexLen += data.index.length;
|
|
13389
|
+
datas.push(data);
|
|
13390
|
+
pointCount += data.aPoint.length / 6;
|
|
13391
13391
|
this.updateItem(item, true);
|
|
13392
13392
|
}
|
|
13393
13393
|
var bundle = {
|
|
@@ -13399,10 +13399,10 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13399
13399
|
index: 0,
|
|
13400
13400
|
};
|
|
13401
13401
|
var _loop_1 = function (i) {
|
|
13402
|
-
var
|
|
13402
|
+
var data = datas[i];
|
|
13403
13403
|
Object.keys(bundle).forEach(function (name) {
|
|
13404
13404
|
var arr = bundle[name];
|
|
13405
|
-
var ta =
|
|
13405
|
+
var ta = data[name];
|
|
13406
13406
|
arr.set(ta, cursor[name]);
|
|
13407
13407
|
cursor[name] += ta.length;
|
|
13408
13408
|
});
|
|
@@ -13669,14 +13669,14 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13669
13669
|
for (var y = 0; y < row; y++) {
|
|
13670
13670
|
var base = (y * 2 + x) * 4;
|
|
13671
13671
|
// @ts-expect-error
|
|
13672
|
-
var
|
|
13673
|
-
var texOffset =
|
|
13672
|
+
var split = textureSheetAnimation ? [0, 0, 1, 1, splits[0][4]] : splits[y * 2 + x];
|
|
13673
|
+
var texOffset = split[4] ? [0, 0, 1, 0, 0, 1, 1, 1] : [0, 1, 0, 0, 1, 1, 1, 0];
|
|
13674
13674
|
var dw = ((x + x + 1) / col - 1) / 2;
|
|
13675
13675
|
var dh = ((y + y + 1) / row - 1) / 2;
|
|
13676
|
-
var tox =
|
|
13677
|
-
var toy =
|
|
13678
|
-
var tsx =
|
|
13679
|
-
var tsy =
|
|
13676
|
+
var tox = split[0];
|
|
13677
|
+
var toy = split[1];
|
|
13678
|
+
var tsx = split[4] ? split[3] : split[2];
|
|
13679
|
+
var tsy = split[4] ? split[2] : split[3];
|
|
13680
13680
|
var origin_1 = [
|
|
13681
13681
|
originData[0] / col + dw,
|
|
13682
13682
|
originData[1] / row + dh,
|
|
@@ -13773,13 +13773,13 @@ function generateFeatureTexture(engine, feather) {
|
|
|
13773
13773
|
}
|
|
13774
13774
|
else {
|
|
13775
13775
|
var len = 128;
|
|
13776
|
-
var
|
|
13776
|
+
var data = new Uint8Array(len);
|
|
13777
13777
|
for (var i = 0, s = len - 1; i < len; i++) {
|
|
13778
13778
|
var p = i / s;
|
|
13779
13779
|
var val = feather.getValue(p);
|
|
13780
|
-
|
|
13780
|
+
data[i] = Math.round(val * 255);
|
|
13781
13781
|
}
|
|
13782
|
-
tex = Texture.createWithData(engine, { width: len, height: 1, data:
|
|
13782
|
+
tex = Texture.createWithData(engine, { width: len, height: 1, data: data }, {
|
|
13783
13783
|
name: 'feather',
|
|
13784
13784
|
format: glContext.LUMINANCE,
|
|
13785
13785
|
minFilter: glContext.LINEAR,
|
|
@@ -13937,22 +13937,22 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
13937
13937
|
* 需要则添加到meshToModify数组
|
|
13938
13938
|
*/
|
|
13939
13939
|
for (var i = 0; i < splits.length; i++) {
|
|
13940
|
-
var
|
|
13940
|
+
var split = splits[i];
|
|
13941
13941
|
// @ts-expect-error
|
|
13942
|
-
var spriteMesh =
|
|
13943
|
-
if (
|
|
13942
|
+
var spriteMesh = split.spriteMesh;
|
|
13943
|
+
if (split.items.length === 0) {
|
|
13944
13944
|
throw new Error('split not combined');
|
|
13945
13945
|
}
|
|
13946
|
-
if (
|
|
13947
|
-
var priority =
|
|
13946
|
+
if (split.dirty) {
|
|
13947
|
+
var priority = split.indexStart;
|
|
13948
13948
|
if (spriteMesh.mesh.priority !== priority) {
|
|
13949
13949
|
spriteMesh.mesh.priority = priority;
|
|
13950
13950
|
meshToModify.push(spriteMesh.mesh);
|
|
13951
13951
|
}
|
|
13952
|
-
spriteMesh.setItems(
|
|
13952
|
+
spriteMesh.setItems(split.items.map(function (item) { return item.content; }));
|
|
13953
13953
|
}
|
|
13954
13954
|
spriteMesh.applyChange();
|
|
13955
|
-
|
|
13955
|
+
split.dirty = false;
|
|
13956
13956
|
}
|
|
13957
13957
|
/**
|
|
13958
13958
|
* 有需要移除的meshSplit 则废弃对应的mesh 保留material
|
|
@@ -13960,8 +13960,8 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
13960
13960
|
*/
|
|
13961
13961
|
if (splitsToRemove.length) {
|
|
13962
13962
|
for (var i = 0; i < splitsToRemove.length; i++) {
|
|
13963
|
-
var
|
|
13964
|
-
var sp =
|
|
13963
|
+
var split = splitsToRemove[i];
|
|
13964
|
+
var sp = split.spriteMesh;
|
|
13965
13965
|
// @ts-expect-error
|
|
13966
13966
|
var mesh = sp.mesh;
|
|
13967
13967
|
mesh.dispose({ material: { textures: DestroyOptions.keep } });
|
|
@@ -14078,7 +14078,7 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14078
14078
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14079
14079
|
if (isSprite(item)) {
|
|
14080
14080
|
var content = item.createContent();
|
|
14081
|
-
var
|
|
14081
|
+
var split = {
|
|
14082
14082
|
indexStart: item.listIndex,
|
|
14083
14083
|
indexEnd: item.listIndex,
|
|
14084
14084
|
items: [item],
|
|
@@ -14086,21 +14086,21 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14086
14086
|
cacheId: content.renderInfo.cacheId,
|
|
14087
14087
|
textures: [item.content.renderer.texture],
|
|
14088
14088
|
};
|
|
14089
|
-
splits.unshift(
|
|
14090
|
-
return [
|
|
14089
|
+
splits.unshift(split);
|
|
14090
|
+
return [split];
|
|
14091
14091
|
}
|
|
14092
14092
|
return [];
|
|
14093
14093
|
}
|
|
14094
14094
|
var _loop_2 = function (i) {
|
|
14095
|
-
var
|
|
14095
|
+
var split = splits[i];
|
|
14096
14096
|
var listIndex = item.listIndex;
|
|
14097
14097
|
if (isSprite(item)) {
|
|
14098
14098
|
// @ts-expect-error
|
|
14099
|
-
if (listIndex <=
|
|
14099
|
+
if (listIndex <= split.indexEnd) {
|
|
14100
14100
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14101
14101
|
var itemIndex_1 = items.indexOf(item);
|
|
14102
|
-
var indexStart = Math.min(itemIndex_1, items.indexOf(
|
|
14103
|
-
var indexEnd = Math.max(itemIndex_1, items.indexOf(
|
|
14102
|
+
var indexStart = Math.min(itemIndex_1, items.indexOf(split.items[0]));
|
|
14103
|
+
var indexEnd = Math.max(itemIndex_1, items.indexOf(split.items[split.items.length - 1]));
|
|
14104
14104
|
var neoSplits_1 = this_2.getMeshSplits(items, indexStart, indexEnd);
|
|
14105
14105
|
var neoSplitIndex_1 = neoSplits_1.findIndex(function (split) { return split.items.includes(item); });
|
|
14106
14106
|
if (neoSplits_1.length === 2) {
|
|
@@ -14108,14 +14108,14 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14108
14108
|
//1 or 0
|
|
14109
14109
|
Object.keys(neoSplits_1[1 - neoSplitIndex_1]).forEach(function (key) {
|
|
14110
14110
|
// @ts-expect-error
|
|
14111
|
-
|
|
14111
|
+
split[key] = neoSplits_1[1 - neoSplitIndex_1][key];
|
|
14112
14112
|
});
|
|
14113
14113
|
return { value: [neoSplits_1[neoSplitIndex_1]] };
|
|
14114
14114
|
}
|
|
14115
14115
|
else if (neoSplits_1.length === 3) {
|
|
14116
14116
|
Object.keys(neoSplits_1[0]).forEach(function (key) {
|
|
14117
14117
|
// @ts-expect-error
|
|
14118
|
-
|
|
14118
|
+
split[key] = neoSplits_1[0][key];
|
|
14119
14119
|
});
|
|
14120
14120
|
splits.splice(i + 1, 0, neoSplits_1[1], neoSplits_1[2]);
|
|
14121
14121
|
if (neoSplitIndex_1 !== 1) {
|
|
@@ -14129,25 +14129,25 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14129
14129
|
//todo add case
|
|
14130
14130
|
Object.keys(neoSplits_1[0]).forEach(function (key) {
|
|
14131
14131
|
// @ts-expect-error
|
|
14132
|
-
|
|
14132
|
+
split[key] = neoSplits_1[0][key];
|
|
14133
14133
|
});
|
|
14134
14134
|
return { value: [] };
|
|
14135
14135
|
}
|
|
14136
14136
|
}
|
|
14137
14137
|
else {
|
|
14138
|
-
if (listIndex <
|
|
14138
|
+
if (listIndex < split.indexStart || listIndex === split.indexEnd) {
|
|
14139
14139
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14140
14140
|
return { value: [] };
|
|
14141
14141
|
// @ts-expect-error
|
|
14142
14142
|
}
|
|
14143
|
-
else if (listIndex <
|
|
14143
|
+
else if (listIndex < split.indexEnd) {
|
|
14144
14144
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14145
|
-
var lastItem =
|
|
14145
|
+
var lastItem = split.items[split.items.length - 1];
|
|
14146
14146
|
var endIndex = items.indexOf(lastItem);
|
|
14147
|
-
var neoSplits_2 = this_2.getMeshSplits(items, items.indexOf(
|
|
14147
|
+
var neoSplits_2 = this_2.getMeshSplits(items, items.indexOf(split.items[0]), endIndex);
|
|
14148
14148
|
Object.keys(neoSplits_2[0]).forEach(function (key) {
|
|
14149
14149
|
// @ts-expect-error
|
|
14150
|
-
|
|
14150
|
+
split[key] = neoSplits_2[0][key];
|
|
14151
14151
|
});
|
|
14152
14152
|
if (neoSplits_2.length === 2) {
|
|
14153
14153
|
splits.splice(i + 1, 0, neoSplits_2[1]);
|
|
@@ -14208,10 +14208,10 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14208
14208
|
* 遍历this.meshSplits,找到元素的listIndex在split的indexStart和indexEnd范围内的第一个meshSplit
|
|
14209
14209
|
*/
|
|
14210
14210
|
for (var i = 0; i < splits.length; i++) {
|
|
14211
|
-
var
|
|
14211
|
+
var split = splits[i];
|
|
14212
14212
|
// @ts-expect-error
|
|
14213
|
-
if (
|
|
14214
|
-
targetSplit =
|
|
14213
|
+
if (split.indexStart <= item.listIndex && split.indexEnd >= item.listIndex) {
|
|
14214
|
+
targetSplit = split;
|
|
14215
14215
|
targetSplitIndex = i;
|
|
14216
14216
|
break;
|
|
14217
14217
|
}
|
|
@@ -14321,8 +14321,8 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14321
14321
|
// FIXME: 可选性
|
|
14322
14322
|
var targetSplitIndex = void 0;
|
|
14323
14323
|
for (var i = 0; i < splits.length; i++) {
|
|
14324
|
-
var
|
|
14325
|
-
if (
|
|
14324
|
+
var split = splits[i];
|
|
14325
|
+
if (split.items.includes(item)) {
|
|
14326
14326
|
targetSplitIndex = i;
|
|
14327
14327
|
break;
|
|
14328
14328
|
}
|
|
@@ -15473,10 +15473,10 @@ var ParticleMesh = /** @class */ (function () {
|
|
|
15473
15473
|
var index = geometry.getIndexData();
|
|
15474
15474
|
for (var i = 0; i < names.length; i++) {
|
|
15475
15475
|
var name_1 = names[i];
|
|
15476
|
-
var
|
|
15477
|
-
if (
|
|
15476
|
+
var data = geometry.getAttributeData(name_1);
|
|
15477
|
+
if (data) {
|
|
15478
15478
|
// @ts-expect-error
|
|
15479
|
-
geometry.setAttributeData(name_1, new
|
|
15479
|
+
geometry.setAttributeData(name_1, new data.constructor(0));
|
|
15480
15480
|
}
|
|
15481
15481
|
}
|
|
15482
15482
|
// @ts-expect-error
|
|
@@ -16851,10 +16851,10 @@ function getGeometryTriangles(geometry, options) {
|
|
|
16851
16851
|
var segment = segments[i];
|
|
16852
16852
|
var p0 = points[i];
|
|
16853
16853
|
var p1 = points[i + 1] || points[0];
|
|
16854
|
-
var
|
|
16854
|
+
var keys = segment;
|
|
16855
16855
|
var point = [0, 0];
|
|
16856
|
-
for (var j = 0; j <
|
|
16857
|
-
var key =
|
|
16856
|
+
for (var j = 0; j < keys.length - 1; j++) {
|
|
16857
|
+
var key = keys[j];
|
|
16858
16858
|
getBezier2DValue(point, key, p0, p1, p0[4], p0[5], p1[2], p1[3]);
|
|
16859
16859
|
setPoint(point[0], point[1]);
|
|
16860
16860
|
}
|
|
@@ -16913,11 +16913,11 @@ function getGeometryByShape(shape, uvTransform) {
|
|
|
16913
16913
|
var index = 0;
|
|
16914
16914
|
for (var i = 0; i < geometries.length; i++) {
|
|
16915
16915
|
var geometry = geometries[i];
|
|
16916
|
-
var
|
|
16917
|
-
indexBase +=
|
|
16918
|
-
datas.push(
|
|
16919
|
-
aPoint +=
|
|
16920
|
-
index +=
|
|
16916
|
+
var data = getGeometryTriangles(geometry, { indexBase: indexBase, uvTransform: uvTransform });
|
|
16917
|
+
indexBase += data.aPoint.length / 5;
|
|
16918
|
+
datas.push(data);
|
|
16919
|
+
aPoint += data.aPoint.length;
|
|
16920
|
+
index += data.index.length;
|
|
16921
16921
|
}
|
|
16922
16922
|
if (datas.length === 1) {
|
|
16923
16923
|
return datas[0];
|
|
@@ -16926,11 +16926,11 @@ function getGeometryByShape(shape, uvTransform) {
|
|
|
16926
16926
|
var indexData = new Uint16Array(index);
|
|
16927
16927
|
// @ts-expect-error
|
|
16928
16928
|
for (var i = 0, pointIndex = 0, idx = 0; i < datas[i]; i++) {
|
|
16929
|
-
var
|
|
16930
|
-
aPointData.set(
|
|
16931
|
-
pointIndex +=
|
|
16932
|
-
indexData.set(
|
|
16933
|
-
idx +=
|
|
16929
|
+
var data = datas[i];
|
|
16930
|
+
aPointData.set(data.aPoint, pointIndex);
|
|
16931
|
+
pointIndex += data.aPoint.length;
|
|
16932
|
+
indexData.set(data.index, idx);
|
|
16933
|
+
idx += data.index.length;
|
|
16934
16934
|
}
|
|
16935
16935
|
return {
|
|
16936
16936
|
aPoint: aPointData,
|
|
@@ -17241,10 +17241,10 @@ var TrailMesh = /** @class */ (function () {
|
|
|
17241
17241
|
var pointCountPerTrail = this.pointCountPerTrail;
|
|
17242
17242
|
if (index >= 0 && index < pointCountPerTrail) {
|
|
17243
17243
|
var startIndex = (trail * pointCountPerTrail + index) * 24 + 8;
|
|
17244
|
-
var
|
|
17245
|
-
out.x =
|
|
17246
|
-
out.y =
|
|
17247
|
-
out.z =
|
|
17244
|
+
var data = this.geometry.getAttributeData('aColor');
|
|
17245
|
+
out.x = data[startIndex];
|
|
17246
|
+
out.y = data[1 + startIndex];
|
|
17247
|
+
out.z = data[2 + startIndex];
|
|
17248
17248
|
return out;
|
|
17249
17249
|
}
|
|
17250
17250
|
};
|
|
@@ -18650,14 +18650,14 @@ var TextMesh = /** @class */ (function (_super) {
|
|
|
18650
18650
|
for (var y_1 = 0; y_1 < row; y_1++) {
|
|
18651
18651
|
var base = (y_1 * 2 + x_1) * 4;
|
|
18652
18652
|
// @ts-expect-error
|
|
18653
|
-
var
|
|
18654
|
-
var texOffset =
|
|
18653
|
+
var split = textureSheetAnimation ? [0, 0, 1, 1, splits[0][4]] : splits[y_1 * 2 + x_1];
|
|
18654
|
+
var texOffset = split[4] ? [0, 0, 1, 0, 0, 1, 1, 1] : [0, 1, 0, 0, 1, 1, 1, 0];
|
|
18655
18655
|
var dw = ((x_1 + x_1 + 1) / col - 1) / 2;
|
|
18656
18656
|
var dh = ((y_1 + y_1 + 1) / row - 1) / 2;
|
|
18657
|
-
var tox =
|
|
18658
|
-
var toy =
|
|
18659
|
-
var tsx =
|
|
18660
|
-
var tsy =
|
|
18657
|
+
var tox = split[0];
|
|
18658
|
+
var toy = split[1];
|
|
18659
|
+
var tsx = split[4] ? split[3] : split[2];
|
|
18660
|
+
var tsy = split[4] ? split[2] : split[3];
|
|
18661
18661
|
var origin_1 = [
|
|
18662
18662
|
originData[0] / col + dw,
|
|
18663
18663
|
originData[1] / row + dh,
|
|
@@ -23337,13 +23337,13 @@ var CompositionSourceManager = /** @class */ (function () {
|
|
|
23337
23337
|
if (renderContent.renderer) {
|
|
23338
23338
|
renderContent.renderer = _this.changeTex(renderContent.renderer);
|
|
23339
23339
|
_this.processMask(renderContent.renderer);
|
|
23340
|
-
var
|
|
23340
|
+
var split = renderContent.splits && !renderContent.textureSheetAnimation && renderContent.splits[0];
|
|
23341
23341
|
if (Number.isInteger(renderContent.renderer.shape)) {
|
|
23342
23342
|
// TODO: scene.shapes 类型问题?
|
|
23343
|
-
renderContent.renderer.shape = getGeometryByShape((_a = _this.jsonScene) === null || _a === void 0 ? void 0 : _a.shapes[renderContent.renderer.shape],
|
|
23343
|
+
renderContent.renderer.shape = getGeometryByShape((_a = _this.jsonScene) === null || _a === void 0 ? void 0 : _a.shapes[renderContent.renderer.shape], split);
|
|
23344
23344
|
}
|
|
23345
23345
|
else if (renderContent.renderer.shape && isObject(renderContent.renderer.shape)) {
|
|
23346
|
-
renderContent.renderer.shape = getGeometryByShape(renderContent.renderer.shape,
|
|
23346
|
+
renderContent.renderer.shape = getGeometryByShape(renderContent.renderer.shape, split);
|
|
23347
23347
|
}
|
|
23348
23348
|
}
|
|
23349
23349
|
else {
|
|
@@ -23355,14 +23355,14 @@ var CompositionSourceManager = /** @class */ (function () {
|
|
|
23355
23355
|
if (renderContent.filter) {
|
|
23356
23356
|
renderContent.filter = __assign$1({}, renderContent.filter);
|
|
23357
23357
|
}
|
|
23358
|
-
var name_1 = item.name, _b = item.delay, delay = _b === void 0 ? 0 : _b,
|
|
23358
|
+
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;
|
|
23359
23359
|
// FIXME: specification 下定义的 Item 不存在 refCount 类型定义
|
|
23360
23360
|
// @ts-expect-error
|
|
23361
23361
|
var refCount = item.refCount;
|
|
23362
23362
|
var _c = _this.jsonScene.plugins, plugins = _c === void 0 ? [] : _c;
|
|
23363
23363
|
option.name = name_1;
|
|
23364
23364
|
option.delay = delay;
|
|
23365
|
-
option.id =
|
|
23365
|
+
option.id = id;
|
|
23366
23366
|
if (parentId) {
|
|
23367
23367
|
option.parentId = parentId;
|
|
23368
23368
|
}
|
|
@@ -23824,8 +23824,8 @@ var AssetManager = /** @class */ (function () {
|
|
|
23824
23824
|
return [2 /*return*/, resultImage];
|
|
23825
23825
|
case 3:
|
|
23826
23826
|
// 如果是加载图片且是数组,设置变量,视频情况下不需要
|
|
23827
|
-
if (background &&
|
|
23828
|
-
variables[background.name] =
|
|
23827
|
+
if (background && Array.isArray(url_1) && variables) {
|
|
23828
|
+
variables[background.name] = resultImage.src;
|
|
23829
23829
|
}
|
|
23830
23830
|
return [4 /*yield*/, combineImageTemplate(resultImage, template, variables, this.options, img.oriY === -1)];
|
|
23831
23831
|
case 4: return [2 /*return*/, _b.sent()];
|
|
@@ -23973,14 +23973,14 @@ var AssetManager = /** @class */ (function () {
|
|
|
23973
23973
|
}());
|
|
23974
23974
|
function fixOldImageUsage(usedImages, compositions, imgUsage, images, renderLevel) {
|
|
23975
23975
|
for (var i = 0; i < compositions.length; i++) {
|
|
23976
|
-
var
|
|
23977
|
-
var ids = imgUsage[
|
|
23976
|
+
var id = compositions[i].id;
|
|
23977
|
+
var ids = imgUsage[id];
|
|
23978
23978
|
if (ids) {
|
|
23979
23979
|
for (var j = 0; j < ids.length; j++) {
|
|
23980
|
-
var
|
|
23981
|
-
var tag = images[
|
|
23980
|
+
var id_1 = ids[j];
|
|
23981
|
+
var tag = images[id_1].renderLevel;
|
|
23982
23982
|
if (passRenderLevel(tag, renderLevel)) {
|
|
23983
|
-
usedImages[
|
|
23983
|
+
usedImages[id_1] = true;
|
|
23984
23984
|
}
|
|
23985
23985
|
}
|
|
23986
23986
|
}
|
|
@@ -24086,18 +24086,14 @@ var CompVFXItem = /** @class */ (function (_super) {
|
|
|
24086
24086
|
// 设置预合成作为元素时的时长、结束行为和渲染延时
|
|
24087
24087
|
if (Item.isComposition(itemProps)) {
|
|
24088
24088
|
var refId = itemProps.content.options.refId;
|
|
24089
|
-
|
|
24090
|
-
if (!props) {
|
|
24091
|
-
throw new Error("\u5F15\u7528\u7684Id: ".concat(refId, " \u7684\u9884\u5408\u6210\u4E0D\u5B58\u5728"));
|
|
24092
|
-
}
|
|
24093
|
-
props.content = itemProps.content;
|
|
24094
|
-
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);
|
|
24089
|
+
item = new CompVFXItem(__assign$1({ refId: refId }, itemProps), this.composition);
|
|
24095
24090
|
item.contentProps = itemProps.content;
|
|
24096
24091
|
item.transform.parentTransform = this.transform;
|
|
24097
24092
|
this.composition.refContent.push(item);
|
|
24098
24093
|
if (item.endBehavior === END_BEHAVIOR_RESTART$1) {
|
|
24099
24094
|
this.composition.autoRefTex = false;
|
|
24100
24095
|
}
|
|
24096
|
+
item.createContent();
|
|
24101
24097
|
}
|
|
24102
24098
|
else {
|
|
24103
24099
|
item = createVFXItem(this.itemProps[i], this.composition);
|
|
@@ -24229,6 +24225,17 @@ var CompVFXItem = /** @class */ (function (_super) {
|
|
|
24229
24225
|
CompVFXItem.prototype.handleVisibleChanged = function (visible) {
|
|
24230
24226
|
this.items.forEach(function (item) { return item.setVisible(visible); });
|
|
24231
24227
|
};
|
|
24228
|
+
CompVFXItem.prototype.setScale = function (x, y, z) {
|
|
24229
|
+
if (this.content) {
|
|
24230
|
+
this.content.startSize = new Vector3(x, y, z);
|
|
24231
|
+
}
|
|
24232
|
+
};
|
|
24233
|
+
CompVFXItem.prototype.scale = function (x, y, z) {
|
|
24234
|
+
if (this.content) {
|
|
24235
|
+
var startSize = this.content.startSize.clone();
|
|
24236
|
+
this.content.startSize = new Vector3(x * startSize.x, y * startSize.y, z * startSize.z);
|
|
24237
|
+
}
|
|
24238
|
+
};
|
|
24232
24239
|
CompVFXItem.prototype.getUpdateTime = function (t) {
|
|
24233
24240
|
var startTime = this.startTimeInms;
|
|
24234
24241
|
var now = this.timeInms;
|
|
@@ -25751,10 +25758,10 @@ var GLTexture = /** @class */ (function (_super) {
|
|
|
25751
25758
|
var target = this.target;
|
|
25752
25759
|
var gl = this.pipelineContext.gl;
|
|
25753
25760
|
if (gl && this.textureBuffer) {
|
|
25754
|
-
var
|
|
25761
|
+
var data = new Uint8Array([255]);
|
|
25755
25762
|
this.bind();
|
|
25756
25763
|
if (target === gl.TEXTURE_2D) {
|
|
25757
|
-
gl.texImage2D(target, 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE,
|
|
25764
|
+
gl.texImage2D(target, 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE, data);
|
|
25758
25765
|
}
|
|
25759
25766
|
else if (target === gl.TEXTURE_CUBE_MAP) {
|
|
25760
25767
|
var faces = [
|
|
@@ -25766,7 +25773,7 @@ var GLTexture = /** @class */ (function (_super) {
|
|
|
25766
25773
|
gl.TEXTURE_CUBE_MAP_POSITIVE_Z,
|
|
25767
25774
|
];
|
|
25768
25775
|
for (var i = 0; i < faces.length; i++) {
|
|
25769
|
-
gl.texImage2D(faces[i], 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE,
|
|
25776
|
+
gl.texImage2D(faces[i], 0, gl.LUMINANCE, 1, 1, 0, gl.LUMINANCE, gl.UNSIGNED_BYTE, data);
|
|
25770
25777
|
}
|
|
25771
25778
|
}
|
|
25772
25779
|
// rewrite mipmap
|
|
@@ -29751,10 +29758,10 @@ var Player = /** @class */ (function () {
|
|
|
29751
29758
|
}
|
|
29752
29759
|
else if (gl) {
|
|
29753
29760
|
this.canvas = gl.canvas;
|
|
29754
|
-
var
|
|
29755
|
-
if (framework !==
|
|
29756
|
-
logger.error("The gl context(".concat(
|
|
29757
|
-
framework =
|
|
29761
|
+
var version = gl instanceof WebGLRenderingContext ? 'webgl' : 'webgl2';
|
|
29762
|
+
if (framework !== version) {
|
|
29763
|
+
logger.error("The gl context(".concat(version, ") is inconsistent with renderFramework or default version(").concat(framework, ")"));
|
|
29764
|
+
framework = version;
|
|
29758
29765
|
}
|
|
29759
29766
|
}
|
|
29760
29767
|
else {
|
|
@@ -30460,7 +30467,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
|
|
|
30460
30467
|
Engine.create = function (gl) {
|
|
30461
30468
|
return new GLEngine(gl);
|
|
30462
30469
|
};
|
|
30463
|
-
var version = "1.3.
|
|
30470
|
+
var version = "1.3.2";
|
|
30464
30471
|
logger.info('player version: ' + version);
|
|
30465
30472
|
|
|
30466
30473
|
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 };
|