@galacean/effects-core 2.2.4 → 2.2.6
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/fallback/migration.d.ts +5 -0
- package/dist/index.js +46 -15
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +46 -15
- package/dist/index.mjs.map +1 -1
- package/dist/math/keyframe-info.d.ts +8 -1
- package/dist/math/value-getters/value-getter.d.ts +3 -1
- package/package.json +1 -1
package/dist/index.mjs
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Description: Galacean Effects runtime core for the web
|
|
4
4
|
* Author: Ant Group CO., Ltd.
|
|
5
5
|
* Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
|
|
6
|
-
* Version: v2.2.
|
|
6
|
+
* Version: v2.2.6
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
@@ -953,7 +953,7 @@ var pluginInfoMap = {
|
|
|
953
953
|
"video": "@galacean/effects-plugin-multimedia",
|
|
954
954
|
"audio": "@galacean/effects-plugin-multimedia",
|
|
955
955
|
"orientation-transformer": "@galacean/effects-plugin-orientation-transformer",
|
|
956
|
-
"
|
|
956
|
+
"rich-text": "@galacean/effects-plugin-rich-text",
|
|
957
957
|
"spine": "@galacean/effects-plugin-spine"
|
|
958
958
|
};
|
|
959
959
|
function getPluginUsageInfo(name) {
|
|
@@ -5761,7 +5761,7 @@ var TextureSourceType;
|
|
|
5761
5761
|
_this.finish(url, xhr.status, xhr.response);
|
|
5762
5762
|
};
|
|
5763
5763
|
var handleLoad = function() {
|
|
5764
|
-
if (xhr.status == 200
|
|
5764
|
+
if (xhr.status == 200) {
|
|
5765
5765
|
_this.finish(url, 200, xhr.response);
|
|
5766
5766
|
} else {
|
|
5767
5767
|
handleError();
|
|
@@ -5787,7 +5787,7 @@ var TextureSourceType;
|
|
|
5787
5787
|
_proto.finish = function finish(url, status, data) {
|
|
5788
5788
|
var callbacks = this.callbacks[url];
|
|
5789
5789
|
delete this.callbacks[url];
|
|
5790
|
-
var args = status == 200
|
|
5790
|
+
var args = status == 200 ? [
|
|
5791
5791
|
data
|
|
5792
5792
|
] : [
|
|
5793
5793
|
status,
|
|
@@ -11715,25 +11715,35 @@ function numberToFix(a, fixed) {
|
|
|
11715
11715
|
}
|
|
11716
11716
|
|
|
11717
11717
|
var keyframeInfo = {
|
|
11718
|
+
pointIndexCache: {
|
|
11719
|
+
xIndex: 0,
|
|
11720
|
+
yIndex: 0
|
|
11721
|
+
},
|
|
11718
11722
|
/**
|
|
11719
11723
|
* 根据不同关键帧类型,获取位于曲线上的点
|
|
11720
11724
|
*/ getPointInCurve: function getPointInCurve(keyframe) {
|
|
11721
11725
|
keyframe[0]; var data = keyframe[1];
|
|
11722
|
-
var _this_getPointIndexInCurve = this.getPointIndexInCurve(keyframe), xIndex = _this_getPointIndexInCurve.xIndex, yIndex = _this_getPointIndexInCurve.yIndex;
|
|
11726
|
+
var _this_getPointIndexInCurve = this.getPointIndexInCurve(keyframe, this.pointIndexCache), xIndex = _this_getPointIndexInCurve.xIndex, yIndex = _this_getPointIndexInCurve.yIndex;
|
|
11723
11727
|
var time = data[xIndex];
|
|
11724
11728
|
var value = data[yIndex];
|
|
11725
11729
|
return new Vector2(time, value);
|
|
11726
11730
|
},
|
|
11727
11731
|
/**
|
|
11728
11732
|
* 根据不同关键帧类型,获取位于曲线上的点的索引
|
|
11729
|
-
*/ getPointIndexInCurve: function getPointIndexInCurve(keyframe) {
|
|
11733
|
+
*/ getPointIndexInCurve: function getPointIndexInCurve(keyframe, res) {
|
|
11730
11734
|
var type = keyframe[0], markType = keyframe[2];
|
|
11731
11735
|
// 不同类型,存放的时间不同
|
|
11732
11736
|
var index = type === BezierKeyframeType.LINE ? 0 : type === BezierKeyframeType.EASE_OUT ? 0 : type === BezierKeyframeType.EASE_IN ? 2 : type === BezierKeyframeType.EASE ? 2 : type === BezierKeyframeType.HOLD ? markType === BezierKeyframeType.EASE_IN ? 2 : 0 : 0;
|
|
11733
|
-
|
|
11734
|
-
xIndex
|
|
11735
|
-
yIndex
|
|
11736
|
-
|
|
11737
|
+
if (res) {
|
|
11738
|
+
res.xIndex = index;
|
|
11739
|
+
res.yIndex = index + 1;
|
|
11740
|
+
return res;
|
|
11741
|
+
} else {
|
|
11742
|
+
return {
|
|
11743
|
+
xIndex: index,
|
|
11744
|
+
yIndex: index + 1
|
|
11745
|
+
};
|
|
11746
|
+
}
|
|
11737
11747
|
},
|
|
11738
11748
|
/**
|
|
11739
11749
|
* 关键帧左侧是否为缓动类型(否则为线段)
|
|
@@ -12640,6 +12650,8 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
|
|
|
12640
12650
|
timeEnd: Number(e.x)
|
|
12641
12651
|
};
|
|
12642
12652
|
}
|
|
12653
|
+
this.startKeyframe = keyframes[0];
|
|
12654
|
+
this.endKeyframe = keyframes[keyframes.length - 1];
|
|
12643
12655
|
this.keyTimeData = Object.keys(this.curveMap);
|
|
12644
12656
|
};
|
|
12645
12657
|
_proto.getValue = function getValue(time) {
|
|
@@ -12647,12 +12659,18 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
|
|
|
12647
12659
|
var keyTimeData = this.keyTimeData;
|
|
12648
12660
|
var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
|
|
12649
12661
|
var keyTimeEnd = this.curveMap[keyTimeData[keyTimeData.length - 1]].timeEnd;
|
|
12650
|
-
// const keyTimeStart = Number(keyTimeData[0].split('&')[0]);
|
|
12651
|
-
// const keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split('&')[1]);
|
|
12652
12662
|
if (time <= keyTimeStart) {
|
|
12663
|
+
if (this.startKeyframe[0] === BezierKeyframeType.LINE || this.startKeyframe[0] === BezierKeyframeType.HOLD) {
|
|
12664
|
+
keyframeInfo.getPointIndexInCurve(this.startKeyframe, keyframeInfo.pointIndexCache);
|
|
12665
|
+
return this.endKeyframe[1][keyframeInfo.pointIndexCache.yIndex];
|
|
12666
|
+
}
|
|
12653
12667
|
return this.getCurveValue(keyTimeData[0], keyTimeStart);
|
|
12654
12668
|
}
|
|
12655
12669
|
if (time >= keyTimeEnd) {
|
|
12670
|
+
if (this.endKeyframe[0] === BezierKeyframeType.LINE || this.endKeyframe[0] === BezierKeyframeType.HOLD) {
|
|
12671
|
+
keyframeInfo.getPointIndexInCurve(this.endKeyframe, keyframeInfo.pointIndexCache);
|
|
12672
|
+
return this.endKeyframe[1][keyframeInfo.pointIndexCache.yIndex];
|
|
12673
|
+
}
|
|
12656
12674
|
return this.getCurveValue(keyTimeData[keyTimeData.length - 1], keyTimeEnd);
|
|
12657
12675
|
}
|
|
12658
12676
|
for(var i = 0; i < keyTimeData.length; i++){
|
|
@@ -16256,7 +16274,7 @@ var EventSystem = /*#__PURE__*/ function() {
|
|
|
16256
16274
|
var vy = 0;
|
|
16257
16275
|
var ts = performance.now();
|
|
16258
16276
|
if (!_this.target) {
|
|
16259
|
-
logger.
|
|
16277
|
+
logger.warn("Trigger TouchEvent after EventSystem is disposed.");
|
|
16260
16278
|
return {
|
|
16261
16279
|
x: x,
|
|
16262
16280
|
y: y,
|
|
@@ -20744,7 +20762,6 @@ var ParticleSystem = /*#__PURE__*/ function(Component) {
|
|
|
20744
20762
|
if (options.removeParticle) {
|
|
20745
20763
|
renderer.removeParticlePoint(pointIndex);
|
|
20746
20764
|
this.clearPointTrail(pointIndex);
|
|
20747
|
-
link.removeNode(node); // TODO: 会多移除一个粒子,为了通过帧对比先保留,等 2.0 合到主分支后移除。
|
|
20748
20765
|
node.content = [
|
|
20749
20766
|
0
|
|
20750
20767
|
];
|
|
@@ -25999,6 +26016,18 @@ function getStandardInteractContent(ui) {
|
|
|
25999
26016
|
});
|
|
26000
26017
|
return json;
|
|
26001
26018
|
}
|
|
26019
|
+
/**
|
|
26020
|
+
* 3.1 版本数据适配
|
|
26021
|
+
* - 富文本插件名称的适配
|
|
26022
|
+
*/ function version31Migration(json) {
|
|
26023
|
+
var _json_plugins;
|
|
26024
|
+
(_json_plugins = json.plugins) == null ? void 0 : _json_plugins.forEach(function(plugin, index) {
|
|
26025
|
+
if (plugin === "richtext") {
|
|
26026
|
+
json.plugins[index] = "rich-text";
|
|
26027
|
+
}
|
|
26028
|
+
});
|
|
26029
|
+
return json;
|
|
26030
|
+
}
|
|
26002
26031
|
/**
|
|
26003
26032
|
* 3.0 以下版本数据适配(runtime 2.0及以上版本支持)
|
|
26004
26033
|
*/ function version30Migration(json) {
|
|
@@ -26826,6 +26855,8 @@ function getStandardJSON(json) {
|
|
|
26826
26855
|
}
|
|
26827
26856
|
// 修正老版本数据中,meshItem 以及 lightItem 结束行为错误问题
|
|
26828
26857
|
version22Migration(json);
|
|
26858
|
+
// 修正老版本数据中,富文本插件名称的问题
|
|
26859
|
+
version31Migration(json);
|
|
26829
26860
|
if (v0.test(json.version)) {
|
|
26830
26861
|
var _exec;
|
|
26831
26862
|
reverseParticle = ((_exec = /^(\d+)/.exec(json.version)) == null ? void 0 : _exec[0]) === "0";
|
|
@@ -31368,7 +31399,7 @@ registerPlugin("sprite", SpriteLoader, VFXItem, true);
|
|
|
31368
31399
|
registerPlugin("particle", ParticleLoader, VFXItem, true);
|
|
31369
31400
|
registerPlugin("cal", CalculateLoader, VFXItem, true);
|
|
31370
31401
|
registerPlugin("interact", InteractLoader, VFXItem, true);
|
|
31371
|
-
var version = "2.2.
|
|
31402
|
+
var version = "2.2.6";
|
|
31372
31403
|
logger.info("Core version: " + version + ".");
|
|
31373
31404
|
|
|
31374
31405
|
export { AbstractPlugin, ActivationPlayable, ActivationPlayableAsset, ActivationTrack, AnimationClip, AnimationClipPlayable, Asset, AssetLoader, AssetManager, BYTES_TYPE_MAP, BaseRenderComponent, Behaviour, BezierCurve, BezierCurvePath, BezierCurveQuat, BinaryAsset, COMPRESSED_TEXTURE, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateLoader, Camera, CameraController, CameraVFXItemLoader, ColorCurve, ColorPropertyPlayableAsset, ColorPropertyTrack, Component, Composition, CompositionComponent, CompositionSourceManager, DEFAULT_FONTS, DEFAULT_FPS, Database, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, EffectComponent, EffectsObject, EffectsPackage, Engine, EventEmitter, EventSystem, Fake3DAnimationMode, Fake3DComponent, FilterMode, Float16ArrayWrapper, FloatPropertyPlayableAsset, FloatPropertyTrack, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, Item, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, MaterialTrack, Mesh, MeshCollider, ObjectBindingTrack, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleBehaviourPlayable, ParticleBehaviourPlayableAsset, ParticleLoader, ParticleMesh, ParticleSystem, ParticleSystemRenderer, ParticleTrack, PassTextureCache, PathSegments, PluginSystem, PostProcessVolume, PropertyTrack, RENDER_PASS_NAME_PREFIX, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, RenderTextureFormat, Renderbuffer, Renderer, RendererComponent, RuntimeClip, 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, Scene, SemanticMap, SerializationHelper, Shader, ShaderCompileResultStatus, ShaderFactory, ShaderType, ShaderVariant, ShapeComponent, SpriteColorPlayableAsset, SpriteColorTrack, SpriteComponent, SpriteLoader, StaticValue, SubCompositionPlayableAsset, SubCompositionTrack, TEMPLATE_USE_OFFSCREEN_CANVAS, TextComponent, TextComponentBase, TextLayout, TextLoader, TextStyle, Texture, TextureFactory, TextureLoadAction, TextureSourceType, TextureStoreAction, Ticker, TimelineAsset, TimelineClip, TimelinePlayable, TrackAsset, TrackSortWrapper, TrackType, Transform, TransformAnimationPlayable, TransformPlayableAsset, TransformTrack, VFXItem, ValueGetter, Vector4Curve, Vector4PropertyPlayableAsset, Vector4PropertyTrack, addByOrder, addItem, addItemWithOrder, applyMixins, assertExist, asserts, base64ToFile, blend, calculateTranslation, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, createCopyShader, createGLContext, createKeyFrameMeta, createShape, createValueGetter, decimalEqual, defaultPlugins, deserializeMipmapTexture, earcut, effectsClass, effectsClassStore, enlargeBuffer, ensureFixedNumber, ensureVec3, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateGUID, generateHalfFloatTexture, generateTransparentTexture, generateWhiteTexture, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getImageItemRenderInfo, getKTXTextureOptions, getKeyFrameMetaByRawValue, getMergedStore, getParticleMeshShader, getPixelRatio, getPreMultiAlpha, getStandardComposition, getStandardImage, getStandardItem, getStandardJSON, getTextureSize, glContext, glType2VertexFormatType, gpuTimer, imageDataFromColor, imageDataFromGradient, initErrors, initGLContext, integrate, interpolateColor, isAlipayMiniApp, isAndroid, isArray, isCanvas, isFunction, isIOS, isIOSByUA, isMiniProgram, isObject, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, isWechatMiniApp, itemFrag, itemFrameFrag, itemVert, loadAVIFOptional, loadBinary, loadBlob, loadImage, loadMedia, loadVideo, loadWebPOptional, logger, index as math, maxSpriteMeshItemCount, modifyMaxKeyframeShader, nearestPowerOfTwo, noop, normalizeColor, numberToFix, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap$1 as particleOriginTranslateMap, particleUniformTypeMap, particleVert, passRenderLevel, pluginLoaderMap, randomInRange, registerPlugin, removeItem, rotateVec2, screenMeshVert, serialize, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setMaxSpriteMeshItemCount, setRayFromCamera, setSideMode, setSpriteMeshMaxItemCountByGPU, sortByOrder, index$1 as spec, spriteMeshShaderFromFilter, spriteMeshShaderFromRenderInfo, spriteMeshShaderIdFromRenderInfo, thresholdFrag, throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecFill, vecMulCombine, version, vertexFormatType2GLType };
|