diff --git a/packages/pinball_components/lib/src/components/boundaries.dart b/packages/pinball_components/lib/src/components/boundaries.dart index 0abd824d..66715e2e 100644 --- a/packages/pinball_components/lib/src/components/boundaries.dart +++ b/packages/pinball_components/lib/src/components/boundaries.dart @@ -106,66 +106,59 @@ class _OuterBoundary extends BodyComponent with InitialPosition { Vector2(3.6, -70.2), Vector2(-14.1, -70.2), ); - final topWallFixtureDef = FixtureDef(topWall); final topLeftCurve = BezierCurveShape( controlPoints: [ - Vector2(-32.3, -57.2), + topWall.vertex1, Vector2(-31.5, -69.9), - Vector2(-14.1, -70.2), + Vector2(-32.3, -57.2), ], ); - final topLeftCurveFixtureDef = FixtureDef(topLeftCurve); final topLeftWall = EdgeShape() ..set( - Vector2(-32.3, -57.2), + topLeftCurve.vertices.last, Vector2(-33.5, -44), ); - final topLeftWallFixtureDef = FixtureDef(topLeftWall); final upperLeftWallCurve = BezierCurveShape( controlPoints: [ - Vector2(-33.5, -44), + topLeftWall.vertex1, Vector2(-33.9, -40.7), Vector2(-32.5, -39), ], ); - final upperLeftWallCurveFixtureDef = FixtureDef(upperLeftWallCurve); final middleLeftWallCurve = BezierCurveShape( controlPoints: [ - Vector2(-32.5, -39), + upperLeftWallCurve.vertices.last, Vector2(-23.2, -31.4), Vector2(-33.9, -21.8), ], ); - final middleLeftWallCurveFixtureDef = FixtureDef(middleLeftWallCurve); final lowerLeftWallCurve = BezierCurveShape( controlPoints: [ - Vector2(-33.9, -21.8), + middleLeftWallCurve.vertices.last, Vector2(-32.4, -17.6), Vector2(-37.3, -11), ], ); - final lowerLeftWallCurveFixtureDef = FixtureDef(lowerLeftWallCurve); final bottomLeftWall = EdgeShape() ..set( - Vector2(-37.3, -11), + lowerLeftWallCurve.vertices.last, Vector2(-43.9, 41.8), ); - final bottomLeftWallFixtureDef = FixtureDef(bottomLeftWall); return [ - topWallFixtureDef, - topLeftCurveFixtureDef, - topLeftWallFixtureDef, - upperLeftWallCurveFixtureDef, - middleLeftWallCurveFixtureDef, - lowerLeftWallCurveFixtureDef, - bottomLeftWallFixtureDef, + FixtureDef(topWall), + FixtureDef(topLeftCurve), + FixtureDef(topLeftWall), + FixtureDef(upperLeftWallCurve), + FixtureDef(middleLeftWallCurve), + FixtureDef(lowerLeftWallCurve), + FixtureDef(bottomLeftWall), ]; }