Move from Position to Vector2

This commit is contained in:
Lukas Klingsbo
2020-09-10 01:16:25 +02:00
parent 113e0db074
commit 5edd5f0fbd
54 changed files with 403 additions and 521 deletions

View File

@ -123,13 +123,13 @@ Note that it could be any component, however complex, inside your widgets tree.
```dart ```dart
import 'package:flame/sprite_animation.dart'; // imports the SpriteAnimation class import 'package:flame/sprite_animation.dart'; // imports the SpriteAnimation class
import 'package:flame/flame.dart'; // imports the Flame helper class import 'package:flame/flame.dart'; // imports the Flame helper class
import 'package:flame/position.dart'; // imports the Position class import 'package:flame/vector.dart'; // imports the Vector2 class
``` ```
How we do the magic then? Just add the following to your widget tree: How do we do the magic then? Just add the following to your widget tree:
```dart ```dart
Flame.util.animationAsWidget(Position(WIDTH, HEIGHT), SpriteAnimation.sequenced('minotaur.png', AMOUNT, textureWidth: FRAME_WIDTH)) Flame.util.animationAsWidget(Vector2(WIDTH, HEIGHT), SpriteAnimation.sequenced('minotaur.png', AMOUNT, textureWidth: FRAME_WIDTH))
``` ```
The first parameter's `WIDTH` and `HEIGHT` are the actual size of the widget on the screen. This does not need to match the sprite size, as Flame will scale it for you. You might, however, wanna keep the aspect, so things don't get distorted. In your case, the minotaur asset is a row of 96x96 pixels, so squares, therefore we can scale keeping `WIDTH/HEIGHT = 1`. We will choose the size as 256 px. The `sequenced` constructor is a helper that easily creates the animation assuming equal-sized frames in a row, in order. You can configure the start x, start y, texture width and height, but those will default gracefully to (0,0) and the actual width and height of the file. You can create your animation passing in the frame list, each frame with a different step time and sprite (source rectangle). The first parameter's `WIDTH` and `HEIGHT` are the actual size of the widget on the screen. This does not need to match the sprite size, as Flame will scale it for you. You might, however, wanna keep the aspect, so things don't get distorted. In your case, the minotaur asset is a row of 96x96 pixels, so squares, therefore we can scale keeping `WIDTH/HEIGHT = 1`. We will choose the size as 256 px. The `sequenced` constructor is a helper that easily creates the animation assuming equal-sized frames in a row, in order. You can configure the start x, start y, texture width and height, but those will default gracefully to (0,0) and the actual width and height of the file. You can create your animation passing in the frame list, each frame with a different step time and sprite (source rectangle).

View File

@ -4,7 +4,7 @@ import 'package:flame/flame.dart';
import 'package:flame/sprite_animation.dart'; import 'package:flame/sprite_animation.dart';
import 'package:flame/sprite.dart'; import 'package:flame/sprite.dart';
import 'package:flame/spritesheet.dart'; import 'package:flame/spritesheet.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import 'package:flame/widgets/animation_widget.dart'; import 'package:flame/widgets/animation_widget.dart';
import 'package:flame/widgets/sprite_widget.dart'; import 'package:flame/widgets/sprite_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -50,7 +50,7 @@ class MyHomePage extends StatefulWidget {
} }
class _MyHomePageState extends State<MyHomePage> { class _MyHomePageState extends State<MyHomePage> {
Position _position = Position(256.0, 256.0); Vector2 _position = Vector2(256.0, 256.0);
@override @override
void initState() { void initState() {
@ -61,7 +61,7 @@ class _MyHomePageState extends State<MyHomePage> {
void changePosition() async { void changePosition() async {
await Future.delayed(const Duration(seconds: 1)); await Future.delayed(const Duration(seconds: 1));
setState(() { setState(() {
_position = Position(10 + _position.x, 10 + _position.y); _position = Vector2(10 + _position.x, 10 + _position.y);
}); });
} }

View File

@ -2,6 +2,7 @@ import 'package:flame/gestures.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/vector.dart';
import 'package:flame/sprite_animation.dart'; import 'package:flame/sprite_animation.dart';
import 'package:flame/components/sprite_animation_component.dart'; import 'package:flame/components/sprite_animation_component.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -10,7 +11,7 @@ void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await Flame.images.loadAll(['creature.png', 'chopper.png']); await Flame.images.loadAll(['creature.png', 'chopper.png']);
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
final game = MyGame(size); final game = MyGame(size);
runApp(game.widget); runApp(game.widget);
} }
@ -53,12 +54,12 @@ class MyGame extends BaseGame with TapDetector {
addAnimation(evt.globalPosition.dx, evt.globalPosition.dy); addAnimation(evt.globalPosition.dx, evt.globalPosition.dy);
} }
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
const s = 100.0; const s = 100.0;
final animationComponent = SpriteAnimationComponent(s, s, animation); final animationComponent = SpriteAnimationComponent(s, s, animation);
animationComponent.x = size.width / 2 - s; animationComponent.x = size.x / 2 - s;
animationComponent.y = s; animationComponent.y = s;
final reversedAnimationComponent = SpriteAnimationComponent( final reversedAnimationComponent = SpriteAnimationComponent(
@ -66,7 +67,7 @@ class MyGame extends BaseGame with TapDetector {
s, s,
animation.reversed(), animation.reversed(),
); );
reversedAnimationComponent.x = size.width / 2; reversedAnimationComponent.x = size.x / 2;
reversedAnimationComponent.y = s; reversedAnimationComponent.y = s;
add(animationComponent); add(animationComponent);

View File

@ -1,17 +1,18 @@
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/sprite_animation.dart'; import 'package:flame/sprite_animation.dart';
import 'package:flame/vector.dart';
import 'package:flame/components/sprite_animation_component.dart'; import 'package:flame/components/sprite_animation_component.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
runApp(MyGame(size).widget); runApp(MyGame(size).widget);
} }
class MyGame extends BaseGame { class MyGame extends BaseGame {
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
_start(); _start();
} }
@ -23,8 +24,8 @@ class MyGame extends BaseGame {
); );
final animationComponent = SpriteAnimationComponent(200, 200, animation); final animationComponent = SpriteAnimationComponent(200, 200, animation);
animationComponent.x = (size.width / 2) - 100; animationComponent.x = (size.x / 2) - 100;
animationComponent.y = (size.height / 2) - 100; animationComponent.y = (size.y / 2) - 100;
add(animationComponent); add(animationComponent);
} }

View File

@ -5,14 +5,14 @@ import 'package:flame/audio_pool.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/palette.dart'; import 'package:flame/palette.dart';
import 'package:flame/position.dart';
import 'package:flame/text_config.dart'; import 'package:flame/text_config.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/vector.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
final MyGame game = MyGame(size); final MyGame game = MyGame(size);
runApp(game.widget); runApp(game.widget);
} }
@ -23,14 +23,14 @@ AudioPool pool = AudioPool('laser.mp3');
class MyGame extends BaseGame with TapDetector { class MyGame extends BaseGame with TapDetector {
static final black = BasicPalette.black.paint; static final black = BasicPalette.black.paint;
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
} }
@override @override
void render(Canvas canvas) { void render(Canvas canvas) {
canvas.drawRect(Rect.fromLTWH(0.0, 0.0, size.width, size.height), black); canvas.drawRect(Rect.fromLTWH(0.0, 0.0, size.x, size.y), black);
final p = Position.fromSize(size).div(2); final p = size / 2;
regular.render(canvas, 'hit me!', p, anchor: Anchor.center); regular.render(canvas, 'hit me!', p, anchor: Anchor.center);
super.render(canvas); super.render(canvas);
} }

View File

@ -1,6 +1,6 @@
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import 'package:flame/components/sprite_component.dart'; import 'package:flame/components/sprite_component.dart';
import 'package:flame/components/mixins/resizable.dart'; import 'package:flame/components/mixins/resizable.dart';
import 'package:flame/text_config.dart'; import 'package:flame/text_config.dart';
@ -34,14 +34,14 @@ class AndroidComponent extends SpriteComponent with Resizable {
final rect = toRect(); final rect = toRect();
if ((x <= 0 && xDirection == -1) || if ((x <= 0 && xDirection == -1) ||
(rect.right >= size.width && xDirection == 1)) { (rect.right >= size.x && xDirection == 1)) {
xDirection = xDirection * -1; xDirection = xDirection * -1;
} }
y += yDirection * SPEED * dt; y += yDirection * SPEED * dt;
if ((y <= 0 && yDirection == -1) || if ((y <= 0 && yDirection == -1) ||
(rect.bottom >= size.height && yDirection == 1)) { (rect.bottom >= size.y && yDirection == 1)) {
yDirection = yDirection * -1; yDirection = yDirection * -1;
} }
} }
@ -81,7 +81,7 @@ class MyGame extends BaseGame {
super.render(canvas); super.render(canvas);
if (debugMode()) { if (debugMode()) {
fpsTextConfig.render(canvas, fps(120).toString(), Position(0, 50)); fpsTextConfig.render(canvas, fps(120).toString(), Vector2(0, 50));
} }
} }
} }

View File

@ -3,7 +3,7 @@ import 'package:flame/effects/move_effect.dart';
import 'package:flame/effects/scale_effect.dart'; import 'package:flame/effects/scale_effect.dart';
import 'package:flame/effects/rotate_effect.dart'; import 'package:flame/effects/rotate_effect.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -37,7 +37,7 @@ class MyGame extends BaseGame with TapDetector {
greenSquare.clearEffects(); greenSquare.clearEffects();
final move = MoveEffect( final move = MoveEffect(
destination: Position(dx, dy), destination: Vector2(dx, dy),
speed: 250.0, speed: 250.0,
curve: Curves.linear, curve: Curves.linear,
isInfinite: false, isInfinite: false,
@ -45,7 +45,7 @@ class MyGame extends BaseGame with TapDetector {
); );
final scale = ScaleEffect( final scale = ScaleEffect(
size: Size(dx, dy), size: Vector2(dx, dy),
speed: 250.0, speed: 250.0,
curve: Curves.linear, curve: Curves.linear,
isInfinite: false, isInfinite: false,

View File

@ -2,7 +2,7 @@ import 'package:flame/effects/move_effect.dart';
import 'package:flame/effects/scale_effect.dart'; import 'package:flame/effects/scale_effect.dart';
import 'package:flame/effects/rotate_effect.dart'; import 'package:flame/effects/rotate_effect.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -44,7 +44,7 @@ class MyGame extends BaseGame with TapDetector {
orangeSquare.clearEffects(); orangeSquare.clearEffects();
greenSquare.addEffect(MoveEffect( greenSquare.addEffect(MoveEffect(
destination: Position(dx, dy), destination: Vector2(dx, dy),
speed: 250.0, speed: 250.0,
curve: Curves.bounceInOut, curve: Curves.bounceInOut,
isInfinite: true, isInfinite: true,
@ -52,7 +52,7 @@ class MyGame extends BaseGame with TapDetector {
)); ));
redSquare.addEffect(ScaleEffect( redSquare.addEffect(ScaleEffect(
size: Size(dx, dy), size: Vector2(dx, dy),
speed: 250.0, speed: 250.0,
curve: Curves.easeInCubic, curve: Curves.easeInCubic,
isInfinite: true, isInfinite: true,

View File

@ -3,7 +3,7 @@ import 'package:flame/effects/scale_effect.dart';
import 'package:flame/effects/rotate_effect.dart'; import 'package:flame/effects/rotate_effect.dart';
import 'package:flame/effects/sequence_effect.dart'; import 'package:flame/effects/sequence_effect.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -34,7 +34,7 @@ class MyGame extends BaseGame with TapDetector {
greenSquare.clearEffects(); greenSquare.clearEffects();
final move1 = MoveEffect( final move1 = MoveEffect(
destination: Position(dx, dy), destination: Vector2(dx, dy),
speed: 250.0, speed: 250.0,
curve: Curves.bounceInOut, curve: Curves.bounceInOut,
isInfinite: false, isInfinite: false,
@ -42,7 +42,7 @@ class MyGame extends BaseGame with TapDetector {
); );
final move2 = MoveEffect( final move2 = MoveEffect(
destination: Position(dx, dy + 150), destination: Vector2(dx, dy + 150),
speed: 150.0, speed: 150.0,
curve: Curves.easeIn, curve: Curves.easeIn,
isInfinite: false, isInfinite: false,
@ -50,7 +50,7 @@ class MyGame extends BaseGame with TapDetector {
); );
final scale = ScaleEffect( final scale = ScaleEffect(
size: Size(dx, dy), size: Vector2(dx, dy),
speed: 250.0, speed: 250.0,
curve: Curves.easeInCubic, curve: Curves.easeInCubic,
isInfinite: false, isInfinite: false,

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/effects/effects.dart'; import 'package:flame/effects/effects.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import './square.dart'; import './square.dart';
@ -17,10 +17,7 @@ class MyGame extends BaseGame with TapDetector {
@override @override
void onTapUp(details) { void onTapUp(details) {
square.addEffect(MoveEffect( square.addEffect(MoveEffect(
destination: Position( destination: VectorUtil.fromOffset(details.localPosition),
details.localPosition.dx,
details.localPosition.dy,
),
speed: 250.0, speed: 250.0,
curve: Curves.bounceInOut, curve: Curves.bounceInOut,
)); ));

View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/anchor.dart'; import 'package:flame/anchor.dart';
import 'package:flame/vector.dart';
import 'package:flame/effects/effects.dart'; import 'package:flame/effects/effects.dart';
import './square.dart'; import './square.dart';
@ -23,7 +24,7 @@ class MyGame extends BaseGame with TapDetector {
grow = !grow; grow = !grow;
square.addEffect(ScaleEffect( square.addEffect(ScaleEffect(
size: Size(s, s), size: Vector2(s, s),
speed: 250.0, speed: 250.0,
curve: Curves.bounceInOut, curve: Curves.bounceInOut,
)); ));

View File

@ -5,6 +5,7 @@ import 'package:flame/components/component.dart';
import 'package:flame/components/joystick/joystick_component.dart'; import 'package:flame/components/joystick/joystick_component.dart';
import 'package:flame/components/joystick/joystick_events.dart'; import 'package:flame/components/joystick/joystick_events.dart';
import 'package:flame/palette.dart'; import 'package:flame/palette.dart';
import 'package:flame/vector.dart';
class Player extends Component implements JoystickListener { class Player extends Component implements JoystickListener {
final _whitePaint = BasicPalette.white.paint; final _whitePaint = BasicPalette.white.paint;
@ -42,10 +43,10 @@ class Player extends Component implements JoystickListener {
} }
@override @override
void resize(Size size) { void resize(Vector2 size) {
_rect = Rect.fromLTWH( _rect = Rect.fromLTWH(
(size.width / 2) - 25, (size.x / 2) - 25,
(size.height / 2) - 25, (size.y / 2) - 25,
50, 50,
50, 50,
); );

View File

@ -2,6 +2,7 @@ import 'package:flame/game.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/nine_tile_box.dart'; import 'package:flame/nine_tile_box.dart';
import 'package:flame/sprite.dart'; import 'package:flame/sprite.dart';
import 'package:flame/vector.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -14,7 +15,7 @@ void main() async {
} }
class MyGame extends Game { class MyGame extends Game {
Size size; Vector2 size;
NineTileBox nineTileBox; NineTileBox nineTileBox;
MyGame(this.size) { MyGame(this.size) {
@ -25,8 +26,8 @@ class MyGame extends Game {
@override @override
void render(Canvas canvas) { void render(Canvas canvas) {
const length = 300.0; const length = 300.0;
final x = (size.width - length) / 2; final x = (size.x - length) / 2;
final y = (size.height - length) / 2; final y = (size.y - length) / 2;
nineTileBox.draw(canvas, x, y, length, length); nineTileBox.draw(canvas, x, y, length, length);
} }

View File

@ -21,7 +21,7 @@ import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/time.dart' as flame_time; import 'package:flame/time.dart' as flame_time;
import 'package:flame/particle.dart'; import 'package:flame/particle.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import 'package:flame/sprite.dart'; import 'package:flame/sprite.dart';
import 'package:flame/spritesheet.dart'; import 'package:flame/spritesheet.dart';
import 'package:flame/text_config.dart'; import 'package:flame/text_config.dart';
@ -33,7 +33,7 @@ class MyGame extends BaseGame {
/// Defines dimensions of the sample /// Defines dimensions of the sample
/// grid to be displayed on the screen, /// grid to be displayed on the screen,
/// 5x5 in this particular case /// 5x5 in this particular case
static const gridSize = 5; static const gridSize = 5.0;
static const steps = 5; static const steps = 5;
/// Miscellaneous values used /// Miscellaneous values used
@ -48,17 +48,17 @@ class MyGame extends BaseGame {
/// Defines the lifespan of all the particles in these examples /// Defines the lifespan of all the particles in these examples
final sceneDuration = const Duration(seconds: 1); final sceneDuration = const Duration(seconds: 1);
Offset cellSize; Vector2 cellSize;
Offset halfCellSize; Vector2 halfCellSize;
@override @override
bool recordFps() => true; bool recordFps() => true;
MyGame({ MyGame({
Size screenSize, Vector2 screenSize,
}) { }) {
size = screenSize; size = screenSize;
cellSize = Offset(size.width / gridSize, size.height / gridSize); cellSize = size / gridSize;
halfCellSize = cellSize * .5; halfCellSize = cellSize * .5;
// Spawn new particles every second // Spawn new particles every second
@ -98,17 +98,17 @@ class MyGame extends BaseGame {
// as per defined grid parameters // as per defined grid parameters
do { do {
final particle = particles.removeLast(); final particle = particles.removeLast();
final col = particles.length % gridSize; final double col = particles.length % gridSize;
final row = particles.length ~/ gridSize; final double row = (particles.length ~/ gridSize).toDouble();
final cellCenter = final cellCenter =
cellSize.scale(col.toDouble(), row.toDouble()) + (cellSize * .5); (cellSize.clone()..multiply(Vector2(col, row))) + (cellSize * .5);
add( add(
// Bind all the particles to a [Component] update // Bind all the particles to a [Component] update
// lifecycle from the [BaseGame]. // lifecycle from the [BaseGame].
TranslatedParticle( TranslatedParticle(
lifespan: 1, lifespan: 1,
offset: cellCenter, offset: VectorUtil.toOffset(cellCenter),
child: particle, child: particle,
).asComponent(), ).asComponent(),
); );
@ -162,10 +162,10 @@ class MyGame extends BaseGame {
return Particle.generate( return Particle.generate(
count: 5, count: 5,
generator: (i) { generator: (i) {
final currentColumn = (cellSize.dx / 5) * i - halfCellSize.dx; final currentColumn = (cellSize.x / 5) * i - halfCellSize.x;
return MovingParticle( return MovingParticle(
from: Offset(currentColumn, -halfCellSize.dy), from: Offset(currentColumn, -halfCellSize.y),
to: Offset(currentColumn, halfCellSize.dy), to: Offset(currentColumn, halfCellSize.y),
child: CircleParticle( child: CircleParticle(
radius: 2.0, radius: 2.0,
paint: Paint()..color = Colors.blue, paint: Paint()..color = Colors.blue,
@ -234,7 +234,7 @@ class MyGame extends BaseGame {
return ComputedParticle( return ComputedParticle(
renderer: (canvas, particle) => canvas.drawCircle( renderer: (canvas, particle) => canvas.drawCircle(
Offset.zero, Offset.zero,
particle.progress * halfCellSize.dx, particle.progress * halfCellSize.x,
Paint() Paint()
..color = Color.lerp( ..color = Color.lerp(
Colors.red, Colors.red,
@ -258,7 +258,7 @@ class MyGame extends BaseGame {
canvas.drawCircle( canvas.drawCircle(
Offset.zero, Offset.zero,
(1 - steppedProgress) * halfCellSize.dx, (1 - steppedProgress) * halfCellSize.x,
Paint() Paint()
..color = Color.lerp( ..color = Color.lerp(
Colors.red, Colors.red,
@ -294,7 +294,7 @@ class MyGame extends BaseGame {
/// be reused across particles. See example below for more details. /// be reused across particles. See example below for more details.
Particle imageParticle() { Particle imageParticle() {
return ImageParticle( return ImageParticle(
size: const Size.square(24), size: Vector2.all(24),
image: Flame.images.loadedFiles['zap.png'].loadedImage, image: Flame.images.loadedFiles['zap.png'].loadedImage,
); );
} }
@ -309,8 +309,8 @@ class MyGame extends BaseGame {
const count = 9; const count = 9;
const perLine = 3; const perLine = 3;
const imageSize = 24.0; const imageSize = 24.0;
final colWidth = cellSize.dx / perLine; final colWidth = cellSize.x / perLine;
final rowHeight = cellSize.dy / perLine; final rowHeight = cellSize.y / perLine;
reusableImageParticle ??= imageParticle(); reusableImageParticle ??= imageParticle();
@ -318,8 +318,8 @@ class MyGame extends BaseGame {
count: count, count: count,
generator: (i) => TranslatedParticle( generator: (i) => TranslatedParticle(
offset: Offset( offset: Offset(
(i % perLine) * colWidth - halfCellSize.dx + imageSize, (i % perLine) * colWidth - halfCellSize.x + imageSize,
(i ~/ perLine) * rowHeight - halfCellSize.dy + imageSize, (i ~/ perLine) * rowHeight - halfCellSize.y + imageSize,
), ),
child: reusableImageParticle), child: reusableImageParticle),
); );
@ -386,7 +386,7 @@ class MyGame extends BaseGame {
Particle spriteParticle() { Particle spriteParticle() {
return SpriteParticle( return SpriteParticle(
sprite: Sprite('zap.png'), sprite: Sprite('zap.png'),
size: Position.fromOffset(cellSize * .5), size: cellSize * .5,
); );
} }
@ -395,7 +395,7 @@ class MyGame extends BaseGame {
Particle animationParticle() { Particle animationParticle() {
return SpriteAnimationParticle( return SpriteAnimationParticle(
animation: getBoomAnimation(), animation: getBoomAnimation(),
size: Position(128, 128), size: Vector2(128, 128),
); );
} }
@ -405,8 +405,8 @@ class MyGame extends BaseGame {
/// which is independent from the parent [Particle]. /// which is independent from the parent [Particle].
Particle componentParticle() { Particle componentParticle() {
return MovingParticle( return MovingParticle(
from: -halfCellSize * .2, from: VectorUtil.toOffset(-halfCellSize * .2),
to: halfCellSize * .2, to: VectorUtil.toOffset(halfCellSize * .2),
curve: SineCurve(), curve: SineCurve(),
child: ComponentParticle(component: trafficLight), child: ComponentParticle(component: trafficLight),
); );
@ -473,19 +473,22 @@ class MyGame extends BaseGame {
), ),
); );
final cellSizeOffset = VectorUtil.toOffset(cellSize);
final halfCellSizeOffset = VectorUtil.toOffset(halfCellSize);
return ComposedParticle(children: <Particle>[ return ComposedParticle(children: <Particle>[
rect rect
.rotating(to: pi / 2) .rotating(to: pi / 2)
.moving(to: -cellSize) .moving(to: -cellSizeOffset)
.scaled(2) .scaled(2)
.accelerated(acceleration: halfCellSize * 5) .accelerated(acceleration: halfCellSizeOffset * 5)
.translated(halfCellSize), .translated(halfCellSizeOffset),
rect rect
.rotating(to: -pi) .rotating(to: -pi)
.moving(to: cellSize.scale(1, -1)) .moving(to: cellSizeOffset.scale(1, -1))
.scaled(2) .scaled(2)
.translated(halfCellSize.scale(-1, 1)) .translated(halfCellSizeOffset.scale(-1, 1))
.accelerated(acceleration: halfCellSize.scale(-5, 5)) .accelerated(acceleration: halfCellSizeOffset.scale(-5, 5))
]); ]);
} }
@ -497,15 +500,18 @@ class MyGame extends BaseGame {
super.render(canvas); super.render(canvas);
if (debugMode()) { if (debugMode()) {
fpsTextConfig.render(canvas, '${fps(120).toStringAsFixed(2)}fps', fpsTextConfig.render(
Position(0, size.height - 24)); canvas, '${fps(120).toStringAsFixed(2)}fps', Vector2(0, size.y - 24));
} }
} }
/// Returns random [Offset] within a virtual /// Returns random [Offset] within a virtual
/// grid cell /// grid cell
Offset randomCellOffset() { Offset randomCellOffset() {
return cellSize.scale(rnd.nextDouble(), rnd.nextDouble()) - halfCellSize; return Offset(
cellSize.x * rnd.nextDouble() - halfCellSize.x,
cellSize.y * rnd.nextDouble() - halfCellSize.y,
);
} }
/// Returns random [Color] from primary swatches /// Returns random [Color] from primary swatches
@ -543,7 +549,7 @@ class MyGame extends BaseGame {
} }
Future<BaseGame> loadGame() async { Future<BaseGame> loadGame() async {
Size gameSize; Vector2 gameSize;
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await Future.wait([ await Future.wait([

View File

@ -2,11 +2,12 @@ import 'package:flame/sprite_animation.dart';
import 'package:flame/components/sprite_animation_component.dart'; import 'package:flame/components/sprite_animation_component.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/vector.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
final game = MyGame(size); final game = MyGame(size);
runApp(game.widget); runApp(game.widget);
} }
@ -22,11 +23,11 @@ class MyGame extends BaseGame {
SpriteAnimationComponent buildAnimation() { SpriteAnimationComponent buildAnimation() {
final ac = SpriteAnimationComponent(100, 100, animation); final ac = SpriteAnimationComponent(100, 100, animation);
ac.x = size.width / 2 - ac.width / 2; ac.x = size.x / 2 - ac.width / 2;
return ac; return ac;
} }
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
final regular = buildAnimation(); final regular = buildAnimation();

View File

@ -1,16 +1,17 @@
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/vector.dart';
import 'package:flame/components/position_component.dart'; import 'package:flame/components/position_component.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
runApp(MyGame(size).widget); runApp(MyGame(size).widget);
} }
class Ball extends PositionComponent { class Ball extends PositionComponent {
final Size gameSize; final Vector2 gameSize;
final paint = Paint()..color = const Color(0xFFFFFFFF); final paint = Paint()..color = const Color(0xFFFFFFFF);
bool forward = true; bool forward = true;
@ -28,9 +29,9 @@ class Ball extends PositionComponent {
super.update(dt); super.update(dt);
x += (forward ? 1 : -1) * 100 * dt; x += (forward ? 1 : -1) * 100 * dt;
if (x <= 0 || x + width >= gameSize.width) { if (x <= 0 || x + width >= gameSize.x) {
if (forward) { if (forward) {
x = gameSize.width - width - 1; x = gameSize.x - width - 1;
} else { } else {
x = 1; x = 1;
} }
@ -42,7 +43,7 @@ class Ball extends PositionComponent {
} }
class MyGame extends BaseGame { class MyGame extends BaseGame {
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
Flame.audio.disableLog(); Flame.audio.disableLog();
@ -51,7 +52,7 @@ class MyGame extends BaseGame {
add( add(
Ball(size) Ball(size)
..y = (size.height / 2) - 50 ..y = (size.y / 2) - 50
..width = 100 ..width = 100
..height = 100, ..height = 100,
); );

View File

@ -4,11 +4,12 @@ import 'package:flame/flame.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/sprite_batch.dart'; import 'package:flame/sprite_batch.dart';
import 'package:flame/vector.dart';
import 'package:flame/components/sprite_batch_component.dart'; import 'package:flame/components/sprite_batch_component.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
final game = MyGame(size); final game = MyGame(size);
runApp(game.widget); runApp(game.widget);
} }
@ -16,7 +17,7 @@ void main() async {
class MyGame extends BaseGame { class MyGame extends BaseGame {
SpriteBatch spriteBatch; SpriteBatch spriteBatch;
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
initData(); initData();
@ -44,8 +45,8 @@ class MyGame extends BaseGame {
for (int i = 0; i < NUM; ++i) { for (int i = 0; i < NUM; ++i) {
final sx = r.nextInt(8) * 128.0; final sx = r.nextInt(8) * 128.0;
final sy = r.nextInt(8) * 128.0; final sy = r.nextInt(8) * 128.0;
final x = r.nextInt(size.width.toInt()).toDouble(); final x = r.nextInt(size.x.toInt()).toDouble();
final y = r.nextInt(size.height ~/ 2).toDouble() + size.height / 2.0; final y = r.nextInt(size.y ~/ 2).toDouble() + size.y / 2.0;
spriteBatch.add( spriteBatch.add(
rect: Rect.fromLTWH(sx, sy, 128, 128), rect: Rect.fromLTWH(sx, sy, 128, 128),
offset: Offset(x - 64, y - 64), offset: Offset(x - 64, y - 64),

View File

@ -3,17 +3,18 @@ import 'dart:math';
import 'package:flame/components/sprite_component.dart'; import 'package:flame/components/sprite_component.dart';
import 'package:flame/flame.dart'; import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/vector.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
final game = MyGame(size); final game = MyGame(size);
runApp(game.widget); runApp(game.widget);
} }
class MyGame extends BaseGame { class MyGame extends BaseGame {
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
} }
@ -28,8 +29,8 @@ class MyGame extends BaseGame {
final r = Random(); final r = Random();
List.generate(500, (i) => SpriteComponent.square(32, 'test.png')) List.generate(500, (i) => SpriteComponent.square(32, 'test.png'))
.forEach((sprite) { .forEach((sprite) {
sprite.x = r.nextInt(size.width.toInt()).toDouble(); sprite.x = r.nextInt(size.x.toInt()).toDouble();
sprite.y = r.nextInt(size.height.toInt()).toDouble(); sprite.y = r.nextInt(size.y.toInt()).toDouble();
add(sprite); add(sprite);
}); });
} }

View File

@ -7,10 +7,11 @@ import 'package:flame/flame.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/palette.dart'; import 'package:flame/palette.dart';
import 'package:flame/text_config.dart'; import 'package:flame/text_config.dart';
import 'package:flame/vector.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
void main() async { void main() async {
final Size size = await Flame.util.initialDimensions(); final Vector2 size = await Flame.util.initialDimensions();
runApp(MyGame(size).widget); runApp(MyGame(size).widget);
} }
@ -34,27 +35,27 @@ class MyTextBox extends TextBoxComponent {
} }
class MyGame extends BaseGame { class MyGame extends BaseGame {
MyGame(Size screenSize) { MyGame(Vector2 screenSize) {
size = screenSize; size = screenSize;
add(TextComponent('Hello, Flame', config: regular) add(TextComponent('Hello, Flame', config: regular)
..anchor = Anchor.topCenter ..anchor = Anchor.topCenter
..x = size.width / 2 ..x = size.x / 2
..y = 32.0); ..y = 32.0);
add(TextComponent('center', config: tiny) add(TextComponent('center', config: tiny)
..anchor = Anchor.center ..anchor = Anchor.center
..x = size.width / 2 ..x = size.x / 2
..y = size.height / 2); ..y = size.y / 2);
add(TextComponent('bottomRight', config: tiny) add(TextComponent('bottomRight', config: tiny)
..anchor = Anchor.bottomRight ..anchor = Anchor.bottomRight
..x = size.width ..x = size.x
..y = size.height); ..y = size.y);
add(MyTextBox( add(MyTextBox(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eget ligula eu lectus lobortis condimentum.', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eget ligula eu lectus lobortis condimentum.',
) )
..anchor = Anchor.bottomLeft ..anchor = Anchor.bottomLeft
..y = size.height); ..y = size.y);
} }
} }

View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/time.dart'; import 'package:flame/time.dart';
import 'package:flame/text_config.dart'; import 'package:flame/text_config.dart';
import 'package:flame/position.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/vector.dart';
import 'package:flame/components/timer_component.dart'; import 'package:flame/components/timer_component.dart';
void main() { void main() {
@ -42,7 +42,7 @@ class RenderedTimeComponent extends TimerComponent {
textConfig.render( textConfig.render(
canvas, canvas,
'Elapsed time: ${timer.current}', 'Elapsed time: ${timer.current}',
Position(10, 150), Vector2(10, 150),
); );
} }
} }
@ -90,8 +90,8 @@ class MyGame extends Game with TapDetector {
textConfig.render( textConfig.render(
canvas, canvas,
'Countdown: ${countdown.current}', 'Countdown: ${countdown.current}',
Position(10, 100), Vector2(10, 100),
); );
textConfig.render(canvas, 'Elapsed time: $elapsedSecs', Position(10, 150)); textConfig.render(canvas, 'Elapsed time: $elapsedSecs', Vector2(10, 150));
} }
} }

View File

@ -58,9 +58,9 @@ __Countdown example:__
import 'dart:ui'; import 'dart:ui';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/position.dart';
import 'package:flame/text_config.dart'; import 'package:flame/text_config.dart';
import 'package:flame/time.dart'; import 'package:flame/time.dart';
import 'package:flame/vector.dart';
class MyGame extends Game { class MyGame extends Game {
final TextConfig textConfig = TextConfig(color: const Color(0xFFFFFFFF)); final TextConfig textConfig = TextConfig(color: const Color(0xFFFFFFFF));
@ -81,7 +81,7 @@ class MyGame extends Game {
@override @override
void render(Canvas canvas) { void render(Canvas canvas) {
textConfig.render(canvas, "Countdown: ${countdown.current.toString()}", textConfig.render(canvas, "Countdown: ${countdown.current.toString()}",
Position(10, 100)); Vector2(10, 100));
} }
} }
@ -93,9 +93,9 @@ __Interval example:__
import 'dart:ui'; import 'dart:ui';
import 'package:flame/game.dart'; import 'package:flame/game.dart';
import 'package:flame/position.dart';
import 'package:flame/text_config.dart'; import 'package:flame/text_config.dart';
import 'package:flame/time.dart'; import 'package:flame/time.dart';
import 'package:flame/vector.dart';
class MyGame extends Game { class MyGame extends Game {
final TextConfig textConfig = TextConfig(color: const Color(0xFFFFFFFF)); final TextConfig textConfig = TextConfig(color: const Color(0xFFFFFFFF));
@ -117,7 +117,7 @@ class MyGame extends Game {
@override @override
void render(Canvas canvas) { void render(Canvas canvas) {
textConfig.render(canvas, "Elapsed time: $elapsedSecs", Position(10, 150)); textConfig.render(canvas, "Elapsed time: $elapsedSecs", Vector2(10, 150));
} }
} }

View File

@ -1,25 +1,25 @@
import 'dart:ui'; import 'package:vector_math/vector_math_64.dart';
import 'position.dart';
class Anchor { class Anchor {
static const Anchor topLeft = Anchor(Offset(0.0, 0.0)); static const Anchor topLeft = Anchor(0.0, 0.0);
static const Anchor topCenter = Anchor(Offset(0.5, 0.0)); static const Anchor topCenter = Anchor(0.5, 0.0);
static const Anchor topRight = Anchor(Offset(1.0, 0.0)); static const Anchor topRight = Anchor(1.0, 0.0);
static const Anchor centerLeft = Anchor(Offset(0.0, 0.5)); static const Anchor centerLeft = Anchor(0.0, 0.5);
static const Anchor center = Anchor(Offset(0.5, 0.5)); static const Anchor center = Anchor(0.5, 0.5);
static const Anchor centerRight = Anchor(Offset(1.0, 0.5)); static const Anchor centerRight = Anchor(1.0, 0.5);
static const Anchor bottomLeft = Anchor(Offset(0.0, 1.0)); static const Anchor bottomLeft = Anchor(0.0, 1.0);
static const Anchor bottomCenter = Anchor(Offset(0.5, 1.0)); static const Anchor bottomCenter = Anchor(0.5, 1.0);
static const Anchor bottomRight = Anchor(Offset(1.0, 1.0)); static const Anchor bottomRight = Anchor(1.0, 1.0);
final Offset relativePosition; final double x;
final double y;
const Anchor(this.relativePosition); Vector2 get relativePosition => Vector2(x, y);
Position translate(Position p, Position size) { const Anchor(this.x, this.y);
return p.clone().minus(
Position(size.x * relativePosition.dx, size.y * relativePosition.dy), Vector2 translate(Vector2 p, Vector2 size) {
); return p - size.clone()
..multiply(relativePosition);
} }
} }

View File

@ -1,6 +1,7 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/painting.dart'; import 'package:flutter/painting.dart';
import 'package:vector_math/vector_math_64.dart';
/// This represents a Component for your game. /// This represents a Component for your game.
/// ///
@ -22,7 +23,7 @@ abstract class Component {
/// ///
/// It receives the new size. /// It receives the new size.
/// You can use the [Resizable] mixin if you want an implementation of this hook that keeps track of the current size. /// You can use the [Resizable] mixin if you want an implementation of this hook that keeps track of the current size.
void resize(Size size) {} void resize(Vector2 size) {}
/// Whether this component has been loaded yet. If not loaded, [BaseGame] will not try to render it. /// Whether this component has been loaded yet. If not loaded, [BaseGame] will not try to render it.
/// ///

View File

@ -1,13 +1,16 @@
import 'dart:math'; import 'dart:math';
import 'dart:ui';
import 'package:box2d_flame/box2d.dart';
import 'package:flame/components/joystick/joystick_component.dart'; import 'package:flame/components/joystick/joystick_component.dart';
import 'package:flame/components/joystick/joystick_events.dart'; import 'package:flame/components/joystick/joystick_events.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/sprite.dart'; import 'package:flame/sprite.dart';
import 'package:flame/vector.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import '../../position.dart'; import '../../vector.dart';
enum JoystickActionAlign { TOP_LEFT, BOTTOM_LEFT, TOP_RIGHT, BOTTOM_RIGHT } enum JoystickActionAlign { TOP_LEFT, BOTTOM_LEFT, TOP_RIGHT, BOTTOM_RIGHT }
@ -58,7 +61,7 @@ class JoystickAction {
_tileSize = _sizeBackgroundDirection / 2; _tileSize = _sizeBackgroundDirection / 2;
} }
void initialize(Size _screenSize, JoystickController joystickController) { void initialize(Vector2 _screenSize, JoystickController joystickController) {
_joystickController = joystickController; _joystickController = joystickController;
final double radius = size / 2; final double radius = size / 2;
double dx = 0, dy = 0; double dx = 0, dy = 0;
@ -69,15 +72,15 @@ class JoystickAction {
break; break;
case JoystickActionAlign.BOTTOM_LEFT: case JoystickActionAlign.BOTTOM_LEFT:
dx = margin.left + radius; dx = margin.left + radius;
dy = _screenSize.height - (margin.bottom + radius); dy = _screenSize.y - (margin.bottom + radius);
break; break;
case JoystickActionAlign.TOP_RIGHT: case JoystickActionAlign.TOP_RIGHT:
dx = _screenSize.width - (margin.right + radius); dx = _screenSize.x - (margin.right + radius);
dy = margin.top + radius; dy = margin.top + radius;
break; break;
case JoystickActionAlign.BOTTOM_RIGHT: case JoystickActionAlign.BOTTOM_RIGHT:
dx = _screenSize.width - (margin.right + radius); dx = _screenSize.x - (margin.right + radius);
dy = _screenSize.height - (margin.bottom + radius); dy = _screenSize.y - (margin.bottom + radius);
break; break;
} }
_rectAction = Rect.fromCircle( _rectAction = Rect.fromCircle(
@ -153,9 +156,9 @@ class JoystickAction {
// Distance between the center of joystick background & drag position // Distance between the center of joystick background & drag position
final centerPosition = final centerPosition =
Position.fromOffset(_rectBackgroundDirection.center); VectorUtil.fromOffset(_rectBackgroundDirection.center);
final dragPosition = Position.fromOffset(_dragPosition); final dragPosition = VectorUtil.fromOffset(_dragPosition);
double dist = centerPosition.distance(dragPosition); double dist = centerPosition.distanceTo(dragPosition);
// The maximum distance for the knob position the edge of // The maximum distance for the knob position the edge of
// the background + half of its own size. The knob can wander in the // the background + half of its own size. The knob can wander in the

View File

@ -7,6 +7,7 @@ import 'package:flame/components/joystick/joystick_events.dart';
import 'package:flame/components/mixins/has_game_ref.dart'; import 'package:flame/components/mixins/has_game_ref.dart';
import 'package:flame/game/base_game.dart'; import 'package:flame/game/base_game.dart';
import 'package:flame/gestures.dart'; import 'package:flame/gestures.dart';
import 'package:flame/vector.dart';
mixin JoystickListener { mixin JoystickListener {
void joystickChangeDirectional(JoystickDirectionalEvent event); void joystickChangeDirectional(JoystickDirectionalEvent event);
@ -69,7 +70,7 @@ class JoystickComponent extends JoystickController {
} }
@override @override
void resize(Size size) { void resize(Vector2 size) {
directional?.initialize(size, this); directional?.initialize(size, this);
actions?.forEach((action) => action.initialize(size, this)); actions?.forEach((action) => action.initialize(size, this));
super.resize(size); super.resize(size);

View File

@ -6,7 +6,7 @@ import 'package:flame/gestures.dart';
import 'package:flame/sprite.dart'; import 'package:flame/sprite.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../position.dart'; import '../../vector.dart';
class JoystickDirectional { class JoystickDirectional {
final double size; final double size;
@ -33,7 +33,7 @@ class JoystickDirectional {
JoystickController _joystickController; JoystickController _joystickController;
Size _screenSize; Vector2 _screenSize;
DragEvent _currentDragEvent; DragEvent _currentDragEvent;
@ -65,11 +65,11 @@ class JoystickDirectional {
_tileSize = size / 2; _tileSize = size / 2;
} }
void initialize(Size _screenSize, JoystickController joystickController) { void initialize(Vector2 _screenSize, JoystickController joystickController) {
this._screenSize = _screenSize; this._screenSize = _screenSize;
_joystickController = joystickController; _joystickController = joystickController;
final Offset osBackground = final Offset osBackground =
Offset(margin.left, _screenSize.height - margin.bottom); Offset(margin.left, _screenSize.y - margin.bottom);
_backgroundRect = Rect.fromCircle(center: osBackground, radius: size / 2); _backgroundRect = Rect.fromCircle(center: osBackground, radius: size / 2);
final Offset osKnob = final Offset osKnob =
@ -117,9 +117,9 @@ class JoystickDirectional {
final double degrees = _radAngle * 180 / pi; final double degrees = _radAngle * 180 / pi;
// Distance between the center of joystick background & drag position // Distance between the center of joystick background & drag position
final centerPosition = Position.fromOffset(_backgroundRect.center); final centerPosition = VectorUtil.fromOffset(_backgroundRect.center);
final dragPosition = Position.fromOffset(_dragPosition); final dragPosition = VectorUtil.fromOffset(_dragPosition);
double dist = centerPosition.distance(dragPosition); double dist = centerPosition.distanceTo(dragPosition);
// The maximum distance for the knob position the edge of // The maximum distance for the knob position the edge of
// the background + half of its own size. The knob can wander in the // the background + half of its own size. The knob can wander in the
@ -186,8 +186,8 @@ class JoystickDirectional {
void _updateDirectionalRect(Offset position) { void _updateDirectionalRect(Offset position) {
if (_screenSize != null && if (_screenSize != null &&
(position.dx > _screenSize.width / 2 || (position.dx > _screenSize.x / 2 ||
position.dy < _screenSize.height / 2 || position.dy < _screenSize.y / 2 ||
isFixed)) { isFixed)) {
return; return;
} }

View File

@ -1,15 +1,17 @@
import 'dart:ui'; import 'dart:ui';
import 'package:vector_math/vector_math_64.dart';
/// Useful mixin to add to your components if you want to hold a reference to the current screen size. /// Useful mixin to add to your components if you want to hold a reference to the current screen size.
/// ///
/// This mixin implements the resize method in order to hold an updated reference to the current screen [size]. /// This mixin implements the resize method in order to hold an updated reference to the current screen [size].
/// Also, it updates its [children], if any. /// Also, it updates its [children], if any.
class Resizable { class Resizable {
/// This is the current updated screen size. /// This is the current updated screen size.
Size size; Vector2 size;
/// Implementation provided by this mixin to the resize hook. /// Implementation provided by this mixin to the resize hook.
void resize(Size size) { void resize(Vector2 size) {
this.size = size; this.size = size;
resizableChildren().where((e) => e != null).forEach((e) => e.resize(size)); resizableChildren().where((e) => e != null).forEach((e) => e.resize(size));
} }

View File

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/painting.dart'; import 'package:flutter/painting.dart';
import 'package:vector_math/vector_math_64.dart';
import '../flame.dart'; import '../flame.dart';
import 'position_component.dart'; import 'position_component.dart';
@ -37,7 +38,7 @@ class ParallaxLayer {
Future<Image> future; Future<Image> future;
Image _image; Image _image;
Size _screenSize; Vector2 _screenSize;
Rect _paintArea; Rect _paintArea;
Offset _scroll; Offset _scroll;
Offset _imageSize; Offset _imageSize;
@ -51,7 +52,7 @@ class ParallaxLayer {
Offset currentOffset() => _scroll; Offset currentOffset() => _scroll;
void resize(Size size) { void resize(Vector2 size) {
if (!loaded()) { if (!loaded()) {
_screenSize = size; _screenSize = size;
return; return;
@ -60,9 +61,9 @@ class ParallaxLayer {
double scale(LayerFill fill) { double scale(LayerFill fill) {
switch (fill) { switch (fill) {
case LayerFill.height: case LayerFill.height:
return _image.height / size.height; return _image.height / size.y;
case LayerFill.width: case LayerFill.width:
return _image.width / size.width; return _image.width / size.x;
default: default:
return _scale; return _scale;
} }
@ -75,12 +76,12 @@ class ParallaxLayer {
// Number of images that can fit on the canvas plus one // Number of images that can fit on the canvas plus one
// to have something to scroll to without leaving canvas empty // to have something to scroll to without leaving canvas empty
final countX = 1 + size.width / _imageSize.dx; final countX = 1 + size.x / _imageSize.dx;
final countY = 1 + size.height / _imageSize.dy; final countY = 1 + size.y / _imageSize.dy;
// Percentage of the image size that will overflow // Percentage of the image size that will overflow
final overflowX = (_imageSize.dx * countX - size.width) / _imageSize.dx; final overflowX = (_imageSize.dx * countX - size.x) / _imageSize.dx;
final overflowY = (_imageSize.dy * countY - size.height) / _imageSize.dy; final overflowY = (_imageSize.dy * countY - size.y) / _imageSize.dy;
// Align image to correct side of the screen // Align image to correct side of the screen
final alignment = parallaxImage.alignment; final alignment = parallaxImage.alignment;
@ -175,7 +176,7 @@ class ParallaxComponent extends PositionComponent {
@mustCallSuper @mustCallSuper
@override @override
void resize(Size size) { void resize(Vector2 size) {
super.resize(size); super.resize(size);
_layers.forEach((layer) => layer.resize(size)); _layers.forEach((layer) => layer.resize(size));
} }

View File

@ -4,11 +4,11 @@ import 'dart:math';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:ordered_set/comparing.dart'; import 'package:ordered_set/comparing.dart';
import 'package:ordered_set/ordered_set.dart'; import 'package:ordered_set/ordered_set.dart';
import 'package:vector_math/vector_math_64.dart';
import '../anchor.dart'; import '../anchor.dart';
import '../effects/effects.dart'; import '../effects/effects.dart';
import '../game.dart'; import '../game.dart';
import '../position.dart';
import '../text_config.dart'; import '../text_config.dart';
import 'component.dart'; import 'component.dart';
@ -72,14 +72,14 @@ abstract class PositionComponent extends Component {
TextConfig get debugTextConfig => TextConfig(color: debugColor, fontSize: 12); TextConfig get debugTextConfig => TextConfig(color: debugColor, fontSize: 12);
Position toPosition() => Position(x, y); Vector2 toPosition() => Vector2(x, y);
void setByPosition(Position position) { void setByPosition(Vector2 position) {
x = position.x; x = position.x;
y = position.y; y = position.y;
} }
Position toSize() => Position(width, height); Vector2 toSize() => Vector2(width, height);
void setBySize(Position size) { void setBySize(Vector2 size) {
width = size.x; width = size.x;
height = size.y; height = size.y;
} }
@ -92,8 +92,8 @@ abstract class PositionComponent extends Component {
/// Returns the relative position/size of this component. /// Returns the relative position/size of this component.
/// Relative because it might be translated by their parents (which is not considered here). /// Relative because it might be translated by their parents (which is not considered here).
Rect toRect() => Rect.fromLTWH( Rect toRect() => Rect.fromLTWH(
x - anchor.relativePosition.dx * width, x - anchor.relativePosition.x * width,
y - anchor.relativePosition.dy * height, y - anchor.relativePosition.y * height,
width, width,
height, height,
); );
@ -101,8 +101,8 @@ abstract class PositionComponent extends Component {
/// Mutates x, y, width and height using the provided [rect] as basis. /// Mutates x, y, width and height using the provided [rect] as basis.
/// This is a relative rect, same definition that [toRect] use (therefore both methods are compatible, i.e. setByRect ∘ toRect = identity). /// This is a relative rect, same definition that [toRect] use (therefore both methods are compatible, i.e. setByRect ∘ toRect = identity).
void setByRect(Rect rect) { void setByRect(Rect rect) {
x = rect.left + anchor.relativePosition.dx * rect.width; x = rect.left + anchor.relativePosition.x * rect.width;
y = rect.top + anchor.relativePosition.dy * rect.height; y = rect.top + anchor.relativePosition.y * rect.height;
width = rect.width; width = rect.width;
height = rect.height; height = rect.height;
} }
@ -112,7 +112,7 @@ abstract class PositionComponent extends Component {
} }
double distance(PositionComponent c) { double distance(PositionComponent c) {
return c.toPosition().distance(toPosition()); return c.toPosition().distanceTo(toPosition());
} }
void renderDebugMode(Canvas canvas) { void renderDebugMode(Canvas canvas) {
@ -120,7 +120,7 @@ abstract class PositionComponent extends Component {
debugTextConfig.render( debugTextConfig.render(
canvas, canvas,
'x: ${x.toStringAsFixed(2)} y:${y.toStringAsFixed(2)}', 'x: ${x.toStringAsFixed(2)} y:${y.toStringAsFixed(2)}',
Position(-50, -15)); Vector2(-50, -15));
final Rect rect = toRect(); final Rect rect = toRect();
final dx = rect.right; final dx = rect.right;
@ -128,15 +128,15 @@ abstract class PositionComponent extends Component {
debugTextConfig.render( debugTextConfig.render(
canvas, canvas,
'x:${dx.toStringAsFixed(2)} y:${dy.toStringAsFixed(2)}', 'x:${dx.toStringAsFixed(2)} y:${dy.toStringAsFixed(2)}',
Position(width - 50, height)); Vector2(width - 50, height));
} }
void _prepareCanvas(Canvas canvas) { void _prepareCanvas(Canvas canvas) {
canvas.translate(x, y); canvas.translate(x, y);
canvas.rotate(angle); canvas.rotate(angle);
final double dx = -anchor.relativePosition.dx * width; final double dx = -anchor.relativePosition.x * width;
final double dy = -anchor.relativePosition.dy * height; final double dy = -anchor.relativePosition.y * height;
canvas.translate(dx, dy); canvas.translate(dx, dy);
// Handle inverted rendering by moving center and flipping. // Handle inverted rendering by moving center and flipping.
@ -193,7 +193,7 @@ abstract class PositionComponent extends Component {
@mustCallSuper @mustCallSuper
@override @override
void resize(Size size) { void resize(Vector2 size) {
super.resize(size); super.resize(size);
_children.forEach((child) => child.resize(size)); _children.forEach((child) => child.resize(size));
} }

View File

@ -3,9 +3,9 @@ import 'dart:math' as math;
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/widgets.dart' as widgets; import 'package:flutter/widgets.dart' as widgets;
import 'package:vector_math/vector_math_64.dart';
import '../palette.dart'; import '../palette.dart';
import '../position.dart';
import '../text_config.dart'; import '../text_config.dart';
import 'mixins/resizable.dart'; import 'mixins/resizable.dart';
import 'position_component.dart'; import 'position_component.dart';
@ -28,7 +28,7 @@ class TextBoxComponent extends PositionComponent with Resizable {
static final Paint _imagePaint = BasicPalette.white.paint static final Paint _imagePaint = BasicPalette.white.paint
..filterQuality = FilterQuality.high; ..filterQuality = FilterQuality.high;
Position p = Position.empty(); Vector2 p = Vector2.zero();
String _text; String _text;
TextConfig _config; TextConfig _config;

View File

@ -2,9 +2,9 @@ import 'dart:math';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:vector_math/vector_math_64.dart';
import '../components/position_component.dart'; import '../components/position_component.dart';
import '../position.dart';
export './move_effect.dart'; export './move_effect.dart';
export './rotate_effect.dart'; export './rotate_effect.dart';
@ -31,9 +31,9 @@ abstract class PositionComponentEffect {
int curveDirection = 1; int curveDirection = 1;
/// Used to be able to determine the end state of a sequence of effects /// Used to be able to determine the end state of a sequence of effects
Position endPosition; Vector2 endPosition;
double endAngle; double endAngle;
Position endSize; Vector2 endSize;
/// If the effect is alternating the travel time is double the normal /// If the effect is alternating the travel time is double the normal
/// travel time /// travel time

View File

@ -1,16 +1,16 @@
import 'package:flutter/animation.dart'; import 'package:flutter/animation.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:vector_math/vector_math_64.dart';
import 'dart:math'; import 'dart:math';
import './effects.dart'; import './effects.dart';
import '../position.dart';
double _direction(double p, double d) => (p - d).sign; double _direction(double p, double d) => (p - d).sign;
double _distance(double a, double b) => (a - b).abs(); double _distance(double a, double b) => (a - b).abs();
class MoveEffect extends PositionComponentEffect { class MoveEffect extends PositionComponentEffect {
Position destination; Vector2 destination;
double speed; double speed;
Curve curve; Curve curve;

View File

@ -1,23 +1,22 @@
import 'package:flutter/animation.dart'; import 'package:flutter/animation.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:vector_math/vector_math_64.dart';
import 'dart:ui';
import 'dart:math'; import 'dart:math';
import './effects.dart'; import './effects.dart';
import '../position.dart';
double _direction(double p, double d) => (p - d).sign; double _direction(double p, double d) => (p - d).sign;
double _size(double a, double b) => (a - b).abs(); double _size(double a, double b) => (a - b).abs();
class ScaleEffect extends PositionComponentEffect { class ScaleEffect extends PositionComponentEffect {
Size size; Vector2 size;
double speed; double speed;
Curve curve; Curve curve;
Size _original; Vector2 _original;
Size _diff; Vector2 _diff;
final Position _dir = Position.empty(); final Vector2 _dir = Vector2.zero();
ScaleEffect({ ScaleEffect({
@required this.size, @required this.size,
@ -32,19 +31,19 @@ class ScaleEffect extends PositionComponentEffect {
void initialize(_comp) { void initialize(_comp) {
super.initialize(_comp); super.initialize(_comp);
if (!isAlternating) { if (!isAlternating) {
endSize = Position.fromSize(size); endSize = size.clone();
} }
_original = Size(component.width, component.height); _original = component.toSize();
_diff = Size( _diff = Vector2(
_size(_original.width, size.width), _size(_original.x, size.x),
_size(_original.height, size.height), _size(_original.y, size.y),
); );
_dir.x = _direction(size.width, _original.width); _dir.x = _direction(size.x, _original.x);
_dir.y = _direction(size.height, _original.height); _dir.y = _direction(size.y, _original.y);
final scaleDistance = sqrt(pow(_diff.width, 2) + pow(_diff.height, 2)); final scaleDistance = sqrt(pow(_diff.x, 2) + pow(_diff.y, 2));
travelTime = scaleDistance / speed; travelTime = scaleDistance / speed;
} }
@ -53,7 +52,7 @@ class ScaleEffect extends PositionComponentEffect {
super.update(dt); super.update(dt);
final double c = curve?.transform(percentage) ?? 1.0; final double c = curve?.transform(percentage) ?? 1.0;
component.width = _original.width + _diff.width * c * _dir.x; component.width = _original.x + _diff.x * c * _dir.x;
component.height = _original.height + _diff.height * c * _dir.y; component.height = _original.y + _diff.y * c * _dir.y;
} }
} }

View File

@ -1,18 +1,17 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flame/components/composed_component.dart';
import 'package:flame/fps_counter.dart'; import 'package:flame/fps_counter.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide WidgetBuilder; import 'package:flutter/widgets.dart' hide WidgetBuilder;
import 'package:ordered_set/comparing.dart'; import 'package:ordered_set/comparing.dart';
import 'package:ordered_set/ordered_set.dart'; import 'package:ordered_set/ordered_set.dart';
import 'package:vector_math/vector_math_64.dart';
import '../components/component.dart'; import '../components/component.dart';
import '../components/mixins/has_game_ref.dart'; import '../components/mixins/has_game_ref.dart';
import '../components/mixins/tapable.dart'; import '../components/mixins/tapable.dart';
import '../components/position_component.dart'; import '../components/position_component.dart';
import '../position.dart';
import 'game.dart'; import 'game.dart';
/// This is a more complete and opinionated implementation of Game. /// This is a more complete and opinionated implementation of Game.
@ -32,10 +31,10 @@ class BaseGame extends Game with FPSCounter {
final List<Component> _removeLater = []; final List<Component> _removeLater = [];
/// Current screen size, updated every resize via the [resize] method hook /// Current screen size, updated every resize via the [resize] method hook
Size size; Vector2 size;
/// Camera position; every non-HUD component is translated so that the camera position is the top-left corner of the screen. /// Camera position; every non-HUD component is translated so that the camera position is the top-left corner of the screen.
Position camera = Position.empty(); Vector2 camera = Vector2.zero();
/// This method is called for every component added, both via [add] and [addLater] methods. /// This method is called for every component added, both via [add] and [addLater] methods.
/// ///
@ -139,7 +138,7 @@ class BaseGame extends Game with FPSCounter {
/// You can override it further to add more custom behaviour, but you should seriously consider calling the super implementation as well. /// You can override it further to add more custom behaviour, but you should seriously consider calling the super implementation as well.
@override @override
@mustCallSuper @mustCallSuper
void resize(Size size) { void resize(Vector2 size) {
this.size = size; this.size = size;
components.forEach((c) => c.resize(size)); components.forEach((c) => c.resize(size));
} }

View File

@ -1,7 +1,6 @@
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide WidgetBuilder; import 'package:flutter/widgets.dart' hide WidgetBuilder;
import 'package:vector_math/vector_math_64.dart';
import '../position.dart';
import 'game_render_box.dart'; import 'game_render_box.dart';
import 'game.dart'; import 'game.dart';
@ -14,7 +13,7 @@ import 'game.dart';
/// You can bind Gesture Recognizers immediately around this to add controls to your widgets, with easy coordinate conversions. /// You can bind Gesture Recognizers immediately around this to add controls to your widgets, with easy coordinate conversions.
class EmbeddedGameWidget extends LeafRenderObjectWidget { class EmbeddedGameWidget extends LeafRenderObjectWidget {
final Game game; final Game game;
final Position size; final Vector2 size;
EmbeddedGameWidget(this.game, {this.size}); EmbeddedGameWidget(this.game, {this.size});

View File

@ -9,6 +9,7 @@ import 'package:flutter/services.dart';
import '../keyboard.dart'; import '../keyboard.dart';
import '../vector.dart';
import 'widget_builder.dart'; import 'widget_builder.dart';
/// Represents a generic game. /// Represents a generic game.
@ -35,7 +36,7 @@ abstract class Game {
/// This is the resize hook; every time the game widget is resized, this hook is called. /// This is the resize hook; every time the game widget is resized, this hook is called.
/// ///
/// The default implementation does nothing; override to use the hook. /// The default implementation does nothing; override to use the hook.
void resize(Size size) {} void resize(Vector2 size) {}
/// This is the lifecycle state change hook; every time the game is resumed, paused or suspended, this is called. /// This is the lifecycle state change hook; every time the game is resumed, paused or suspended, this is called.
/// ///

View File

@ -5,6 +5,7 @@ import 'package:flutter/rendering.dart';
import 'package:flutter/scheduler.dart'; import 'package:flutter/scheduler.dart';
import 'package:flutter/widgets.dart' hide WidgetBuilder; import 'package:flutter/widgets.dart' hide WidgetBuilder;
import '../vector.dart';
import 'game_loop.dart'; import 'game_loop.dart';
import 'game.dart'; import 'game.dart';
@ -23,7 +24,7 @@ class GameRenderBox extends RenderBox with WidgetsBindingObserver {
@override @override
void performResize() { void performResize() {
super.performResize(); super.performResize();
game.resize(constraints.biggest); game.resize(VectorUtil.fromSize(constraints.biggest));
} }
@override @override

View File

@ -1,14 +1,14 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:vector_math/vector_math_64.dart';
import '../sprite_animation.dart'; import '../sprite_animation.dart';
import '../particle.dart'; import '../particle.dart';
import '../position.dart';
class SpriteAnimationParticle extends Particle { class SpriteAnimationParticle extends Particle {
final SpriteAnimation animation; final SpriteAnimation animation;
final Position size; final Vector2 size;
final Paint overridePaint; final Paint overridePaint;
final bool alignAnimationTime; final bool alignAnimationTime;
@ -36,7 +36,7 @@ class SpriteAnimationParticle extends Particle {
void render(Canvas canvas) { void render(Canvas canvas) {
animation.getSprite().renderCentered( animation.getSprite().renderCentered(
canvas, canvas,
Position.empty(), Vector2.zero(),
overridePaint: overridePaint, overridePaint: overridePaint,
size: size, size: size,
); );

View File

@ -1,14 +1,14 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:vector_math/vector_math_64.dart';
import '../particle.dart'; import '../particle.dart';
import '../position.dart';
import '../components/component.dart'; import '../components/component.dart';
class ComponentParticle extends Particle { class ComponentParticle extends Particle {
final Component component; final Component component;
final Position size; final Vector2 size;
final Paint overridePaint; final Paint overridePaint;
ComponentParticle({ ComponentParticle({

View File

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import '../particle.dart'; import '../particle.dart';
import '../vector.dart';
/// A [Particle] which renders given [Image] on a [Canvas] /// A [Particle] which renders given [Image] on a [Canvas]
/// image is centered. If any other behavior is needed, consider /// image is centered. If any other behavior is needed, consider
@ -16,13 +17,13 @@ class ImageParticle extends Particle {
ImageParticle({ ImageParticle({
@required this.image, @required this.image,
Size size, Vector2 size,
double lifespan, double lifespan,
}) : super(lifespan: lifespan) { }) : super(lifespan: lifespan) {
final srcWidth = image.width.toDouble(); final srcWidth = image.width.toDouble();
final srcHeight = image.height.toDouble(); final srcHeight = image.height.toDouble();
final destWidth = size?.width ?? srcWidth; final destWidth = size?.x ?? srcWidth;
final destHeight = size?.height ?? srcHeight; final destHeight = size?.y ?? srcHeight;
src = Rect.fromLTWH(0, 0, srcWidth, srcHeight); src = Rect.fromLTWH(0, 0, srcWidth, srcHeight);
dest = dest =

View File

@ -8,7 +8,7 @@ import '../components/mixins/single_child_particle.dart';
import '../particles/curved_particle.dart'; import '../particles/curved_particle.dart';
/// Statically offset given child [Particle] by given [Offset] /// Statically offset given child [Particle] by given [Offset]
/// If you're loking to move the child, consider [MovingParticle] /// If you're looking to move the child, consider [MovingParticle]
class MovingParticle extends CurvedParticle with SingleChildParticle { class MovingParticle extends CurvedParticle with SingleChildParticle {
@override @override
Particle child; Particle child;

View File

@ -1,14 +1,14 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:vector_math/vector_math_64.dart';
import '../particle.dart'; import '../particle.dart';
import '../position.dart';
import '../sprite.dart'; import '../sprite.dart';
class SpriteParticle extends Particle { class SpriteParticle extends Particle {
final Sprite sprite; final Sprite sprite;
final Position size; final Vector2 size;
final Paint overridePaint; final Paint overridePaint;
SpriteParticle({ SpriteParticle({
@ -24,7 +24,7 @@ class SpriteParticle extends Particle {
void render(Canvas canvas) { void render(Canvas canvas) {
sprite.renderCentered( sprite.renderCentered(
canvas, canvas,
Position.empty(), Vector2.zero(),
overridePaint: overridePaint, overridePaint: overridePaint,
size: size, size: size,
); );

View File

@ -1,226 +0,0 @@
import 'dart:math' as math;
import 'dart:ui' as ui;
import 'package:box2d_flame/box2d.dart' as b2d;
/// An ordered pair representation (point, position, offset).
///
/// It differs from the default implementations provided (math.Point and ui.Offset) as it's mutable.
/// Also, it offers helpful converters and a some useful methods for manipulation.
/// It always uses double values to store the coordinates.
class Position {
/// Coordinates
double x, y;
/// Basic constructor
Position(this.x, this.y);
/// Creates a point at the origin
Position.empty() : this(0.0, 0.0);
/// Creates converting integers to double.
///
/// Internal representation is still using double, the conversion is made in the constructor only.
Position.fromInts(int x, int y) : this(x.toDouble(), y.toDouble());
/// Creates using an [ui.Offset]
Position.fromOffset(ui.Offset offset) : this(offset.dx, offset.dy);
/// Creates using an [ui.Size]
Position.fromSize(ui.Size size) : this(size.width, size.height);
/// Creates using an [math.Point]
Position.fromPoint(math.Point point) : this(point.x, point.y);
/// Creates using another [Position]; i.e., clones this position.
///
/// This is useful because this class is mutable, so beware of mutability issues.
Position.fromPosition(Position position) : this(position.x, position.y);
/// Creates using a [b2d.Vector2]
Position.fromVector(b2d.Vector2 vector) : this(vector.x, vector.y);
/// Adds the coordinates from another vector.
///
/// This method changes `this` instance and returns itself.
Position add(Position other) {
x += other.x;
y += other.y;
return this;
}
/// Substracts the coordinates from another vector.
///
/// This method changes `this` instance and returns itself.
Position minus(Position other) {
return add(other.clone().opposite());
}
Position times(double scalar) {
x *= scalar;
y *= scalar;
return this;
}
Position opposite() {
return times(-1.0);
}
Position div(double scalar) {
return times(1 / scalar);
}
double dotProduct(Position p) {
return x * p.x + y * p.y;
}
/// The length (or magnitude) of this vector.
double length() {
return math.sqrt(dotProduct(this));
}
/// Rotate around origin; [angle] in radians.
Position rotate(double angle) {
final double nx = math.cos(angle) * x - math.sin(angle) * y;
final double ny = math.sin(angle) * x + math.cos(angle) * y;
x = nx;
y = ny;
return this;
}
/// Rotate around origin; [angle] in degrees.
Position rotateDeg(double angle) {
return rotate(angle * math.pi / 180);
}
/// Change current rotation by delta angle; [angle] in radians.
Position rotateDelta(double radians) {
return rotate(angle() + radians);
}
/// Change current rotation by delta angle; [angle] in degrees.
Position rotateDeltaDeg(double degrees) {
return rotateDeg(angleDeg() + degrees);
}
/// Returns the angle of this vector from origin in radians.
double angle() {
return math.atan2(y, x);
}
/// Returns the angle of this vector from origin in degrees.
double angleDeg() {
return angle() * 180 / math.pi;
}
/// Returns the angle of this vector from another [Position] in radians.
double angleFrom(Position other) {
// Technically the origin is not a vector so you cannot find the angle between
// itself and another vector so just default to calculating the angle between
// the non-origin point and the origin to avoid division by zero
if (x == 0 && y == 0) {
return other.angle();
}
if (other.x == 0 && other.y == 0) {
return angle();
}
return math.acos(dotProduct(other) / (length() * other.length()));
}
/// Returns the angle of this vector from another [Position] in degrees.
double angleFromDeg(Position other) {
return angleFrom(other) * 180 / math.pi;
}
double distance(Position other) {
return clone().minus(other).length();
}
/// Changes the [length] of this vector to the one provided, without chaning direction.
///
/// If you try to scale the zero (empty) vector, it will remain unchanged, and no error will be thrown.
Position scaleTo(double newLength) {
final l = length();
if (l == 0) {
return this;
}
return times(newLength.abs() / l);
}
/// Normalizes this vector, without changing direction.
Position normalize() {
return scaleTo(1.0);
}
/// Limits the [length] of this vector to the one provided, without changing direction.
///
/// If this vector's length is bigger than [maxLength], it becomes [maxLength]; otherwise, nothing changes.
Position limit(double maxLength) {
final newLength = length().clamp(0.0, maxLength.abs());
return scaleTo(newLength);
}
ui.Offset toOffset() {
return ui.Offset(x, y);
}
ui.Size toSize() {
return ui.Size(x, y);
}
math.Point toPoint() {
return math.Point(x, y);
}
b2d.Vector2 toVector() {
return b2d.Vector2(x, y);
}
Position clone() {
return Position.fromPosition(this);
}
bool equals(Position p) {
return p.x == x && p.y == y;
}
@override
bool operator ==(other) {
return other is Position && equals(other);
}
/// Negate.
Position operator -() => clone()..opposite();
/// Subtract two vectors.
Position operator -(Position other) => clone()..minus(other);
/// Add two vectors.
Position operator +(Position other) => clone()..add(other);
/// Scale.
Position operator /(double scale) => clone()..div(scale);
/// Scale.
Position operator *(double scale) => clone()..times(scale);
@override
int get hashCode => toString().hashCode;
@override
String toString() {
return '($x, $y)';
}
static ui.Rect rectFrom(Position topLeft, Position size) {
return ui.Rect.fromLTWH(topLeft.x, topLeft.y, size.x, size.y);
}
static ui.Rect bounds(List<Position> pts) {
final double minx = pts.map((e) => e.x).reduce(math.min);
final double maxx = pts.map((e) => e.x).reduce(math.max);
final double miny = pts.map((e) => e.y).reduce(math.min);
final double maxy = pts.map((e) => e.y).reduce(math.max);
return ui.Rect.fromPoints(ui.Offset(minx, miny), ui.Offset(maxx, maxy));
}
}

View File

@ -1,9 +1,12 @@
import 'dart:ui'; import 'dart:ui';
import 'dart:async'; import 'dart:async';
import 'package:vector_math/vector_math_64.dart';
import 'flame.dart'; import 'flame.dart';
import 'position.dart';
import 'palette.dart'; import 'palette.dart';
import 'vector.dart';
class Sprite { class Sprite {
Paint paint = BasicPalette.white.paint; Paint paint = BasicPalette.white.paint;
@ -62,15 +65,15 @@ class Sprite {
double get _imageHeight => image.height.toDouble(); double get _imageHeight => image.height.toDouble();
Position get originalSize { Vector2 get originalSize {
if (!loaded()) { if (!loaded()) {
return null; return null;
} }
return Position(_imageWidth, _imageHeight); return Vector2(_imageWidth, _imageHeight);
} }
Position get size { Vector2 get size {
return Position(src.width, src.height); return Vector2(src.width, src.height);
} }
/// Renders this Sprite on the position [p], scaled by the [scale] factor provided. /// Renders this Sprite on the position [p], scaled by the [scale] factor provided.
@ -78,22 +81,21 @@ class Sprite {
/// It renders with src size multiplied by [scale] in both directions. /// It renders with src size multiplied by [scale] in both directions.
/// Anchor is on top left as default. /// Anchor is on top left as default.
/// If not loaded, does nothing. /// If not loaded, does nothing.
void renderScaled(Canvas canvas, Position p, void renderScaled(Canvas canvas, Vector2 p,
{double scale = 1.0, Paint overridePaint}) { {double scale = 1.0, Paint overridePaint}) {
if (!loaded()) { if (!loaded()) {
return; return;
} }
renderPosition(canvas, p, renderPosition(canvas, p, size: size * scale, overridePaint: overridePaint);
size: size.times(scale), overridePaint: overridePaint);
} }
void renderPosition(Canvas canvas, Position p, void renderPosition(Canvas canvas, Vector2 p,
{Position size, Paint overridePaint}) { {Vector2 size, Paint overridePaint}) {
if (!loaded()) { if (!loaded()) {
return; return;
} }
size ??= this.size; size ??= this.size;
renderRect(canvas, Position.rectFrom(p, size), renderRect(canvas, VectorUtil.rectFrom(p, size),
overridePaint: overridePaint); overridePaint: overridePaint);
} }
@ -112,8 +114,8 @@ class Sprite {
/// ///
/// If [size] is not provided, the original size of the src image is used. /// If [size] is not provided, the original size of the src image is used.
/// If the asset is not yet loaded, it does nothing. /// If the asset is not yet loaded, it does nothing.
void renderCentered(Canvas canvas, Position p, void renderCentered(Canvas canvas, Vector2 p,
{Position size, Paint overridePaint}) { {Vector2 size, Paint overridePaint}) {
if (!loaded()) { if (!loaded()) {
return; return;
} }

View File

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'flame.dart'; import 'flame.dart';
import 'vector.dart';
/// sprite atlas with an image and a set of rects and transforms /// sprite atlas with an image and a set of rects and transforms
class SpriteBatch { class SpriteBatch {
@ -27,7 +28,7 @@ class SpriteBatch {
int get height => atlas.height; int get height => atlas.height;
Size get size => Size(width.toDouble(), height.toDouble()); Vector2 get size => Vector2(width.toDouble(), height.toDouble());
void addTransform({ void addTransform({
@required Rect rect, @required Rect rect,

View File

@ -1,10 +1,11 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flame/components/text_component.dart'; import 'package:flame/components/text_component.dart';
import 'package:flutter/material.dart' as material; import 'package:flutter/material.dart' as material;
import 'package:vector_math/vector_math_64.dart';
import 'position.dart';
import 'anchor.dart'; import 'anchor.dart';
import 'memory_cache.dart'; import 'memory_cache.dart';
import 'vector.dart';
/// A Text Config contains all typographical information required to render texts; i.e., font size and color, family, etc. /// A Text Config contains all typographical information required to render texts; i.e., font size and color, family, etc.
/// ///
@ -76,12 +77,12 @@ class TextConfig {
/// ///
/// const TextConfig config = TextConfig(fontSize: 48.0, fontFamily: 'Awesome Font'); /// const TextConfig config = TextConfig(fontSize: 48.0, fontFamily: 'Awesome Font');
/// config.render(c, Offset(size.width - 10, size.height - 10, anchor: Anchor.bottomRight); /// config.render(c, Offset(size.width - 10, size.height - 10, anchor: Anchor.bottomRight);
void render(Canvas canvas, String text, Position p, void render(Canvas canvas, String text, Vector2 p,
{Anchor anchor = Anchor.topLeft}) { {Anchor anchor = Anchor.topLeft}) {
final material.TextPainter tp = toTextPainter(text); final material.TextPainter tp = toTextPainter(text);
final Position translatedPosition = final Vector2 translatedPosition =
anchor.translate(p, Position.fromSize(tp.size)); anchor.translate(p, VectorUtil.fromSize(tp.size));
tp.paint(canvas, translatedPosition.toOffset()); tp.paint(canvas, VectorUtil.toOffset(translatedPosition));
} }
/// Returns a [material.TextPainter] that allows for text rendering and size measuring. /// Returns a [material.TextPainter] that allows for text rendering and size measuring.

View File

@ -1,12 +1,11 @@
import 'dart:async'; import 'dart:async';
import 'dart:ui'; import 'dart:ui';
import 'package:flame/vector.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'position.dart';
/// Some utilities that did not fit anywhere else. /// Some utilities that did not fit anywhere else.
/// ///
/// To use this class, access it via [Flame.util]. /// To use this class, access it via [Flame.util].
@ -98,20 +97,21 @@ class Util {
/// ///
/// A best practice would be to implement there resize hooks on your game and components and don't use this at all. /// A best practice would be to implement there resize hooks on your game and components and don't use this at all.
/// Make sure your components are able to render and update themselves for any possible screen size. /// Make sure your components are able to render and update themselves for any possible screen size.
Future<Size> initialDimensions() async { Future<Vector2> initialDimensions() async {
// https://github.com/flutter/flutter/issues/5259 // https://github.com/flutter/flutter/issues/5259
// "In release mode we start off at 0x0 but we don't in debug mode" // "In release mode we start off at 0x0 but we don't in debug mode"
return await Future<Size>(() { return await Future<Vector2>(() {
if (window.physicalSize.isEmpty) { if (window.physicalSize.isEmpty) {
final completer = Completer<Size>(); final completer = Completer<Vector2>();
window.onMetricsChanged = () { window.onMetricsChanged = () {
if (!window.physicalSize.isEmpty && !completer.isCompleted) { if (!window.physicalSize.isEmpty && !completer.isCompleted) {
completer.complete(window.physicalSize / window.devicePixelRatio); completer.complete(VectorUtil.fromSize(
window.physicalSize / window.devicePixelRatio));
} }
}; };
return completer.future; return completer.future;
} }
return window.physicalSize / window.devicePixelRatio; return VectorUtil.fromSize(window.physicalSize / window.devicePixelRatio);
}); });
} }
@ -148,7 +148,7 @@ class Util {
/// ///
/// Some render methods don't allow to pass a offset. /// Some render methods don't allow to pass a offset.
/// This method translate the canvas, draw what you want, and then translate back. /// This method translate the canvas, draw what you want, and then translate back.
void drawWhere(Canvas c, Position p, void Function(Canvas) fn) { void drawWhere(Canvas c, Vector2 p, void Function(Canvas) fn) {
c.translate(p.x, p.y); c.translate(p.x, p.y);
fn(c); fn(c);
c.translate(-p.x, -p.y); c.translate(-p.x, -p.y);

80
lib/vector.dart Normal file
View File

@ -0,0 +1,80 @@
library flame.vector_math;
export 'package:vector_math/vector_math_64.dart' show Vector2;
import 'dart:math' as math;
import 'dart:ui' as ui;
import 'package:vector_math/vector_math_64.dart';
class VectorUtil {
/// Creates converting integers to double.
///
/// Internal representation is still using double, the conversion is made in the constructor only.
static Vector2 fromInts(int x, int y) => Vector2(x.toDouble(), y.toDouble());
/// Creates using an [ui.Offset]
static Vector2 fromOffset(ui.Offset offset) => Vector2(offset.dx, offset.dy);
/// Creates using an [ui.Size]
static Vector2 fromSize(ui.Size size) => Vector2(size.width, size.height);
/// Creates using an [math.Point]
static Vector2 fromPoint(math.Point point) => Vector2(point.x, point.y);
static ui.Offset toOffset(Vector2 v) => ui.Offset(v.x, v.y);
static ui.Size toSize(Vector2 v) => ui.Size(v.x, v.y);
static math.Point toPoint(Vector2 v) => math.Point(v.x, v.y);
// Used once in sprite
static ui.Rect rectFrom(Vector2 topLeft, Vector2 size) {
return ui.Rect.fromLTWH(topLeft.x, topLeft.y, size.x, size.y);
}
static ui.Rect bounds(List<Vector2> pts) {
final double minx = pts.map((e) => e.x).reduce(math.min);
final double maxx = pts.map((e) => e.x).reduce(math.max);
final double miny = pts.map((e) => e.y).reduce(math.min);
final double maxy = pts.map((e) => e.y).reduce(math.max);
return ui.Rect.fromPoints(ui.Offset(minx, miny), ui.Offset(maxx, maxy));
}
/// Linearly interpolate between two vectors.
static Vector2 lerp(Vector2 a, Vector2 b, double t) {
return a + (b - a) * t;
}
static void rotate(Vector2 v, double angle) {
final double sin = math.sin(angle);
final double cos = math.cos(angle);
v.setValues(v.x * cos - v.y * sin, v.x * sin + v.y * cos);
}
static Vector2 rotated(Vector2 v, double angle) {
final double sin = math.sin(angle);
final double cos = math.cos(angle);
return Vector2(v.x * cos - v.y * sin, v.x * sin + v.y * cos);
}
/// Returns a new vector with the [length] scaled to [newLength], without changing direction.
///
/// If you try to scale the zero (empty) vector, it will remain unchanged, and no error will be thrown.
static Vector2 scaledTo(Vector2 v, double newLength) {
final l = v.length;
if (l == 0) {
return v;
}
return v * (newLength.abs() / l);
}
/// Changes the [length] of the vector to the length provided, without changing direction.
///
/// If you try to scale the zero (empty) vector, it will remain unchanged, and no error will be thrown.
static void scaleTo(Vector2 v, double newLength) {
final l = v.length;
if (l != 0) {
v.setFrom(v * (newLength.abs() / l));
}
}
}

View File

@ -50,12 +50,12 @@ class _SpritePainter extends CustomPainter {
final w = _sprite.size.x * rate; final w = _sprite.size.x * rate;
final h = _sprite.size.y * rate; final h = _sprite.size.y * rate;
final double dx = _anchor.relativePosition.dx * size.width; final double dx = _anchor.relativePosition.x * size.width;
final double dy = _anchor.relativePosition.dy * size.height; final double dy = _anchor.relativePosition.y * size.height;
canvas.translate( canvas.translate(
dx - w * _anchor.relativePosition.dx, dx - w * _anchor.relativePosition.x,
dy - h * _anchor.relativePosition.dy, dy - h * _anchor.relativePosition.y,
); );
_sprite.render(canvas, width: w, height: h); _sprite.render(canvas, width: w, height: h);

View File

@ -14,6 +14,7 @@ dependencies:
convert: ^2.0.1 convert: ^2.0.1
flare_flutter: ^2.0.1 flare_flutter: ^2.0.1
meta: ^1.1.8 meta: ^1.1.8
vector_math: '>=2.0.0 <3.0.0'
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

View File

@ -2,7 +2,7 @@ import 'dart:ui';
import 'package:flame/components/position_component.dart'; import 'package:flame/components/position_component.dart';
import 'package:flame/components/sprite_component.dart'; import 'package:flame/components/sprite_component.dart';
import 'package:flame/position.dart'; import 'package:flame/vector.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
void main() { void main() {
@ -14,7 +14,7 @@ void main() {
expect(c.toPosition().x, 2.2); expect(c.toPosition().x, 2.2);
expect(c.toPosition().y, 3.4); expect(c.toPosition().y, 3.4);
c.setByPosition(Position(1.0, 0.0)); c.setByPosition(Vector2(1.0, 0.0));
expect(c.x, 1.0); expect(c.x, 1.0);
expect(c.y, 0.0); expect(c.y, 0.0);
}); });
@ -26,7 +26,7 @@ void main() {
expect(c.toSize().x, 2.2); expect(c.toSize().x, 2.2);
expect(c.toSize().y, 3.4); expect(c.toSize().y, 3.4);
c.setBySize(Position(1.0, 0.0)); c.setBySize(Vector2(1.0, 0.0));
expect(c.width, 1.0); expect(c.width, 1.0);
expect(c.height, 0.0); expect(c.height, 0.0);
}); });

View File

@ -5,6 +5,7 @@ import 'package:flame/components/mixins/has_game_ref.dart';
import 'package:flame/components/mixins/resizable.dart'; import 'package:flame/components/mixins/resizable.dart';
import 'package:flame/components/mixins/tapable.dart'; import 'package:flame/components/mixins/tapable.dart';
import 'package:flame/game/base_game.dart'; import 'package:flame/game/base_game.dart';
import 'package:flame/vector.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
@ -29,7 +30,7 @@ class MyComposed extends PositionComponent with HasGameRef, Tapable {
class PositionComponentNoNeedForRect extends PositionComponent with Tapable {} class PositionComponentNoNeedForRect extends PositionComponent with Tapable {}
const Size size = Size(1.0, 1.0); Vector2 size = Vector2(1.0, 1.0);
void main() { void main() {
group('composable component test', () { group('composable component test', () {

View File

@ -1,6 +1,7 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flame/game/base_game.dart'; import 'package:flame/game/base_game.dart';
import 'package:flame/vector.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:flame/components/position_component.dart'; import 'package:flame/components/position_component.dart';
@ -18,7 +19,7 @@ class MyComponent extends PositionComponent with Resizable {
class MyGame extends BaseGame {} class MyGame extends BaseGame {}
Size size = const Size(1.0, 1.0); Vector2 size = Vector2(1.0, 1.0);
void main() { void main() {
group('resizable test', () { group('resizable test', () {

View File

@ -1,8 +1,7 @@
import 'package:flame/vector.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'dart:math' as math; import 'dart:math' as math;
import 'package:flame/position.dart';
void expectDouble(double d1, double d2) { void expectDouble(double d1, double d2) {
expect((d1 - d2).abs() <= 0.0001, true); expect((d1 - d2).abs() <= 0.0001, true);
} }
@ -10,95 +9,96 @@ void expectDouble(double d1, double d2) {
void main() { void main() {
group('position test', () { group('position test', () {
test('test add', () { test('test add', () {
final Position p = Position(0.0, 5.0); final Vector2 p = Vector2(0.0, 5.0);
final Position p2 = p.add(Position(5.0, 5.0)); final Vector2 p2 = p + Vector2(5.0, 5.0);
expect(p, p2); expect(p, p2);
expectDouble(p.x, 5.0); expectDouble(p.x, 5.0);
expectDouble(p.y, 10.0); expectDouble(p.y, 10.0);
}); });
test('test clone', () { test('test clone', () {
final Position p = Position(1.0, 0.0); final Vector2 p = Vector2(1.0, 0.0);
final Position clone = p.clone(); final Vector2 clone = p.clone();
clone.times(2.0); clone.scale(2.0);
expectDouble(p.x, 1.0); expectDouble(p.x, 1.0);
expectDouble(clone.x, 2.0); expectDouble(clone.x, 2.0);
}); });
test('test rotate', () { test('test rotate', () {
final Position p = Position(1.0, 0.0).rotate(math.pi / 2); final Vector2 p = Vector2(1.0, 0.0);
VectorUtil.rotate(p, math.pi / 2);
expectDouble(p.x, 0.0); expectDouble(p.x, 0.0);
expectDouble(p.y, 1.0); expectDouble(p.y, 1.0);
}); });
test('test length', () { test('test length', () {
final Position p1 = Position(3.0, 4.0); final Vector2 p1 = Vector2(3.0, 4.0);
expectDouble(p1.length(), 5.0); expectDouble(p1.length, 5.0);
final Position p2 = Position(2.0, 0.0); final Vector2 p2 = Vector2(2.0, 0.0);
expectDouble(p2.length(), 2.0); expectDouble(p2.length, 2.0);
final Position p3 = Position(0.0, 1.5); final Vector2 p3 = Vector2(0.0, 1.5);
expectDouble(p3.length(), 1.5); expectDouble(p3.length, 1.5);
}); });
test('test distance', () { test('test distance', () {
final Position p1 = Position(10.0, 20.0); final Vector2 p1 = Vector2(10.0, 20.0);
final Position p2 = Position(13.0, 24.0); final Vector2 p2 = Vector2(13.0, 24.0);
final double result = p1.distance(p2); final double result = p1.distanceTo(p2);
expectDouble(result, 5.0); expectDouble(result, 5.0);
}); });
test('equality', () { test('equality', () {
final Position p1 = Position.empty(); final Vector2 p1 = Vector2.zero();
final Position p2 = Position.empty(); final Vector2 p2 = Vector2.zero();
expect(p1 == p2, true); expect(p1 == p2, true);
}); });
test('non equality', () { test('non equality', () {
final Position p1 = Position.empty(); final Vector2 p1 = Vector2.zero();
final Position p2 = Position(1.0, 0.0); final Vector2 p2 = Vector2(1.0, 0.0);
expect(p1 == p2, false); expect(p1 == p2, false);
}); });
test('hashCode', () { test('hashCode', () {
final Position p1 = Position(2.0, -1.0); final Vector2 p1 = Vector2(2.0, -1.0);
final Position p2 = Position(1.0, 0.0); final Vector2 p2 = Vector2(1.0, 0.0);
expect(p1.hashCode == p2.hashCode, false); expect(p1.hashCode == p2.hashCode, false);
}); });
test('scaleTo', () { test('scaleTo', () {
final Position p = Position(1.0, 0.0); final Vector2 p = VectorUtil.rotated(Vector2(1.0, 0.0), math.pi / 4);
VectorUtil.scaleTo(p, 2.0);
p.rotate(math.pi / 4).scaleTo(2.0); expect(p.length, 2.0);
expect(p.length(), 2.0);
p.rotate(-math.pi / 4); VectorUtil.rotate(p, -math.pi / 4);
expect(p.length(), 2.0); expect(p.length, 2.0);
expect(p.x, 2.0); expect(p.x, 2.0);
expect(p.y, 0.0); expect(p.y, 0.0);
}); });
test('scaleTo the zero vector', () { test('scaleTo the zero vector', () {
final Position p = Position.empty(); final Vector2 p = Vector2.zero();
expect(p.scaleTo(1.0).length(), 0.0); expect(p.normalized().length, 0.0);
}); });
test('limit', () { test('limit', () {
final Position p1 = Position(1.0, 0.0); final Vector2 p1 = Vector2(1.0, 0.0);
p1.limit(0.75); p1.clampScalar(0, 0.75);
expect(p1.length(), 0.75); expect(p1.length, 0.75);
expect(p1.x, 0.75); expect(p1.x, 0.75);
expect(p1.y, 0.0); expect(p1.y, 0.0);
final Position p2 = Position(1.0, 1.0); final Vector2 p2 = Vector2(1.0, 1.0);
p2.limit(3.0); p2.clampScalar(0, 3.0);
expectDouble(p2.length(), math.sqrt(2)); expectDouble(p2.length, math.sqrt(2));
expect(p2.x, 1.0); expect(p2.x, 1.0);
expect(p2.y, 1.0); expect(p2.y, 1.0);
p2.limit(1.0); p2.clampScalar(0, 1.0);
expectDouble(p2.length(), 1.0); expectDouble(p2.length, 1.0);
expect(p2.x, p2.y); expect(p2.x, p2.y);
}); });
}); });