refactor: some visual adjustments

pull/120/head
Allison Ryan 4 years ago
parent 63fc95b355
commit 5dad6d03b2

@ -3,10 +3,7 @@
import 'dart:math' as math;
import 'package:flame/components.dart';
import 'package:flame/extensions.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flutter/material.dart';
import 'package:pinball/game/game.dart';
import 'package:pinball/gen/assets.gen.dart';
import 'package:pinball_components/pinball_components.dart' hide Assets;
@ -46,9 +43,6 @@ class LauncherRamp extends BodyComponent with InitialPosition, Layered {
/// {@macro launcher_ramp}
LauncherRamp() : super(priority: -1) {
layer = Layer.launcher;
paint = Paint()
..color = const Color.fromARGB(255, 251, 255, 0)
..style = PaintingStyle.stroke;
}
List<FixtureDef> _createFixtureDefs() {
@ -142,18 +136,14 @@ class LauncherRamp extends BodyComponent with InitialPosition, Layered {
}
}
/// {@template launcher_ramp}
/// The yellow right ramp, where the [Ball] goes through when launched from the
/// [Plunger].
/// {@template launcher_foreground_railing}
/// Foreground railing for the [LauncherRamp] to render in front of the [Ball].
/// {@endtemplate}
class LauncherForegroundRailing extends BodyComponent
with InitialPosition, Layered {
/// {@macro launcher_ramp}
LauncherForegroundRailing() : super(priority: 5) {
/// {@macro launcher_foreground_railing}
LauncherForegroundRailing() : super(priority: 4) {
layer = Layer.launcher;
paint = Paint()
..color = const Color.fromARGB(255, 251, 255, 0)
..style = PaintingStyle.stroke;
}
List<FixtureDef> _createFixtureDefs() {
@ -199,7 +189,7 @@ class LauncherForegroundRailing extends BodyComponent
size: Vector2(38.1, 138.6),
anchor: Anchor.center,
position: Vector2(22.8, 0),
priority: 5,
priority: 4,
);
await gameRef.add(spriteComponent);

@ -1,5 +1,6 @@
import 'package:flame/components.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:pinball_components/pinball_components.dart';
@ -13,7 +14,11 @@ class Plunger extends BodyComponent with KeyboardHandler, InitialPosition {
/// {@macro plunger}
Plunger({
required this.compressionDistance,
});
}) : super(
priority: 5,
// TODO(allisonryan0002): remove paint after asset is added.
paint: Paint()..color = const Color.fromARGB(255, 241, 8, 8),
);
/// Distance the plunger can lower.
final double compressionDistance;

@ -11,13 +11,11 @@ extension PinballGameAssetsX on PinballGame {
images.load(components.Assets.images.flutterSignPost.keyName),
images.load(components.Assets.images.flipper.left.keyName),
images.load(components.Assets.images.flipper.right.keyName),
images.load(components.Assets.images.spaceshipSaucer.keyName),
images.load(components.Assets.images.spaceshipBridge.keyName),
images.load(Assets.images.components.background.path),
images.load(Assets.images.components.launchRamp.launchRamp.path),
images.load(Assets.images.components.launchRamp.launchRailFG.path),
images.load(Assets.images.components.spaceship.androidTop.path),
images.load(Assets.images.components.spaceship.androidBottom.path),
images.load(Assets.images.components.spaceship.lower.path),
images.load(Assets.images.components.spaceship.upper.path),
]);
}
}

@ -24,9 +24,6 @@ class $AssetsImagesComponentsGen {
$AssetsImagesComponentsLaunchRampGen get launchRamp =>
const $AssetsImagesComponentsLaunchRampGen();
$AssetsImagesComponentsSpaceshipGen get spaceship =>
const $AssetsImagesComponentsSpaceshipGen();
}
class $AssetsImagesComponentsLaunchRampGen {
@ -41,30 +38,6 @@ class $AssetsImagesComponentsLaunchRampGen {
'assets/images/components/launch_ramp/launch-rail-FG.png');
}
class $AssetsImagesComponentsSpaceshipGen {
const $AssetsImagesComponentsSpaceshipGen();
/// File path: assets/images/components/spaceship/android-bottom.png
AssetGenImage get androidBottom => const AssetGenImage(
'assets/images/components/spaceship/android-bottom.png');
/// File path: assets/images/components/spaceship/android-top.png
AssetGenImage get androidTop =>
const AssetGenImage('assets/images/components/spaceship/android-top.png');
/// File path: assets/images/components/spaceship/lower.png
AssetGenImage get lower =>
const AssetGenImage('assets/images/components/spaceship/lower.png');
/// File path: assets/images/components/spaceship/saucer.png
AssetGenImage get saucer =>
const AssetGenImage('assets/images/components/spaceship/saucer.png');
/// File path: assets/images/components/spaceship/upper.png
AssetGenImage get upper =>
const AssetGenImage('assets/images/components/spaceship/upper.png');
}
class Assets {
Assets._();

@ -43,7 +43,6 @@ flutter:
assets:
- assets/images/components/
- assets/images/components/spaceship/
- assets/images/components/launch_ramp/
flutter_gen:

Loading…
Cancel
Save