@tsparticles/move-base 3.0.3 → 3.2.0

package/esm/BaseMover.js

@@ -1,52 +1,38 @@
-import { getDistance, getRangeMax, getRangeValue, } from "@tsparticles/engine";
-import { applyDistance, getProximitySpeedFactor, move, spin } from "./Utils.js";
-const diffFactor = 2;
+import { getRangeMax, getRangeValue } from "@tsparticles/engine";
+const diffFactor = 2, defaultSizeFactor = 1, defaultDeltaFactor = 1;
 export class BaseMover {
-    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 * 0.01 * container.canvas.size.width,
-                y: spinPos.y * 0.01 * container.canvas.size.height,
-            }, pos = particle.getPosition(), distance = getDistance(pos, spinCenter), spinAcceleration = getRangeValue(spinOptions.acceleration);
-            particle.retina.spinAcceleration = spinAcceleration * container.retina.pixelRatio;
-            particle.spin = {
-                center: spinCenter,
-                direction: particle.velocity.x >= 0 ? "clockwise" : "counter-clockwise",
-                angle: particle.velocity.angle,
-                radius: distance,
-                acceleration: particle.retina.spinAcceleration,
-            };
-        };
-    }
-    init(particle) {
+    async 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);
+        const { initSpin } = await import("./Utils.js");
+        initSpin(particle);
+        await Promise.resolve();
     }
     isEnabled(particle) {
         return !particle.destroyed && particle.options.move.enable;
     }
-    move(particle, delta) {
+    async move(particle, delta) {
         const particleOptions = particle.options, moveOptions = particleOptions.move;
         if (!moveOptions.enable) {
             return;
         }
-        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;
+        const container = particle.container, pxRatio = container.retina.pixelRatio;
+        particle.retina.moveSpeed ??= getRangeValue(moveOptions.speed) * pxRatio;
+        particle.retina.moveDrift ??= getRangeValue(particle.options.move.drift) * pxRatio;
+        const { getProximitySpeedFactor } = await import("./Utils.js"), slowFactor = getProximitySpeedFactor(particle), baseSpeed = particle.retina.moveSpeed * container.retina.reduceFactor, moveDrift = particle.retina.moveDrift, maxSize = getRangeMax(particleOptions.size.value) * pxRatio, sizeFactor = moveOptions.size ? particle.getRadius() / maxSize : defaultSizeFactor, deltaFactor = delta.factor || defaultDeltaFactor, moveSpeed = (baseSpeed * sizeFactor * slowFactor * deltaFactor) / diffFactor, maxSpeed = particle.retina.maxSpeed ?? container.retina.maxSpeed;
         if (moveOptions.spin.enable) {
+            const { spin } = await import("./Utils.js");
             spin(particle, moveSpeed);
         }
         else {
-            move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta);
+            const { move } = await import("./Utils.js");
+            await move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta);
         }
+        const { applyDistance } = await import("./Utils.js");
         applyDistance(particle);
     }
 }

package/esm/Utils.js

@@ -1,16 +1,18 @@
-import { clamp, getDistances, getRandom, } from "@tsparticles/engine";
+import { clamp, getDistance, getDistances, getRandom, getRangeValue, } from "@tsparticles/engine";
+const half = 0.5, minVelocity = 0, identity = 1, moveSpeedFactor = 60, minSpinRadius = 0, spinFactor = 0.01;
 export function applyDistance(particle) {
     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;
     }
-    if (((hDistance && dxFixed >= hDistance) || (vDistance && dyFixed >= vDistance)) && !particle.misplaced) {
+    const hasHDistance = (hDistance && dxFixed >= hDistance) ?? false, hasVDistance = (vDistance && dyFixed >= vDistance) ?? false;
+    if ((hasHDistance || hasVDistance) && !particle.misplaced) {
         particle.misplaced = (!!hDistance && dxFixed > hDistance) || (!!vDistance && dyFixed > vDistance);
         if (hDistance) {
-            particle.velocity.x = particle.velocity.y * 0.5 - particle.velocity.x;
+            particle.velocity.x = particle.velocity.y * half - particle.velocity.x;
         }
         if (vDistance) {
-            particle.velocity.y = particle.velocity.x * 0.5 - particle.velocity.y;
+            particle.velocity.y = particle.velocity.x * half - particle.velocity.y;
         }
     }
     else if ((!hDistance || dxFixed < hDistance) && (!vDistance || dyFixed < vDistance) && particle.misplaced) {
@@ -18,36 +20,39 @@ export function applyDistance(particle) {
     }
     else if (particle.misplaced) {
         const pos = particle.position, vel = particle.velocity;
-        if (hDistance && ((pos.x < initialPosition.x && vel.x < 0) || (pos.x > initialPosition.x && vel.x > 0))) {
+        if (hDistance &&
+            ((pos.x < initialPosition.x && vel.x < minVelocity) || (pos.x > initialPosition.x && vel.x > minVelocity))) {
             vel.x *= -getRandom();
         }
-        if (vDistance && ((pos.y < initialPosition.y && vel.y < 0) || (pos.y > initialPosition.y && vel.y > 0))) {
+        if (vDistance &&
+            ((pos.y < initialPosition.y && vel.y < minVelocity) || (pos.y > initialPosition.y && vel.y > minVelocity))) {
             vel.y *= -getRandom();
         }
     }
 }
-export function move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta) {
-    applyPath(particle, delta);
-    const gravityOptions = particle.gravity, gravityFactor = gravityOptions?.enable && gravityOptions.inverse ? -1 : 1;
+export async function move(particle, moveOptions, moveSpeed, maxSpeed, moveDrift, delta) {
+    await applyPath(particle, delta);
+    const gravityOptions = particle.gravity, gravityFactor = gravityOptions?.enable && gravityOptions.inverse ? -identity : identity;
     if (moveDrift && moveSpeed) {
-        particle.velocity.x += (moveDrift * delta.factor) / (60 * moveSpeed);
+        particle.velocity.x += (moveDrift * delta.factor) / (moveSpeedFactor * moveSpeed);
     }
     if (gravityOptions?.enable && moveSpeed) {
-        particle.velocity.y += (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (60 * moveSpeed);
+        particle.velocity.y +=
+            (gravityFactor * (gravityOptions.acceleration * delta.factor)) / (moveSpeedFactor * 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))) {
+        maxSpeed > minVelocity &&
+        ((!gravityOptions.inverse && velocity.y >= minVelocity && velocity.y >= maxSpeed) ||
+            (gravityOptions.inverse && velocity.y <= minVelocity && 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;
+    const zIndexOptions = particle.options.zIndex, zVelocityFactor = (identity - particle.zIndexFactor) ** zIndexOptions.velocityRate;
     velocity.multTo(zVelocityFactor);
     const { position } = particle;
     position.addTo(velocity);
@@ -68,18 +73,18 @@ export function spin(particle, moveSpeed) {
     particle.position.x = particle.spin.center.x + particle.spin.radius * updateFunc.x(particle.spin.angle);
     particle.position.y = particle.spin.center.y + particle.spin.radius * updateFunc.y(particle.spin.angle);
     particle.spin.radius += particle.spin.acceleration;
-    const maxCanvasSize = Math.max(container.canvas.size.width, container.canvas.size.height), halfMaxSize = maxCanvasSize * 0.5;
+    const maxCanvasSize = Math.max(container.canvas.size.width, container.canvas.size.height), halfMaxSize = maxCanvasSize * half;
     if (particle.spin.radius > halfMaxSize) {
         particle.spin.radius = halfMaxSize;
-        particle.spin.acceleration *= -1;
+        particle.spin.acceleration *= -identity;
     }
-    else if (particle.spin.radius < 0) {
-        particle.spin.radius = 0;
-        particle.spin.acceleration *= -1;
+    else if (particle.spin.radius < minSpinRadius) {
+        particle.spin.radius = minSpinRadius;
+        particle.spin.acceleration *= -identity;
     }
-    particle.spin.angle += moveSpeed * 0.01 * (1 - particle.spin.radius / maxCanvasSize);
+    particle.spin.angle += moveSpeed * spinFactor * (identity - particle.spin.radius / maxCanvasSize);
 }
-export function applyPath(particle, delta) {
+export async function applyPath(particle, delta) {
     const particlesOptions = particle.options, pathOptions = particlesOptions.move.path, pathEnabled = pathOptions.enable;
     if (!pathEnabled) {
         return;
@@ -88,16 +93,35 @@ export function applyPath(particle, delta) {
         particle.lastPathTime += delta.value;
         return;
     }
-    const path = particle.pathGenerator?.generate(particle, delta);
+    const path = await particle.pathGenerator?.generate(particle, delta);
     if (path) {
         particle.velocity.addTo(path);
     }
     if (pathOptions.clamp) {
-        particle.velocity.x = clamp(particle.velocity.x, -1, 1);
-        particle.velocity.y = clamp(particle.velocity.y, -1, 1);
+        particle.velocity.x = clamp(particle.velocity.x, -identity, identity);
+        particle.velocity.y = clamp(particle.velocity.y, -identity, identity);
     }
     particle.lastPathTime -= particle.pathDelay;
 }
 export function getProximitySpeedFactor(particle) {
-    return particle.slow.inRange ? particle.slow.factor : 1;
+    return particle.slow.inRange ? particle.slow.factor : identity;
+}
+export function 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 }, spinFactor = 0.01, spinCenter = {
+        x: spinPos.x * spinFactor * container.canvas.size.width,
+        y: spinPos.y * spinFactor * container.canvas.size.height,
+    }, pos = particle.getPosition(), distance = getDistance(pos, spinCenter), spinAcceleration = getRangeValue(spinOptions.acceleration);
+    particle.retina.spinAcceleration = spinAcceleration * container.retina.pixelRatio;
+    const minVelocity = 0;
+    particle.spin = {
+        center: spinCenter,
+        direction: particle.velocity.x >= minVelocity ? "clockwise" : "counter-clockwise",
+        angle: particle.velocity.angle,
+        radius: distance,
+        acceleration: particle.retina.spinAcceleration,
+    };
 }

package/esm/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsparticles/move-base",
-  "version": "3.0.3",
+  "version": "3.2.0",
   "description": "tsParticles Base movement",
   "homepage": "https://particles.js.org",
   "repository": {
@@ -87,7 +87,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@tsparticles/engine": "^3.0.3"
+    "@tsparticles/engine": "^3.2.0"
   },
   "publishConfig": {
     "access": "public"

package/report.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <title>@tsparticles/move-base [26 Dec 2023 at 19:27]</title>
+    <title>@tsparticles/move-base [31 Jan 2024 at 02:05]</title>
     <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" />
 
     <script>
@@ -31,8 +31,8 @@
   <body>
     <div id="app"></div>
     <script>
-      window.chartData = [{"label":"tsparticles.move.base.js","isAsset":true,"statSize":7390,"parsedSize":11266,"gzipSize":3132,"groups":[{"label":"dist/browser","path":"./dist/browser","statSize":7348,"groups":[{"id":577,"label":"index.js + 2 modules (concatenated)","path":"./dist/browser/index.js + 2 modules (concatenated)","statSize":7348,"parsedSize":11266,"gzipSize":3132,"concatenated":true,"groups":[{"label":"dist/browser","path":"./dist/browser/index.js + 2 modules (concatenated)/dist/browser","statSize":7348,"groups":[{"id":null,"label":"index.js","path":"./dist/browser/index.js + 2 modules (concatenated)/dist/browser/index.js","statSize":172,"parsedSize":263,"gzipSize":73,"inaccurateSizes":true},{"id":null,"label":"BaseMover.js","path":"./dist/browser/index.js + 2 modules (concatenated)/dist/browser/BaseMover.js","statSize":2635,"parsedSize":4039,"gzipSize":1123,"inaccurateSizes":true},{"id":null,"label":"Utils.js","path":"./dist/browser/index.js + 2 modules (concatenated)/dist/browser/Utils.js","statSize":4541,"parsedSize":6962,"gzipSize":1935,"inaccurateSizes":true}],"parsedSize":11266,"gzipSize":3132,"inaccurateSizes":true}]}],"parsedSize":11266,"gzipSize":3132},{"label":"engine\",\"commonjs2\":\"@tsparticles/engine\",\"amd\":\"@tsparticles","path":"./engine\",\"commonjs2\":\"@tsparticles/engine\",\"amd\":\"@tsparticles","statSize":42,"groups":[{"id":533,"label":"engine\",\"root\":\"window\"}","path":"./engine\",\"commonjs2\":\"@tsparticles/engine\",\"amd\":\"@tsparticles/engine\",\"root\":\"window\"}","statSize":42}],"parsedSize":0,"gzipSize":0}],"isInitialByEntrypoint":{"tsparticles.move.base":true}}];
-      window.entrypoints = ["tsparticles.move.base","tsparticles.move.base.min"];
+      window.chartData = [];
+      window.entrypoints = ["tsparticles.move.base.min"];
       window.defaultSizes = "parsed";
     </script>
   </body>