@galacean/effects-core 2.1.0-alpha.1 → 2.1.0-alpha.2

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.1.0-alpha.1
+ * Version: v2.1.0-alpha.2
  */
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -8348,7 +8348,7 @@ var seed$8 = 1;
    * 通过 URL 创建 Texture 对象。
    * @param url - 要创建的 Texture URL
    * @since 2.0.0
-   */ Texture.fromImage = function fromImage(url, engine) {
+   */ Texture.fromImage = function fromImage(url, engine, options) {
         return _async_to_generator(function() {
             var image, texture;
             return __generator(this, function(_state) {
@@ -8360,12 +8360,13 @@ var seed$8 = 1;
                         ];
                     case 1:
                         image = _state.sent();
-                        texture = Texture.create(engine, {
+                        texture = Texture.create(engine, _extends({
                             sourceType: TextureSourceType.image,
                             image: image,
+                            target: glContext.TEXTURE_2D,
                             id: generateGUID(),
                             flipY: true
-                        });
+                        }, options));
                         texture.initialize();
                         return [
                             2,
@@ -10297,15 +10298,19 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
                 points: points,
                 timeInterval: timeInterval,
                 valueInterval: valueInterval,
-                curve: curve
+                curve: curve,
+                timeStart: Number(s.x),
+                timeEnd: Number(e.x)
             };
         }
     };
     _proto.getValue = function getValue(time) {
         var result = 0;
         var keyTimeData = Object.keys(this.curveMap);
-        var keyTimeStart = Number(keyTimeData[0].split("&")[0]);
-        var keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split("&")[1]);
+        var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
+        var keyTimeEnd = this.curveMap[keyTimeData[keyTimeData.length - 1]].timeEnd;
+        // const keyTimeStart = Number(keyTimeData[0].split('&')[0]);
+        // const keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split('&')[1]);
         if (time <= keyTimeStart) {
             return this.getCurveValue(keyTimeData[0], keyTimeStart);
         }
@@ -10313,7 +10318,9 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
             return this.getCurveValue(keyTimeData[keyTimeData.length - 1], keyTimeEnd);
         }
         for(var i = 0; i < keyTimeData.length; i++){
-            var _keyTimeData_i_split = keyTimeData[i].split("&"), xMin = _keyTimeData_i_split[0], xMax = _keyTimeData_i_split[1];
+            var xMin = this.curveMap[keyTimeData[i]].timeStart;
+            var xMax = this.curveMap[keyTimeData[i]].timeEnd;
+            // const [xMin, xMax] = keyTimeData[i].split('&');
             if (time >= Number(xMin) && time < Number(xMax)) {
                 result = this.getCurveValue(keyTimeData[i], time);
                 break;
@@ -10326,12 +10333,13 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
         var time = (t1 - t0) / ts;
         var result = 0;
         var keyTimeData = Object.keys(this.curveMap);
-        var keyTimeStart = Number(keyTimeData[0].split("&")[0]);
+        var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
         if (time <= keyTimeStart) {
             return 0;
         }
         for(var i = 0; i < keyTimeData.length; i++){
-            var _keyTimeData_i_split = keyTimeData[i].split("&"), xMin = _keyTimeData_i_split[0], xMax = _keyTimeData_i_split[1];
+            var xMin = this.curveMap[keyTimeData[i]].timeStart;
+            var xMax = this.curveMap[keyTimeData[i]].timeEnd;
             if (time >= Number(xMax)) {
                 result += ts * this.getCurveIntegrateValue(keyTimeData[i], Number(xMax));
             }
@@ -17665,6 +17673,12 @@ var particleUniformTypeMap = {
 var ParticleMesh = /*#__PURE__*/ function() {
     function ParticleMesh(engine, props) {
         this.particleCount = 0;
+        this.cachedVelocity = new Vector3();
+        this.cachedRotationVector3 = new Vector3();
+        this.cachedRotationMatrix = new Matrix3();
+        this.cachedLinearMove = new Vector3();
+        this.tempMatrix3 = new Matrix3();
+        this.tempVector3 = new Vector3();
         this.VERT_MAX_KEY_FRAME_COUNT = 0;
         var _engine_renderer;
         var env = ((_engine_renderer = engine.renderer) != null ? _engine_renderer : {}).env;
@@ -18068,39 +18082,40 @@ var ParticleMesh = /*#__PURE__*/ function() {
         // if (!uParams) {
         //   return;
         // }
-        var localTime = new Float32Array([
-            this.time
-        ])[0];
+        var localTime = this.time;
         var particleCount = Math.ceil(aPosArray.length / 12);
         // calculate particle translation
         var aTranslationArray = this.geometry.getAttributeData("aTranslation");
         if (aTranslationArray.length < particleCount * 3) {
-            aTranslationArray = new Float32Array(particleCount * 3);
+            aTranslationArray = this.expandArray(aTranslationArray, particleCount * 3);
         }
-        var velocity = new Vector3(0, 0, 0);
+        var velocity = this.cachedVelocity;
         for(var i = 0; i < particleCount; i++){
             var velOffset = i * 12 + 3;
             velocity.set(aVelArray[velOffset], aVelArray[velOffset + 1], aVelArray[velOffset + 2]);
-            var trans = this.calculateTranslation(velocity, aOffsetArray[i * 4 + 2], localTime, aOffsetArray[i * 4 + 3]);
+            this.calculateTranslation(velocity, aOffsetArray[i * 4 + 2], localTime, aOffsetArray[i * 4 + 3]);
             var aTranslationOffset = i * 3;
-            aTranslationArray[aTranslationOffset] = trans.x;
-            aTranslationArray[aTranslationOffset + 1] = trans.y;
-            aTranslationArray[aTranslationOffset + 2] = trans.z;
+            if (aOffsetArray[i * 4 + 2] < localTime) {
+                var translation = velocity.multiply(dt / 1000);
+                aTranslationArray[aTranslationOffset] += translation.x;
+                aTranslationArray[aTranslationOffset + 1] += translation.y;
+                aTranslationArray[aTranslationOffset + 2] += translation.z;
+            }
         }
         this.geometry.setAttributeData("aTranslation", aTranslationArray);
         // calculate particle rotation
         var aRotationArray = this.geometry.getAttributeData("aRotation0");
         if (aRotationArray.length < particleCount * 9) {
-            aRotationArray = new Float32Array(particleCount * 9);
+            aRotationArray = this.expandArray(aRotationArray, particleCount * 9);
         }
         for(var i1 = 0; i1 < particleCount; i1++){
             var time = localTime - aOffsetArray[i1 * 4 + 2];
             var duration = aOffsetArray[i1 * 4 + 3];
             var life = clamp$1(time / duration, 0.0, 1.0);
             var aRotOffset = i1 * 8;
-            var aRot = new Vector3(aRotArray[aRotOffset], aRotArray[aRotOffset + 1], aRotArray[aRotOffset + 2]);
+            var aRot = this.cachedRotationVector3.set(aRotArray[aRotOffset], aRotArray[aRotOffset + 1], aRotArray[aRotOffset + 2]);
             var aSeed = aSeedArray[i1 * 8 + 3];
-            var aRotation = this.transformFromRotation(aRot, life, duration, aSeed);
+            var aRotation = this.transformFromRotation(aRot, life, duration, aSeed, this.cachedRotationMatrix);
             var aRotationOffset = i1 * 9;
             var matrixArray = aRotation.toArray();
             aRotationArray.set(matrixArray, aRotationOffset);
@@ -18109,14 +18124,16 @@ var ParticleMesh = /*#__PURE__*/ function() {
         // calculate linear movement
         var aLinearMoveArray = this.geometry.getAttributeData("aLinearMove");
         if (aLinearMoveArray.length < particleCount * 3) {
-            aLinearMoveArray = new Float32Array(particleCount * 3);
+            aLinearMoveArray = this.expandArray(aLinearMoveArray, particleCount * 3);
         }
+        var linearMove = this.cachedLinearMove;
         for(var i2 = 0; i2 < particleCount; i2++){
             var time1 = localTime - aOffsetArray[i2 * 4 + 2];
             var duration1 = aOffsetArray[i2 * 4 + 3];
             // const life = math.clamp(time / duration, 0.0, 1.0);
             var aSeed1 = aSeedArray[i2 * 8 + 3];
-            var linearMove = this.calLinearMov(time1, duration1, aSeed1);
+            linearMove.setZero();
+            this.calLinearMov(time1, duration1, aSeed1, linearMove);
             var aLinearMoveOffset = i2 * 3;
             aLinearMoveArray[aLinearMoveOffset] = linearMove.x;
             aLinearMoveArray[aLinearMoveOffset + 1] = linearMove.y;
@@ -18136,29 +18153,23 @@ var ParticleMesh = /*#__PURE__*/ function() {
         var uAcceleration = this.mesh.material.getVector4("uAcceleration");
         var uGravityModifierValue = this.mesh.material.getVector4("uGravityModifierValue");
         if (!uAcceleration || !uGravityModifierValue) {
-            return new Vector3();
+            return velocity;
         }
         var dt = t1 - t0; // 相对delay的时间
-        var d = this.gravityModifier.getIntegrateByTime(0, dt);
-        var acc = [
-            uAcceleration.x * d,
-            uAcceleration.y * d,
-            uAcceleration.z * d
-        ];
-        // ret.addScaledVector(velData, speedIntegrate);
-        // ret.addScaledVector(acc, d);
+        var d = this.gravityModifier.getIntegrateValue(0, dt, duration);
+        var acc = this.tempVector3.set(uAcceleration.x * d, uAcceleration.y * d, uAcceleration.z * d);
         // speedIntegrate = speedOverLifetime.getIntegrateValue(0, time, duration);
         if (this.speedOverLifetime) {
             // dt / dur 归一化
-            var speed = this.speedOverLifetime.getIntegrateValue(0, dt, duration);
-            return velocity.clone().multiply(speed).add(acc);
+            var speed = this.speedOverLifetime.getValue(dt / duration);
+            return velocity.multiply(speed).add(acc);
         }
-        return velocity.clone().multiply(dt).add(acc);
+        return velocity.add(acc);
     };
-    _proto.transformFromRotation = function transformFromRotation(rot, life, dur, aSeed) {
-        var rotation = rot.clone();
+    _proto.transformFromRotation = function transformFromRotation(rot, life, dur, aSeed, result) {
+        var rotation = rot;
         if (!this.rotationOverLifetime) {
-            return new Matrix3();
+            return result.setZero();
         }
         if (this.rotationOverLifetime.asRotation) {
             // Adjust rotation based on the specified lifetime components
@@ -18209,32 +18220,33 @@ var ParticleMesh = /*#__PURE__*/ function() {
         }
         // If the rotation vector is zero, return the identity matrix
         if (rotation.dot(rotation) === 0.0) {
-            return new Matrix3().identity();
+            return result.identity();
         }
         // Return the rotation matrix derived from the rotation vector
-        return this.mat3FromRotation(rotation);
+        return this.mat3FromRotation(rotation, result);
     };
-    _proto.mat3FromRotation = function mat3FromRotation(rotation) {
+    _proto.mat3FromRotation = function mat3FromRotation(rotation, result) {
         var d2r = Math.PI / 180;
-        var sinR = rotation.clone().multiply(d2r);
-        sinR.x = Math.sin(sinR.x);
-        sinR.y = Math.sin(sinR.y);
-        sinR.z = Math.sin(sinR.z);
-        var cosR = rotation.clone().multiply(d2r);
-        cosR.x = Math.cos(cosR.x);
-        cosR.y = Math.cos(cosR.y);
-        cosR.z = Math.cos(cosR.z);
-        var rotZ = new Matrix3(cosR.z, -sinR.z, 0., sinR.z, cosR.z, 0., 0., 0., 1.);
-        var rotY = new Matrix3(cosR.y, 0., sinR.y, 0., 1., 0., -sinR.y, 0, cosR.y);
-        var rotX = new Matrix3(1., 0., 0., 0, cosR.x, -sinR.x, 0., sinR.x, cosR.x);
-        var result = rotZ.multiply(rotY).multiply(rotX);
+        var rotationXD2r = rotation.x * d2r;
+        var rotationYD2r = rotation.y * d2r;
+        var rotationZD2r = rotation.z * d2r;
+        var sinRX = Math.sin(rotationXD2r);
+        var sinRY = Math.sin(rotationYD2r);
+        var sinRZ = Math.sin(rotationZD2r);
+        var cosRX = Math.cos(rotationXD2r);
+        var cosRY = Math.cos(rotationYD2r);
+        var cosRZ = Math.cos(rotationZD2r);
+        // rotZ * rotY * rotX
+        result.set(cosRZ, -sinRZ, 0., sinRZ, cosRZ, 0., 0., 0., 1.); //rotZ
+        result.multiply(this.tempMatrix3.set(cosRY, 0., sinRY, 0., 1., 0., -sinRY, 0, cosRY)); //rotY
+        result.multiply(this.tempMatrix3.set(1., 0., 0., 0, cosRX, -sinRX, 0., sinRX, cosRX)); //rotX
         return result;
     };
-    _proto.calLinearMov = function calLinearMov(time, duration, aSeed) {
-        var mov = new Vector3();
+    _proto.calLinearMov = function calLinearMov(time, duration, aSeed, result) {
+        var mov = result;
         var lifetime = time / duration;
         if (!this.linearVelOverLifetime || !this.linearVelOverLifetime.enabled) {
-            return new Vector3();
+            return mov;
         }
         if (this.linearVelOverLifetime.asMovement) {
             if (this.linearVelOverLifetime.x) {
@@ -18307,7 +18319,8 @@ var ParticleMesh = /*#__PURE__*/ function() {
             var pointData = {
                 aPos: new Float32Array(48),
                 aRot: new Float32Array(32),
-                aOffset: new Float32Array(16)
+                aOffset: new Float32Array(16),
+                aTranslation: new Float32Array(12)
             };
             var useSprite = this.useSprite;
             if (useSprite) {
@@ -18416,6 +18429,11 @@ var ParticleMesh = /*#__PURE__*/ function() {
             geometry.setDrawCount(this.particleCount * 6);
         }
     };
+    _proto.expandArray = function expandArray(array, newSize) {
+        var newArr = new Float32Array(newSize);
+        newArr.set(array);
+        return newArr;
+    };
     return ParticleMesh;
 }();
 var gl2UniformSlots = [
@@ -28066,7 +28084,7 @@ registerPlugin("sprite", SpriteLoader, VFXItem, true);
 registerPlugin("particle", ParticleLoader, VFXItem, true);
 registerPlugin("cal", CalculateLoader, VFXItem, true);
 registerPlugin("interact", InteractLoader, VFXItem, true);
-var version = "2.1.0-alpha.1";
+var version = "2.1.0-alpha.2";
 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, 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, FilterMode, Float16ArrayWrapper, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, Item, 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, PostProcessVolume, 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, ShaderFactory, 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, createCopyShader, createGLContext, createKeyFrameMeta, createShape, 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, 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, isSceneJSON, isSceneURL, isSceneWithOptions, 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, 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 };