diff --git a/CHANGELOG.md b/CHANGELOG.md index fea575ef5..27dee9879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Moving render functions from `util.dart` to `extensions/canvas.dart` - Adapting ParallaxComponent contructors to match the pattern followed on other components - Adapting SpriteBatchComponent constructors to match the pattern used on other components + - Enabling direct import of Sprite and SpriteAnimation - Renamed `Composition` to `ImageComposition` to prevent confusion with the composition component - Added `rotation` and `anchor` arguments to `ImageComposition.add` diff --git a/doc/examples/isometric/lib/main.dart b/doc/examples/isometric/lib/main.dart index e971481f8..1b14c6c88 100644 --- a/doc/examples/isometric/lib/main.dart +++ b/doc/examples/isometric/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flame/gestures.dart'; -import 'package:flame/spritesheet.dart'; +import 'package:flame/sprite.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart' hide Image; diff --git a/doc/examples/particles/lib/main.dart b/doc/examples/particles/lib/main.dart index 0f7ea2b2b..92bedd509 100644 --- a/doc/examples/particles/lib/main.dart +++ b/doc/examples/particles/lib/main.dart @@ -6,7 +6,7 @@ import 'package:flame/components.dart' hide Timer; import 'package:flame/timer.dart' as flame_timer; import 'package:flame/game.dart'; import 'package:flame/particles.dart'; -import 'package:flame/spritesheet.dart'; +import 'package:flame/sprite.dart'; import 'package:flutter/material.dart' hide Image; void main() async { diff --git a/doc/examples/sprite_batch/lib/main.dart b/doc/examples/sprite_batch/lib/main.dart index 167032686..1f8b67974 100644 --- a/doc/examples/sprite_batch/lib/main.dart +++ b/doc/examples/sprite_batch/lib/main.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flame/components.dart'; import 'package:flutter/material.dart'; import 'package:flame/game.dart'; -import 'package:flame/sprite_batch.dart'; +import 'package:flame/sprite.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/doc/examples/sprite_batch/lib/main_auto_loading.dart b/doc/examples/sprite_batch/lib/main_auto_loading.dart index 7ecce8fd8..9eccdd92e 100644 --- a/doc/examples/sprite_batch/lib/main_auto_loading.dart +++ b/doc/examples/sprite_batch/lib/main_auto_loading.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flame/sprite_batch.dart'; +import 'package:flame/sprite.dart'; import 'package:flame/components.dart'; import 'package:flutter/material.dart'; import 'package:flame/game.dart'; diff --git a/doc/examples/spritesheet/lib/main.dart b/doc/examples/spritesheet/lib/main.dart index 12259da3f..ff0ee3017 100644 --- a/doc/examples/spritesheet/lib/main.dart +++ b/doc/examples/spritesheet/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flame/components.dart'; import 'package:flame/game.dart'; -import 'package:flame/spritesheet.dart'; +import 'package:flame/sprite.dart'; import 'package:flutter/material.dart'; void main() async { diff --git a/doc/examples/widgets/lib/main.dart b/doc/examples/widgets/lib/main.dart index 0bd804be5..99cdde28f 100644 --- a/doc/examples/widgets/lib/main.dart +++ b/doc/examples/widgets/lib/main.dart @@ -2,7 +2,7 @@ import 'package:flame/extensions.dart'; import 'package:flame/widgets.dart'; import 'package:flutter/material.dart' hide Animation; import 'package:flame/flame.dart'; -import 'package:flame/spritesheet.dart'; +import 'package:flame/sprite.dart'; import 'package:dashbook/dashbook.dart'; Anchor parseAnchor(String name) { diff --git a/doc/images.md b/doc/images.md index e145c240b..557d82097 100644 --- a/doc/images.md +++ b/doc/images.md @@ -45,6 +45,7 @@ Example: ```dart import 'package:flame/flame.dart'; +import 'package:flame/sprite.dart'; // inside an async context Image image = await Flame.images.load('player.png'); @@ -314,7 +315,7 @@ You can see a full example of the SpriteSheet class [here](https://github.com/fl Sprite sheets are big images with several frames of the same sprite on it and is a very good way to organize and keep your animations stored. Flame provides a very simple utility class to deal with SpriteSheets, with it you can load your sprite sheet image and extract animations from it. Below is a very simple example of how to use it: ```dart -import 'package:flame/spritesheet.dart'; +import 'package:flame/sprite.dart'; final spritesheet = SpriteSheet( image: imageInstance, diff --git a/lib/sprite.dart b/lib/sprite.dart new file mode 100644 index 000000000..77408fddb --- /dev/null +++ b/lib/sprite.dart @@ -0,0 +1,4 @@ +export 'src/sprite.dart'; +export 'src/sprite_animation.dart'; +export 'src/sprite_batch.dart'; +export 'src/spritesheet.dart'; diff --git a/lib/sprite_batch.dart b/lib/sprite_batch.dart deleted file mode 100644 index 790deceb8..000000000 --- a/lib/sprite_batch.dart +++ /dev/null @@ -1 +0,0 @@ -export 'src/sprite_batch.dart'; diff --git a/lib/spritesheet.dart b/lib/spritesheet.dart deleted file mode 100644 index b34ae469a..000000000 --- a/lib/spritesheet.dart +++ /dev/null @@ -1 +0,0 @@ -export 'src/spritesheet.dart';