refactor: back to active/inactive naming

pull/204/head
Allison Ryan 3 years ago
parent d73088fb03
commit d7620256f8

@ -48,22 +48,22 @@ extension PinballGameAssetsX on PinballGame {
), ),
images.load(components.Assets.images.spaceship.rail.main.keyName), images.load(components.Assets.images.spaceship.rail.main.keyName),
images.load(components.Assets.images.spaceship.rail.foreground.keyName), images.load(components.Assets.images.spaceship.rail.foreground.keyName),
images.load(components.Assets.images.alienBumper.a.on.keyName), images.load(components.Assets.images.alienBumper.a.active.keyName),
images.load(components.Assets.images.alienBumper.a.off.keyName), images.load(components.Assets.images.alienBumper.a.inactive.keyName),
images.load(components.Assets.images.alienBumper.b.on.keyName), images.load(components.Assets.images.alienBumper.b.active.keyName),
images.load(components.Assets.images.alienBumper.b.off.keyName), images.load(components.Assets.images.alienBumper.b.inactive.keyName),
images.load(components.Assets.images.chromeDino.mouth.keyName), images.load(components.Assets.images.chromeDino.mouth.keyName),
images.load(components.Assets.images.chromeDino.head.keyName), images.load(components.Assets.images.chromeDino.head.keyName),
images.load(components.Assets.images.plunger.plunger.keyName), images.load(components.Assets.images.plunger.plunger.keyName),
images.load(components.Assets.images.plunger.rocket.keyName), images.load(components.Assets.images.plunger.rocket.keyName),
images.load(components.Assets.images.sparky.computer.base.keyName), images.load(components.Assets.images.sparky.computer.base.keyName),
images.load(components.Assets.images.sparky.computer.top.keyName), images.load(components.Assets.images.sparky.computer.top.keyName),
images.load(components.Assets.images.sparky.bumper.a.on.keyName), images.load(components.Assets.images.sparky.bumper.a.active.keyName),
images.load(components.Assets.images.sparky.bumper.a.off.keyName), images.load(components.Assets.images.sparky.bumper.a.inactive.keyName),
images.load(components.Assets.images.sparky.bumper.b.on.keyName), images.load(components.Assets.images.sparky.bumper.b.active.keyName),
images.load(components.Assets.images.sparky.bumper.b.off.keyName), images.load(components.Assets.images.sparky.bumper.b.inactive.keyName),
images.load(components.Assets.images.sparky.bumper.c.on.keyName), images.load(components.Assets.images.sparky.bumper.c.active.keyName),
images.load(components.Assets.images.sparky.bumper.c.off.keyName), images.load(components.Assets.images.sparky.bumper.c.inactive.keyName),
images.load(components.Assets.images.backboard.backboardScores.keyName), images.load(components.Assets.images.backboard.backboardScores.keyName),
images.load(components.Assets.images.backboard.backboardGameOver.keyName), images.load(components.Assets.images.backboard.backboardGameOver.keyName),
images.load(components.Assets.images.googleWord.letter1.keyName), images.load(components.Assets.images.googleWord.letter1.keyName),

@ -250,25 +250,25 @@ class $AssetsImagesSparkyGen {
class $AssetsImagesAlienBumperAGen { class $AssetsImagesAlienBumperAGen {
const $AssetsImagesAlienBumperAGen(); const $AssetsImagesAlienBumperAGen();
/// File path: assets/images/alien_bumper/a/off.png /// File path: assets/images/alien_bumper/a/active.png
AssetGenImage get off => AssetGenImage get active =>
const AssetGenImage('assets/images/alien_bumper/a/off.png'); const AssetGenImage('assets/images/alien_bumper/a/active.png');
/// File path: assets/images/alien_bumper/a/on.png /// File path: assets/images/alien_bumper/a/inactive.png
AssetGenImage get on => AssetGenImage get inactive =>
const AssetGenImage('assets/images/alien_bumper/a/on.png'); const AssetGenImage('assets/images/alien_bumper/a/inactive.png');
} }
class $AssetsImagesAlienBumperBGen { class $AssetsImagesAlienBumperBGen {
const $AssetsImagesAlienBumperBGen(); const $AssetsImagesAlienBumperBGen();
/// File path: assets/images/alien_bumper/b/off.png /// File path: assets/images/alien_bumper/b/active.png
AssetGenImage get off => AssetGenImage get active =>
const AssetGenImage('assets/images/alien_bumper/b/off.png'); const AssetGenImage('assets/images/alien_bumper/b/active.png');
/// File path: assets/images/alien_bumper/b/on.png /// File path: assets/images/alien_bumper/b/inactive.png
AssetGenImage get on => AssetGenImage get inactive =>
const AssetGenImage('assets/images/alien_bumper/b/on.png'); const AssetGenImage('assets/images/alien_bumper/b/inactive.png');
} }
class $AssetsImagesDashBumperGen { class $AssetsImagesDashBumperGen {
@ -371,37 +371,37 @@ class $AssetsImagesDashBumperMainGen {
class $AssetsImagesSparkyBumperAGen { class $AssetsImagesSparkyBumperAGen {
const $AssetsImagesSparkyBumperAGen(); const $AssetsImagesSparkyBumperAGen();
/// File path: assets/images/sparky/bumper/a/off.png /// File path: assets/images/sparky/bumper/a/active.png
AssetGenImage get off => AssetGenImage get active =>
const AssetGenImage('assets/images/sparky/bumper/a/off.png'); const AssetGenImage('assets/images/sparky/bumper/a/active.png');
/// File path: assets/images/sparky/bumper/a/on.png /// File path: assets/images/sparky/bumper/a/inactive.png
AssetGenImage get on => AssetGenImage get inactive =>
const AssetGenImage('assets/images/sparky/bumper/a/on.png'); const AssetGenImage('assets/images/sparky/bumper/a/inactive.png');
} }
class $AssetsImagesSparkyBumperBGen { class $AssetsImagesSparkyBumperBGen {
const $AssetsImagesSparkyBumperBGen(); const $AssetsImagesSparkyBumperBGen();
/// File path: assets/images/sparky/bumper/b/off.png /// File path: assets/images/sparky/bumper/b/active.png
AssetGenImage get off => AssetGenImage get active =>
const AssetGenImage('assets/images/sparky/bumper/b/off.png'); const AssetGenImage('assets/images/sparky/bumper/b/active.png');
/// File path: assets/images/sparky/bumper/a/on.png /// File path: assets/images/sparky/bumper/b/inactive.png
AssetGenImage get on => AssetGenImage get inactive =>
const AssetGenImage('assets/images/sparky/bumper/b/on.png'); const AssetGenImage('assets/images/sparky/bumper/b/inactive.png');
} }
class $AssetsImagesSparkyBumperCGen { class $AssetsImagesSparkyBumperCGen {
const $AssetsImagesSparkyBumperCGen(); const $AssetsImagesSparkyBumperCGen();
/// File path: assets/images/sparky/bumper/c/off.png /// File path: assets/images/sparky/bumper/c/active.png
AssetGenImage get off => AssetGenImage get active =>
const AssetGenImage('assets/images/sparky/bumper/c/off.png'); const AssetGenImage('assets/images/sparky/bumper/c/active.png');
/// File path: assets/images/sparky/bumper/c/on.png /// File path: assets/images/sparky/bumper/c/inactive.png
AssetGenImage get on => AssetGenImage get inactive =>
const AssetGenImage('assets/images/sparky/bumper/c/on.png'); const AssetGenImage('assets/images/sparky/bumper/c/inactive.png');
} }
class Assets { class Assets {

@ -33,8 +33,8 @@ class AlienBumper extends BodyComponent with InitialPosition {
: this._( : this._(
majorRadius: 3.52, majorRadius: 3.52,
minorRadius: 2.97, minorRadius: 2.97,
onAssetPath: Assets.images.alienBumper.a.on.keyName, onAssetPath: Assets.images.alienBumper.a.active.keyName,
offAssetPath: Assets.images.alienBumper.a.off.keyName, offAssetPath: Assets.images.alienBumper.a.inactive.keyName,
); );
/// {@macro alien_bumper} /// {@macro alien_bumper}
@ -42,8 +42,8 @@ class AlienBumper extends BodyComponent with InitialPosition {
: this._( : this._(
majorRadius: 3.19, majorRadius: 3.19,
minorRadius: 2.79, minorRadius: 2.79,
onAssetPath: Assets.images.alienBumper.b.on.keyName, onAssetPath: Assets.images.alienBumper.b.active.keyName,
offAssetPath: Assets.images.alienBumper.b.off.keyName, offAssetPath: Assets.images.alienBumper.b.inactive.keyName,
); );
final double _majorRadius; final double _majorRadius;
@ -71,9 +71,9 @@ class AlienBumper extends BodyComponent with InitialPosition {
/// Animates the [AlienBumper]. /// Animates the [AlienBumper].
Future<void> animate() async { Future<void> animate() async {
final spriteGroupComponent = firstChild<_AlienBumperSpriteGroupComponent>() final spriteGroupComponent = firstChild<_AlienBumperSpriteGroupComponent>()
?..current = AlienBumperSpriteState.off; ?..current = AlienBumperSpriteState.inactive;
await Future<void>.delayed(const Duration(milliseconds: 50)); await Future<void>.delayed(const Duration(milliseconds: 50));
spriteGroupComponent?.current = AlienBumperSpriteState.on; spriteGroupComponent?.current = AlienBumperSpriteState.active;
} }
} }
@ -81,11 +81,11 @@ class AlienBumper extends BodyComponent with InitialPosition {
/// Indicates the [AlienBumper]'s current sprite state. /// Indicates the [AlienBumper]'s current sprite state.
enum AlienBumperSpriteState { enum AlienBumperSpriteState {
/// The on sprite is being displayed. /// The active sprite is being displayed.
on, active,
/// The off sprite is being displayed. /// The inactive sprite is being displayed.
off, inactive,
} }
class _AlienBumperSpriteGroupComponent class _AlienBumperSpriteGroupComponent
@ -108,14 +108,15 @@ class _AlienBumperSpriteGroupComponent
await super.onLoad(); await super.onLoad();
final sprites = { final sprites = {
AlienBumperSpriteState.on: Sprite(gameRef.images.fromCache(_onAssetPath)), AlienBumperSpriteState.active:
AlienBumperSpriteState.off: Sprite(gameRef.images.fromCache(_onAssetPath)),
AlienBumperSpriteState.inactive:
Sprite(gameRef.images.fromCache(_offAssetPath)), Sprite(gameRef.images.fromCache(_offAssetPath)),
}; };
this.sprites = sprites; this.sprites = sprites;
size = sprites[AlienBumperSpriteState.on]!.originalSize / 10; size = sprites[AlienBumperSpriteState.active]!.originalSize / 10;
current = AlienBumperSpriteState.on; current = AlienBumperSpriteState.active;
} }
} }

@ -35,8 +35,8 @@ class SparkyBumper extends BodyComponent with InitialPosition {
: this._( : this._(
majorRadius: 2.9, majorRadius: 2.9,
minorRadius: 2.1, minorRadius: 2.1,
onAssetPath: Assets.images.sparky.bumper.a.on.keyName, onAssetPath: Assets.images.sparky.bumper.a.active.keyName,
offAssetPath: Assets.images.sparky.bumper.a.off.keyName, offAssetPath: Assets.images.sparky.bumper.a.inactive.keyName,
spritePosition: Vector2(0, -0.25), spritePosition: Vector2(0, -0.25),
); );
@ -45,8 +45,8 @@ class SparkyBumper extends BodyComponent with InitialPosition {
: this._( : this._(
majorRadius: 2.85, majorRadius: 2.85,
minorRadius: 2, minorRadius: 2,
onAssetPath: Assets.images.sparky.bumper.b.on.keyName, onAssetPath: Assets.images.sparky.bumper.b.active.keyName,
offAssetPath: Assets.images.sparky.bumper.b.off.keyName, offAssetPath: Assets.images.sparky.bumper.b.inactive.keyName,
spritePosition: Vector2(0, -0.35), spritePosition: Vector2(0, -0.35),
); );
@ -55,8 +55,8 @@ class SparkyBumper extends BodyComponent with InitialPosition {
: this._( : this._(
majorRadius: 3, majorRadius: 3,
minorRadius: 2.2, minorRadius: 2.2,
onAssetPath: Assets.images.sparky.bumper.c.on.keyName, onAssetPath: Assets.images.sparky.bumper.c.active.keyName,
offAssetPath: Assets.images.sparky.bumper.c.off.keyName, offAssetPath: Assets.images.sparky.bumper.c.inactive.keyName,
spritePosition: Vector2(0, -0.4), spritePosition: Vector2(0, -0.4),
); );
@ -86,9 +86,9 @@ class SparkyBumper extends BodyComponent with InitialPosition {
/// Animates the [DashNestBumper]. /// Animates the [DashNestBumper].
Future<void> animate() async { Future<void> animate() async {
final spriteGroupComponent = firstChild<_SparkyBumperSpriteGroupComponent>() final spriteGroupComponent = firstChild<_SparkyBumperSpriteGroupComponent>()
?..current = SparkyBumperSpriteState.off; ?..current = SparkyBumperSpriteState.inactive;
await Future<void>.delayed(const Duration(milliseconds: 50)); await Future<void>.delayed(const Duration(milliseconds: 50));
spriteGroupComponent?.current = SparkyBumperSpriteState.on; spriteGroupComponent?.current = SparkyBumperSpriteState.active;
} }
} }
@ -96,11 +96,11 @@ class SparkyBumper extends BodyComponent with InitialPosition {
/// Indicates the [SparkyBumper]'s current sprite state. /// Indicates the [SparkyBumper]'s current sprite state.
enum SparkyBumperSpriteState { enum SparkyBumperSpriteState {
/// The on sprite is being displayed. /// The active sprite is being displayed.
on, active,
/// The off sprite is being displayed. /// The inactive sprite is being displayed.
off, inactive,
} }
class _SparkyBumperSpriteGroupComponent class _SparkyBumperSpriteGroupComponent
@ -123,14 +123,14 @@ class _SparkyBumperSpriteGroupComponent
Future<void> onLoad() async { Future<void> onLoad() async {
await super.onLoad(); await super.onLoad();
final sprites = { final sprites = {
SparkyBumperSpriteState.on: SparkyBumperSpriteState.active:
Sprite(gameRef.images.fromCache(_onAssetPath)), Sprite(gameRef.images.fromCache(_onAssetPath)),
SparkyBumperSpriteState.off: SparkyBumperSpriteState.inactive:
Sprite(gameRef.images.fromCache(_offAssetPath)), Sprite(gameRef.images.fromCache(_offAssetPath)),
}; };
this.sprites = sprites; this.sprites = sprites;
size = sprites[SparkyBumperSpriteState.on]!.originalSize / 10; size = sprites[SparkyBumperSpriteState.active]!.originalSize / 10;
current = SparkyBumperSpriteState.on; current = SparkyBumperSpriteState.active;
} }
} }

@ -18,8 +18,8 @@ class AlienBumperAGame extends BasicBallGame {
await super.onLoad(); await super.onLoad();
await Future.wait([ await Future.wait([
images.load(Assets.images.alienBumper.a.on.keyName), images.load(Assets.images.alienBumper.a.active.keyName),
images.load(Assets.images.alienBumper.a.off.keyName), images.load(Assets.images.alienBumper.a.inactive.keyName),
]); ]);
final center = screenToWorld(camera.viewport.canvasSize! / 2); final center = screenToWorld(camera.viewport.canvasSize! / 2);

@ -18,8 +18,8 @@ class AlienBumperBGame extends BasicBallGame {
await super.onLoad(); await super.onLoad();
await Future.wait([ await Future.wait([
images.load(Assets.images.alienBumper.b.on.keyName), images.load(Assets.images.alienBumper.b.active.keyName),
images.load(Assets.images.alienBumper.b.off.keyName), images.load(Assets.images.alienBumper.b.inactive.keyName),
]); ]);
final center = screenToWorld(camera.viewport.canvasSize! / 2); final center = screenToWorld(camera.viewport.canvasSize! / 2);

@ -17,12 +17,12 @@ class SparkyBumperGame extends BasicBallGame with Traceable {
await super.onLoad(); await super.onLoad();
await Future.wait([ await Future.wait([
images.load(Assets.images.sparky.bumper.a.on.keyName), images.load(Assets.images.sparky.bumper.a.active.keyName),
images.load(Assets.images.sparky.bumper.a.off.keyName), images.load(Assets.images.sparky.bumper.a.inactive.keyName),
images.load(Assets.images.sparky.bumper.b.on.keyName), images.load(Assets.images.sparky.bumper.b.active.keyName),
images.load(Assets.images.sparky.bumper.b.off.keyName), images.load(Assets.images.sparky.bumper.b.inactive.keyName),
images.load(Assets.images.sparky.bumper.c.on.keyName), images.load(Assets.images.sparky.bumper.c.active.keyName),
images.load(Assets.images.sparky.bumper.c.off.keyName), images.load(Assets.images.sparky.bumper.c.inactive.keyName),
]); ]);
final center = screenToWorld(camera.viewport.canvasSize! / 2); final center = screenToWorld(camera.viewport.canvasSize! / 2);

@ -10,10 +10,10 @@ import '../../helpers/helpers.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final assets = [ final assets = [
Assets.images.alienBumper.a.on.keyName, Assets.images.alienBumper.a.active.keyName,
Assets.images.alienBumper.a.off.keyName, Assets.images.alienBumper.a.inactive.keyName,
Assets.images.alienBumper.b.on.keyName, Assets.images.alienBumper.b.active.keyName,
Assets.images.alienBumper.b.off.keyName, Assets.images.alienBumper.b.inactive.keyName,
]; ];
final flameTester = FlameTester(() => TestGame(assets)); final flameTester = FlameTester(() => TestGame(assets));
@ -40,21 +40,21 @@ void main() {
expect( expect(
spriteGroupComponent.current, spriteGroupComponent.current,
equals(AlienBumperSpriteState.on), equals(AlienBumperSpriteState.active),
); );
final future = bumper.animate(); final future = bumper.animate();
expect( expect(
spriteGroupComponent.current, spriteGroupComponent.current,
equals(AlienBumperSpriteState.off), equals(AlienBumperSpriteState.inactive),
); );
await future; await future;
expect( expect(
spriteGroupComponent.current, spriteGroupComponent.current,
equals(AlienBumperSpriteState.on), equals(AlienBumperSpriteState.active),
); );
}); });
}); });

@ -10,12 +10,12 @@ import '../../helpers/helpers.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final assets = [ final assets = [
Assets.images.sparky.bumper.a.on.keyName, Assets.images.sparky.bumper.a.active.keyName,
Assets.images.sparky.bumper.a.off.keyName, Assets.images.sparky.bumper.a.inactive.keyName,
Assets.images.sparky.bumper.b.on.keyName, Assets.images.sparky.bumper.b.active.keyName,
Assets.images.sparky.bumper.b.off.keyName, Assets.images.sparky.bumper.b.inactive.keyName,
Assets.images.sparky.bumper.c.on.keyName, Assets.images.sparky.bumper.c.active.keyName,
Assets.images.sparky.bumper.c.off.keyName, Assets.images.sparky.bumper.c.inactive.keyName,
]; ];
final flameTester = FlameTester(() => TestGame(assets)); final flameTester = FlameTester(() => TestGame(assets));
@ -48,21 +48,21 @@ void main() {
expect( expect(
spriteGroupComponent.current, spriteGroupComponent.current,
equals(SparkyBumperSpriteState.on), equals(SparkyBumperSpriteState.active),
); );
final future = bumper.animate(); final future = bumper.animate();
expect( expect(
spriteGroupComponent.current, spriteGroupComponent.current,
equals(SparkyBumperSpriteState.off), equals(SparkyBumperSpriteState.inactive),
); );
await future; await future;
expect( expect(
spriteGroupComponent.current, spriteGroupComponent.current,
equals(SparkyBumperSpriteState.on), equals(SparkyBumperSpriteState.active),
); );
}); });
}); });

@ -14,10 +14,10 @@ import '../../helpers/helpers.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final assets = [ final assets = [
Assets.images.alienBumper.a.on.keyName, Assets.images.alienBumper.a.active.keyName,
Assets.images.alienBumper.a.off.keyName, Assets.images.alienBumper.a.inactive.keyName,
Assets.images.alienBumper.b.on.keyName, Assets.images.alienBumper.b.active.keyName,
Assets.images.alienBumper.b.off.keyName, Assets.images.alienBumper.b.inactive.keyName,
]; ];
final flameTester = FlameTester(() => EmptyPinballTestGame(assets)); final flameTester = FlameTester(() => EmptyPinballTestGame(assets));

@ -14,12 +14,12 @@ import '../../helpers/helpers.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final assets = [ final assets = [
Assets.images.sparky.bumper.a.on.keyName, Assets.images.sparky.bumper.a.active.keyName,
Assets.images.sparky.bumper.a.off.keyName, Assets.images.sparky.bumper.a.inactive.keyName,
Assets.images.sparky.bumper.b.on.keyName, Assets.images.sparky.bumper.b.active.keyName,
Assets.images.sparky.bumper.b.off.keyName, Assets.images.sparky.bumper.b.inactive.keyName,
Assets.images.sparky.bumper.c.on.keyName, Assets.images.sparky.bumper.c.active.keyName,
Assets.images.sparky.bumper.c.off.keyName, Assets.images.sparky.bumper.c.inactive.keyName,
]; ];
final flameTester = FlameTester(() => EmptyPinballTestGame(assets)); final flameTester = FlameTester(() => EmptyPinballTestGame(assets));

@ -19,16 +19,16 @@ void main() {
Assets.images.dash.bumper.a.inactive.keyName, Assets.images.dash.bumper.a.inactive.keyName,
Assets.images.dash.bumper.b.active.keyName, Assets.images.dash.bumper.b.active.keyName,
Assets.images.dash.bumper.b.inactive.keyName, Assets.images.dash.bumper.b.inactive.keyName,
Assets.images.alienBumper.a.on.keyName, Assets.images.alienBumper.a.active.keyName,
Assets.images.alienBumper.a.off.keyName, Assets.images.alienBumper.a.inactive.keyName,
Assets.images.alienBumper.b.on.keyName, Assets.images.alienBumper.b.active.keyName,
Assets.images.alienBumper.b.off.keyName, Assets.images.alienBumper.b.inactive.keyName,
Assets.images.sparky.bumper.a.on.keyName, Assets.images.sparky.bumper.a.active.keyName,
Assets.images.sparky.bumper.a.off.keyName, Assets.images.sparky.bumper.a.inactive.keyName,
Assets.images.sparky.bumper.b.on.keyName, Assets.images.sparky.bumper.b.active.keyName,
Assets.images.sparky.bumper.b.off.keyName, Assets.images.sparky.bumper.b.inactive.keyName,
Assets.images.sparky.bumper.c.on.keyName, Assets.images.sparky.bumper.c.active.keyName,
Assets.images.sparky.bumper.c.off.keyName, Assets.images.sparky.bumper.c.inactive.keyName,
]; ];
final flameTester = FlameTester(() => PinballTestGame(assets)); final flameTester = FlameTester(() => PinballTestGame(assets));
final debugModeFlameTester = FlameTester(() => DebugPinballTestGame(assets)); final debugModeFlameTester = FlameTester(() => DebugPinballTestGame(assets));

Loading…
Cancel
Save