@galacean/effects-core 2.0.0-alpha.23 → 2.0.0-alpha.25

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.0.0-alpha.23
+ * Version: v2.0.0-alpha.25
  */
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -8871,6 +8871,7 @@ var MaterialRenderType;
         var _this;
         _this = EffectsObject.call(this, engine) || this;
         _this.stringTags = {};
+        _this.enabledMacros = {};
         _this.destroyed = false;
         _this.initialized = false;
         if (props) {
@@ -16387,6 +16388,9 @@ var ParticleSystem = /*#__PURE__*/ function(Component) {
         return _this;
     }
     var _proto = ParticleSystem.prototype;
+    _proto.isFrozen = function isFrozen() {
+        return this.frozen;
+    };
     _proto.initEmitterTransform = function initEmitterTransform() {
         var position = this.item.transform.position.clone();
         var rotation = this.item.transform.rotation.clone();
@@ -16520,6 +16524,7 @@ var ParticleSystem = /*#__PURE__*/ function(Component) {
             return b.reset();
         });
         this.frozen = false;
+        this.ended = false;
     };
     _proto.onUpdate = function onUpdate(delta) {
         var _this = this;
@@ -17303,10 +17308,7 @@ function randomArrItem(arr, keepArr) {
  */ var ParticleBehaviourPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ParticleBehaviourPlayable, Playable);
     function ParticleBehaviourPlayable() {
-        var _this;
-        _this = Playable.apply(this, arguments) || this;
-        _this.lastTime = 0;
-        return _this;
+        return Playable.apply(this, arguments);
     }
     var _proto = ParticleBehaviourPlayable.prototype;
     _proto.start = function start(context) {
@@ -17331,13 +17333,11 @@ function randomArrItem(arr, keepArr) {
             // particleSystem.setParentTransform(parentItem.transform);
             particleSystem.setVisible(true);
             var deltaTime = context.deltaTime;
-            // 直接用 this.lastTime - this.time 获取 deltaTime 会有精度问题
-            if (this.lastTime === this.time) {
-                deltaTime = 0;
+            if (this.time < particleSystem.item.duration && particleSystem.isFrozen()) {
+                particleSystem.reset();
             }
             particleSystem.onUpdate(deltaTime);
         }
-        this.lastTime = this.time;
     };
     return ParticleBehaviourPlayable;
 }(Playable);
@@ -18717,9 +18717,9 @@ var AnimationClipPlayable = /*#__PURE__*/ function(Playable) {
         var localTime = time - this.start;
         var duration = this.duration;
         if (localTime - duration > 0.001) {
-            if (this.endBehaviour === ItemEndBehavior.loop) {
+            if (this.endBehavior === ItemEndBehavior.loop) {
                 localTime = localTime % duration;
-            } else if (this.endBehaviour === ItemEndBehavior.freeze) {
+            } else if (this.endBehavior === ItemEndBehavior.freeze) {
                 localTime = Math.min(duration, localTime);
             }
         }
@@ -18844,9 +18844,9 @@ var RuntimeClip = /*#__PURE__*/ function() {
         var weight = 1.0;
         var ended = false;
         var started = false;
-        var boundItem = this.track.binding;
-        if (localTime > clip.start + clip.duration + 0.001 && clip.endBehaviour === ItemEndBehavior.destroy) {
-            if (VFXItem.isParticle(boundItem) && this.particleSystem && !this.particleSystem.destroyed) {
+        var boundObject = this.track.binding;
+        if (localTime > clip.start + clip.duration + 0.001 && clip.endBehavior === ItemEndBehavior.destroy) {
+            if (_instanceof1(boundObject, VFXItem) && VFXItem.isParticle(boundObject) && this.particleSystem && !this.particleSystem.destroyed) {
                 weight = 1.0;
             } else {
                 weight = 0.0;
@@ -18863,25 +18863,22 @@ var RuntimeClip = /*#__PURE__*/ function() {
         }
         this.parentMixer.setInputWeight(this.playable, weight);
         // 判断动画是否结束
-        if (ended && !boundItem.ended) {
-            boundItem.ended = true;
-            boundItem.onEnd();
-        }
-        if (ended && this.playable.getPlayState() === PlayState.Playing) {
-            this.playable.pause();
-            this.onClipEnd();
+        if (ended) {
+            if (_instanceof1(boundObject, VFXItem) && !boundObject.ended) {
+                boundObject.ended = true;
+                boundObject.onEnd();
+                if (!boundObject.compositionReusable && !boundObject.reusable) {
+                    boundObject.dispose();
+                    this.playable.dispose();
+                }
+            }
+            if (this.playable.getPlayState() === PlayState.Playing) {
+                this.playable.pause();
+            }
         }
         var clipTime = clip.toLocalTime(localTime);
         this.playable.setTime(clipTime);
     };
-    _proto.onClipEnd = function onClipEnd() {
-        var boundItem = this.track.binding;
-        if (!boundItem.compositionReusable && !boundItem.reusable) {
-            boundItem.dispose();
-            this.playable.dispose();
-            return;
-        }
-    };
     _create_class(RuntimeClip, [
         {
             key: "enable",
@@ -18913,7 +18910,7 @@ var ObjectBindingTrack = /*#__PURE__*/ function(TrackAsset1) {
             var particleClip = particleTrack.createClip(ParticleBehaviourPlayableAsset);
             particleClip.start = boundItem.start;
             particleClip.duration = boundItem.duration;
-            particleClip.endBehaviour = boundItem.endBehavior;
+            particleClip.endBehavior = boundItem.endBehavior;
         }
     };
     return ObjectBindingTrack;
@@ -19214,7 +19211,7 @@ function compareTracks(a, b) {
                     if (!props) {
                         throw new Error("Referenced precomposition with Id: " + refId + " does not exist.");
                     }
-                    // endBehaviour 类型需优化
+                    // endBehavior 类型需优化
                     props.content = itemData.content;
                     item = assetLoader.loadGUID(itemData.id);
                     item.composition = this.item.composition;
@@ -22226,7 +22223,7 @@ function getStandardCameraContent(model) {
  */ function version30Migration(json) {
     var _loop = function() {
         var composition = _step1.value;
-        // composition 的 endbehaviour 兼容
+        // composition 的 endBehavior 兼容
         if (composition.endBehavior === CompositionEndBehavior.pause_destroy || composition.endBehavior === CompositionEndBehavior.pause) {
             composition.endBehavior = END_BEHAVIOR_FREEZE;
         }
@@ -22612,7 +22609,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                 {
                     start: item.delay,
                     duration: item.duration,
-                    endBehaviour: item.endBehavior,
+                    endBehavior: item.endBehavior,
                     asset: {
                         id: newActivationPlayableAsset.id
                     }
@@ -22643,7 +22640,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newTransformPlayableAssetData.id
                         }
@@ -22671,7 +22668,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newSpriteColorPlayableAssetData.id
                         }
@@ -22697,7 +22694,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newSubCompositionPlayableAssetData.id
                         }
@@ -24039,7 +24036,7 @@ var tmpScale = new Vector3(1, 1, 1);
     function Camera(name, options) {
         if (options === void 0) options = {};
         this.name = name;
-        this.fovScaleRatio = 1.0;
+        this.viewportMatrix = Matrix4.fromIdentity();
         this.viewMatrix = Matrix4.fromIdentity();
         this.projectionMatrix = Matrix4.fromIdentity();
         this.viewProjectionMatrix = Matrix4.fromIdentity();
@@ -24067,12 +24064,12 @@ var tmpScale = new Vector3(1, 1, 1);
         this.updateMatrix();
     }
     var _proto = Camera.prototype;
-    _proto.setFovScaleRatio = function setFovScaleRatio(value) {
-        this.fovScaleRatio = value;
+    _proto.setViewportMatrix = function setViewportMatrix(matrix) {
+        this.viewportMatrix = matrix.clone();
         this.dirty = true;
     };
-    _proto.getFovScaleRatio = function getFovScaleRatio() {
-        return this.fovScaleRatio;
+    _proto.getViewportMatrix = function getViewportMatrix() {
+        return this.viewportMatrix;
     };
     /**
    * 获取相机的视图变换矩阵
@@ -24194,7 +24191,8 @@ var tmpScale = new Vector3(1, 1, 1);
    */ _proto.updateMatrix = function updateMatrix() {
         if (this.dirty) {
             var _this_options = this.options, fov = _this_options.fov, aspect = _this_options.aspect, near = _this_options.near, far = _this_options.far, clipMode = _this_options.clipMode, position = _this_options.position;
-            this.projectionMatrix.perspective(fov * DEG2RAD * this.fovScaleRatio, aspect, near, far, clipMode === CameraClipMode.portrait);
+            this.projectionMatrix.perspective(fov * DEG2RAD, aspect, near, far, clipMode === CameraClipMode.portrait);
+            this.projectionMatrix.premultiply(this.viewportMatrix);
             this.inverseViewMatrix.compose(position, this.getQuat(), tmpScale);
             this.viewMatrix.copyFrom(this.inverseViewMatrix).invert();
             this.viewProjectionMatrix.multiplyMatrices(this.projectionMatrix, this.viewMatrix);
@@ -25309,12 +25307,12 @@ var listOrder = 0;
             }
         },
         {
-            key: "editorScaleRatio",
+            key: "viewportMatrix",
             get: function get() {
-                return this.camera.getFovScaleRatio();
+                return this.camera.getViewportMatrix();
             },
-            set: function set(value) {
-                this.camera.setFovScaleRatio(value);
+            set: function set(matrix) {
+                this.camera.setViewportMatrix(matrix);
             }
         }
     ]);
@@ -25713,7 +25711,7 @@ registerPlugin("sprite", SpriteLoader, VFXItem, true);
 registerPlugin("particle", ParticleLoader, VFXItem, true);
 registerPlugin("cal", CalculateLoader, VFXItem, true);
 registerPlugin("interact", InteractLoader, VFXItem, true);
-var version = "2.0.0-alpha.23";
+var version = "2.0.0-alpha.25";
 logger.info("Core version: " + version + ".");
 
 export { AbstractPlugin, ActivationPlayable, ActivationPlayableAsset, ActivationTrack, AnimationClip, AnimationClipPlayable, AssetLoader, AssetManager, BYTES_TYPE_MAP, Behaviour, BezierCurve, BezierCurvePath, BezierCurveQuat, BinaryAsset, COMPRESSED_TEXTURE, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateLoader, Camera, CameraController, CameraVFXItemLoader, Component, Composition, CompositionComponent, CompositionSourceManager, DEFAULT_FONTS, Database, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, EffectComponent, EffectsObject, Engine, EventSystem, FilterMode, Float16ArrayWrapper, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, Item, ItemBehaviour, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, Mesh, ObjectBindingTrack, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleBehaviourPlayable, ParticleBehaviourPlayableAsset, ParticleLoader, ParticleMesh, ParticleSystem, ParticleSystemRenderer, PassTextureCache, PathSegments, PluginSystem, 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, SemanticMap, SerializationHelper, Shader, ShaderCompileResultStatus, ShaderType, ShaderVariant, SpriteColorPlayable, 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, addByOrder, addItem, addItemWithOrder, applyMixins, assertExist, asserts, base64ToFile, blend, calculateTranslation, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, compatible_frag as compatibleFrag, compatible_vert as compatibleVert, createCopyShader, createGLContext, createKeyFrameMeta, createShaderWithMacros, createShape, createVFXItem, createValueGetter, decimalEqual, defaultGlobalVolume, defaultPlugins, deserializeMipmapTexture, earcut, effectsClass, effectsClassStore, enlargeBuffer, ensureFixedNumber, ensureVec3, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateGUID, generateHalfFloatTexture, generateTransparentTexture, generateWhiteTexture, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTemplateCanvasPool, 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, isObject, isSceneJSON, isSceneURL, isSceneWithOptions, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, itemFrag, itemFrameFrag, itemVert, 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, pluginLoaderMap, pointOnLine, 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, vecAssign, vecFill, vecMulCombine, vecNormalize, version, vertexFormatType2GLType };