From ebeb8e2d425508f8a9f9644ca0914ebb1658a094 Mon Sep 17 00:00:00 2001 From: Viktor Lidholt Date: Tue, 25 Aug 2015 16:08:46 -0700 Subject: [PATCH] Moves sky sprites to its own package --- examples/game/lib/game_demo.dart | 2 +- examples/game/lib/main.dart | 2 +- examples/game/pubspec.yaml | 3 +++ examples/game/test_drawatlas.dart | 3 +-- examples/game/test_performance.dart | 3 +-- packages/flutter_sprites/.gitignore | 7 +++++++ packages/flutter_sprites/README.md | 8 ++++++++ .../game => packages/flutter_sprites}/lib/action.dart | 2 +- .../flutter_sprites}/lib/action_spline.dart | 2 +- .../flutter_sprites}/lib/color_secuence.dart | 2 +- .../game => packages/flutter_sprites}/lib/constraint.dart | 2 +- .../game => packages/flutter_sprites}/lib/image_map.dart | 2 +- .../game => packages/flutter_sprites}/lib/layer.dart | 2 +- {examples/game => packages/flutter_sprites}/lib/node.dart | 2 +- .../game => packages/flutter_sprites}/lib/node3d.dart | 2 +- .../flutter_sprites}/lib/node_with_size.dart | 2 +- .../flutter_sprites}/lib/particle_system.dart | 2 +- .../flutter_sprites/lib/skysprites.dart | 2 +- .../game => packages/flutter_sprites}/lib/sound.dart | 2 +- .../flutter_sprites}/lib/sound_manager.dart | 2 +- .../game => packages/flutter_sprites}/lib/sprite.dart | 2 +- .../game => packages/flutter_sprites}/lib/sprite_box.dart | 2 +- .../flutter_sprites}/lib/sprite_widget.dart | 2 +- .../flutter_sprites}/lib/spritesheet.dart | 2 +- .../game => packages/flutter_sprites}/lib/texture.dart | 2 +- {examples/game => packages/flutter_sprites}/lib/util.dart | 2 +- .../flutter_sprites}/lib/virtual_joystick.dart | 2 +- packages/flutter_sprites/pubspec.yaml | 6 ++++++ 28 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 packages/flutter_sprites/.gitignore create mode 100644 packages/flutter_sprites/README.md rename {examples/game => packages/flutter_sprites}/lib/action.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/action_spline.dart (98%) rename {examples/game => packages/flutter_sprites}/lib/color_secuence.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/constraint.dart (98%) rename {examples/game => packages/flutter_sprites}/lib/image_map.dart (97%) rename {examples/game => packages/flutter_sprites}/lib/layer.dart (98%) rename {examples/game => packages/flutter_sprites}/lib/node.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/node3d.dart (98%) rename {examples/game => packages/flutter_sprites}/lib/node_with_size.dart (98%) rename {examples/game => packages/flutter_sprites}/lib/particle_system.dart (99%) rename examples/game/lib/sprites.dart => packages/flutter_sprites/lib/skysprites.dart (98%) rename {examples/game => packages/flutter_sprites}/lib/sound.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/sound_manager.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/sprite.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/sprite_box.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/sprite_widget.dart (98%) rename {examples/game => packages/flutter_sprites}/lib/spritesheet.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/texture.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/util.dart (99%) rename {examples/game => packages/flutter_sprites}/lib/virtual_joystick.dart (98%) create mode 100644 packages/flutter_sprites/pubspec.yaml diff --git a/examples/game/lib/game_demo.dart b/examples/game/lib/game_demo.dart index 1a7ce7d5588..cba7e05fb47 100644 --- a/examples/game/lib/game_demo.dart +++ b/examples/game/lib/game_demo.dart @@ -3,9 +3,9 @@ library game; import 'dart:async'; import 'dart:math' as math; import 'dart:sky' as sky; -import 'sprites.dart'; import 'package:sky/rendering/object.dart'; import 'package:sky/widgets/framework.dart'; +import 'package:skysprites/skysprites.dart'; part 'game_demo_node.dart'; diff --git a/examples/game/lib/main.dart b/examples/game/lib/main.dart index c6154512894..515c382bf5e 100644 --- a/examples/game/lib/main.dart +++ b/examples/game/lib/main.dart @@ -14,9 +14,9 @@ import 'package:sky/widgets/navigator.dart'; import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/title.dart'; import 'package:sky/widgets/theme.dart'; +import 'package:skysprites/skysprites.dart'; import 'game_demo.dart'; -import 'sprites.dart'; AssetBundle _initBundle() { if (rootBundle != null) diff --git a/examples/game/pubspec.yaml b/examples/game/pubspec.yaml index 259b8e1be77..69c481bc3fc 100644 --- a/examples/game/pubspec.yaml +++ b/examples/game/pubspec.yaml @@ -2,8 +2,11 @@ name: asteroids dependencies: sky: any sky_tools: any + skysprites: any dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons sky: path: ../../sky/packages/sky + skysprites: + path: ../../skysprites diff --git a/examples/game/test_drawatlas.dart b/examples/game/test_drawatlas.dart index 76fa427404d..56b70d0a4c0 100644 --- a/examples/game/test_drawatlas.dart +++ b/examples/game/test_drawatlas.dart @@ -1,5 +1,3 @@ -import 'lib/sprites.dart'; - import 'dart:sky'; import 'package:sky/mojo/asset_bundle.dart'; @@ -7,6 +5,7 @@ import 'package:sky/rendering/object.dart'; import 'package:sky/theme/colors.dart' as colors; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets.dart'; +import 'package:skysprites/skysprites.dart'; AssetBundle _initBundle() { if (rootBundle != null) diff --git a/examples/game/test_performance.dart b/examples/game/test_performance.dart index 97ebd9da746..c65e08d8022 100644 --- a/examples/game/test_performance.dart +++ b/examples/game/test_performance.dart @@ -5,8 +5,7 @@ import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/rendering/object.dart'; import 'package:sky/theme/colors.dart' as colors; import 'package:sky/widgets.dart'; - -import 'lib/sprites.dart'; +import 'package:skysprites/skysprites.dart'; AssetBundle _initBundle() { if (rootBundle != null) diff --git a/packages/flutter_sprites/.gitignore b/packages/flutter_sprites/.gitignore new file mode 100644 index 00000000000..1687d396dfa --- /dev/null +++ b/packages/flutter_sprites/.gitignore @@ -0,0 +1,7 @@ +.DS_Store +.idea +.packages +.pub/ +build/ +packages +pubspec.lock diff --git a/packages/flutter_sprites/README.md b/packages/flutter_sprites/README.md new file mode 100644 index 00000000000..0d4848f8948 --- /dev/null +++ b/packages/flutter_sprites/README.md @@ -0,0 +1,8 @@ +# skysprites + +A minimal Sky project. + +## Getting Started + +For help getting started with Sky, view our online +[documentation](https://github.com/domokit/sky_engine/blob/master/sky/packages/sky/README.md). diff --git a/examples/game/lib/action.dart b/packages/flutter_sprites/lib/action.dart similarity index 99% rename from examples/game/lib/action.dart rename to packages/flutter_sprites/lib/action.dart index 331da4a8950..01c9486a10a 100644 --- a/examples/game/lib/action.dart +++ b/packages/flutter_sprites/lib/action.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; typedef void ActionCallback(); diff --git a/examples/game/lib/action_spline.dart b/packages/flutter_sprites/lib/action_spline.dart similarity index 98% rename from examples/game/lib/action_spline.dart rename to packages/flutter_sprites/lib/action_spline.dart index 5b4a3515305..6f7fcf4dadb 100644 --- a/examples/game/lib/action_spline.dart +++ b/packages/flutter_sprites/lib/action_spline.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; Point _cardinalSplineAt(Point p0, Point p1, Point p2, Point p3, double tension, double t) { double t2 = t * t; diff --git a/examples/game/lib/color_secuence.dart b/packages/flutter_sprites/lib/color_secuence.dart similarity index 99% rename from examples/game/lib/color_secuence.dart rename to packages/flutter_sprites/lib/color_secuence.dart index 9ba85eefca9..8395bece233 100644 --- a/examples/game/lib/color_secuence.dart +++ b/packages/flutter_sprites/lib/color_secuence.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// A sequence of colors representing a gradient or a color transition over /// time. The sequence is represented by a list of [colors] and a list of diff --git a/examples/game/lib/constraint.dart b/packages/flutter_sprites/lib/constraint.dart similarity index 98% rename from examples/game/lib/constraint.dart rename to packages/flutter_sprites/lib/constraint.dart index 0833e54cd32..6a36acf2526 100644 --- a/examples/game/lib/constraint.dart +++ b/packages/flutter_sprites/lib/constraint.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; abstract class Constraint { void preUpdate(Node node, double dt) { diff --git a/examples/game/lib/image_map.dart b/packages/flutter_sprites/lib/image_map.dart similarity index 97% rename from examples/game/lib/image_map.dart rename to packages/flutter_sprites/lib/image_map.dart index f89492a73b4..16d5dcc13bd 100644 --- a/examples/game/lib/image_map.dart +++ b/packages/flutter_sprites/lib/image_map.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -part of sprites; +part of skysprites; class ImageMap { ImageMap(AssetBundle bundle) : _bundle = bundle; diff --git a/examples/game/lib/layer.dart b/packages/flutter_sprites/lib/layer.dart similarity index 98% rename from examples/game/lib/layer.dart rename to packages/flutter_sprites/lib/layer.dart index 4f8fc1c438d..18e02dea2e3 100644 --- a/examples/game/lib/layer.dart +++ b/packages/flutter_sprites/lib/layer.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// A [Node] that provides an intermediate rendering surface in the sprite /// rendering tree. A [Layer] can be used to change the opacity, color, or to diff --git a/examples/game/lib/node.dart b/packages/flutter_sprites/lib/node.dart similarity index 99% rename from examples/game/lib/node.dart rename to packages/flutter_sprites/lib/node.dart index bad9f4bfc2e..1ce3a005161 100644 --- a/examples/game/lib/node.dart +++ b/packages/flutter_sprites/lib/node.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; double convertDegrees2Radians(double degrees) => degrees * math.PI/180.8; diff --git a/examples/game/lib/node3d.dart b/packages/flutter_sprites/lib/node3d.dart similarity index 98% rename from examples/game/lib/node3d.dart rename to packages/flutter_sprites/lib/node3d.dart index 7b27bfae59c..c3e26b09a1a 100644 --- a/examples/game/lib/node3d.dart +++ b/packages/flutter_sprites/lib/node3d.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// An node that transforms its children using a 3D perspective projection. This /// node type can be used to create 3D flips and other similar effects. diff --git a/examples/game/lib/node_with_size.dart b/packages/flutter_sprites/lib/node_with_size.dart similarity index 98% rename from examples/game/lib/node_with_size.dart rename to packages/flutter_sprites/lib/node_with_size.dart index cef9d60f72f..8c7371b8346 100644 --- a/examples/game/lib/node_with_size.dart +++ b/packages/flutter_sprites/lib/node_with_size.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// The super class of any [Node] that has a size. /// diff --git a/examples/game/lib/particle_system.dart b/packages/flutter_sprites/lib/particle_system.dart similarity index 99% rename from examples/game/lib/particle_system.dart rename to packages/flutter_sprites/lib/particle_system.dart index a80edaffe77..b13853a53ff 100644 --- a/examples/game/lib/particle_system.dart +++ b/packages/flutter_sprites/lib/particle_system.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; class _Particle { Vector2 pos; diff --git a/examples/game/lib/sprites.dart b/packages/flutter_sprites/lib/skysprites.dart similarity index 98% rename from examples/game/lib/sprites.dart rename to packages/flutter_sprites/lib/skysprites.dart index 9521be3e1db..cdffb4a3901 100644 --- a/examples/game/lib/sprites.dart +++ b/packages/flutter_sprites/lib/skysprites.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -library sprites; +library skysprites; import 'dart:async'; import 'dart:convert'; diff --git a/examples/game/lib/sound.dart b/packages/flutter_sprites/lib/sound.dart similarity index 99% rename from examples/game/lib/sound.dart rename to packages/flutter_sprites/lib/sound.dart index b5ff1d9f391..902bbb5ee6d 100644 --- a/examples/game/lib/sound.dart +++ b/packages/flutter_sprites/lib/sound.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; // TODO: The sound effects should probably use Android's SoundPool instead of // MediaPlayer as it is more efficient and flexible for playing back sound effects diff --git a/examples/game/lib/sound_manager.dart b/packages/flutter_sprites/lib/sound_manager.dart similarity index 99% rename from examples/game/lib/sound_manager.dart rename to packages/flutter_sprites/lib/sound_manager.dart index 311da05f29b..4c0b3286868 100644 --- a/examples/game/lib/sound_manager.dart +++ b/packages/flutter_sprites/lib/sound_manager.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; enum SoundFadeMode { crossFade, diff --git a/examples/game/lib/sprite.dart b/packages/flutter_sprites/lib/sprite.dart similarity index 99% rename from examples/game/lib/sprite.dart rename to packages/flutter_sprites/lib/sprite.dart index d77681e0ca4..c567f0b07c3 100644 --- a/examples/game/lib/sprite.dart +++ b/packages/flutter_sprites/lib/sprite.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// A Sprite is a [Node] that renders a bitmap image to the screen. class Sprite extends NodeWithSize with SpritePaint { diff --git a/examples/game/lib/sprite_box.dart b/packages/flutter_sprites/lib/sprite_box.dart similarity index 99% rename from examples/game/lib/sprite_box.dart rename to packages/flutter_sprites/lib/sprite_box.dart index 264cc5f3a2b..cc357a06f0b 100644 --- a/examples/game/lib/sprite_box.dart +++ b/packages/flutter_sprites/lib/sprite_box.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// Options for setting up a [SpriteBox]. /// diff --git a/examples/game/lib/sprite_widget.dart b/packages/flutter_sprites/lib/sprite_widget.dart similarity index 98% rename from examples/game/lib/sprite_widget.dart rename to packages/flutter_sprites/lib/sprite_widget.dart index 7ddb51e23ef..02a2b59df19 100644 --- a/examples/game/lib/sprite_widget.dart +++ b/packages/flutter_sprites/lib/sprite_widget.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// A widget that uses a [SpriteBox] to render a sprite node tree to the screen. class SpriteWidget extends OneChildRenderObjectWrapper { diff --git a/examples/game/lib/spritesheet.dart b/packages/flutter_sprites/lib/spritesheet.dart similarity index 99% rename from examples/game/lib/spritesheet.dart rename to packages/flutter_sprites/lib/spritesheet.dart index 39bf503a288..57cf7168573 100644 --- a/examples/game/lib/spritesheet.dart +++ b/packages/flutter_sprites/lib/spritesheet.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// A sprite sheet packs a number of smaller images into a single large image. /// diff --git a/examples/game/lib/texture.dart b/packages/flutter_sprites/lib/texture.dart similarity index 99% rename from examples/game/lib/texture.dart rename to packages/flutter_sprites/lib/texture.dart index 39cc70e0829..28fbdacd075 100644 --- a/examples/game/lib/texture.dart +++ b/packages/flutter_sprites/lib/texture.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; /// A texture represents a rectangular area of an image and is typically used to draw a sprite to the screen. /// diff --git a/examples/game/lib/util.dart b/packages/flutter_sprites/lib/util.dart similarity index 99% rename from examples/game/lib/util.dart rename to packages/flutter_sprites/lib/util.dart index 5ff5d00a346..81c1a9e03d8 100644 --- a/examples/game/lib/util.dart +++ b/packages/flutter_sprites/lib/util.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; math.Random _random = new math.Random(); diff --git a/examples/game/lib/virtual_joystick.dart b/packages/flutter_sprites/lib/virtual_joystick.dart similarity index 98% rename from examples/game/lib/virtual_joystick.dart rename to packages/flutter_sprites/lib/virtual_joystick.dart index b4dabcf0001..1f6abba04a2 100644 --- a/examples/game/lib/virtual_joystick.dart +++ b/packages/flutter_sprites/lib/virtual_joystick.dart @@ -1,4 +1,4 @@ -part of sprites; +part of skysprites; class VirtualJoystick extends NodeWithSize { VirtualJoystick() : super(new Size(160.0, 160.0)) { diff --git a/packages/flutter_sprites/pubspec.yaml b/packages/flutter_sprites/pubspec.yaml new file mode 100644 index 00000000000..ebd4f30e5e7 --- /dev/null +++ b/packages/flutter_sprites/pubspec.yaml @@ -0,0 +1,6 @@ +name: skysprites +description: A sprite toolkit built on top of Sky. +version: 0.0.1 +dependencies: + sky: any + sky_tools: any