@galacean/effects-threejs 1.3.0-alpha.1 → 1.3.0
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 +130 -130
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +5 -5
- package/dist/index.min.js.map +1 -1
- package/dist/index.mjs +130 -130
- package/dist/index.mjs.map +1 -1
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Description: Galacean Effects runtime threejs plugin for the web
|
|
4
4
|
* Author: Ant Group CO., Ltd.
|
|
5
5
|
* Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
|
|
6
|
-
* Version: v1.3.0
|
|
6
|
+
* Version: v1.3.0
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
'use strict';
|
|
@@ -708,7 +708,7 @@ function asserts(condition, msg) {
|
|
|
708
708
|
* Name: @galacean/effects-specification
|
|
709
709
|
* Description: Galacean Effects JSON Specification
|
|
710
710
|
* Author: Ant Group CO., Ltd.
|
|
711
|
-
* Version: v1.1.0
|
|
711
|
+
* Version: v1.1.0
|
|
712
712
|
*/
|
|
713
713
|
|
|
714
714
|
/*********************************************/
|
|
@@ -7152,9 +7152,9 @@ var Float16ArrayWrapper = /** @class */ (function () {
|
|
|
7152
7152
|
this.data = new Uint16Array(num);
|
|
7153
7153
|
}
|
|
7154
7154
|
else if (num && typeof num === 'object' && Number.isInteger(num.length)) {
|
|
7155
|
-
var
|
|
7156
|
-
for (var i = 0; i <
|
|
7157
|
-
|
|
7155
|
+
var data_1 = this.data = new Uint16Array(num.length);
|
|
7156
|
+
for (var i = 0; i < data_1.length; i++) {
|
|
7157
|
+
data_1[i] = toHalf(num[i]);
|
|
7158
7158
|
}
|
|
7159
7159
|
}
|
|
7160
7160
|
}
|
|
@@ -7527,9 +7527,9 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7527
7527
|
CurveValue.getAllData = function (meta, halfFloat) {
|
|
7528
7528
|
var ret = new (halfFloat ? Float16ArrayWrapper : Float32Array)(meta.index * 4);
|
|
7529
7529
|
for (var i = 0, cursor = 0, curves = meta.curves; i < curves.length; i++) {
|
|
7530
|
-
var
|
|
7531
|
-
ret.set(
|
|
7532
|
-
cursor +=
|
|
7530
|
+
var data_1 = curves[i].toData();
|
|
7531
|
+
ret.set(data_1, cursor);
|
|
7532
|
+
cursor += data_1.length;
|
|
7533
7533
|
}
|
|
7534
7534
|
return halfFloat ? ret.data : ret;
|
|
7535
7535
|
};
|
|
@@ -7538,17 +7538,17 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7538
7538
|
var max = -Infinity;
|
|
7539
7539
|
//formatted number
|
|
7540
7540
|
if (Number.isFinite(props[0]) && Number.isFinite(props[1])) {
|
|
7541
|
-
var
|
|
7541
|
+
var keys_1 = [];
|
|
7542
7542
|
for (var i = 2; i < props.length; i++) {
|
|
7543
7543
|
// FIXME
|
|
7544
|
-
|
|
7544
|
+
keys_1.push(props[i].slice(0, 4));
|
|
7545
7545
|
}
|
|
7546
|
-
this.keys =
|
|
7546
|
+
this.keys = keys_1;
|
|
7547
7547
|
this.min = props[0];
|
|
7548
7548
|
this.dist = props[1] - props[0];
|
|
7549
7549
|
}
|
|
7550
7550
|
else {
|
|
7551
|
-
var
|
|
7551
|
+
var keys_2 = props.map(function (item) {
|
|
7552
7552
|
if (isArray(item)) {
|
|
7553
7553
|
min = Math.min(min, item[1]);
|
|
7554
7554
|
max = Math.max(max, item[1]);
|
|
@@ -7563,22 +7563,22 @@ var CurveValue = /** @class */ (function (_super) {
|
|
|
7563
7563
|
throw new Error('invalid keyframe');
|
|
7564
7564
|
});
|
|
7565
7565
|
var dist = max - min;
|
|
7566
|
-
this.keys =
|
|
7566
|
+
this.keys = keys_2;
|
|
7567
7567
|
if (dist !== 0) {
|
|
7568
|
-
for (var i = 0; i <
|
|
7569
|
-
var key =
|
|
7568
|
+
for (var i = 0; i < keys_2.length; i++) {
|
|
7569
|
+
var key = keys_2[i];
|
|
7570
7570
|
key[1] = (key[1] - min) / dist;
|
|
7571
7571
|
}
|
|
7572
7572
|
}
|
|
7573
|
-
var key0 =
|
|
7573
|
+
var key0 = keys_2[0];
|
|
7574
7574
|
if (key0[0] > 0) {
|
|
7575
7575
|
key0[2] = 0;
|
|
7576
|
-
|
|
7576
|
+
keys_2.unshift([0, key0[1], 0, 0]);
|
|
7577
7577
|
}
|
|
7578
|
-
var key1 =
|
|
7578
|
+
var key1 = keys_2[keys_2.length - 1];
|
|
7579
7579
|
if (key1[0] < 1) {
|
|
7580
7580
|
key1[3] = 0;
|
|
7581
|
-
|
|
7581
|
+
keys_2.push([1, key1[1], 0, 0]);
|
|
7582
7582
|
}
|
|
7583
7583
|
this.min = min;
|
|
7584
7584
|
this.dist = dist;
|
|
@@ -7953,14 +7953,14 @@ function curveValueIntegrateByTime(t1, keyframe0, keyframe1) {
|
|
|
7953
7953
|
function getKeyFrameMetaByRawValue(meta, value) {
|
|
7954
7954
|
if (value) {
|
|
7955
7955
|
var type = value[0];
|
|
7956
|
-
var
|
|
7956
|
+
var keys_3 = value[1];
|
|
7957
7957
|
if (type === ValueType$1.CURVE) {
|
|
7958
|
-
meta.curves.push(
|
|
7959
|
-
var keyLen =
|
|
7960
|
-
if (
|
|
7958
|
+
meta.curves.push(keys_3);
|
|
7959
|
+
var keyLen = keys_3.length;
|
|
7960
|
+
if (keys_3[0][0] > 0) {
|
|
7961
7961
|
keyLen++;
|
|
7962
7962
|
}
|
|
7963
|
-
if (
|
|
7963
|
+
if (keys_3[keys_3.length - 1][0] < 1) {
|
|
7964
7964
|
keyLen++;
|
|
7965
7965
|
}
|
|
7966
7966
|
meta.index += keyLen;
|
|
@@ -7968,19 +7968,19 @@ function getKeyFrameMetaByRawValue(meta, value) {
|
|
|
7968
7968
|
meta.curveCount += keyLen;
|
|
7969
7969
|
}
|
|
7970
7970
|
else if (type === ValueType$1.LINE) {
|
|
7971
|
-
var keyLen =
|
|
7972
|
-
if (keyLen === 2 &&
|
|
7971
|
+
var keyLen = keys_3.length;
|
|
7972
|
+
if (keyLen === 2 && keys_3[0][0] === 0 && keys_3[1][0] === 1) {
|
|
7973
7973
|
return;
|
|
7974
7974
|
}
|
|
7975
|
-
if (
|
|
7975
|
+
if (keys_3[0][0] > 0) {
|
|
7976
7976
|
keyLen++;
|
|
7977
7977
|
}
|
|
7978
|
-
if (
|
|
7978
|
+
if (keys_3[keys_3.length - 1][0] < 1) {
|
|
7979
7979
|
keyLen++;
|
|
7980
7980
|
}
|
|
7981
7981
|
var uniformCount = Math.ceil(keyLen / 2);
|
|
7982
7982
|
meta.lineSegCount += uniformCount;
|
|
7983
|
-
meta.curves.push(
|
|
7983
|
+
meta.curves.push(keys_3);
|
|
7984
7984
|
meta.index += uniformCount;
|
|
7985
7985
|
meta.max = Math.max(meta.max, uniformCount);
|
|
7986
7986
|
}
|
|
@@ -10461,9 +10461,9 @@ var KTXTexture = /** @class */ (function () {
|
|
|
10461
10461
|
for (var level = 0; level < mipmapCount; level++) {
|
|
10462
10462
|
var imageSize = new Int32Array(this.arrayBuffer, this.baseOffset + dataOffset, 1)[0]; // size per face, since not supporting array cubemaps
|
|
10463
10463
|
for (var face = 0; face < this.numberOfFaces; face++) {
|
|
10464
|
-
var
|
|
10464
|
+
var data_1 = new Uint8Array(this.arrayBuffer, this.baseOffset + dataOffset + 4, imageSize);
|
|
10465
10465
|
mipmaps.push({
|
|
10466
|
-
data:
|
|
10466
|
+
data: data_1,
|
|
10467
10467
|
width: width,
|
|
10468
10468
|
height: height,
|
|
10469
10469
|
});
|
|
@@ -13292,16 +13292,16 @@ var InteractVFXItem = /** @class */ (function (_super) {
|
|
|
13292
13292
|
var nx = position[0] - width;
|
|
13293
13293
|
var ny = position[1] - height;
|
|
13294
13294
|
if (options.dxRange) {
|
|
13295
|
-
var _d = __read$3(options.dxRange, 2),
|
|
13296
|
-
nx = clamp$1(nx,
|
|
13297
|
-
if (nx !==
|
|
13295
|
+
var _d = __read$3(options.dxRange, 2), min_1 = _d[0], max_1 = _d[1];
|
|
13296
|
+
nx = clamp$1(nx, min_1, max_1);
|
|
13297
|
+
if (nx !== min_1 && nx !== max_1 && min_1 !== max_1) {
|
|
13298
13298
|
(_a = event.origin) === null || _a === void 0 ? void 0 : _a.preventDefault();
|
|
13299
13299
|
}
|
|
13300
13300
|
}
|
|
13301
13301
|
if (options.dyRange) {
|
|
13302
|
-
var _e = __read$3(options.dyRange, 2),
|
|
13303
|
-
ny = clamp$1(ny,
|
|
13304
|
-
if (ny !==
|
|
13302
|
+
var _e = __read$3(options.dyRange, 2), min_2 = _e[0], max_2 = _e[1];
|
|
13303
|
+
ny = clamp$1(ny, min_2, max_2);
|
|
13304
|
+
if (ny !== min_2 && ny !== max_2 && min_2 !== max_2) {
|
|
13305
13305
|
(_b = event.origin) === null || _b === void 0 ? void 0 : _b.preventDefault();
|
|
13306
13306
|
}
|
|
13307
13307
|
}
|
|
@@ -13415,11 +13415,11 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13415
13415
|
var item = items[i];
|
|
13416
13416
|
var texture = item === null || item === void 0 ? void 0 : item.renderer.texture;
|
|
13417
13417
|
var textureIndex = texture ? textures.indexOf(texture) : -1;
|
|
13418
|
-
var
|
|
13419
|
-
aPointLen +=
|
|
13420
|
-
indexLen +=
|
|
13421
|
-
datas.push(
|
|
13422
|
-
pointCount +=
|
|
13418
|
+
var data_1 = this.getItemInitData(item, i, pointCount, textureIndex);
|
|
13419
|
+
aPointLen += data_1.aPoint.length;
|
|
13420
|
+
indexLen += data_1.index.length;
|
|
13421
|
+
datas.push(data_1);
|
|
13422
|
+
pointCount += data_1.aPoint.length / 6;
|
|
13423
13423
|
this.updateItem(item, true);
|
|
13424
13424
|
}
|
|
13425
13425
|
var bundle = {
|
|
@@ -13431,10 +13431,10 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13431
13431
|
index: 0,
|
|
13432
13432
|
};
|
|
13433
13433
|
var _loop_1 = function (i) {
|
|
13434
|
-
var
|
|
13434
|
+
var data_2 = datas[i];
|
|
13435
13435
|
Object.keys(bundle).forEach(function (name) {
|
|
13436
13436
|
var arr = bundle[name];
|
|
13437
|
-
var ta =
|
|
13437
|
+
var ta = data_2[name];
|
|
13438
13438
|
arr.set(ta, cursor[name]);
|
|
13439
13439
|
cursor[name] += ta.length;
|
|
13440
13440
|
});
|
|
@@ -13701,14 +13701,14 @@ var SpriteMesh = /** @class */ (function () {
|
|
|
13701
13701
|
for (var y = 0; y < row; y++) {
|
|
13702
13702
|
var base = (y * 2 + x) * 4;
|
|
13703
13703
|
// @ts-expect-error
|
|
13704
|
-
var
|
|
13705
|
-
var texOffset =
|
|
13704
|
+
var split_1 = textureSheetAnimation ? [0, 0, 1, 1, splits[0][4]] : splits[y * 2 + x];
|
|
13705
|
+
var texOffset = split_1[4] ? [0, 0, 1, 0, 0, 1, 1, 1] : [0, 1, 0, 0, 1, 1, 1, 0];
|
|
13706
13706
|
var dw = ((x + x + 1) / col - 1) / 2;
|
|
13707
13707
|
var dh = ((y + y + 1) / row - 1) / 2;
|
|
13708
|
-
var tox =
|
|
13709
|
-
var toy =
|
|
13710
|
-
var tsx =
|
|
13711
|
-
var tsy =
|
|
13708
|
+
var tox = split_1[0];
|
|
13709
|
+
var toy = split_1[1];
|
|
13710
|
+
var tsx = split_1[4] ? split_1[3] : split_1[2];
|
|
13711
|
+
var tsy = split_1[4] ? split_1[2] : split_1[3];
|
|
13712
13712
|
var origin_1 = [
|
|
13713
13713
|
originData[0] / col + dw,
|
|
13714
13714
|
originData[1] / row + dh,
|
|
@@ -13805,13 +13805,13 @@ function generateFeatureTexture(engine, feather) {
|
|
|
13805
13805
|
}
|
|
13806
13806
|
else {
|
|
13807
13807
|
var len = 128;
|
|
13808
|
-
var
|
|
13808
|
+
var data_3 = new Uint8Array(len);
|
|
13809
13809
|
for (var i = 0, s = len - 1; i < len; i++) {
|
|
13810
13810
|
var p = i / s;
|
|
13811
13811
|
var val = feather.getValue(p);
|
|
13812
|
-
|
|
13812
|
+
data_3[i] = Math.round(val * 255);
|
|
13813
13813
|
}
|
|
13814
|
-
tex = Texture.createWithData(engine, { width: len, height: 1, data:
|
|
13814
|
+
tex = Texture.createWithData(engine, { width: len, height: 1, data: data_3 }, {
|
|
13815
13815
|
name: 'feather',
|
|
13816
13816
|
format: glContext.LUMINANCE,
|
|
13817
13817
|
minFilter: glContext.LINEAR,
|
|
@@ -13969,22 +13969,22 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
13969
13969
|
* 需要则添加到meshToModify数组
|
|
13970
13970
|
*/
|
|
13971
13971
|
for (var i = 0; i < splits.length; i++) {
|
|
13972
|
-
var
|
|
13972
|
+
var split_1 = splits[i];
|
|
13973
13973
|
// @ts-expect-error
|
|
13974
|
-
var spriteMesh =
|
|
13975
|
-
if (
|
|
13974
|
+
var spriteMesh = split_1.spriteMesh;
|
|
13975
|
+
if (split_1.items.length === 0) {
|
|
13976
13976
|
throw new Error('split not combined');
|
|
13977
13977
|
}
|
|
13978
|
-
if (
|
|
13979
|
-
var priority =
|
|
13978
|
+
if (split_1.dirty) {
|
|
13979
|
+
var priority = split_1.indexStart;
|
|
13980
13980
|
if (spriteMesh.mesh.priority !== priority) {
|
|
13981
13981
|
spriteMesh.mesh.priority = priority;
|
|
13982
13982
|
meshToModify.push(spriteMesh.mesh);
|
|
13983
13983
|
}
|
|
13984
|
-
spriteMesh.setItems(
|
|
13984
|
+
spriteMesh.setItems(split_1.items.map(function (item) { return item.content; }));
|
|
13985
13985
|
}
|
|
13986
13986
|
spriteMesh.applyChange();
|
|
13987
|
-
|
|
13987
|
+
split_1.dirty = false;
|
|
13988
13988
|
}
|
|
13989
13989
|
/**
|
|
13990
13990
|
* 有需要移除的meshSplit 则废弃对应的mesh 保留material
|
|
@@ -13992,8 +13992,8 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
13992
13992
|
*/
|
|
13993
13993
|
if (splitsToRemove.length) {
|
|
13994
13994
|
for (var i = 0; i < splitsToRemove.length; i++) {
|
|
13995
|
-
var
|
|
13996
|
-
var sp =
|
|
13995
|
+
var split_2 = splitsToRemove[i];
|
|
13996
|
+
var sp = split_2.spriteMesh;
|
|
13997
13997
|
// @ts-expect-error
|
|
13998
13998
|
var mesh = sp.mesh;
|
|
13999
13999
|
mesh.dispose({ material: { textures: exports.DestroyOptions.keep } });
|
|
@@ -14110,7 +14110,7 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14110
14110
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14111
14111
|
if (isSprite(item)) {
|
|
14112
14112
|
var content = item.createContent();
|
|
14113
|
-
var
|
|
14113
|
+
var split_4 = {
|
|
14114
14114
|
indexStart: item.listIndex,
|
|
14115
14115
|
indexEnd: item.listIndex,
|
|
14116
14116
|
items: [item],
|
|
@@ -14118,21 +14118,21 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14118
14118
|
cacheId: content.renderInfo.cacheId,
|
|
14119
14119
|
textures: [item.content.renderer.texture],
|
|
14120
14120
|
};
|
|
14121
|
-
splits.unshift(
|
|
14122
|
-
return [
|
|
14121
|
+
splits.unshift(split_4);
|
|
14122
|
+
return [split_4];
|
|
14123
14123
|
}
|
|
14124
14124
|
return [];
|
|
14125
14125
|
}
|
|
14126
14126
|
var _loop_2 = function (i) {
|
|
14127
|
-
var
|
|
14127
|
+
var split_5 = splits[i];
|
|
14128
14128
|
var listIndex = item.listIndex;
|
|
14129
14129
|
if (isSprite(item)) {
|
|
14130
14130
|
// @ts-expect-error
|
|
14131
|
-
if (listIndex <=
|
|
14131
|
+
if (listIndex <= split_5.indexEnd) {
|
|
14132
14132
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14133
14133
|
var itemIndex_1 = items.indexOf(item);
|
|
14134
|
-
var indexStart = Math.min(itemIndex_1, items.indexOf(
|
|
14135
|
-
var indexEnd = Math.max(itemIndex_1, items.indexOf(
|
|
14134
|
+
var indexStart = Math.min(itemIndex_1, items.indexOf(split_5.items[0]));
|
|
14135
|
+
var indexEnd = Math.max(itemIndex_1, items.indexOf(split_5.items[split_5.items.length - 1]));
|
|
14136
14136
|
var neoSplits_1 = this_2.getMeshSplits(items, indexStart, indexEnd);
|
|
14137
14137
|
var neoSplitIndex_1 = neoSplits_1.findIndex(function (split) { return split.items.includes(item); });
|
|
14138
14138
|
if (neoSplits_1.length === 2) {
|
|
@@ -14140,14 +14140,14 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14140
14140
|
//1 or 0
|
|
14141
14141
|
Object.keys(neoSplits_1[1 - neoSplitIndex_1]).forEach(function (key) {
|
|
14142
14142
|
// @ts-expect-error
|
|
14143
|
-
|
|
14143
|
+
split_5[key] = neoSplits_1[1 - neoSplitIndex_1][key];
|
|
14144
14144
|
});
|
|
14145
14145
|
return { value: [neoSplits_1[neoSplitIndex_1]] };
|
|
14146
14146
|
}
|
|
14147
14147
|
else if (neoSplits_1.length === 3) {
|
|
14148
14148
|
Object.keys(neoSplits_1[0]).forEach(function (key) {
|
|
14149
14149
|
// @ts-expect-error
|
|
14150
|
-
|
|
14150
|
+
split_5[key] = neoSplits_1[0][key];
|
|
14151
14151
|
});
|
|
14152
14152
|
splits.splice(i + 1, 0, neoSplits_1[1], neoSplits_1[2]);
|
|
14153
14153
|
if (neoSplitIndex_1 !== 1) {
|
|
@@ -14161,25 +14161,25 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14161
14161
|
//todo add case
|
|
14162
14162
|
Object.keys(neoSplits_1[0]).forEach(function (key) {
|
|
14163
14163
|
// @ts-expect-error
|
|
14164
|
-
|
|
14164
|
+
split_5[key] = neoSplits_1[0][key];
|
|
14165
14165
|
});
|
|
14166
14166
|
return { value: [] };
|
|
14167
14167
|
}
|
|
14168
14168
|
}
|
|
14169
14169
|
else {
|
|
14170
|
-
if (listIndex <
|
|
14170
|
+
if (listIndex < split_5.indexStart || listIndex === split_5.indexEnd) {
|
|
14171
14171
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14172
14172
|
return { value: [] };
|
|
14173
14173
|
// @ts-expect-error
|
|
14174
14174
|
}
|
|
14175
|
-
else if (listIndex <
|
|
14175
|
+
else if (listIndex < split_5.indexEnd) {
|
|
14176
14176
|
addItemWithOrder(items, item, itemSortProperty);
|
|
14177
|
-
var lastItem =
|
|
14177
|
+
var lastItem = split_5.items[split_5.items.length - 1];
|
|
14178
14178
|
var endIndex = items.indexOf(lastItem);
|
|
14179
|
-
var neoSplits_2 = this_2.getMeshSplits(items, items.indexOf(
|
|
14179
|
+
var neoSplits_2 = this_2.getMeshSplits(items, items.indexOf(split_5.items[0]), endIndex);
|
|
14180
14180
|
Object.keys(neoSplits_2[0]).forEach(function (key) {
|
|
14181
14181
|
// @ts-expect-error
|
|
14182
|
-
|
|
14182
|
+
split_5[key] = neoSplits_2[0][key];
|
|
14183
14183
|
});
|
|
14184
14184
|
if (neoSplits_2.length === 2) {
|
|
14185
14185
|
splits.splice(i + 1, 0, neoSplits_2[1]);
|
|
@@ -14240,10 +14240,10 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14240
14240
|
* 遍历this.meshSplits,找到元素的listIndex在split的indexStart和indexEnd范围内的第一个meshSplit
|
|
14241
14241
|
*/
|
|
14242
14242
|
for (var i = 0; i < splits.length; i++) {
|
|
14243
|
-
var
|
|
14243
|
+
var split_6 = splits[i];
|
|
14244
14244
|
// @ts-expect-error
|
|
14245
|
-
if (
|
|
14246
|
-
targetSplit =
|
|
14245
|
+
if (split_6.indexStart <= item.listIndex && split_6.indexEnd >= item.listIndex) {
|
|
14246
|
+
targetSplit = split_6;
|
|
14247
14247
|
targetSplitIndex = i;
|
|
14248
14248
|
break;
|
|
14249
14249
|
}
|
|
@@ -14353,8 +14353,8 @@ var SpriteGroup = /** @class */ (function () {
|
|
|
14353
14353
|
// FIXME: 可选性
|
|
14354
14354
|
var targetSplitIndex = void 0;
|
|
14355
14355
|
for (var i = 0; i < splits.length; i++) {
|
|
14356
|
-
var
|
|
14357
|
-
if (
|
|
14356
|
+
var split_7 = splits[i];
|
|
14357
|
+
if (split_7.items.includes(item)) {
|
|
14358
14358
|
targetSplitIndex = i;
|
|
14359
14359
|
break;
|
|
14360
14360
|
}
|
|
@@ -15505,10 +15505,10 @@ var ParticleMesh = /** @class */ (function () {
|
|
|
15505
15505
|
var index = geometry.getIndexData();
|
|
15506
15506
|
for (var i = 0; i < names.length; i++) {
|
|
15507
15507
|
var name_1 = names[i];
|
|
15508
|
-
var
|
|
15509
|
-
if (
|
|
15508
|
+
var data_1 = geometry.getAttributeData(name_1);
|
|
15509
|
+
if (data_1) {
|
|
15510
15510
|
// @ts-expect-error
|
|
15511
|
-
geometry.setAttributeData(name_1, new
|
|
15511
|
+
geometry.setAttributeData(name_1, new data_1.constructor(0));
|
|
15512
15512
|
}
|
|
15513
15513
|
}
|
|
15514
15514
|
// @ts-expect-error
|
|
@@ -16883,10 +16883,10 @@ function getGeometryTriangles(geometry, options) {
|
|
|
16883
16883
|
var segment = segments[i];
|
|
16884
16884
|
var p0 = points[i];
|
|
16885
16885
|
var p1 = points[i + 1] || points[0];
|
|
16886
|
-
var
|
|
16886
|
+
var keys_1 = segment;
|
|
16887
16887
|
var point = [0, 0];
|
|
16888
|
-
for (var j = 0; j <
|
|
16889
|
-
var key =
|
|
16888
|
+
for (var j = 0; j < keys_1.length - 1; j++) {
|
|
16889
|
+
var key = keys_1[j];
|
|
16890
16890
|
getBezier2DValue(point, key, p0, p1, p0[4], p0[5], p1[2], p1[3]);
|
|
16891
16891
|
setPoint(point[0], point[1]);
|
|
16892
16892
|
}
|
|
@@ -16945,11 +16945,11 @@ function getGeometryByShape(shape, uvTransform) {
|
|
|
16945
16945
|
var index = 0;
|
|
16946
16946
|
for (var i = 0; i < geometries.length; i++) {
|
|
16947
16947
|
var geometry = geometries[i];
|
|
16948
|
-
var
|
|
16949
|
-
indexBase +=
|
|
16950
|
-
datas.push(
|
|
16951
|
-
aPoint +=
|
|
16952
|
-
index +=
|
|
16948
|
+
var data_1 = getGeometryTriangles(geometry, { indexBase: indexBase, uvTransform: uvTransform });
|
|
16949
|
+
indexBase += data_1.aPoint.length / 5;
|
|
16950
|
+
datas.push(data_1);
|
|
16951
|
+
aPoint += data_1.aPoint.length;
|
|
16952
|
+
index += data_1.index.length;
|
|
16953
16953
|
}
|
|
16954
16954
|
if (datas.length === 1) {
|
|
16955
16955
|
return datas[0];
|
|
@@ -16958,11 +16958,11 @@ function getGeometryByShape(shape, uvTransform) {
|
|
|
16958
16958
|
var indexData = new Uint16Array(index);
|
|
16959
16959
|
// @ts-expect-error
|
|
16960
16960
|
for (var i = 0, pointIndex = 0, idx = 0; i < datas[i]; i++) {
|
|
16961
|
-
var
|
|
16962
|
-
aPointData.set(
|
|
16963
|
-
pointIndex +=
|
|
16964
|
-
indexData.set(
|
|
16965
|
-
idx +=
|
|
16961
|
+
var data_2 = datas[i];
|
|
16962
|
+
aPointData.set(data_2.aPoint, pointIndex);
|
|
16963
|
+
pointIndex += data_2.aPoint.length;
|
|
16964
|
+
indexData.set(data_2.index, idx);
|
|
16965
|
+
idx += data_2.index.length;
|
|
16966
16966
|
}
|
|
16967
16967
|
return {
|
|
16968
16968
|
aPoint: aPointData,
|
|
@@ -17273,10 +17273,10 @@ var TrailMesh = /** @class */ (function () {
|
|
|
17273
17273
|
var pointCountPerTrail = this.pointCountPerTrail;
|
|
17274
17274
|
if (index >= 0 && index < pointCountPerTrail) {
|
|
17275
17275
|
var startIndex = (trail * pointCountPerTrail + index) * 24 + 8;
|
|
17276
|
-
var
|
|
17277
|
-
out.x =
|
|
17278
|
-
out.y =
|
|
17279
|
-
out.z =
|
|
17276
|
+
var data_1 = this.geometry.getAttributeData('aColor');
|
|
17277
|
+
out.x = data_1[startIndex];
|
|
17278
|
+
out.y = data_1[1 + startIndex];
|
|
17279
|
+
out.z = data_1[2 + startIndex];
|
|
17280
17280
|
return out;
|
|
17281
17281
|
}
|
|
17282
17282
|
};
|
|
@@ -18682,14 +18682,14 @@ var TextMesh = /** @class */ (function (_super) {
|
|
|
18682
18682
|
for (var y_1 = 0; y_1 < row; y_1++) {
|
|
18683
18683
|
var base = (y_1 * 2 + x_1) * 4;
|
|
18684
18684
|
// @ts-expect-error
|
|
18685
|
-
var
|
|
18686
|
-
var texOffset =
|
|
18685
|
+
var split_1 = textureSheetAnimation ? [0, 0, 1, 1, splits[0][4]] : splits[y_1 * 2 + x_1];
|
|
18686
|
+
var texOffset = split_1[4] ? [0, 0, 1, 0, 0, 1, 1, 1] : [0, 1, 0, 0, 1, 1, 1, 0];
|
|
18687
18687
|
var dw = ((x_1 + x_1 + 1) / col - 1) / 2;
|
|
18688
18688
|
var dh = ((y_1 + y_1 + 1) / row - 1) / 2;
|
|
18689
|
-
var tox =
|
|
18690
|
-
var toy =
|
|
18691
|
-
var tsx =
|
|
18692
|
-
var tsy =
|
|
18689
|
+
var tox = split_1[0];
|
|
18690
|
+
var toy = split_1[1];
|
|
18691
|
+
var tsx = split_1[4] ? split_1[3] : split_1[2];
|
|
18692
|
+
var tsy = split_1[4] ? split_1[2] : split_1[3];
|
|
18693
18693
|
var origin_1 = [
|
|
18694
18694
|
originData[0] / col + dw,
|
|
18695
18695
|
originData[1] / row + dh,
|
|
@@ -21599,7 +21599,7 @@ var filters = {
|
|
|
21599
21599
|
* Name: @galacean/effects-specification
|
|
21600
21600
|
* Description: Galacean Effects JSON Specification
|
|
21601
21601
|
* Author: Ant Group CO., Ltd.
|
|
21602
|
-
* Version: v1.1.0
|
|
21602
|
+
* Version: v1.1.0
|
|
21603
21603
|
*/
|
|
21604
21604
|
|
|
21605
21605
|
/*********************************************/
|
|
@@ -23369,13 +23369,13 @@ var CompositionSourceManager = /** @class */ (function () {
|
|
|
23369
23369
|
if (renderContent.renderer) {
|
|
23370
23370
|
renderContent.renderer = _this.changeTex(renderContent.renderer);
|
|
23371
23371
|
_this.processMask(renderContent.renderer);
|
|
23372
|
-
var
|
|
23372
|
+
var split_1 = renderContent.splits && !renderContent.textureSheetAnimation && renderContent.splits[0];
|
|
23373
23373
|
if (Number.isInteger(renderContent.renderer.shape)) {
|
|
23374
23374
|
// TODO: scene.shapes 类型问题?
|
|
23375
|
-
renderContent.renderer.shape = getGeometryByShape((_a = _this.jsonScene) === null || _a === void 0 ? void 0 : _a.shapes[renderContent.renderer.shape],
|
|
23375
|
+
renderContent.renderer.shape = getGeometryByShape((_a = _this.jsonScene) === null || _a === void 0 ? void 0 : _a.shapes[renderContent.renderer.shape], split_1);
|
|
23376
23376
|
}
|
|
23377
23377
|
else if (renderContent.renderer.shape && isObject(renderContent.renderer.shape)) {
|
|
23378
|
-
renderContent.renderer.shape = getGeometryByShape(renderContent.renderer.shape,
|
|
23378
|
+
renderContent.renderer.shape = getGeometryByShape(renderContent.renderer.shape, split_1);
|
|
23379
23379
|
}
|
|
23380
23380
|
}
|
|
23381
23381
|
else {
|
|
@@ -23387,14 +23387,14 @@ var CompositionSourceManager = /** @class */ (function () {
|
|
|
23387
23387
|
if (renderContent.filter) {
|
|
23388
23388
|
renderContent.filter = __assign$1({}, renderContent.filter);
|
|
23389
23389
|
}
|
|
23390
|
-
var name_1 = item.name, _b = item.delay, delay = _b === void 0 ? 0 : _b,
|
|
23390
|
+
var name_1 = item.name, _b = item.delay, delay = _b === void 0 ? 0 : _b, id_1 = item.id, parentId = item.parentId, duration = item.duration, endBehavior = item.endBehavior, pluginName = item.pluginName, pn = item.pn, transform = item.transform;
|
|
23391
23391
|
// FIXME: specification 下定义的 Item 不存在 refCount 类型定义
|
|
23392
23392
|
// @ts-expect-error
|
|
23393
23393
|
var refCount = item.refCount;
|
|
23394
23394
|
var _c = _this.jsonScene.plugins, plugins = _c === void 0 ? [] : _c;
|
|
23395
23395
|
option.name = name_1;
|
|
23396
23396
|
option.delay = delay;
|
|
23397
|
-
option.id =
|
|
23397
|
+
option.id = id_1;
|
|
23398
23398
|
if (parentId) {
|
|
23399
23399
|
option.parentId = parentId;
|
|
23400
23400
|
}
|
|
@@ -24005,14 +24005,14 @@ var AssetManager = /** @class */ (function () {
|
|
|
24005
24005
|
}());
|
|
24006
24006
|
function fixOldImageUsage(usedImages, compositions, imgUsage, images, renderLevel) {
|
|
24007
24007
|
for (var i = 0; i < compositions.length; i++) {
|
|
24008
|
-
var
|
|
24009
|
-
var ids = imgUsage[
|
|
24008
|
+
var id_1 = compositions[i].id;
|
|
24009
|
+
var ids = imgUsage[id_1];
|
|
24010
24010
|
if (ids) {
|
|
24011
24011
|
for (var j = 0; j < ids.length; j++) {
|
|
24012
|
-
var
|
|
24013
|
-
var tag = images[
|
|
24012
|
+
var id_2 = ids[j];
|
|
24013
|
+
var tag = images[id_2].renderLevel;
|
|
24014
24014
|
if (passRenderLevel(tag, renderLevel)) {
|
|
24015
|
-
usedImages[
|
|
24015
|
+
usedImages[id_2] = true;
|
|
24016
24016
|
}
|
|
24017
24017
|
}
|
|
24018
24018
|
}
|
|
@@ -26293,10 +26293,10 @@ var ThreeTexture = /** @class */ (function (_super) {
|
|
|
26293
26293
|
var texture = undefined;
|
|
26294
26294
|
this.sourceType = sourceType;
|
|
26295
26295
|
if (sourceType === exports.TextureSourceType.data) {
|
|
26296
|
-
var
|
|
26297
|
-
texture = new THREE__namespace.DataTexture(
|
|
26298
|
-
this.width =
|
|
26299
|
-
this.height =
|
|
26296
|
+
var data_1 = options.data;
|
|
26297
|
+
texture = new THREE__namespace.DataTexture(data_1.data, data_1.width, data_1.height, format, type, mapping, wrapS, wrapT, magFilter, minFilter);
|
|
26298
|
+
this.width = data_1.width;
|
|
26299
|
+
this.height = data_1.height;
|
|
26300
26300
|
}
|
|
26301
26301
|
else if (sourceType === exports.TextureSourceType.image) {
|
|
26302
26302
|
var image = options.image;
|
|
@@ -26328,10 +26328,10 @@ var ThreeTexture = /** @class */ (function (_super) {
|
|
|
26328
26328
|
texture = new THREE__namespace.VideoTexture(options.video, mapping, wrapS, wrapT, magFilter, minFilter, format, type);
|
|
26329
26329
|
}
|
|
26330
26330
|
else if (sourceType === exports.TextureSourceType.framebuffer) {
|
|
26331
|
-
var
|
|
26332
|
-
if (
|
|
26333
|
-
var width = (_a =
|
|
26334
|
-
var height = (_b =
|
|
26331
|
+
var data_2 = options.data;
|
|
26332
|
+
if (data_2) {
|
|
26333
|
+
var width = (_a = data_2.width) !== null && _a !== void 0 ? _a : 0;
|
|
26334
|
+
var height = (_b = data_2.height) !== null && _b !== void 0 ? _b : 0;
|
|
26335
26335
|
texture = new THREE__namespace.FramebufferTexture(width, height, format);
|
|
26336
26336
|
this.width = width;
|
|
26337
26337
|
this.height = height;
|
|
@@ -26467,11 +26467,11 @@ var ThreeGeometry = /** @class */ (function (_super) {
|
|
|
26467
26467
|
if (attributes[dataSource] === undefined) {
|
|
26468
26468
|
_this.setAttributeType(dataSource, attr, geometry, attributes, props.maxVertex);
|
|
26469
26469
|
}
|
|
26470
|
-
var size = attr.size, offset = attr.offset,
|
|
26470
|
+
var size = attr.size, offset = attr.offset, normalize_1 = attr.normalize;
|
|
26471
26471
|
var dataSourceAttribute = attributes[dataSource];
|
|
26472
26472
|
var buffer = dataSourceAttribute.buffer;
|
|
26473
26473
|
var dataLength = dataSourceAttribute.dataLength;
|
|
26474
|
-
var attribute = new THREE__namespace.InterleavedBufferAttribute(buffer, size, (offset !== null && offset !== void 0 ? offset : 0) / dataLength,
|
|
26474
|
+
var attribute = new THREE__namespace.InterleavedBufferAttribute(buffer, size, (offset !== null && offset !== void 0 ? offset : 0) / dataLength, normalize_1);
|
|
26475
26475
|
geometry.setAttribute(name, attribute);
|
|
26476
26476
|
attributes[name] = {
|
|
26477
26477
|
buffer: buffer,
|
|
@@ -26962,7 +26962,7 @@ Geometry.create = function (engine, options) {
|
|
|
26962
26962
|
Mesh.create = function (engine, props) {
|
|
26963
26963
|
return new ThreeMesh(engine, props);
|
|
26964
26964
|
};
|
|
26965
|
-
var version = "1.3.0
|
|
26965
|
+
var version = "1.3.0";
|
|
26966
26966
|
logger.info('THREEJS plugin version: ' + version);
|
|
26967
26967
|
|
|
26968
26968
|
exports.AbstractPlugin = AbstractPlugin;
|