@tsparticles/engine 3.0.3 → 3.2.0

package/browser/Core/Engine.js

@@ -1,12 +1,11 @@
 import { errorPrefix, generatedAttribute } from "./Utils/Constants.js";
 import { executeOnSingleOrMultiple, getLogger, itemFromSingleOrMultiple } from "../Utils/Utils.js";
-import { Container } from "./Container.js";
 import { EventDispatcher } from "../Utils/EventDispatcher.js";
 import { getRandom } from "../Utils/NumberUtils.js";
-function getItemsFromInitializer(container, map, initializers, force = false) {
+async function getItemsFromInitializer(container, map, initializers, force = false) {
     let res = map.get(container);
     if (!res || force) {
-        res = [...initializers.values()].map((t) => t(container));
+        res = await Promise.all([...initializers.values()].map((t) => t(container)));
         map.set(container, res);
     }
     return res;
@@ -18,7 +17,7 @@ async function getDataFromUrl(data) {
     }
     const response = await fetch(url);
     if (response.ok) {
-        return response.json();
+        return (await response.json());
     }
     getLogger().error(`${errorPrefix} ${response.status} while retrieving config file`);
     return data.fallback;
@@ -51,16 +50,18 @@ export class Engine {
         return res;
     }
     get version() {
-        return "3.0.3";
+        return "3.2.0";
     }
     addConfig(config) {
-        const name = config.name ?? "default";
-        this._configs.set(name, config);
-        this._eventDispatcher.dispatchEvent("configAdded", { data: { name, config } });
+        const key = config.key ?? config.name ?? "default";
+        this._configs.set(key, config);
+        this._eventDispatcher.dispatchEvent("configAdded", { data: { name: key, config } });
     }
     async addEffect(effect, drawer, refresh = true) {
         executeOnSingleOrMultiple(effect, (type) => {
-            !this.getEffectDrawer(type) && this.effectDrawers.set(type, drawer);
+            if (!this.getEffectDrawer(type)) {
+                this.effectDrawers.set(type, drawer);
+            }
         });
         await this.refresh(refresh);
     }
@@ -80,20 +81,28 @@ export class Engine {
         await this.refresh(refresh);
     }
     async addPathGenerator(name, generator, refresh = true) {
-        !this.getPathGenerator(name) && this.pathGenerators.set(name, generator);
+        if (!this.getPathGenerator(name)) {
+            this.pathGenerators.set(name, generator);
+        }
         await this.refresh(refresh);
     }
     async addPlugin(plugin, refresh = true) {
-        !this.getPlugin(plugin.id) && this.plugins.push(plugin);
+        if (!this.getPlugin(plugin.id)) {
+            this.plugins.push(plugin);
+        }
         await this.refresh(refresh);
     }
     async addPreset(preset, options, override = false, refresh = true) {
-        (override || !this.getPreset(preset)) && this.presets.set(preset, options);
+        if (override || !this.getPreset(preset)) {
+            this.presets.set(preset, options);
+        }
         await this.refresh(refresh);
     }
     async addShape(shape, drawer, refresh = true) {
         executeOnSingleOrMultiple(shape, (type) => {
-            !this.getShapeDrawer(type) && this.shapeDrawers.set(type, drawer);
+            if (!this.getShapeDrawer(type)) {
+                this.shapeDrawers.set(type, drawer);
+            }
         });
         await this.refresh(refresh);
     }
@@ -111,26 +120,29 @@ export class Engine {
     domItem(index) {
         const dom = this.dom(), item = dom[index];
         if (!item || item.destroyed) {
-            dom.splice(index, 1);
+            const deleteCount = 1;
+            dom.splice(index, deleteCount);
             return;
         }
         return item;
     }
-    getAvailablePlugins(container) {
+    async getAvailablePlugins(container) {
         const res = new Map();
         for (const plugin of this.plugins) {
-            plugin.needsPlugin(container.actualOptions) && res.set(plugin.id, plugin.getPlugin(container));
+            if (plugin.needsPlugin(container.actualOptions)) {
+                res.set(plugin.id, await plugin.getPlugin(container));
+            }
         }
         return res;
     }
     getEffectDrawer(type) {
         return this.effectDrawers.get(type);
     }
-    getInteractors(container, force = false) {
-        return getItemsFromInitializer(container, this.interactors, this._initializers.interactors, force);
+    async getInteractors(container, force = false) {
+        return await getItemsFromInitializer(container, this.interactors, this._initializers.interactors, force);
     }
-    getMovers(container, force = false) {
-        return getItemsFromInitializer(container, this.movers, this._initializers.movers, force);
+    async getMovers(container, force = false) {
+        return await getItemsFromInitializer(container, this.movers, this._initializers.movers, force);
     }
     getPathGenerator(type) {
         return this.pathGenerators.get(type);
@@ -150,8 +162,8 @@ export class Engine {
     getSupportedShapes() {
         return this.shapeDrawers.keys();
     }
-    getUpdaters(container, force = false) {
-        return getItemsFromInitializer(container, this.updaters, this._initializers.updaters, force);
+    async getUpdaters(container, force = false) {
+        return await getItemsFromInitializer(container, this.updaters, this._initializers.updaters, force);
     }
     init() {
         if (this._initialized) {
@@ -160,19 +172,20 @@ export class Engine {
         this._initialized = true;
     }
     async load(params) {
-        const id = params.id ?? params.element?.id ?? `tsparticles${Math.floor(getRandom() * 10000)}`, { index, url } = params, options = url ? await getDataFromUrl({ fallback: params.options, url, index }) : params.options;
+        const randomFactor = 10000, id = params.id ?? params.element?.id ?? `tsparticles${Math.floor(getRandom() * randomFactor)}`, { index, url } = params, options = url ? await getDataFromUrl({ fallback: params.options, url, index }) : params.options;
         let domContainer = params.element ?? document.getElementById(id);
         if (!domContainer) {
             domContainer = document.createElement("div");
             domContainer.id = id;
             document.body.append(domContainer);
         }
-        const currentOptions = itemFromSingleOrMultiple(options, index), dom = this.dom(), oldIndex = dom.findIndex((v) => v.id.description === id);
-        if (oldIndex >= 0) {
+        const currentOptions = itemFromSingleOrMultiple(options, index), dom = this.dom(), oldIndex = dom.findIndex((v) => v.id.description === id), minIndex = 0;
+        if (oldIndex >= minIndex) {
             const old = this.domItem(oldIndex);
             if (old && !old.destroyed) {
                 old.destroy();
-                dom.splice(oldIndex, 1);
+                const deleteCount = 1;
+                dom.splice(oldIndex, deleteCount);
             }
         }
         let canvasEl;
@@ -183,7 +196,8 @@ export class Engine {
         else {
             const existingCanvases = domContainer.getElementsByTagName("canvas");
             if (existingCanvases.length) {
-                canvasEl = existingCanvases[0];
+                const firstIndex = 0;
+                canvasEl = existingCanvases[firstIndex];
                 canvasEl.dataset[generatedAttribute] = "false";
             }
             else {
@@ -198,9 +212,10 @@ export class Engine {
         if (!canvasEl.style.height) {
             canvasEl.style.height = "100%";
         }
-        const newItem = new Container(this, id, currentOptions);
-        if (oldIndex >= 0) {
-            dom.splice(oldIndex, 0, newItem);
+        const { Container } = await import("./Container.js"), newItem = new Container(this, id, currentOptions);
+        if (oldIndex >= minIndex) {
+            const deleteCount = 0;
+            dom.splice(oldIndex, deleteCount, newItem);
         }
         else {
             dom.push(newItem);
@@ -220,14 +235,14 @@ export class Engine {
             return;
         }
         for (const updater of updaters) {
-            updater.loadOptions && updater.loadOptions(options, ...sourceOptions);
+            updater.loadOptions?.(options, ...sourceOptions);
         }
     }
     async refresh(refresh = true) {
         if (!refresh) {
             return;
         }
-        this.dom().forEach((t) => t.refresh());
+        await Promise.all(this.dom().map((t) => t.refresh()));
     }
     removeEventListener(type, listener) {
         this._eventDispatcher.removeEventListener(type, listener);

package/browser/Core/Particle.js

@@ -1,12 +1,13 @@
-import { calcExactPositionOrRandomFromSize, clamp, getDistance, getParticleBaseVelocity, getParticleDirectionAngle, getRandom, getRangeValue, randomInRange, setRangeValue, } from "../Utils/NumberUtils.js";
+import { calcExactPositionOrRandomFromSize, clamp, degToRad, getDistance, getParticleBaseVelocity, getParticleDirectionAngle, getRandom, getRangeValue, randomInRange, setRangeValue, } from "../Utils/NumberUtils.js";
 import { deepExtend, getPosition, initParticleNumericAnimationValue, isInArray, itemFromSingleOrMultiple, } from "../Utils/Utils.js";
+import { errorPrefix, millisecondsToSeconds } from "./Utils/Constants.js";
 import { getHslFromAnimation, rangeColorToRgb } from "../Utils/ColorUtils.js";
 import { Interactivity } from "../Options/Classes/Interactivity/Interactivity.js";
 import { Vector } from "./Utils/Vector.js";
 import { Vector3d } from "./Utils/Vector3d.js";
 import { alterHsl } from "../Utils/CanvasUtils.js";
-import { errorPrefix } from "./Utils/Constants.js";
 import { loadParticlesOptions } from "../Utils/OptionsUtils.js";
+const defaultRetryCount = 0, double = 2, half = 0.5, squareExp = 2;
 function loadEffectData(effect, effectOptions, id, reduceDuplicates) {
     const effectData = effectOptions.options[effect];
     if (!effectData) {
@@ -31,7 +32,7 @@ function fixOutMode(data) {
     if (!isInArray(data.outMode, data.checkModes)) {
         return;
     }
-    const diameter = data.radius * 2;
+    const diameter = data.radius * double;
     if (data.coord > data.maxCoord - diameter) {
         data.setCb(-data.radius);
     }
@@ -40,9 +41,9 @@ function fixOutMode(data) {
     }
 }
 export class Particle {
-    constructor(engine, id, container, position, overrideOptions, group) {
+    constructor(engine, container) {
         this.container = container;
-        this._calcPosition = (container, position, zIndex, tryCount = 0) => {
+        this._calcPosition = (container, position, zIndex, tryCount = defaultRetryCount) => {
             for (const [, plugin] of container.plugins) {
                 const pluginPos = plugin.particlePosition !== undefined ? plugin.particlePosition(position, this) : undefined;
                 if (pluginPos) {
@@ -55,7 +56,7 @@ export class Particle {
             }), pos = Vector3d.create(exactPosition.x, exactPosition.y, zIndex), radius = this.getRadius(), outModes = this.options.move.outModes, fixHorizontal = (outMode) => {
                 fixOutMode({
                     outMode,
-                    checkModes: ["bounce", "bounce-horizontal"],
+                    checkModes: ["bounce"],
                     coord: pos.x,
                     maxCoord: container.canvas.size.width,
                     setCb: (value) => (pos.x += value),
@@ -64,7 +65,7 @@ export class Particle {
             }, fixVertical = (outMode) => {
                 fixOutMode({
                     outMode,
-                    checkModes: ["bounce", "bounce-vertical"],
+                    checkModes: ["bounce"],
                     coord: pos.y,
                     maxCoord: container.canvas.size.height,
                     setCb: (value) => (pos.y += value),
@@ -76,7 +77,8 @@ export class Particle {
             fixVertical(outModes.top ?? outModes.default);
             fixVertical(outModes.bottom ?? outModes.default);
             if (this._checkOverlap(pos, tryCount)) {
-                return this._calcPosition(container, undefined, zIndex, tryCount + 1);
+                const increment = 1;
+                return this._calcPosition(container, undefined, zIndex, tryCount + increment);
             }
             return pos;
         };
@@ -85,9 +87,9 @@ export class Particle {
             if (moveOptions.direction === "inside" || moveOptions.direction === "outside") {
                 return res;
             }
-            const rad = (Math.PI / 180) * getRangeValue(moveOptions.angle.value), radOffset = (Math.PI / 180) * getRangeValue(moveOptions.angle.offset), range = {
-                left: radOffset - rad * 0.5,
-                right: radOffset + rad * 0.5,
+            const rad = degToRad(getRangeValue(moveOptions.angle.value)), radOffset = degToRad(getRangeValue(moveOptions.angle.offset)), range = {
+                left: radOffset - rad * half,
+                right: radOffset + rad * half,
             };
             if (!moveOptions.straight) {
                 res.angle += randomInRange(setRangeValue(range.left, range.right));
@@ -97,7 +99,7 @@ export class Particle {
             }
             return res;
         };
-        this._checkOverlap = (pos, tryCount = 0) => {
+        this._checkOverlap = (pos, tryCount = defaultRetryCount) => {
             const collisionsOptions = this.options.collisions, radius = this.getRadius();
             if (!collisionsOptions.enable) {
                 return false;
@@ -106,8 +108,8 @@ export class Particle {
             if (overlapOptions.enable) {
                 return false;
             }
-            const retries = overlapOptions.retries;
-            if (retries >= 0 && tryCount > retries) {
+            const retries = overlapOptions.retries, minRetries = 0;
+            if (retries >= minRetries && tryCount > retries) {
                 throw new Error(`${errorPrefix} particle is overlapping and can't be placed`);
             }
             return !!this.container.particles.find((particle) => getDistance(pos, particle.position) < radius + particle.getRadius());
@@ -116,7 +118,7 @@ export class Particle {
             if (!color || !this.roll || (!this.backColor && !this.roll.alter)) {
                 return color;
             }
-            const backFactor = this.roll.horizontal && this.roll.vertical ? 2 : 1, backSum = this.roll.horizontal ? Math.PI * 0.5 : 0, rolled = Math.floor(((this.roll.angle ?? 0) + backSum) / (Math.PI / backFactor)) % 2;
+            const rollFactor = 1, none = 0, backFactor = this.roll.horizontal && this.roll.vertical ? double * rollFactor : rollFactor, backSum = this.roll.horizontal ? Math.PI * half : none, rolled = Math.floor(((this.roll.angle ?? none) + backSum) / (Math.PI / backFactor)) % double;
             if (!rolled) {
                 return color;
             }
@@ -129,13 +131,13 @@ export class Particle {
             return color;
         };
         this._initPosition = (position) => {
-            const container = this.container, zIndexValue = getRangeValue(this.options.zIndex.value);
-            this.position = this._calcPosition(container, position, clamp(zIndexValue, 0, container.zLayers));
+            const container = this.container, zIndexValue = getRangeValue(this.options.zIndex.value), minZ = 0;
+            this.position = this._calcPosition(container, position, clamp(zIndexValue, minZ, container.zLayers));
             this.initialPosition = this.position.copy();
-            const canvasSize = container.canvas.size;
+            const canvasSize = container.canvas.size, defaultRadius = 0;
             this.moveCenter = {
                 ...getPosition(this.options.move.center, canvasSize),
-                radius: this.options.move.center.radius ?? 0,
+                radius: this.options.move.center.radius ?? defaultRadius,
                 mode: this.options.move.center.mode ?? "percent",
             };
             this.direction = getParticleDirectionAngle(this.options.move.direction, this.position, this.moveCenter);
@@ -150,7 +152,6 @@ export class Particle {
             this.offset = Vector.origin;
         };
         this._engine = engine;
-        this.init(id, position, overrideOptions, group);
     }
     destroy(override) {
         if (this.unbreakable || this.destroyed) {
@@ -160,14 +161,14 @@ export class Particle {
         this.bubble.inRange = false;
         this.slow.inRange = false;
         const container = this.container, pathGenerator = this.pathGenerator, shapeDrawer = container.shapeDrawers.get(this.shape);
-        shapeDrawer && shapeDrawer.particleDestroy && shapeDrawer.particleDestroy(this);
+        shapeDrawer?.particleDestroy?.(this);
         for (const [, plugin] of container.plugins) {
-            plugin.particleDestroyed && plugin.particleDestroyed(this, override);
+            plugin.particleDestroyed?.(this, override);
         }
         for (const updater of container.particles.updaters) {
-            updater.particleDestroyed && updater.particleDestroyed(this, override);
+            updater.particleDestroyed?.(this, override);
         }
-        pathGenerator && pathGenerator.reset(this);
+        pathGenerator?.reset(this);
         this._engine.dispatchEvent("particleDestroyed", {
             container: this.container,
             data: {
@@ -175,18 +176,18 @@ export class Particle {
             },
         });
     }
-    draw(delta) {
+    async draw(delta) {
         const container = this.container, canvas = container.canvas;
         for (const [, plugin] of container.plugins) {
-            canvas.drawParticlePlugin(plugin, this, delta);
+            await canvas.drawParticlePlugin(plugin, this, delta);
         }
-        canvas.drawParticle(this, delta);
+        await canvas.drawParticle(this, delta);
     }
     getFillColor() {
         return this._getRollColor(this.bubble.color ?? getHslFromAnimation(this.color));
     }
     getMass() {
-        return this.getRadius() ** 2 * Math.PI * 0.5;
+        return this.getRadius() ** squareExp * Math.PI * half;
     }
     getPosition() {
         return {
@@ -201,7 +202,7 @@ export class Particle {
     getStrokeColor() {
         return this._getRollColor(this.bubble.color ?? getHslFromAnimation(this.strokeColor));
     }
-    init(id, position, overrideOptions, group) {
+    async init(id, position, overrideOptions, group) {
         const container = this.container, engine = this._engine;
         this.id = id;
         this.group = group;
@@ -225,14 +226,14 @@ export class Particle {
         this.shape = itemFromSingleOrMultiple(shapeType, this.id, reduceDuplicates);
         const effectOptions = particlesOptions.effect, shapeOptions = particlesOptions.shape;
         if (overrideOptions) {
-            if (overrideOptions.effect && overrideOptions.effect.type) {
+            if (overrideOptions.effect?.type) {
                 const overrideEffectType = overrideOptions.effect.type, effect = itemFromSingleOrMultiple(overrideEffectType, this.id, reduceDuplicates);
                 if (effect) {
                     this.effect = effect;
                     effectOptions.load(overrideOptions.effect);
                 }
             }
-            if (overrideOptions.shape && overrideOptions.shape.type) {
+            if (overrideOptions.shape?.type) {
                 const overrideShapeType = overrideOptions.shape.type, shape = itemFromSingleOrMultiple(overrideShapeType, this.id, reduceDuplicates);
                 if (shape) {
                     this.shape = shape;
@@ -261,11 +262,11 @@ export class Particle {
         this.shapeClose = shapeData?.close ?? particlesOptions.shape.close;
         this.options = particlesOptions;
         const pathOptions = this.options.move.path;
-        this.pathDelay = getRangeValue(pathOptions.delay.value) * 1000;
+        this.pathDelay = getRangeValue(pathOptions.delay.value) * millisecondsToSeconds;
         if (pathOptions.generator) {
             this.pathGenerator = this._engine.getPathGenerator(pathOptions.generator);
             if (this.pathGenerator && container.addPath(pathOptions.generator, this.pathGenerator)) {
-                this.pathGenerator.init(container);
+                await this.pathGenerator.init(container);
             }
         }
         container.retina.initParticle(this);
@@ -280,7 +281,8 @@ export class Particle {
         this._initPosition(position);
         this.initialVelocity = this._calculateVelocity();
         this.velocity = this.initialVelocity.copy();
-        this.moveDecay = 1 - getRangeValue(this.options.move.decay);
+        const decayOffset = 1;
+        this.moveDecay = decayOffset - getRangeValue(this.options.move.decay);
         const particles = container.particles;
         particles.setLastZIndex(this.position.z);
         this.zIndexFactor = this.position.z / container.zLayers;
@@ -292,8 +294,8 @@ export class Particle {
                 container.effectDrawers.set(this.effect, effectDrawer);
             }
         }
-        if (effectDrawer && effectDrawer.loadEffect) {
-            effectDrawer.loadEffect(this);
+        if (effectDrawer?.loadEffect) {
+            await effectDrawer.loadEffect(this);
         }
         let shapeDrawer = container.shapeDrawers.get(this.shape);
         if (!shapeDrawer) {
@@ -302,8 +304,8 @@ export class Particle {
                 container.shapeDrawers.set(this.shape, shapeDrawer);
             }
         }
-        if (shapeDrawer && shapeDrawer.loadShape) {
-            shapeDrawer.loadShape(this);
+        if (shapeDrawer?.loadShape) {
+            await shapeDrawer.loadShape(this);
         }
         const sideCountFunc = shapeDrawer?.getSidesCount;
         if (sideCountFunc) {
@@ -312,19 +314,15 @@ export class Particle {
         this.spawning = false;
         this.shadowColor = rangeColorToRgb(this.options.shadow.color);
         for (const updater of particles.updaters) {
-            updater.init(this);
+            await updater.init(this);
         }
         for (const mover of particles.movers) {
-            mover.init && mover.init(this);
-        }
-        if (effectDrawer && effectDrawer.particleInit) {
-            effectDrawer.particleInit(container, this);
-        }
-        if (shapeDrawer && shapeDrawer.particleInit) {
-            shapeDrawer.particleInit(container, this);
+            await mover.init?.(this);
         }
+        await effectDrawer?.particleInit?.(container, this);
+        await shapeDrawer?.particleInit?.(container, this);
         for (const [, plugin] of container.plugins) {
-            plugin.particleCreated && plugin.particleCreated(this);
+            plugin.particleCreated?.(this);
         }
     }
     isInsideCanvas() {
@@ -339,7 +337,7 @@ export class Particle {
     }
     reset() {
         for (const updater of this.container.particles.updaters) {
-            updater.reset && updater.reset(this);
+            updater.reset?.(this);
         }
     }
 }