add test

pixijs · Sep 3, 2024 · 54518cb · 54518cb
1 parent 089c388
commit 54518cb
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/packages/assetpack/src/texture-packer/texturePacker.ts b/packages/assetpack/src/texture-packer/texturePacker.ts
@@ -69,7 +69,7 @@ export function texturePacker(_options: TexturePackerOptions = {}): AssetPipe<Te
                 nameStyle: 'relative',
                 ..._options.texturePacker,
             },
-            addFrameNames: false,
+            addFrameNames: _options.addFrameNames ?? false,
         },
         tags: {
             tps: 'tps',
@@ -133,7 +133,7 @@ export function texturePacker(_options: TexturePackerOptions = {}): AssetPipe<Te
             const assets: Asset[] = [];
 
             let checkedForClashes = false;
-            const imageNames: string[] = [];
+            const imageNames = new Set();
 
             Object.values(resolutionHash).sort((a, b) => b - a).forEach((resolution) =>
             {
@@ -151,6 +151,14 @@ export function texturePacker(_options: TexturePackerOptions = {}): AssetPipe<Te
                         resolution,
                     });
 
+                    if (options.addFrameNames)
+                    {
+                        out.jsons.forEach(({ json }) =>
+                        {
+                            Object.keys(json.frames).forEach((frame) => imageNames.add(frame));
+                        });
+                    }
+
                     const outPromises: Promise<void>[] = [];
 
                     for (let i = 0; i < out.textures.length; i++)
@@ -164,8 +172,6 @@ export function texturePacker(_options: TexturePackerOptions = {}): AssetPipe<Te
 
                         const { json, name: jsonName } = out.jsons[i];
 
-                        imageNames.push(...Object.keys(json.frames));
-
                         const jsonAsset = createNewAssetAt(asset, jsonName);
 
                         if (!checkedForClashes)
@@ -192,7 +198,7 @@ export function texturePacker(_options: TexturePackerOptions = {}): AssetPipe<Te
 
             if (options.addFrameNames)
             {
-                asset.metaData.frameNames = imageNames;
+                asset.metaData.frameNames = Array.from(imageNames);
             }
 
             return assets;

diff --git a/packages/assetpack/test/manifest/Manifest.test.ts b/packages/assetpack/test/manifest/Manifest.test.ts
@@ -121,6 +121,7 @@ describe('Manifest', () =>
                     resolutionOptions: {
                         maximumTextureSize: 512,
                     },
+                    addFrameNames: true,
                 }),
                 mipmap(),
                 compress({
@@ -183,10 +184,34 @@ describe('Manifest', () =>
                         'bundle/tps-0.png.json'],
                     data: {
                         tags: {
-                            tps: true,
                             m: true,
+                            tps: true,
+                            frameNames: [
+                                'sprite9.png',
+                                'sprite8.png',
+                                'sprite7.png',
+                                'sprite6.png',
+                                'sprite5.png',
+                                'sprite4.png',
+                                'sprite3.png',
+                                'sprite2.png',
+                                'sprite1.png',
+                                'sprite0.png'
+                            ]
                         },
-                    },
+                        frameNames: [
+                            'sprite9.png',
+                            'sprite8.png',
+                            'sprite7.png',
+                            'sprite6.png',
+                            'sprite5.png',
+                            'sprite4.png',
+                            'sprite3.png',
+                            'sprite2.png',
+                            'sprite1.png',
+                            'sprite0.png'
+                        ]
+                    }
                 },
             ],
         });