@tsparticles/move-base 3.0.0-alpha.1 → 3.0.0-beta.1

package/README.md

@@ -2,9 +2,9 @@
 
 # tsParticles Standard Mover
 
-[![jsDelivr](https://data.jsdelivr.com/v1/package/npm/tsparticles-move-base/badge)](https://www.jsdelivr.com/package/npm/tsparticles-move-base)
-[![npmjs](https://badge.fury.io/js/tsparticles-move-base.svg)](https://www.npmjs.com/package/tsparticles-move-base)
-[![npmjs](https://img.shields.io/npm/dt/tsparticles-move-base)](https://www.npmjs.com/package/tsparticles-move-base) [![GitHub Sponsors](https://img.shields.io/github/sponsors/matteobruni)](https://github.com/sponsors/matteobruni)
+[![jsDelivr](https://data.jsdelivr.com/v1/package/npm/@tsparticles/move-base/badge)](https://www.jsdelivr.com/package/npm/@tsparticles/move-base)
+[![npmjs](https://badge.fury.io/js/@tsparticles/move-base.svg)](https://www.npmjs.com/package/@tsparticles/move-base)
+[![npmjs](https://img.shields.io/npm/dt/@tsparticles/move-base)](https://www.npmjs.com/package/@tsparticles/move-base) [![GitHub Sponsors](https://img.shields.io/github/sponsors/matteobruni)](https://github.com/sponsors/matteobruni)
 
 [tsParticles](https://github.com/matteobruni/tsparticles) move plugin for standard movement effect.
 
@@ -42,29 +42,33 @@ Once the scripts are loaded you can set up `tsParticles` and the interaction plu
 This package is compatible also with ES or CommonJS modules, firstly this needs to be installed, like this:
 
 ```shell
-$ npm install tsparticles-move-base
+$ npm install @tsparticles/move-base
 ```
 
 or
 
 ```shell
-$ yarn add tsparticles-move-base
+$ yarn add @tsparticles/move-base
 ```
 
 Then you need to import it in the app, like this:
 
 ```javascript
-const { tsParticles } = require("tsparticles-engine");
-const { loadBaseMover } = require("tsparticles-move-base");
+const { tsParticles } = require("@tsparticles/engine");
+const { loadBaseMover } = require("@tsparticles/move-base");
 
-loadBaseMover(tsParticles); // awaitable
+(async () => {
+  await loadBaseMover(tsParticles);
+})();
 ```
 
 or
 
 ```javascript
-import { tsParticles } from "tsparticles-engine";
-import { loadBaseMover } from "tsparticles-move-base";
+import { tsParticles } from "@tsparticles/engine";
+import { loadBaseMover } from "@tsparticles/move-base";
 
-loadBaseMover(tsParticles); // awaitable
+(async () => {
+  await loadBaseMover(tsParticles);
+})();
 ```

package/browser/BaseMover.js

@@ -1,16 +1,14 @@
-import { getDistance, getRangeMax, getRangeValue } from "@tsparticles/engine";
-import { applyDistance, applyPath, getProximitySpeedFactor, spin } from "./Utils";
+import { getDistance, getRangeMax, getRangeValue, } from "@tsparticles/engine";
+import { applyDistance, getProximitySpeedFactor, move, spin } from "./Utils.js";
+const diffFactor = 2;
 export class BaseMover {
-    init(particle) {
-        var _a;
-        const container = particle.container, options = particle.options, gravityOptions = options.move.gravity, spinOptions = options.move.spin;
-        particle.gravity = {
-            enable: gravityOptions.enable,
-            acceleration: getRangeValue(gravityOptions.acceleration),
-            inverse: gravityOptions.inverse,
-        };
-        if (spinOptions.enable) {
-            const spinPos = (_a = spinOptions.position) !== null && _a !== void 0 ? _a : { x: 50, y: 50 }, spinCenter = {
+    constructor() {
+        this._initSpin = (particle) => {
+            const container = particle.container, options = particle.options, spinOptions = options.move.spin;
+            if (!spinOptions.enable) {
+                return;
+            }
+            const spinPos = spinOptions.position ?? { x: 50, y: 50 }, spinCenter = {
                 x: (spinPos.x / 100) * container.canvas.size.width,
                 y: (spinPos.y / 100) * container.canvas.size.height,
             }, pos = particle.getPosition(), distance = getDistance(pos, spinCenter), spinAcceleration = getRangeValue(spinOptions.acceleration);
@@ -22,56 +20,32 @@ export class BaseMover {
                 radius: distance,
                 acceleration: particle.retina.spinAcceleration,
             };
-        }
+        };
+    }
+    init(particle) {
+        const options = particle.options, gravityOptions = options.move.gravity;
+        particle.gravity = {
+            enable: gravityOptions.enable,
+            acceleration: getRangeValue(gravityOptions.acceleration),
+            inverse: gravityOptions.inverse,
+        };
+        this._initSpin(particle);
     }
     isEnabled(particle) {
         return !particle.destroyed && particle.options.move.enable;
     }
     move(particle, delta) {
-        var _a, _b, _c;
-        var _d, _e;
         const particleOptions = particle.options, moveOptions = particleOptions.move;
         if (!moveOptions.enable) {
             return;
         }
-        const container = particle.container, slowFactor = getProximitySpeedFactor(particle), baseSpeed = ((_a = (_d = particle.retina).moveSpeed) !== null && _a !== void 0 ? _a : (_d.moveSpeed = getRangeValue(moveOptions.speed) * container.retina.pixelRatio)) *
-            container.retina.reduceFactor, moveDrift = ((_b = (_e = particle.retina).moveDrift) !== null && _b !== void 0 ? _b : (_e.moveDrift = getRangeValue(particle.options.move.drift) * container.retina.pixelRatio)), maxSize = getRangeMax(particleOptions.size.value) * container.retina.pixelRatio, sizeFactor = moveOptions.size ? particle.getRadius() / maxSize : 1, speedFactor = sizeFactor * slowFactor * (delta.factor || 1), diffFactor = 2, moveSpeed = (baseSpeed * speedFactor) / diffFactor;
+        const container = particle.container, pxRatio = container.retina.pixelRatio, slowFactor = getProximitySpeedFactor(particle), baseSpeed = (particle.retina.moveSpeed ??= getRangeValue(moveOptions.speed) * pxRatio) *
+            container.retina.reduceFactor, moveDrift = (particle.retina.moveDrift ??= getRangeValue(particle.options.move.drift) * pxRatio), maxSize = getRangeMax(particleOptions.size.value) * pxRatio, sizeFactor = moveOptions.size ? particle.getRadius() / maxSize : 1, moveSpeed = (baseSpeed * sizeFactor * slowFactor * (delta.factor || 1)) / diffFactor, maxSpeed = particle.retina.maxSpeed ?? container.retina.maxSpeed;
         if (moveOptions.spin.enable) {
             spin(particle, moveSpeed);
         }
         else {
-            applyPath(particle, delta);
-            const gravityOptions = particle.gravity, gravityFactor = (gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) && gravityOptions.inverse ? -1 : 1;
-            if ((gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) && moveSpeed) {
-                particle.velocity.y +=
-                    (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (60 * moveSpeed);
-            }
-            if (moveDrift && moveSpeed) {
-                particle.velocity.x += (moveDrift * delta.factor) / (60 * moveSpeed);
-            }
-            const decay = particle.moveDecay;
-            if (decay != 1) {
-                particle.velocity.multTo(decay);
-            }
-            const velocity = particle.velocity.mult(moveSpeed), maxSpeed = (_c = particle.retina.maxSpeed) !== null && _c !== void 0 ? _c : container.retina.maxSpeed;
-            if ((gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) &&
-                maxSpeed > 0 &&
-                ((!gravityOptions.inverse && velocity.y >= 0 && velocity.y >= maxSpeed) ||
-                    (gravityOptions.inverse && velocity.y <= 0 && velocity.y <= -maxSpeed))) {
-                velocity.y = gravityFactor * maxSpeed;
-                if (moveSpeed) {
-                    particle.velocity.y = velocity.y / moveSpeed;
-                }
-            }
-            const zIndexOptions = particle.options.zIndex, zVelocityFactor = (1 - particle.zIndexFactor) ** zIndexOptions.velocityRate;
-            if (zVelocityFactor != 1) {
-                velocity.multTo(zVelocityFactor);
-            }
-            particle.position.addTo(velocity);
-            if (moveOptions.vibrate) {
-                particle.position.x += Math.sin(particle.position.x * Math.cos(particle.position.y));
-                particle.position.y += Math.cos(particle.position.y * Math.sin(particle.position.x));
-            }
+            move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta);
         }
         applyDistance(particle);
     }

package/browser/Utils.js

@@ -1,6 +1,6 @@
-import { clamp, getDistances, getRandom } from "@tsparticles/engine";
+import { clamp, getDistances, getRandom, } from "@tsparticles/engine";
 export function applyDistance(particle) {
-    const initialPosition = particle.initialPosition, { dx, dy } = getDistances(initialPosition, particle.position), dxFixed = Math.abs(dx), dyFixed = Math.abs(dy), hDistance = particle.retina.maxDistance.horizontal, vDistance = particle.retina.maxDistance.vertical;
+    const initialPosition = particle.initialPosition, { dx, dy } = getDistances(initialPosition, particle.position), dxFixed = Math.abs(dx), dyFixed = Math.abs(dy), { maxDistance } = particle.retina, hDistance = maxDistance.horizontal, vDistance = maxDistance.vertical;
     if (!hDistance && !vDistance) {
         return;
     }
@@ -26,6 +26,36 @@ export function applyDistance(particle) {
         }
     }
 }
+export function move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta) {
+    applyPath(particle, delta);
+    const gravityOptions = particle.gravity, gravityFactor = gravityOptions?.enable && gravityOptions.inverse ? -1 : 1;
+    if (moveDrift && moveSpeed) {
+        particle.velocity.x += (moveDrift * delta.factor) / (60 * moveSpeed);
+    }
+    if (gravityOptions?.enable && moveSpeed) {
+        particle.velocity.y += (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (60 * moveSpeed);
+    }
+    const decay = particle.moveDecay;
+    particle.velocity.multTo(decay);
+    const velocity = particle.velocity.mult(moveSpeed);
+    if (gravityOptions?.enable &&
+        maxSpeed > 0 &&
+        ((!gravityOptions.inverse && velocity.y >= 0 && velocity.y >= maxSpeed) ||
+            (gravityOptions.inverse && velocity.y <= 0 && velocity.y <= -maxSpeed))) {
+        velocity.y = gravityFactor * maxSpeed;
+        if (moveSpeed) {
+            particle.velocity.y = velocity.y / moveSpeed;
+        }
+    }
+    const zIndexOptions = particle.options.zIndex, zVelocityFactor = (1 - particle.zIndexFactor) ** zIndexOptions.velocityRate;
+    velocity.multTo(zVelocityFactor);
+    const { position } = particle;
+    position.addTo(velocity);
+    if (moveOptions.vibrate) {
+        position.x += Math.sin(position.x * Math.cos(position.y));
+        position.y += Math.cos(position.y * Math.sin(position.x));
+    }
+}
 export function spin(particle, moveSpeed) {
     const container = particle.container;
     if (!particle.spin) {
@@ -50,7 +80,6 @@ export function spin(particle, moveSpeed) {
     particle.spin.angle += (moveSpeed / 100) * (1 - particle.spin.radius / maxCanvasSize);
 }
 export function applyPath(particle, delta) {
-    var _a;
     const particlesOptions = particle.options, pathOptions = particlesOptions.move.path, pathEnabled = pathOptions.enable;
     if (!pathEnabled) {
         return;
@@ -59,7 +88,7 @@ export function applyPath(particle, delta) {
         particle.lastPathTime += delta.value;
         return;
     }
-    const path = (_a = particle.pathGenerator) === null || _a === void 0 ? void 0 : _a.generate(particle);
+    const path = particle.pathGenerator?.generate(particle, delta);
     if (path) {
         particle.velocity.addTo(path);
     }

package/browser/index.js

@@ -1,4 +1,4 @@
-import { BaseMover } from "./BaseMover";
-export async function loadBaseMover(engine) {
-    engine.addMover("base", () => new BaseMover());
+import { BaseMover } from "./BaseMover.js";
+export async function loadBaseMover(engine, refresh = true) {
+    await engine.addMover("base", () => new BaseMover(), refresh);
 }

package/browser/package.json

@@ -0,0 +1 @@
+{ "type": "module" }

package/cjs/BaseMover.js

@@ -2,18 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseMover = void 0;
 const engine_1 = require("@tsparticles/engine");
-const Utils_1 = require("./Utils");
+const Utils_js_1 = require("./Utils.js");
+const diffFactor = 2;
 class BaseMover {
-    init(particle) {
-        var _a;
-        const container = particle.container, options = particle.options, gravityOptions = options.move.gravity, spinOptions = options.move.spin;
-        particle.gravity = {
-            enable: gravityOptions.enable,
-            acceleration: (0, engine_1.getRangeValue)(gravityOptions.acceleration),
-            inverse: gravityOptions.inverse,
-        };
-        if (spinOptions.enable) {
-            const spinPos = (_a = spinOptions.position) !== null && _a !== void 0 ? _a : { x: 50, y: 50 }, spinCenter = {
+    constructor() {
+        this._initSpin = (particle) => {
+            const container = particle.container, options = particle.options, spinOptions = options.move.spin;
+            if (!spinOptions.enable) {
+                return;
+            }
+            const spinPos = spinOptions.position ?? { x: 50, y: 50 }, spinCenter = {
                 x: (spinPos.x / 100) * container.canvas.size.width,
                 y: (spinPos.y / 100) * container.canvas.size.height,
             }, pos = particle.getPosition(), distance = (0, engine_1.getDistance)(pos, spinCenter), spinAcceleration = (0, engine_1.getRangeValue)(spinOptions.acceleration);
@@ -25,58 +23,34 @@ class BaseMover {
                 radius: distance,
                 acceleration: particle.retina.spinAcceleration,
             };
-        }
+        };
+    }
+    init(particle) {
+        const options = particle.options, gravityOptions = options.move.gravity;
+        particle.gravity = {
+            enable: gravityOptions.enable,
+            acceleration: (0, engine_1.getRangeValue)(gravityOptions.acceleration),
+            inverse: gravityOptions.inverse,
+        };
+        this._initSpin(particle);
     }
     isEnabled(particle) {
         return !particle.destroyed && particle.options.move.enable;
     }
     move(particle, delta) {
-        var _a, _b, _c;
-        var _d, _e;
         const particleOptions = particle.options, moveOptions = particleOptions.move;
         if (!moveOptions.enable) {
             return;
         }
-        const container = particle.container, slowFactor = (0, Utils_1.getProximitySpeedFactor)(particle), baseSpeed = ((_a = (_d = particle.retina).moveSpeed) !== null && _a !== void 0 ? _a : (_d.moveSpeed = (0, engine_1.getRangeValue)(moveOptions.speed) * container.retina.pixelRatio)) *
-            container.retina.reduceFactor, moveDrift = ((_b = (_e = particle.retina).moveDrift) !== null && _b !== void 0 ? _b : (_e.moveDrift = (0, engine_1.getRangeValue)(particle.options.move.drift) * container.retina.pixelRatio)), maxSize = (0, engine_1.getRangeMax)(particleOptions.size.value) * container.retina.pixelRatio, sizeFactor = moveOptions.size ? particle.getRadius() / maxSize : 1, speedFactor = sizeFactor * slowFactor * (delta.factor || 1), diffFactor = 2, moveSpeed = (baseSpeed * speedFactor) / diffFactor;
+        const container = particle.container, pxRatio = container.retina.pixelRatio, slowFactor = (0, Utils_js_1.getProximitySpeedFactor)(particle), baseSpeed = (particle.retina.moveSpeed ??= (0, engine_1.getRangeValue)(moveOptions.speed) * pxRatio) *
+            container.retina.reduceFactor, moveDrift = (particle.retina.moveDrift ??= (0, engine_1.getRangeValue)(particle.options.move.drift) * pxRatio), maxSize = (0, engine_1.getRangeMax)(particleOptions.size.value) * pxRatio, sizeFactor = moveOptions.size ? particle.getRadius() / maxSize : 1, moveSpeed = (baseSpeed * sizeFactor * slowFactor * (delta.factor || 1)) / diffFactor, maxSpeed = particle.retina.maxSpeed ?? container.retina.maxSpeed;
         if (moveOptions.spin.enable) {
-            (0, Utils_1.spin)(particle, moveSpeed);
+            (0, Utils_js_1.spin)(particle, moveSpeed);
         }
         else {
-            (0, Utils_1.applyPath)(particle, delta);
-            const gravityOptions = particle.gravity, gravityFactor = (gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) && gravityOptions.inverse ? -1 : 1;
-            if ((gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) && moveSpeed) {
-                particle.velocity.y +=
-                    (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (60 * moveSpeed);
-            }
-            if (moveDrift && moveSpeed) {
-                particle.velocity.x += (moveDrift * delta.factor) / (60 * moveSpeed);
-            }
-            const decay = particle.moveDecay;
-            if (decay != 1) {
-                particle.velocity.multTo(decay);
-            }
-            const velocity = particle.velocity.mult(moveSpeed), maxSpeed = (_c = particle.retina.maxSpeed) !== null && _c !== void 0 ? _c : container.retina.maxSpeed;
-            if ((gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) &&
-                maxSpeed > 0 &&
-                ((!gravityOptions.inverse && velocity.y >= 0 && velocity.y >= maxSpeed) ||
-                    (gravityOptions.inverse && velocity.y <= 0 && velocity.y <= -maxSpeed))) {
-                velocity.y = gravityFactor * maxSpeed;
-                if (moveSpeed) {
-                    particle.velocity.y = velocity.y / moveSpeed;
-                }
-            }
-            const zIndexOptions = particle.options.zIndex, zVelocityFactor = Math.pow((1 - particle.zIndexFactor), zIndexOptions.velocityRate);
-            if (zVelocityFactor != 1) {
-                velocity.multTo(zVelocityFactor);
-            }
-            particle.position.addTo(velocity);
-            if (moveOptions.vibrate) {
-                particle.position.x += Math.sin(particle.position.x * Math.cos(particle.position.y));
-                particle.position.y += Math.cos(particle.position.y * Math.sin(particle.position.x));
-            }
+            (0, Utils_js_1.move)(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta);
         }
-        (0, Utils_1.applyDistance)(particle);
+        (0, Utils_js_1.applyDistance)(particle);
     }
 }
 exports.BaseMover = BaseMover;

package/cjs/Utils.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProximitySpeedFactor = exports.applyPath = exports.spin = exports.applyDistance = void 0;
+exports.getProximitySpeedFactor = exports.applyPath = exports.spin = exports.move = exports.applyDistance = void 0;
 const engine_1 = require("@tsparticles/engine");
 function applyDistance(particle) {
-    const initialPosition = particle.initialPosition, { dx, dy } = (0, engine_1.getDistances)(initialPosition, particle.position), dxFixed = Math.abs(dx), dyFixed = Math.abs(dy), hDistance = particle.retina.maxDistance.horizontal, vDistance = particle.retina.maxDistance.vertical;
+    const initialPosition = particle.initialPosition, { dx, dy } = (0, engine_1.getDistances)(initialPosition, particle.position), dxFixed = Math.abs(dx), dyFixed = Math.abs(dy), { maxDistance } = particle.retina, hDistance = maxDistance.horizontal, vDistance = maxDistance.vertical;
     if (!hDistance && !vDistance) {
         return;
     }
@@ -30,6 +30,37 @@ function applyDistance(particle) {
     }
 }
 exports.applyDistance = applyDistance;
+function move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta) {
+    applyPath(particle, delta);
+    const gravityOptions = particle.gravity, gravityFactor = gravityOptions?.enable && gravityOptions.inverse ? -1 : 1;
+    if (moveDrift && moveSpeed) {
+        particle.velocity.x += (moveDrift * delta.factor) / (60 * moveSpeed);
+    }
+    if (gravityOptions?.enable && moveSpeed) {
+        particle.velocity.y += (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (60 * moveSpeed);
+    }
+    const decay = particle.moveDecay;
+    particle.velocity.multTo(decay);
+    const velocity = particle.velocity.mult(moveSpeed);
+    if (gravityOptions?.enable &&
+        maxSpeed > 0 &&
+        ((!gravityOptions.inverse && velocity.y >= 0 && velocity.y >= maxSpeed) ||
+            (gravityOptions.inverse && velocity.y <= 0 && velocity.y <= -maxSpeed))) {
+        velocity.y = gravityFactor * maxSpeed;
+        if (moveSpeed) {
+            particle.velocity.y = velocity.y / moveSpeed;
+        }
+    }
+    const zIndexOptions = particle.options.zIndex, zVelocityFactor = (1 - particle.zIndexFactor) ** zIndexOptions.velocityRate;
+    velocity.multTo(zVelocityFactor);
+    const { position } = particle;
+    position.addTo(velocity);
+    if (moveOptions.vibrate) {
+        position.x += Math.sin(position.x * Math.cos(position.y));
+        position.y += Math.cos(position.y * Math.sin(position.x));
+    }
+}
+exports.move = move;
 function spin(particle, moveSpeed) {
     const container = particle.container;
     if (!particle.spin) {
@@ -55,7 +86,6 @@ function spin(particle, moveSpeed) {
 }
 exports.spin = spin;
 function applyPath(particle, delta) {
-    var _a;
     const particlesOptions = particle.options, pathOptions = particlesOptions.move.path, pathEnabled = pathOptions.enable;
     if (!pathEnabled) {
         return;
@@ -64,7 +94,7 @@ function applyPath(particle, delta) {
         particle.lastPathTime += delta.value;
         return;
     }
-    const path = (_a = particle.pathGenerator) === null || _a === void 0 ? void 0 : _a.generate(particle);
+    const path = particle.pathGenerator?.generate(particle, delta);
     if (path) {
         particle.velocity.addTo(path);
     }

package/cjs/index.js

@@ -1,19 +1,8 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadBaseMover = void 0;
-const BaseMover_1 = require("./BaseMover");
-function loadBaseMover(engine) {
-    return __awaiter(this, void 0, void 0, function* () {
-        engine.addMover("base", () => new BaseMover_1.BaseMover());
-    });
+const BaseMover_js_1 = require("./BaseMover.js");
+async function loadBaseMover(engine, refresh = true) {
+    await engine.addMover("base", () => new BaseMover_js_1.BaseMover(), refresh);
 }
 exports.loadBaseMover = loadBaseMover;

package/cjs/package.json

@@ -0,0 +1 @@
+{ "type": "commonjs" }

package/esm/BaseMover.js

@@ -1,16 +1,14 @@
-import { getDistance, getRangeMax, getRangeValue } from "@tsparticles/engine";
-import { applyDistance, applyPath, getProximitySpeedFactor, spin } from "./Utils";
+import { getDistance, getRangeMax, getRangeValue, } from "@tsparticles/engine";
+import { applyDistance, getProximitySpeedFactor, move, spin } from "./Utils.js";
+const diffFactor = 2;
 export class BaseMover {
-    init(particle) {
-        var _a;
-        const container = particle.container, options = particle.options, gravityOptions = options.move.gravity, spinOptions = options.move.spin;
-        particle.gravity = {
-            enable: gravityOptions.enable,
-            acceleration: getRangeValue(gravityOptions.acceleration),
-            inverse: gravityOptions.inverse,
-        };
-        if (spinOptions.enable) {
-            const spinPos = (_a = spinOptions.position) !== null && _a !== void 0 ? _a : { x: 50, y: 50 }, spinCenter = {
+    constructor() {
+        this._initSpin = (particle) => {
+            const container = particle.container, options = particle.options, spinOptions = options.move.spin;
+            if (!spinOptions.enable) {
+                return;
+            }
+            const spinPos = spinOptions.position ?? { x: 50, y: 50 }, spinCenter = {
                 x: (spinPos.x / 100) * container.canvas.size.width,
                 y: (spinPos.y / 100) * container.canvas.size.height,
             }, pos = particle.getPosition(), distance = getDistance(pos, spinCenter), spinAcceleration = getRangeValue(spinOptions.acceleration);
@@ -22,56 +20,32 @@ export class BaseMover {
                 radius: distance,
                 acceleration: particle.retina.spinAcceleration,
             };
-        }
+        };
+    }
+    init(particle) {
+        const options = particle.options, gravityOptions = options.move.gravity;
+        particle.gravity = {
+            enable: gravityOptions.enable,
+            acceleration: getRangeValue(gravityOptions.acceleration),
+            inverse: gravityOptions.inverse,
+        };
+        this._initSpin(particle);
     }
     isEnabled(particle) {
         return !particle.destroyed && particle.options.move.enable;
     }
     move(particle, delta) {
-        var _a, _b, _c;
-        var _d, _e;
         const particleOptions = particle.options, moveOptions = particleOptions.move;
         if (!moveOptions.enable) {
             return;
         }
-        const container = particle.container, slowFactor = getProximitySpeedFactor(particle), baseSpeed = ((_a = (_d = particle.retina).moveSpeed) !== null && _a !== void 0 ? _a : (_d.moveSpeed = getRangeValue(moveOptions.speed) * container.retina.pixelRatio)) *
-            container.retina.reduceFactor, moveDrift = ((_b = (_e = particle.retina).moveDrift) !== null && _b !== void 0 ? _b : (_e.moveDrift = getRangeValue(particle.options.move.drift) * container.retina.pixelRatio)), maxSize = getRangeMax(particleOptions.size.value) * container.retina.pixelRatio, sizeFactor = moveOptions.size ? particle.getRadius() / maxSize : 1, speedFactor = sizeFactor * slowFactor * (delta.factor || 1), diffFactor = 2, moveSpeed = (baseSpeed * speedFactor) / diffFactor;
+        const container = particle.container, pxRatio = container.retina.pixelRatio, slowFactor = getProximitySpeedFactor(particle), baseSpeed = (particle.retina.moveSpeed ??= getRangeValue(moveOptions.speed) * pxRatio) *
+            container.retina.reduceFactor, moveDrift = (particle.retina.moveDrift ??= getRangeValue(particle.options.move.drift) * pxRatio), maxSize = getRangeMax(particleOptions.size.value) * pxRatio, sizeFactor = moveOptions.size ? particle.getRadius() / maxSize : 1, moveSpeed = (baseSpeed * sizeFactor * slowFactor * (delta.factor || 1)) / diffFactor, maxSpeed = particle.retina.maxSpeed ?? container.retina.maxSpeed;
         if (moveOptions.spin.enable) {
             spin(particle, moveSpeed);
         }
         else {
-            applyPath(particle, delta);
-            const gravityOptions = particle.gravity, gravityFactor = (gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) && gravityOptions.inverse ? -1 : 1;
-            if ((gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) && moveSpeed) {
-                particle.velocity.y +=
-                    (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (60 * moveSpeed);
-            }
-            if (moveDrift && moveSpeed) {
-                particle.velocity.x += (moveDrift * delta.factor) / (60 * moveSpeed);
-            }
-            const decay = particle.moveDecay;
-            if (decay != 1) {
-                particle.velocity.multTo(decay);
-            }
-            const velocity = particle.velocity.mult(moveSpeed), maxSpeed = (_c = particle.retina.maxSpeed) !== null && _c !== void 0 ? _c : container.retina.maxSpeed;
-            if ((gravityOptions === null || gravityOptions === void 0 ? void 0 : gravityOptions.enable) &&
-                maxSpeed > 0 &&
-                ((!gravityOptions.inverse && velocity.y >= 0 && velocity.y >= maxSpeed) ||
-                    (gravityOptions.inverse && velocity.y <= 0 && velocity.y <= -maxSpeed))) {
-                velocity.y = gravityFactor * maxSpeed;
-                if (moveSpeed) {
-                    particle.velocity.y = velocity.y / moveSpeed;
-                }
-            }
-            const zIndexOptions = particle.options.zIndex, zVelocityFactor = (1 - particle.zIndexFactor) ** zIndexOptions.velocityRate;
-            if (zVelocityFactor != 1) {
-                velocity.multTo(zVelocityFactor);
-            }
-            particle.position.addTo(velocity);
-            if (moveOptions.vibrate) {
-                particle.position.x += Math.sin(particle.position.x * Math.cos(particle.position.y));
-                particle.position.y += Math.cos(particle.position.y * Math.sin(particle.position.x));
-            }
+            move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta);
         }
         applyDistance(particle);
     }

package/esm/Utils.js

@@ -1,6 +1,6 @@
-import { clamp, getDistances, getRandom } from "@tsparticles/engine";
+import { clamp, getDistances, getRandom, } from "@tsparticles/engine";
 export function applyDistance(particle) {
-    const initialPosition = particle.initialPosition, { dx, dy } = getDistances(initialPosition, particle.position), dxFixed = Math.abs(dx), dyFixed = Math.abs(dy), hDistance = particle.retina.maxDistance.horizontal, vDistance = particle.retina.maxDistance.vertical;
+    const initialPosition = particle.initialPosition, { dx, dy } = getDistances(initialPosition, particle.position), dxFixed = Math.abs(dx), dyFixed = Math.abs(dy), { maxDistance } = particle.retina, hDistance = maxDistance.horizontal, vDistance = maxDistance.vertical;
     if (!hDistance && !vDistance) {
         return;
     }
@@ -26,6 +26,36 @@ export function applyDistance(particle) {
         }
     }
 }
+export function move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta) {
+    applyPath(particle, delta);
+    const gravityOptions = particle.gravity, gravityFactor = gravityOptions?.enable && gravityOptions.inverse ? -1 : 1;
+    if (moveDrift && moveSpeed) {
+        particle.velocity.x += (moveDrift * delta.factor) / (60 * moveSpeed);
+    }
+    if (gravityOptions?.enable && moveSpeed) {
+        particle.velocity.y += (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (60 * moveSpeed);
+    }
+    const decay = particle.moveDecay;
+    particle.velocity.multTo(decay);
+    const velocity = particle.velocity.mult(moveSpeed);
+    if (gravityOptions?.enable &&
+        maxSpeed > 0 &&
+        ((!gravityOptions.inverse && velocity.y >= 0 && velocity.y >= maxSpeed) ||
+            (gravityOptions.inverse && velocity.y <= 0 && velocity.y <= -maxSpeed))) {
+        velocity.y = gravityFactor * maxSpeed;
+        if (moveSpeed) {
+            particle.velocity.y = velocity.y / moveSpeed;
+        }
+    }
+    const zIndexOptions = particle.options.zIndex, zVelocityFactor = (1 - particle.zIndexFactor) ** zIndexOptions.velocityRate;
+    velocity.multTo(zVelocityFactor);
+    const { position } = particle;
+    position.addTo(velocity);
+    if (moveOptions.vibrate) {
+        position.x += Math.sin(position.x * Math.cos(position.y));
+        position.y += Math.cos(position.y * Math.sin(position.x));
+    }
+}
 export function spin(particle, moveSpeed) {
     const container = particle.container;
     if (!particle.spin) {
@@ -50,7 +80,6 @@ export function spin(particle, moveSpeed) {
     particle.spin.angle += (moveSpeed / 100) * (1 - particle.spin.radius / maxCanvasSize);
 }
 export function applyPath(particle, delta) {
-    var _a;
     const particlesOptions = particle.options, pathOptions = particlesOptions.move.path, pathEnabled = pathOptions.enable;
     if (!pathEnabled) {
         return;
@@ -59,7 +88,7 @@ export function applyPath(particle, delta) {
         particle.lastPathTime += delta.value;
         return;
     }
-    const path = (_a = particle.pathGenerator) === null || _a === void 0 ? void 0 : _a.generate(particle);
+    const path = particle.pathGenerator?.generate(particle, delta);
     if (path) {
         particle.velocity.addTo(path);
     }

package/esm/index.js

@@ -1,4 +1,4 @@
-import { BaseMover } from "./BaseMover";
-export async function loadBaseMover(engine) {
-    engine.addMover("base", () => new BaseMover());
+import { BaseMover } from "./BaseMover.js";
+export async function loadBaseMover(engine, refresh = true) {
+    await engine.addMover("base", () => new BaseMover(), refresh);
 }

package/esm/package.json

@@ -0,0 +1 @@
+{ "type": "module" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsparticles/move-base",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-beta.1",
   "description": "tsParticles Base movement",
   "homepage": "https://particles.js.org",
   "repository": {
@@ -68,15 +68,28 @@
   "bugs": {
     "url": "https://github.com/matteobruni/tsparticles/issues"
   },
-  "main": "cjs/index.js",
+  "sideEffects": false,
   "jsdelivr": "tsparticles.move.base.min.js",
   "unpkg": "tsparticles.move.base.min.js",
+  "browser": "browser/index.js",
+  "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "types/index.d.ts",
-  "publishConfig": {
-    "access": "public"
+  "exports": {
+    ".": {
+      "types": "./types/index.d.ts",
+      "browser": "./browser/index.js",
+      "import": "./esm/index.js",
+      "require": "./cjs/index.js",
+      "umd": "./umd/index.js",
+      "default": "./cjs/index.js"
+    },
+    "./package.json": "./package.json"
   },
   "dependencies": {
-    "@tsparticles/engine": "^3.0.0-alpha.1"
+    "@tsparticles/engine": "^3.0.0-beta.1"
+  },
+  "publishConfig": {
+    "access": "public"
   }
-}
+}