Suppress cache warnings when attempting to load the same asset (#8949)

pixijs · Dec 12, 2022 · b9fbbfc · b9fbbfc
1 parent 66c6847
commit b9fbbfc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/packages/assets/test/assets.tests.ts b/packages/assets/test/assets.tests.ts
@@ -404,4 +404,20 @@ describe('Assets', () =>
 
         expect(font).toBeInstanceOf(FontFace);
     });
+
+    it('should not show a cache warning if the same asset is loaded twice', async () =>
+    {
+        await Assets.init({
+            basePath,
+        });
+
+        const spy = jest.spyOn(console, 'warn');
+
+        const bunnyPromise = Assets.load('textures/bunny.png');
+        const bunnyPromise2 = Assets.load('textures/bunny.png');
+
+        await Promise.all([bunnyPromise, bunnyPromise2]);
+
+        expect(spy).not.toHaveBeenCalled();
+    });
 });
diff --git a/packages/core/src/textures/BaseTexture.ts b/packages/core/src/textures/BaseTexture.ts
@@ -669,7 +669,8 @@ export class BaseTexture<R extends Resource = Resource, RO = IAutoDetectOptions>
                 baseTexture.textureCacheIds.push(id);
             }
 
-            if (BaseTextureCache[id])
+            // only throw a warning if there is a different base texture mapped to this id.
+            if (BaseTextureCache[id] && BaseTextureCache[id] !== baseTexture)
             {
                 // eslint-disable-next-line no-console
                 console.warn(`BaseTexture added to the cache with an id [${id}] that already had an entry`);

diff --git a/packages/core/src/textures/Texture.ts b/packages/core/src/textures/Texture.ts
@@ -520,7 +520,8 @@ export class Texture<R extends Resource = Resource> extends EventEmitter
                 texture.textureCacheIds.push(id);
             }
 
-            if (TextureCache[id])
+            // only throw a warning if there is a different texture mapped to this id.
+            if (TextureCache[id] && TextureCache[id] !== texture)
             {
                 // eslint-disable-next-line no-console
                 console.warn(`Texture added to the cache with an id [${id}] that already had an entry`);