fix: Possibility to create RenderableTiledMap from TiledMap

packages/flame_tiled/lib/src/renderable_tile_map.dart

@@ -5,7 +5,6 @@ import 'package:flame/extensions.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/sprite.dart';
 import 'package:tiled/tiled.dart';
-import 'package:xml/xml.dart';
 
 import 'flame_tsx_provider.dart';
 import 'simple_flips.dart';
@@ -103,7 +102,18 @@ class RenderableTiledMap {
  String contents,
  Vector2 destTileSize,
  ) async {
- final map = await _loadMap(contents);
+ final map = await TiledMap.fromString(
+ contents,
+ FlameTsxProvider.parse,
+ );
+ return fromTiledMap(map, destTileSize);
+ }
+
+ /// Parses a [TiledMap] returning a [RenderableTiledMap].
+ static Future<RenderableTiledMap> fromTiledMap(
+ TiledMap map,
+ Vector2 destTileSize,
+ ) async {
  final batchesByLayer = await Future.wait(
  _renderableTileLayers(map).map((e) => _loadImages(map)),
  );
@@ -119,26 +129,6 @@ class RenderableTiledMap {
  return map.layers.where((layer) => layer.visible).whereType<TileLayer>();
  }
 
- static Future<TiledMap> _loadMap(String contents) async {
- final tsxSourcePaths = XmlDocument.parse(contents)
- .rootElement
- .children
- .whereType<XmlElement>()
- .where((element) => element.name.local == 'tileset')
- .map((e) => e.getAttribute('source'));
-
- final tsxProviders = await Future.wait(
- tsxSourcePaths
- .where((key) => key != null)
- .map((key) async => FlameTsxProvider.parse(key!)),
- );
-
- return TileMapParser.parseTmx(
- contents,
- tsxList: tsxProviders.isEmpty ? null : tsxProviders,
- );
- }
-
  static Future<Map<String, SpriteBatch>> _loadImages(TiledMap map) async {
  final result = <String, SpriteBatch>{};
 

packages/flame_tiled/pubspec.yaml

@@ -9,7 +9,7 @@ environment:
 
 dependencies:
  flame: ^1.1.0
- tiled: ^0.8.0
+ tiled: ^0.8.1
  xml: ^5.3.0
  meta: ^1.7.0
  collection: ^1.15.0