From 65deabc6b7a775c42ce6dd8f1e24a0a2a5b490d6 Mon Sep 17 00:00:00 2001 From: Mykola Chykin Date: Wed, 21 May 2025 19:13:27 -0700 Subject: [PATCH] update flame to 1.28.1 --- example/lib/main.dart | 5 +- example/pubspec.lock | 38 +++---- example/pubspec.yaml | 7 +- lib/.DS_Store | Bin 6148 -> 6148 bytes lib/src/ldtk_component.dart | 6 +- lib/src/renderable_tile_map.dart | 6 +- pubspec.lock | 174 ++++++++++++++++++------------- pubspec.yaml | 4 +- 8 files changed, 130 insertions(+), 110 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index c090faa..e3eaeff 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,6 @@ // ignore: depend_on_referenced_packages import 'package:collection/collection.dart'; +import 'package:flame/camera.dart'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame_ldtk/flame_ldtk.dart'; @@ -55,7 +56,7 @@ class LdtkGame extends FlameGame { // final coins = await Flame.images.load('coins.png'); // camera.zoom = .5; - camera.viewport = FixedResolutionViewport(Vector2(512, 256)); + camera.viewport = FixedResolutionViewport( resolution: Vector2(512, 256),); // We are 100% sure that an object layer named `AnimatedCoins` // exists in the example `map.tmx`. @@ -86,7 +87,7 @@ class LdtkGame extends FlameGame { // Pan the camera down and right for 10 seconds, then reverse if (time % 20 < 10) { - cameraTarget = mapComponent.size - camera.viewport.effectiveSize; + cameraTarget = mapComponent.size - camera.viewport.size; } else { cameraTarget.setZero(); } diff --git a/example/pubspec.lock b/example/pubspec.lock index d634b09..e4a42f0 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,26 +5,26 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.4.0" collection: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.19.1" flame: dependency: "direct main" description: name: flame - sha256: "0c55f8d704f09536125c811a19d9aab7407dce245b2bfb507e84296c1c996202" + sha256: f9e7a100c25f8d6bfd143bf325a9689c509216cd1c8133ce4684955c56770de7 url: "https://pub.dev" source: hosted - version: "1.6.0" + version: "1.28.1" flame_ldtk: dependency: "direct main" description: @@ -45,14 +45,6 @@ packages: description: flutter source: sdk version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" ldtk: dependency: transitive description: @@ -66,31 +58,31 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.16.0" ordered_set: dependency: transitive description: name: ordered_set - sha256: "74b0454418f58c34c8e527d91fb1ef571297dbcd5d3b4e5f983dc884e39cdf85" + sha256: dc68b8f1abc7115b81cf890bf7d2ece4ed1d95e0f3e486ab4b64ab3d16d2ea42 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "7.0.0" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" vector_math: dependency: transitive description: @@ -100,5 +92,5 @@ packages: source: hosted version: "2.1.4" sdks: - dart: ">=2.18.2 <3.0.0" - flutter: ">=3.3.0" + dart: ">=3.7.0-0 <4.0.0" + flutter: ">=3.27.1" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index b4a084a..bbbb0d0 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -7,7 +7,7 @@ environment: sdk: ">=2.17.0 <3.0.0" dependencies: - flame: ^1.6.0 + flame: ^1.28.1 flame_ldtk: path: ../ flutter: @@ -19,3 +19,8 @@ flutter: uses-material-design: true assets: - assets/ + - assets/ldtk/ + - assets/ldtk/atlas/ + - assets/ldtk/linear/ + - assets/ldtk/map_4/ + - assets/ldtk/third_map/ diff --git a/lib/.DS_Store b/lib/.DS_Store index 9a874b5768f336915163bb88cd434575b859f936..ddaf23e3e8b95382f8a5fdd1dcf04cb51cd64003 100644 GIT binary patch delta 142 zcmZoMXfc=|&e%3FQH+&?fq{WzVxou)6OaJ{AexbZL4YASCn-Na2gqb#o|vei4iaZ( zC}t>PNKPq6l7k4P0mZ<|HztO%Pc{%?+04zs!@=0LG4VU|WPTAvQIK{8AWi^ckeLU7 Lm|?S{$bM!3hXfmv delta 103 zcmZoMXfc=|&Zs)EP*|Ulfq{XUp_rkFAvvWuIVUMUKL;cP224;IBml$$49Phg*G92V pyb!#ZokM_wQFY_N@640=MHD$fDiT1dC!6pnZ%z extends PositionComponent - with HasGameRef { + with HasGameReference { /// {@macro _ldtk_component} LdtkComponent( this.tileMap, { @@ -84,7 +84,7 @@ class LdtkComponent extends PositionComponent Future? onLoad() async { super.onLoad(); // Automatically use the FlameGame camera if it's not already set. - tileMap.camera ??= gameRef.camera; + tileMap.camera ??= game.camera; } @override @@ -108,7 +108,7 @@ class LdtkComponent extends PositionComponent static Future load( String fileName, { int? priority, - Camera? camera, + CameraComponent? camera, bool simpleMode = false, bool compositeAllLevels = false, }) async { diff --git a/lib/src/renderable_tile_map.dart b/lib/src/renderable_tile_map.dart index aa39b5d..a908772 100644 --- a/lib/src/renderable_tile_map.dart +++ b/lib/src/renderable_tile_map.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:io'; import 'dart:math'; import 'dart:ui'; @@ -34,7 +33,7 @@ class RenderableLdtkMap { /// Camera used for determining the current viewport for layer rendering. /// Optional, but required for parallax support - Camera? camera; + CameraComponent? camera; /// Local path for the main .ldtk file, used to get the path of tileset /// images, and will support external .ldtkl levels in the future @@ -88,7 +87,6 @@ class RenderableLdtkMap { final ldtkPath = Uri.file( 'assets/ldtk/$fileName', - windows: Platform.isWindows, ); final ldtkProjectName = fileName.substring(0, fileName.length - 5); @@ -107,7 +105,7 @@ class RenderableLdtkMap { Image? image; if (tileset.embedAtlas != EmbedAtlas.LDTK_ICONS) { image = await (Flame.images..prefix = '').load( - tilesetImagePath.toFilePath(windows: Platform.isWindows), + tilesetImagePath.toFilePath(), ); tilesetsDefinitions[tileset.uid ?? -1] = image; } diff --git a/pubspec.lock b/pubspec.lock index 643c2cd..17f3e74 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,74 +5,74 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" + sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f url: "https://pub.dev" source: hosted - version: "52.0.0" + version: "82.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 + sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "7.4.5" args: dependency: transitive description: name: args - sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611" + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.7.0" async: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.2.1" - cli_util: + version: "1.4.0" + cli_config: dependency: transitive description: - name: cli_util - sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + name: cli_config + sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec url: "https://pub.dev" source: hosted - version: "0.3.5" + version: "0.2.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: "direct main" description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.19.1" convert: dependency: transitive description: @@ -85,42 +85,42 @@ packages: dependency: transitive description: name: coverage - sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097" + sha256: "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d" url: "https://pub.dev" source: hosted - version: "1.6.3" + version: "1.13.1" crypto: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.6" csslib: dependency: transitive description: name: csslib - sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "0.17.2" + version: "1.0.2" dartdoc: dependency: "direct dev" description: name: dartdoc - sha256: f9bf2fbf11e5dce3ffd085e1169f6218b632318403cb3f5762619e4d092e1e68 + sha256: eb152ab07c585adb11cc24b7b93280a02f6ac5ff724cca4e6cabb24e8be88c82 url: "https://pub.dev" source: hosted - version: "6.1.5" + version: "8.3.3" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" file: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: "direct main" description: name: flame - sha256: "0c55f8d704f09536125c811a19d9aab7407dce245b2bfb507e84296c1c996202" + sha256: f9e7a100c25f8d6bfd143bf325a9689c509216cd1c8133ce4684955c56770de7 url: "https://pub.dev" source: hosted - version: "1.6.0" + version: "1.28.1" flutter: dependency: "direct main" description: flutter @@ -159,18 +159,18 @@ packages: dependency: transitive description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.3" html: dependency: transitive description: name: html - sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269 + sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602" url: "https://pub.dev" source: hosted - version: "0.15.1" + version: "0.15.6" http_multi_server: dependency: transitive description: @@ -212,6 +212,30 @@ packages: url: "https://github.com/foamify/ldtk.dart.git" source: git version: "1.0.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + url: "https://pub.dev" + source: hosted + version: "10.0.9" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" logging: dependency: transitive description: @@ -224,34 +248,34 @@ packages: dependency: transitive description: name: markdown - sha256: c2b81e184067b41d0264d514f7cdaa2c02d38511e39d6521a1ccc238f6d7b3f2 + sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1" url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "7.3.0" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.11.1" meta: dependency: "direct main" description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.16.0" mime: dependency: transitive description: @@ -272,10 +296,10 @@ packages: dependency: transitive description: name: ordered_set - sha256: "74b0454418f58c34c8e527d91fb1ef571297dbcd5d3b4e5f983dc884e39cdf85" + sha256: dc68b8f1abc7115b81cf890bf7d2ece4ed1d95e0f3e486ab4b64ab3d16d2ea42 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "7.0.0" package_config: dependency: transitive description: @@ -288,10 +312,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" pool: dependency: transitive description: @@ -304,10 +328,10 @@ packages: dependency: transitive description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" shelf: dependency: transitive description: @@ -344,7 +368,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_map_stack_trace: dependency: transitive description: @@ -365,66 +389,66 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test: dependency: "direct dev" description: name: test - sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d + sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" url: "https://pub.dev" source: hosted - version: "1.22.0" + version: "1.25.15" test_api: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.7.4" test_core: dependency: transitive description: name: test_core - sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888" + sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" url: "https://pub.dev" source: hosted - version: "0.4.20" + version: "0.6.8" typed_data: dependency: transitive description: @@ -453,18 +477,18 @@ packages: dependency: transitive description: name: vm_service - sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "9.4.0" + version: "15.0.0" watcher: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.1" web_socket_channel: dependency: transitive description: @@ -485,10 +509,10 @@ packages: dependency: transitive description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.3" sdks: - dart: ">=2.19.0 <3.0.0" - flutter: ">=3.3.0" + dart: ">=3.7.0-0 <4.0.0" + flutter: ">=3.27.1" diff --git a/pubspec.yaml b/pubspec.yaml index 246a20f..00f8ef0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: collection: ^1.17.0 - flame: ^1.6.0 + flame: ^1.28.1 flutter: sdk: flutter ldtk: @@ -17,7 +17,7 @@ dependencies: meta: ^1.7.0 dev_dependencies: - dartdoc: ^6.1.5 + dartdoc: ^8.3.3 very_good_analysis: ^4.0.0+1 flutter_test: sdk: flutter