@tsparticles/plugin-infection 3.0.0-alpha.1 → 3.0.0-beta.0

package/cjs/index.js

@@ -13,15 +13,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-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.loadInfectionPlugin = void 0;
 const Infection_1 = require("./Options/Classes/Infection");
@@ -35,26 +26,23 @@ class InfectionPlugin {
         return new InfectionInstance_1.InfectionInstance(container);
     }
     loadOptions(options, source) {
-        if (!this.needsPlugin(source)) {
+        if (!this.needsPlugin(options) && !this.needsPlugin(source)) {
             return;
         }
         let infectionOptions = options.infection;
-        if ((infectionOptions === null || infectionOptions === void 0 ? void 0 : infectionOptions.load) === undefined) {
+        if (infectionOptions?.load === undefined) {
             options.infection = infectionOptions = new Infection_1.Infection();
         }
-        infectionOptions.load(source === null || source === void 0 ? void 0 : source.infection);
+        infectionOptions.load(source?.infection);
     }
     needsPlugin(options) {
-        var _a, _b;
-        return (_b = (_a = options === null || options === void 0 ? void 0 : options.infection) === null || _a === void 0 ? void 0 : _a.enable) !== null && _b !== void 0 ? _b : false;
+        return options?.infection?.enable ?? false;
     }
 }
-function loadInfectionPlugin(engine) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const plugin = new InfectionPlugin();
-        yield engine.addPlugin(plugin);
-        yield engine.addInteractor("particlesInfection", (container) => new ParticlesInfecter_1.ParticlesInfecter(container));
-    });
+async function loadInfectionPlugin(engine, refresh = true) {
+    const plugin = new InfectionPlugin();
+    await engine.addPlugin(plugin, refresh);
+    await engine.addInteractor("particlesInfection", (container) => new ParticlesInfecter_1.ParticlesInfecter(container), refresh);
 }
 exports.loadInfectionPlugin = loadInfectionPlugin;
 __exportStar(require("./Options/Interfaces/IInfection"), exports);

package/esm/Infecter.js

@@ -1,97 +1,95 @@
 export class Infecter {
     constructor(container) {
-        this.container = container;
+        this._nextInfectionStage = (particle) => {
+            const infectionOptions = this._container.actualOptions.infection, { infection } = particle;
+            if (!infectionOptions || !infection) {
+                return;
+            }
+            const stagesCount = infectionOptions.stages.length;
+            if (stagesCount <= 0 || infection.stage === undefined) {
+                return;
+            }
+            infection.time = 0;
+            if (stagesCount <= ++infection.stage) {
+                if (infectionOptions.cure) {
+                    delete infection.stage;
+                    delete infection.time;
+                    return;
+                }
+                else {
+                    infection.stage = 0;
+                    infection.time = 0;
+                }
+            }
+        };
+        this._container = container;
     }
     startInfection(particle, stage) {
-        const options = this.container.actualOptions;
-        if (!options.infection || !particle.infection) {
+        const infectionOptions = this._container.actualOptions.infection, { infection } = particle;
+        if (!infectionOptions || !infection) {
             return;
         }
-        const stages = options.infection.stages, stagesCount = stages.length;
+        const stages = infectionOptions.stages, stagesCount = stages.length;
         if (stage > stagesCount || stage < 0) {
             return;
         }
-        particle.infection.delay = 0;
-        particle.infection.delayStage = stage;
+        infection.delay = 0;
+        infection.delayStage = stage;
     }
     updateInfection(particle, delta) {
-        const infection = this.container.actualOptions.infection;
-        if (!infection || !particle.infection) {
+        const infectionOptions = this._container.actualOptions.infection, { infection } = particle;
+        if (!infectionOptions || !infection) {
             return;
         }
-        const stages = infection.stages, stagesCount = stages.length;
-        if (particle.infection.delay !== undefined && particle.infection.delayStage !== undefined) {
-            const stage = particle.infection.delayStage;
+        const stages = infectionOptions.stages, stagesCount = stages.length;
+        if (infection.delay !== undefined && infection.delayStage !== undefined) {
+            const stage = infection.delayStage;
             if (stage > stagesCount || stage < 0) {
                 return;
             }
-            if (particle.infection.delay >= infection.delay * 1000) {
-                particle.infection.stage = stage;
-                particle.infection.time = 0;
-                delete particle.infection.delay;
-                delete particle.infection.delayStage;
+            if (infection.delay >= infectionOptions.delay * 1000) {
+                infection.stage = stage;
+                infection.time = 0;
+                delete infection.delay;
+                delete infection.delayStage;
             }
             else {
-                particle.infection.delay += delta;
+                infection.delay += delta;
             }
         }
         else {
-            delete particle.infection.delay;
-            delete particle.infection.delayStage;
+            delete infection.delay;
+            delete infection.delayStage;
         }
-        if (particle.infection.stage !== undefined && particle.infection.time !== undefined) {
-            const infectionStage = stages[particle.infection.stage];
+        if (infection.stage !== undefined && infection.time !== undefined) {
+            const infectionStage = stages[infection.stage];
             if (infectionStage.duration !== undefined && infectionStage.duration >= 0) {
-                if (particle.infection.time > infectionStage.duration * 1000) {
-                    this.nextInfectionStage(particle);
+                if (infection.time > infectionStage.duration * 1000) {
+                    this._nextInfectionStage(particle);
                 }
                 else {
-                    particle.infection.time += delta;
+                    infection.time += delta;
                 }
             }
             else {
-                particle.infection.time += delta;
+                infection.time += delta;
             }
         }
         else {
-            delete particle.infection.stage;
-            delete particle.infection.time;
+            delete infection.stage;
+            delete infection.time;
         }
     }
     updateInfectionStage(particle, stage) {
-        const options = this.container.actualOptions;
-        if (!options.infection || !particle.infection) {
+        const options = this._container.actualOptions, { infection } = particle;
+        if (!options.infection || !infection) {
             return;
         }
         const stagesCount = options.infection.stages.length;
-        if (stage > stagesCount ||
-            stage < 0 ||
-            (particle.infection.stage !== undefined && particle.infection.stage > stage)) {
+        if (stage > stagesCount || stage < 0 || (infection.stage !== undefined && infection.stage > stage)) {
             return;
         }
-        particle.infection.stage = stage;
-        particle.infection.time = 0;
-    }
-    nextInfectionStage(particle) {
-        const options = this.container.actualOptions;
-        if (!options.infection || !particle.infection) {
-            return;
-        }
-        const stagesCount = options.infection.stages.length;
-        if (stagesCount <= 0 || particle.infection.stage === undefined) {
-            return;
-        }
-        particle.infection.time = 0;
-        if (stagesCount <= ++particle.infection.stage) {
-            if (options.infection.cure) {
-                delete particle.infection.stage;
-                delete particle.infection.time;
-                return;
-            }
-            else {
-                particle.infection.stage = 0;
-                particle.infection.time = 0;
-            }
-        }
+        infection.stage = stage;
+        infection.time = 0;
     }
 }

package/esm/InfectionInstance.js

@@ -1,12 +1,12 @@
-import { Infecter } from "./Infecter";
 import { itemFromArray } from "@tsparticles/engine";
+import { Infecter } from "./Infecter";
 export class InfectionInstance {
     constructor(container) {
-        this.container = container;
-        this.container.infecter = new Infecter(this.container);
+        this._container = container;
+        this._container.infecter = new Infecter(this._container);
     }
     particleFillColor(particle) {
-        const options = this.container.actualOptions;
+        const options = this._container.actualOptions;
         if (!particle.infection || !options.infection) {
             return;
         }
@@ -17,13 +17,12 @@ export class InfectionInstance {
         return this.particleFillColor(particle);
     }
     particlesSetup() {
-        var _a;
-        const options = this.container.actualOptions;
+        const options = this._container.actualOptions;
         if (!options.infection) {
             return;
         }
         for (let i = 0; i < options.infection.infections; i++) {
-            const notInfected = this.container.particles.array.filter((p) => {
+            const notInfected = this._container.particles.filter((p) => {
                 const infP = p;
                 if (!infP.infection) {
                     infP.infection = {};
@@ -31,7 +30,7 @@ export class InfectionInstance {
                 return infP.infection.stage === undefined;
             });
             const infected = itemFromArray(notInfected);
-            (_a = this.container.infecter) === null || _a === void 0 ? void 0 : _a.startInfection(infected, 0);
+            this._container.infecter?.startInfection(infected, 0);
         }
     }
 }

package/esm/ParticlesInfecter.js

@@ -8,46 +8,43 @@ export class ParticlesInfecter extends ParticlesInteractorBase {
     init() {
     }
     async interact(p1, delta) {
-        var _a, _b, _c, _d, _e;
         const infecter = this.container.infecter;
         if (!infecter) {
             return;
         }
         infecter.updateInfection(p1, delta.value);
-        if (((_a = p1.infection) === null || _a === void 0 ? void 0 : _a.stage) === undefined) {
+        if (p1.infection?.stage === undefined) {
             return;
         }
         const container = this.container, options = container.actualOptions, infectionOptions = options.infection;
-        if (!(infectionOptions === null || infectionOptions === void 0 ? void 0 : infectionOptions.enable) || infectionOptions.stages.length < 1) {
+        if (!infectionOptions?.enable || infectionOptions.stages.length < 1) {
             return;
         }
-        const infectionStage1 = infectionOptions.stages[p1.infection.stage], pxRatio = container.retina.pixelRatio, radius = p1.getRadius() * 2 + infectionStage1.radius * pxRatio, pos = p1.getPosition(), infectedStage1 = (_b = infectionStage1.infectedStage) !== null && _b !== void 0 ? _b : p1.infection.stage, query = container.particles.quadTree.queryCircle(pos, radius), infections = infectionStage1.rate, neighbors = query.length;
+        const infectionStage1 = infectionOptions.stages[p1.infection.stage], pxRatio = container.retina.pixelRatio, radius = p1.getRadius() * 2 + infectionStage1.radius * pxRatio, pos = p1.getPosition(), infectedStage1 = infectionStage1.infectedStage ?? p1.infection.stage, query = container.particles.quadTree.queryCircle(pos, radius), infections = infectionStage1.rate, neighbors = query.length;
         for (const p2 of query) {
             const infP2 = p2;
             if (infP2 === p1 ||
                 infP2.destroyed ||
                 infP2.spawning ||
-                !(((_c = infP2.infection) === null || _c === void 0 ? void 0 : _c.stage) === undefined || infP2.infection.stage !== p1.infection.stage)) {
+                !(infP2.infection?.stage === undefined || infP2.infection.stage !== p1.infection.stage) ||
+                getRandom() >= infections / neighbors) {
                 continue;
             }
-            if (getRandom() < infections / neighbors) {
-                if (((_d = infP2.infection) === null || _d === void 0 ? void 0 : _d.stage) === undefined) {
-                    infecter.startInfection(infP2, infectedStage1);
-                }
-                else if (infP2.infection.stage < p1.infection.stage) {
-                    infecter.updateInfectionStage(infP2, infectedStage1);
-                }
-                else if (infP2.infection.stage > p1.infection.stage) {
-                    const infectionStage2 = infectionOptions.stages[infP2.infection.stage];
-                    const infectedStage2 = (_e = infectionStage2 === null || infectionStage2 === void 0 ? void 0 : infectionStage2.infectedStage) !== null && _e !== void 0 ? _e : infP2.infection.stage;
-                    infecter.updateInfectionStage(p1, infectedStage2);
-                }
+            if (infP2.infection?.stage === undefined) {
+                infecter.startInfection(infP2, infectedStage1);
+            }
+            else if (infP2.infection.stage < p1.infection.stage) {
+                infecter.updateInfectionStage(infP2, infectedStage1);
+            }
+            else if (infP2.infection.stage > p1.infection.stage) {
+                const infectionStage2 = infectionOptions.stages[infP2.infection.stage];
+                const infectedStage2 = infectionStage2?.infectedStage ?? infP2.infection.stage;
+                infecter.updateInfectionStage(p1, infectedStage2);
             }
         }
     }
     isEnabled() {
-        var _a, _b, _c;
-        return (_c = (_b = (_a = this.container.actualOptions) === null || _a === void 0 ? void 0 : _a.infection) === null || _b === void 0 ? void 0 : _b.enable) !== null && _c !== void 0 ? _c : false;
+        return this.container.actualOptions?.infection?.enable ?? false;
     }
     reset() {
     }

package/esm/index.js

@@ -9,24 +9,23 @@ class InfectionPlugin {
         return new InfectionInstance(container);
     }
     loadOptions(options, source) {
-        if (!this.needsPlugin(source)) {
+        if (!this.needsPlugin(options) && !this.needsPlugin(source)) {
             return;
         }
         let infectionOptions = options.infection;
-        if ((infectionOptions === null || infectionOptions === void 0 ? void 0 : infectionOptions.load) === undefined) {
+        if (infectionOptions?.load === undefined) {
             options.infection = infectionOptions = new Infection();
         }
-        infectionOptions.load(source === null || source === void 0 ? void 0 : source.infection);
+        infectionOptions.load(source?.infection);
     }
     needsPlugin(options) {
-        var _a, _b;
-        return (_b = (_a = options === null || options === void 0 ? void 0 : options.infection) === null || _a === void 0 ? void 0 : _a.enable) !== null && _b !== void 0 ? _b : false;
+        return options?.infection?.enable ?? false;
     }
 }
-export async function loadInfectionPlugin(engine) {
+export async function loadInfectionPlugin(engine, refresh = true) {
     const plugin = new InfectionPlugin();
-    await engine.addPlugin(plugin);
-    await engine.addInteractor("particlesInfection", (container) => new ParticlesInfecter(container));
+    await engine.addPlugin(plugin, refresh);
+    await engine.addInteractor("particlesInfection", (container) => new ParticlesInfecter(container), refresh);
 }
 export * from "./Options/Interfaces/IInfection";
 export * from "./Options/Interfaces/IInfectionStage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsparticles/plugin-infection",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-beta.0",
   "description": "tsParticles infection plugin",
   "homepage": "https://particles.js.org",
   "repository": {
@@ -72,6 +72,10 @@
       "type": "github",
       "url": "https://github.com/sponsors/matteobruni"
     },
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/tsparticles"
+    },
     {
       "type": "buymeacoffee",
       "url": "https://www.buymeacoffee.com/matteobruni"
@@ -82,10 +86,11 @@
   "unpkg": "tsparticles.plugin.infection.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"
   }
-}
+}