feat: Omit TiledImage without source from TiledMap.tiledImages (#68)

flame-engine · Mar 28, 2023 · 41c9439 · 41c9439
1 parent 1d3043f
commit 41c9439
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 5 deletions.
diff --git a/packages/tiled/lib/src/tiled_map.dart b/packages/tiled/lib/src/tiled_map.dart
@@ -205,17 +205,22 @@ class TiledMap {
     final imageSet = <TiledImage>{};
     for (var i = 0; i < tilesets.length; ++i) {
       final image = tilesets[i].image;
-      if (image != null) {
-        imageSet.add(image);
+      if (image?.source != null) {
+        imageSet.add(image!);
       }
       for (var j = 0; j < tilesets[i].tiles.length; ++j) {
         final image = tilesets[i].tiles[j].image;
-        if (image != null) {
-          imageSet.add(image);
+        if (image?.source != null) {
+          imageSet.add(image!);
         }
       }
     }
-    imageSet.addAll(layers.whereType<ImageLayer>().map((e) => e.image));
+    imageSet.addAll(
+      layers
+          .whereType<ImageLayer>()
+          .map((e) => e.image)
+          .where((e) => e.source != null),
+    );
     return imageSet.toList();
   }
 

diff --git a/packages/tiled/test/map_test.dart b/packages/tiled/test/map_test.dart
@@ -287,6 +287,70 @@ void main() {
     });
   });
 
+  group('Map.tiledImages', () {
+    late TiledMap map;
+    setUp(() {
+      map = TiledMap(
+        width: 10,
+        height: 10,
+        tileWidth: 16,
+        tileHeight: 16,
+        layers: [
+          ImageLayer(
+            name: 'image layer 1',
+            image: const TiledImage(),
+            repeatX: false,
+            repeatY: false,
+          ),
+          ImageLayer(
+            name: 'image layer 2',
+            image: const TiledImage(source: 'image_layer_2.png'),
+            repeatX: false,
+            repeatY: false,
+          ),
+        ],
+        tilesets: [
+          Tileset(
+            name: 'tileset 1',
+            image: const TiledImage(source: 'tileset_1.png'),
+          ),
+          Tileset(
+            name: 'tileset 2',
+            image: const TiledImage(),
+          ),
+          Tileset(
+            name: 'tileset 3',
+            tiles: [
+              Tile(
+                localId: 0,
+                image: const TiledImage(source: 'tile_0.png'),
+              ),
+              Tile(
+                localId: 1,
+                image: const TiledImage(),
+              ),
+            ],
+          )
+        ],
+      );
+    });
+    test('returns images with source', () {
+      final imageSources = map.tiledImages().map((e) => e.source);
+
+      expect(imageSources, hasLength(3));
+      expect(
+        imageSources,
+        containsAll(
+          <String>[
+            'image_layer_2.png',
+            'tileset_1.png',
+            'tile_0.png',
+          ],
+        ),
+      );
+    });
+  });
+
   group('Map.getTileSet', () {
     late TiledMap map;
     final tileset = Tileset(