@tsparticles/interaction-particles-collisions 3.0.0-alpha.1 → 3.0.0-beta.0

package/README.md

@@ -2,9 +2,9 @@
 
 # tsParticles Particles Collisions Interaction
 
-[![jsDelivr](https://data.jsdelivr.com/v1/package/npm/tsparticles-interaction-particles-collisions/badge)](https://www.jsdelivr.com/package/npm/tsparticles-interaction-particles-collisions)
-[![npmjs](https://badge.fury.io/js/tsparticles-interaction-particles-collisions.svg)](https://www.npmjs.com/package/tsparticles-interaction-particles-collisions)
-[![npmjs](https://img.shields.io/npm/dt/tsparticles-interaction-particles-collisions)](https://www.npmjs.com/package/tsparticles-interaction-particles-collisions) [![GitHub Sponsors](https://img.shields.io/github/sponsors/matteobruni)](https://github.com/sponsors/matteobruni)
+[![jsDelivr](https://data.jsdelivr.com/v1/package/npm/@tsparticles/interaction-particles-collisions/badge)](https://www.jsdelivr.com/package/npm/@tsparticles/interaction-particles-collisions)
+[![npmjs](https://badge.fury.io/js/@tsparticles/interaction-particles-collisions.svg)](https://www.npmjs.com/package/@tsparticles/interaction-particles-collisions)
+[![npmjs](https://img.shields.io/npm/dt/@tsparticles/interaction-particles-collisions)](https://www.npmjs.com/package/@tsparticles/interaction-particles-collisions) [![GitHub Sponsors](https://img.shields.io/github/sponsors/matteobruni)](https://github.com/sponsors/matteobruni)
 
 [tsParticles](https://github.com/matteobruni/tsparticles) interaction plugin for collisions effect between particles.
 
@@ -14,8 +14,7 @@
 
 The CDN/Vanilla version JS has one required file in vanilla configuration:
 
-Including the `tsparticles.interaction.particles.collisions.min.js` file will export the function to load the
-interaction
+Including the `tsparticles.interaction.particles.collisions.min.js` file will export the function to load the interaction
 plugin:
 
 ```javascript
@@ -27,14 +26,16 @@ loadParticlesCollisionsInteraction;
 Once the scripts are loaded you can set up `tsParticles` and the interaction plugin like this:
 
 ```javascript
-loadParticlesCollisionsInteraction(tsParticles);
-
-tsParticles.load({
-  id: "tsparticles",
-  options: {
-    /* options */
-  },
-});
+(async () => {
+  await loadParticlesCollisionsInteraction(tsParticles);
+
+  await tsParticles.load({
+    id: "tsparticles",
+    options: {
+      /* options */
+    },
+  });
+})();
 ```
 
 ### ESM / CommonJS
@@ -42,29 +43,33 @@ tsParticles.load({
 This package is compatible also with ES or CommonJS modules, firstly this needs to be installed, like this:
 
 ```shell
-$ npm install tsparticles-interaction-particles-collisions
+$ npm install @tsparticles/interaction-particles-collisions
 ```
 
 or
 
 ```shell
-$ yarn add tsparticles-interaction-particles-collisions
+$ yarn add @tsparticles/interaction-particles-collisions
 ```
 
 Then you need to import it in the app, like this:
 
 ```javascript
-const { tsParticles } = require("tsparticles-engine");
-const { loadParticlesCollisionsInteraction } = require("tsparticles-interaction-particles-collisions");
+const { tsParticles } = require("@tsparticles/engine");
+const { loadParticlesCollisionsInteraction } = require("@tsparticles/interaction-particles-collisions");
 
-loadParticlesCollisionsInteraction(tsParticles);
+(async () => {
+  await loadParticlesCollisionsInteraction(tsParticles);
+})();
 ```
 
 or
 
 ```javascript
-import { tsParticles } from "tsparticles-engine";
-import { loadParticlesCollisionsInteraction } from "tsparticles-interaction-particles-collisions";
+import { tsParticles } from "@tsparticles/engine";
+import { loadParticlesCollisionsInteraction } from "@tsparticles/interaction-particles-collisions";
 
-loadParticlesCollisionsInteraction(tsParticles);
+(async () => {
+  await loadParticlesCollisionsInteraction(tsParticles);
+})();
 ```

package/browser/Bounce.js

@@ -1,4 +1,14 @@
-import { circleBounce, circleBounceDataFromParticle } from "@tsparticles/engine";
+import { circleBounce, circleBounceDataFromParticle, getRangeValue } from "@tsparticles/engine";
+const fixBounceSpeed = (p) => {
+    if (p.collisionMaxSpeed === undefined) {
+        p.collisionMaxSpeed = getRangeValue(p.options.collisions.maxSpeed);
+    }
+    if (p.velocity.length > p.collisionMaxSpeed) {
+        p.velocity.length = p.collisionMaxSpeed;
+    }
+};
 export function bounce(p1, p2) {
     circleBounce(circleBounceDataFromParticle(p1), circleBounceDataFromParticle(p2));
+    fixBounceSpeed(p1);
+    fixBounceSpeed(p2);
 }

package/browser/Collider.js

@@ -9,6 +9,9 @@ export class Collider extends ParticlesInteractorBase {
     init() {
     }
     async interact(p1, delta) {
+        if (p1.destroyed || p1.spawning) {
+            return;
+        }
         const container = this.container, pos1 = p1.getPosition(), radius1 = p1.getRadius(), query = container.particles.quadTree.queryCircle(pos1, radius1 * 2);
         for (const p2 of query) {
             if (p1 === p2 ||

package/browser/Destroy.js

@@ -10,7 +10,7 @@ export function destroy(p1, p2) {
         p2.destroy();
     }
     else if (p1.getRadius() !== undefined && p2.getRadius() !== undefined) {
-        const deleteP = p1.getRadius() >= p2.getRadius() ? p1 : p2;
+        const deleteP = p1.getRadius() >= p2.getRadius() ? p2 : p1;
         deleteP.destroy();
     }
 }

package/browser/index.js

@@ -1,4 +1,4 @@
 import { Collider } from "./Collider";
-export async function loadParticlesCollisionsInteraction(engine) {
-    await engine.addInteractor("particlesCollisions", (container) => new Collider(container));
+export async function loadParticlesCollisionsInteraction(engine, refresh = true) {
+    await engine.addInteractor("particlesCollisions", (container) => new Collider(container), refresh);
 }

package/cjs/Bounce.js

@@ -2,7 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bounce = void 0;
 const engine_1 = require("@tsparticles/engine");
+const fixBounceSpeed = (p) => {
+    if (p.collisionMaxSpeed === undefined) {
+        p.collisionMaxSpeed = (0, engine_1.getRangeValue)(p.options.collisions.maxSpeed);
+    }
+    if (p.velocity.length > p.collisionMaxSpeed) {
+        p.velocity.length = p.collisionMaxSpeed;
+    }
+};
 function bounce(p1, p2) {
     (0, engine_1.circleBounce)((0, engine_1.circleBounceDataFromParticle)(p1), (0, engine_1.circleBounceDataFromParticle)(p2));
+    fixBounceSpeed(p1);
+    fixBounceSpeed(p2);
 }
 exports.bounce = bounce;

package/cjs/Collider.js

@@ -1,13 +1,4 @@
 "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.Collider = void 0;
 const engine_1 = require("@tsparticles/engine");
@@ -20,28 +11,29 @@ class Collider extends engine_1.ParticlesInteractorBase {
     }
     init() {
     }
-    interact(p1, delta) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const container = this.container, pos1 = p1.getPosition(), radius1 = p1.getRadius(), query = container.particles.quadTree.queryCircle(pos1, radius1 * 2);
-            for (const p2 of query) {
-                if (p1 === p2 ||
-                    !p2.options.collisions.enable ||
-                    p1.options.collisions.mode !== p2.options.collisions.mode ||
-                    p2.destroyed ||
-                    p2.spawning) {
-                    continue;
-                }
-                const pos2 = p2.getPosition(), radius2 = p2.getRadius();
-                if (Math.abs(Math.round(pos1.z) - Math.round(pos2.z)) > radius1 + radius2) {
-                    continue;
-                }
-                const dist = (0, engine_1.getDistance)(pos1, pos2), distP = radius1 + radius2;
-                if (dist > distP) {
-                    continue;
-                }
-                (0, ResolveCollision_1.resolveCollision)(p1, p2, delta, container.retina.pixelRatio);
+    async interact(p1, delta) {
+        if (p1.destroyed || p1.spawning) {
+            return;
+        }
+        const container = this.container, pos1 = p1.getPosition(), radius1 = p1.getRadius(), query = container.particles.quadTree.queryCircle(pos1, radius1 * 2);
+        for (const p2 of query) {
+            if (p1 === p2 ||
+                !p2.options.collisions.enable ||
+                p1.options.collisions.mode !== p2.options.collisions.mode ||
+                p2.destroyed ||
+                p2.spawning) {
+                continue;
             }
-        });
+            const pos2 = p2.getPosition(), radius2 = p2.getRadius();
+            if (Math.abs(Math.round(pos1.z) - Math.round(pos2.z)) > radius1 + radius2) {
+                continue;
+            }
+            const dist = (0, engine_1.getDistance)(pos1, pos2), distP = radius1 + radius2;
+            if (dist > distP) {
+                continue;
+            }
+            (0, ResolveCollision_1.resolveCollision)(p1, p2, delta, container.retina.pixelRatio);
+        }
     }
     isEnabled(particle) {
         return particle.options.collisions.enable;

package/cjs/Destroy.js

@@ -13,7 +13,7 @@ function destroy(p1, p2) {
         p2.destroy();
     }
     else if (p1.getRadius() !== undefined && p2.getRadius() !== undefined) {
-        const deleteP = p1.getRadius() >= p2.getRadius() ? p1 : p2;
+        const deleteP = p1.getRadius() >= p2.getRadius() ? p2 : p1;
         deleteP.destroy();
     }
 }

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.loadParticlesCollisionsInteraction = void 0;
 const Collider_1 = require("./Collider");
-function loadParticlesCollisionsInteraction(engine) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield engine.addInteractor("particlesCollisions", (container) => new Collider_1.Collider(container));
-    });
+async function loadParticlesCollisionsInteraction(engine, refresh = true) {
+    await engine.addInteractor("particlesCollisions", (container) => new Collider_1.Collider(container), refresh);
 }
 exports.loadParticlesCollisionsInteraction = loadParticlesCollisionsInteraction;

package/esm/Bounce.js

@@ -1,4 +1,14 @@
-import { circleBounce, circleBounceDataFromParticle } from "@tsparticles/engine";
+import { circleBounce, circleBounceDataFromParticle, getRangeValue } from "@tsparticles/engine";
+const fixBounceSpeed = (p) => {
+    if (p.collisionMaxSpeed === undefined) {
+        p.collisionMaxSpeed = getRangeValue(p.options.collisions.maxSpeed);
+    }
+    if (p.velocity.length > p.collisionMaxSpeed) {
+        p.velocity.length = p.collisionMaxSpeed;
+    }
+};
 export function bounce(p1, p2) {
     circleBounce(circleBounceDataFromParticle(p1), circleBounceDataFromParticle(p2));
+    fixBounceSpeed(p1);
+    fixBounceSpeed(p2);
 }

package/esm/Collider.js

@@ -9,6 +9,9 @@ export class Collider extends ParticlesInteractorBase {
     init() {
     }
     async interact(p1, delta) {
+        if (p1.destroyed || p1.spawning) {
+            return;
+        }
         const container = this.container, pos1 = p1.getPosition(), radius1 = p1.getRadius(), query = container.particles.quadTree.queryCircle(pos1, radius1 * 2);
         for (const p2 of query) {
             if (p1 === p2 ||

package/esm/Destroy.js

@@ -10,7 +10,7 @@ export function destroy(p1, p2) {
         p2.destroy();
     }
     else if (p1.getRadius() !== undefined && p2.getRadius() !== undefined) {
-        const deleteP = p1.getRadius() >= p2.getRadius() ? p1 : p2;
+        const deleteP = p1.getRadius() >= p2.getRadius() ? p2 : p1;
         deleteP.destroy();
     }
 }

package/esm/index.js

@@ -1,4 +1,4 @@
 import { Collider } from "./Collider";
-export async function loadParticlesCollisionsInteraction(engine) {
-    await engine.addInteractor("particlesCollisions", (container) => new Collider(container));
+export async function loadParticlesCollisionsInteraction(engine, refresh = true) {
+    await engine.addInteractor("particlesCollisions", (container) => new Collider(container), refresh);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsparticles/interaction-particles-collisions",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-beta.0",
   "description": "tsParticles collisions particles interaction",
   "homepage": "https://particles.js.org",
   "repository": {
@@ -73,10 +73,11 @@
   "unpkg": "tsparticles.interaction.particles.collisions.min.js",
   "module": "esm/index.js",
   "types": "types/index.d.ts",
+  "sideEffects": false,
+  "dependencies": {
+    "@tsparticles/engine": "^3.0.0-beta.0"
+  },
   "publishConfig": {
     "access": "public"
-  },
-  "dependencies": {
-    "@tsparticles/engine": "^3.0.0-alpha.1"
   }
-}
+}