From b8f561c0d7b8c080b8228406a96b7042d018e67e Mon Sep 17 00:00:00 2001 From: alestiago Date: Tue, 12 Apr 2022 23:17:12 +0100 Subject: [PATCH] refactor: resolved gravityScale problems --- packages/pinball_components/lib/src/components/ball.dart | 4 ++-- .../pinball_components/lib/src/components/chrome_dino.dart | 2 +- packages/pinball_components/lib/src/components/flipper.dart | 2 +- packages/pinball_components/lib/src/components/plunger.dart | 2 +- .../pinball_components/test/src/components/ball_test.dart | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/pinball_components/lib/src/components/ball.dart b/packages/pinball_components/lib/src/components/ball.dart index 71719a0e..fcd6830d 100644 --- a/packages/pinball_components/lib/src/components/ball.dart +++ b/packages/pinball_components/lib/src/components/ball.dart @@ -79,7 +79,7 @@ class Ball extends BodyComponent // TODO(allisonryan0002): prevent motion from contact with other balls. void stop() { body - ..gravityScale = 0 + ..gravityScale = Vector2.zero() ..linearVelocity = Vector2.zero() ..angularVelocity = 0; } @@ -88,7 +88,7 @@ class Ball extends BodyComponent /// /// If previously [stop]ped, the previous ball's velocity is not kept. void resume() { - body.gravityScale = 1; + body.gravityScale = Vector2(0, 1); } @override diff --git a/packages/pinball_components/lib/src/components/chrome_dino.dart b/packages/pinball_components/lib/src/components/chrome_dino.dart index 327e14f5..06b302c7 100644 --- a/packages/pinball_components/lib/src/components/chrome_dino.dart +++ b/packages/pinball_components/lib/src/components/chrome_dino.dart @@ -94,7 +94,7 @@ class ChromeDino extends BodyComponent with InitialPosition { @override Body createBody() { final bodyDef = BodyDef() - ..gravityScale = 0 + ..gravityScale = Vector2.zero() ..position = initialPosition ..type = BodyType.dynamic; diff --git a/packages/pinball_components/lib/src/components/flipper.dart b/packages/pinball_components/lib/src/components/flipper.dart index c9580510..b0914917 100644 --- a/packages/pinball_components/lib/src/components/flipper.dart +++ b/packages/pinball_components/lib/src/components/flipper.dart @@ -120,7 +120,7 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { Body createBody() { final bodyDef = BodyDef() ..position = initialPosition - ..gravityScale = 0 + ..gravityScale = Vector2.zero() ..type = BodyType.dynamic; final body = world.createBody(bodyDef); _createFixtureDefs().forEach(body.createFixture); diff --git a/packages/pinball_components/lib/src/components/plunger.dart b/packages/pinball_components/lib/src/components/plunger.dart index 7e0ba5ba..0ea3ebda 100644 --- a/packages/pinball_components/lib/src/components/plunger.dart +++ b/packages/pinball_components/lib/src/components/plunger.dart @@ -35,7 +35,7 @@ class Plunger extends BodyComponent with InitialPosition { ..position = initialPosition ..userData = this ..type = BodyType.dynamic - ..gravityScale = 0; + ..gravityScale = Vector2.zero(); return world.createBody(bodyDef)..createFixture(fixtureDef); } diff --git a/packages/pinball_components/test/src/components/ball_test.dart b/packages/pinball_components/test/src/components/ball_test.dart index 4fb8b5ff..a0a73e2b 100644 --- a/packages/pinball_components/test/src/components/ball_test.dart +++ b/packages/pinball_components/test/src/components/ball_test.dart @@ -48,7 +48,7 @@ void main() { final ball = Ball(baseColor: Colors.blue); await game.ensureAdd(ball); - ball.body.gravityScale = 0; + ball.body.gravityScale = Vector2.zero(); ball.body.linearVelocity.setValues(10, 10); game.update(1); expect(ball.body.position, isNot(equals(ball.initialPosition))); @@ -153,7 +153,7 @@ void main() { ball.stop(); ball.resume(); - ball.body.gravityScale = 0; + ball.body.gravityScale = Vector2.zero(); ball.body.linearVelocity.setValues(10, 10); game.update(1); expect(ball.body.position, isNot(equals(ball.initialPosition)));