From f07daaac09eefc6f8e85a58099f7734fc231a65e Mon Sep 17 00:00:00 2001
From: RuiAlonso <rui.alonso@verygood.ventures>
Date: Thu, 31 Mar 2022 20:19:47 +0200
Subject: [PATCH] fix: fixed top wall shape

---
 lib/game/components/wall.dart           | 27 ++++++++++++-------------
 lib/game/pinball_game.dart              |  4 ++--
 packages/geometry/lib/src/geometry.dart |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/game/components/wall.dart b/lib/game/components/wall.dart
index 54738fd5..6f19ca56 100644
--- a/lib/game/components/wall.dart
+++ b/lib/game/components/wall.dart
@@ -4,6 +4,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;
@@ -107,9 +108,9 @@ class DinoTopWall extends BodyComponent with InitialPosition {
     fixturesDef.add(topStraightFixtureDef);
 
     final topCurveControlPoints = [
-      Vector2(28.4, 35.1),
-      Vector2(18, 26.38),
-      Vector2(26.6, 20.5),
+      topStraightControlPoints.last,
+      Vector2(17.4, 26.38),
+      Vector2(25.5, 20.7),
     ];
     final topCurveShape = BezierCurveShape(
       controlPoints: topCurveControlPoints,
@@ -117,9 +118,9 @@ class DinoTopWall extends BodyComponent with InitialPosition {
     fixturesDef.add(FixtureDef(topCurveShape));
 
     final middleCurveControlPoints = [
-      Vector2(26.6, 20.5),
-      Vector2(27.5, 20.1),
-      Vector2(26.6, 18.8),
+      topCurveControlPoints.last,
+      Vector2(27.8, 20.1),
+      Vector2(26.8, 19.5),
     ];
     final middleCurveShape = BezierCurveShape(
       controlPoints: middleCurveControlPoints,
@@ -127,9 +128,9 @@ class DinoTopWall extends BodyComponent with InitialPosition {
     fixturesDef.add(FixtureDef(middleCurveShape));
 
     final bottomCurveControlPoints = [
-      Vector2(26.6, 18.8),
-      Vector2(21.15, 17.1),
-      Vector2(24.6, 15.1),
+      middleCurveControlPoints.last,
+      Vector2(21.15, 16),
+      Vector2(25.6, 15.2),
     ];
     final bottomCurveShape = BezierCurveShape(
       controlPoints: bottomCurveControlPoints,
@@ -137,8 +138,8 @@ class DinoTopWall extends BodyComponent with InitialPosition {
     fixturesDef.add(FixtureDef(bottomCurveShape));
 
     final bottomStraightControlPoints = [
-      Vector2(24.6, 15.1),
-      Vector2(31.8, 14.1),
+      bottomCurveControlPoints.last,
+      Vector2(31, 14.5),
     ];
     final bottomStraightShape = EdgeShape()
       ..set(
@@ -186,9 +187,7 @@ class DinoTopWall extends BodyComponent with InitialPosition {
       sprite: sprite,
       size: Vector2(10.6, 27.7),
       anchor: Anchor.center,
-    )
-      ..position = Vector2(-3, -5)
-      ..priority = -1;
+    )..position = Vector2(27, -28.2);
 
     await add(spriteComponent);
   }
diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart
index cfa52a9f..3e5ad5dc 100644
--- a/lib/game/pinball_game.dart
+++ b/lib/game/pinball_game.dart
@@ -67,7 +67,7 @@ class PinballGame extends Forge2DGame
     await add(BottomWall());
     createBoundaries(this).forEach(add);
     await add(
-      DinoTopWall()..initialPosition = Vector2(27.4, 23.1),
+      DinoTopWall()..initialPosition = Vector2(-2.4, 0),
     );
   }
 
@@ -125,7 +125,7 @@ class DebugPinballGame extends PinballGame with TapDetector {
       size: Vector2(120, 160),
       anchor: Anchor.center,
     )
-      ..position = Vector2(0, -7.8)
+      ..position = Vector2(0, -15)
       ..priority = -1;
 
     await add(spriteComponent);
diff --git a/packages/geometry/lib/src/geometry.dart b/packages/geometry/lib/src/geometry.dart
index 6975f8cb..edc176e7 100644
--- a/packages/geometry/lib/src/geometry.dart
+++ b/packages/geometry/lib/src/geometry.dart
@@ -82,7 +82,7 @@ List<Vector2> calculateEllipse({
 /// For more information read: https://en.wikipedia.org/wiki/B%C3%A9zier_curve
 List<Vector2> calculateBezierCurve({
   required List<Vector2> controlPoints,
-  double step = 0.001,
+  double step = 0.01,
 }) {
   assert(
     0 <= step && step <= 1,