@tsparticles/shape-image 4.0.0-alpha.5 → 4.0.0-beta.0

package/esm/ImageDrawer.js

@@ -1,27 +1,12 @@
 import { defaultAlpha, defaultRatio, double, } from "@tsparticles/engine";
-import { replaceImageColor } from "./Utils.js";
+import { replaceImageColor, shapeTypes } from "./Utils.js";
 import { drawGif } from "./GifUtils/Utils.js";
 const sides = 12;
 export class ImageDrawer {
+    _engine;
     constructor(engine) {
-        this.validTypes = ["image", "images"];
-        this.loadImageShape = async (imageShape) => {
-            if (!this._engine.loadImage) {
-                throw new Error(`Image shape not initialized`);
-            }
-            await this._engine.loadImage({
-                gif: imageShape.gif,
-                name: imageShape.name,
-                replaceColor: imageShape.replaceColor,
-                src: imageShape.src,
-            });
-        };
         this._engine = engine;
     }
-    addImage(image) {
-        this._engine.images ??= [];
-        this._engine.images.push(image);
-    }
     draw(data) {
         const { context, radius, particle, opacity } = data, image = particle.image, element = image?.element;
         if (!image) {
@@ -29,7 +14,7 @@ export class ImageDrawer {
         }
         context.globalAlpha = opacity;
         if (image.gif && image.gifData) {
-            drawGif(data);
+            drawGif(data, particle.container.canvas.settings);
         }
         else if (element) {
             const ratio = image.ratio, pos = {
@@ -48,36 +33,38 @@ export class ImageDrawer {
         if (!options.preload || !this._engine.loadImage) {
             return;
         }
+        const promises = [];
         for (const imageData of options.preload) {
-            await this._engine.loadImage(imageData);
+            promises.push(this._engine.loadImage(container, imageData));
         }
+        await Promise.all(promises);
     }
     loadShape(particle) {
-        if (particle.shape !== "image" && particle.shape !== "images") {
+        const { container } = particle;
+        if (!particle.shape || !shapeTypes.includes(particle.shape)) {
             return;
         }
-        this._engine.images ??= [];
         const imageData = particle.shapeData;
         if (!imageData) {
             return;
         }
-        const image = this._engine.images.find((t) => t.name === imageData.name || t.source === imageData.src);
-        if (!image) {
-            void this.loadImageShape(imageData).then(() => {
-                this.loadShape(particle);
-            });
+        const images = this._engine.getImages?.(container), image = images?.find((t) => t.name === imageData.name || t.source === imageData.src);
+        if (image) {
+            return;
         }
+        void this.loadImageShape(container, imageData).then(() => {
+            this.loadShape(particle);
+        });
     }
     particleInit(container, particle) {
         if (particle.shape !== "image" && particle.shape !== "images") {
             return;
         }
-        this._engine.images ??= [];
-        const images = this._engine.images, imageData = particle.shapeData;
+        const images = this._engine.getImages?.(container), imageData = particle.shapeData;
         if (!imageData) {
             return;
         }
-        const color = particle.getFillColor(), image = images.find((t) => t.name === imageData.name || t.source === imageData.src);
+        const color = particle.getFillColor(), image = images?.find((t) => t.name === imageData.name || t.source === imageData.src);
         if (!image) {
             return;
         }
@@ -102,9 +89,7 @@ export class ImageDrawer {
                     gifData: image.gifData,
                     gifLoopCount: image.gifLoopCount,
                     loaded: true,
-                    ratio: imageData.width && imageData.height
-                        ? imageData.width / imageData.height
-                        : (image.ratio ?? defaultRatio),
+                    ratio: imageData.width && imageData.height ? imageData.width / imageData.height : (image.ratio ?? defaultRatio),
                     replaceColor: replaceColor,
                     source: imageData.src,
                 };
@@ -112,14 +97,23 @@ export class ImageDrawer {
             if (!imageRes.ratio) {
                 imageRes.ratio = 1;
             }
-            const fill = imageData.fill ?? particle.shapeFill, close = imageData.close ?? particle.shapeClose, imageShape = {
+            const close = imageData.close ?? particle.shapeClose, imageShape = {
                 image: imageRes,
-                fill,
                 close,
             };
             particle.image = imageShape.image;
-            particle.shapeFill = imageShape.fill;
             particle.shapeClose = imageShape.close;
         })();
     }
+    loadImageShape = async (container, imageShape) => {
+        if (!this._engine.loadImage) {
+            throw new Error(`Image shape not initialized`);
+        }
+        await this._engine.loadImage(container, {
+            gif: imageShape.gif,
+            name: imageShape.name,
+            replaceColor: imageShape.replaceColor,
+            src: imageShape.src,
+        });
+    };
 }

package/esm/ImagePreloader.js

@@ -1,11 +1,13 @@
 import { Preload } from "./Options/Classes/Preload.js";
 export class ImagePreloaderPlugin {
-    constructor() {
-        this.id = "imagePreloader";
+    id = "image-preloader";
+    _engine;
+    constructor(engine) {
+        this._engine = engine;
     }
-    async getPlugin() {
-        await Promise.resolve();
-        return {};
+    async getPlugin(container) {
+        const { ImagePreloaderInstance } = await import("./ImagePreloaderInstance.js");
+        return new ImagePreloaderInstance(this._engine, container);
     }
     loadOptions(_container, options, source) {
         if (!source?.preload) {

package/esm/ImagePreloaderInstance.js

@@ -0,0 +1,11 @@
+export class ImagePreloaderInstance {
+    _container;
+    _engine;
+    constructor(engine, container) {
+        this._engine = engine;
+        this._container = container;
+    }
+    destroy() {
+        this._engine.images?.delete(this._container);
+    }
+}

package/esm/Options/Classes/Preload.js

@@ -1,5 +1,11 @@
 import { isNull } from "@tsparticles/engine";
 export class Preload {
+    gif;
+    height;
+    name;
+    replaceColor;
+    src;
+    width;
     constructor() {
         this.src = "";
         this.gif = false;

package/esm/Utils.js

@@ -1,4 +1,5 @@
 import { getLogger, getStyleFromHsl } from "@tsparticles/engine";
+export const shapeTypes = ["image", "images"];
 const stringStart = 0, defaultOpacity = 1;
 const currentColorRegex = /(#(?:[0-9a-f]{2}){2,4}|(#[0-9a-f]{3})|(rgb|hsl)a?\((-?\d+%?[,\s]+){2,3}\s*[\d.]+%?\))|currentcolor/gi;
 function replaceColorSvg(imageShape, color, opacity, hdr = false) {
@@ -8,13 +9,13 @@ function replaceColorSvg(imageShape, color, opacity, hdr = false) {
     }
     const colorStyle = getStyleFromHsl(color, hdr, opacity);
     if (svgData.includes("fill")) {
-        return svgData.replace(currentColorRegex, () => colorStyle);
+        return svgData.replaceAll(currentColorRegex, () => colorStyle);
     }
     const preFillIndex = svgData.indexOf(">");
     return `${svgData.substring(stringStart, preFillIndex)} fill="${colorStyle}"${svgData.substring(preFillIndex)}`;
 }
 export async function loadImage(image) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
         image.loading = true;
         const img = new Image();
         image.element = img;
@@ -39,12 +40,12 @@ export async function downloadSvgImage(image) {
     }
     image.loading = true;
     const response = await fetch(image.source);
-    if (!response.ok) {
-        getLogger().error("Image not found");
-        image.error = true;
+    if (response.ok) {
+        image.svgData = await response.text();
     }
     else {
-        image.svgData = await response.text();
+        getLogger().error("Image not found");
+        image.error = true;
     }
     image.loading = false;
 }

package/esm/index.js

@@ -1,14 +1,25 @@
+import { shapeTypes } from "./Utils.js";
 const extLength = 3;
 function addLoadImageToEngine(engine) {
-    if (engine.loadImage) {
-        return;
-    }
-    engine.loadImage = async (data) => {
+    engine.getImages ??= (container) => {
+        engine.images ??= new Map();
+        let images = engine.images.get(container);
+        if (!images) {
+            images = [];
+            engine.images.set(container, images);
+        }
+        return images;
+    };
+    engine.loadImage ??= async (container, data) => {
+        if (!engine.getImages) {
+            throw new Error("No images collection found");
+        }
         if (!data.name && !data.src) {
             throw new Error("No image source provided");
         }
-        engine.images ??= [];
-        if (engine.images.some((t) => t.name === data.name || t.source === data.src)) {
+        engine.images ??= new Map();
+        const containerImages = engine.getImages(container);
+        if (containerImages.some((t) => t.name === data.name || t.source === data.src)) {
             return;
         }
         try {
@@ -22,11 +33,12 @@ function addLoadImageToEngine(engine) {
                 replaceColor: data.replaceColor,
                 ratio: data.width && data.height ? data.width / data.height : undefined,
             };
-            engine.images.push(image);
+            containerImages.push(image);
+            engine.images.set(container, containerImages);
             let imageFunc;
             if (data.gif) {
                 const { loadGifImage } = await import("./GifUtils/Utils.js");
-                imageFunc = loadGifImage;
+                imageFunc = (img) => loadGifImage(img, { colorSpace: "srgb" });
             }
             else if (data.replaceColor) {
                 const { downloadSvgImage } = await import("./Utils.js");
@@ -44,12 +56,14 @@ function addLoadImageToEngine(engine) {
     };
 }
 export async function loadImageShape(engine) {
-    engine.checkVersion("4.0.0-alpha.5");
+    engine.checkVersion("4.0.0-beta.0");
     await engine.register(async (e) => {
-        const { ImageDrawer } = await import("./ImageDrawer.js"), { ImagePreloaderPlugin } = await import("./ImagePreloader.js");
+        const { ImagePreloaderPlugin } = await import("./ImagePreloader.js");
         addLoadImageToEngine(e);
-        const preloader = new ImagePreloaderPlugin();
-        e.addPlugin(preloader);
-        e.addShape(new ImageDrawer(e));
+        e.addPlugin(new ImagePreloaderPlugin(e));
+        e.addShape(shapeTypes, async () => {
+            const { ImageDrawer } = await import("./ImageDrawer.js");
+            return new ImageDrawer(e);
+        });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsparticles/shape-image",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-beta.0",
   "description": "tsParticles image shape",
   "homepage": "https://particles.js.org",
   "repository": {
@@ -59,7 +59,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@tsparticles/engine": "4.0.0-alpha.5"
+    "@tsparticles/engine": "4.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"