diff options
| author | Peter Wu <lekensteyn@gmail.com> | 2014-01-17 15:42:11 +0100 |
|---|---|---|
| committer | Peter Wu <lekensteyn@gmail.com> | 2014-01-17 15:42:11 +0100 |
| commit | dd013f762fdc69da2deff839864f039d6896ba45 (patch) | |
| tree | 7e3dd06974f59244df7f82419dddab2425473b2b /src/RaceTrack.java | |
| parent | 499778373f172dad7b2d0a3eabf335283ae1e274 (diff) | |
| parent | 38bc4417b6fd81e9ba93d3d626cd0b9d51524caf (diff) | |
| download | 2iv60-robots-dd013f762fdc69da2deff839864f039d6896ba45.tar.gz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
src/RaceTrack.java
Diffstat (limited to 'src/RaceTrack.java')
| -rw-r--r-- | src/RaceTrack.java | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/src/RaceTrack.java b/src/RaceTrack.java index 81fdc99..d588fbe 100644 --- a/src/RaceTrack.java +++ b/src/RaceTrack.java @@ -88,6 +88,79 @@ class RaceTrack extends BetterBase { new Vector( 8, -15, 1), new Vector( 15, -8, 1), }; + + controlPointsLTrack = new Vector[] { + /// FAIL + // top-right curve to bottom + new Vector( -4, 15, 1), + + new Vector( -2.5, 15, 1), + new Vector( -1, 15, 1), + + new Vector( -1, 12, 1), + + + new Vector( -1, -5, 1), + new Vector( -1, -6.5, 1), + new Vector( 0.5, -8, 1), + new Vector( 2, -8, 1), + + + new Vector( 8, -8, 1), + new Vector( 9.5, -8, 1), + new Vector( 11, -9.5, 1), + new Vector( 11, -11, 1), + + new Vector( 11, -12.5, 1), + new Vector( 9.5, -14, 1), + new Vector( 8, -14, 1), + + + new Vector ( -4, -14, 1), + new Vector ( -5.5, -14, 1), + new Vector ( -7, -12.5, 1), + new Vector ( -7, -11, 1), + + new Vector ( -7, 12, 1), + new Vector ( -7, 13.5, 1), + new Vector ( -5.5, 15, 1), + new Vector ( -4, 15, 1), + + }; + + controlPointsCTrack = new Vector[] { + // CORRECT + new Vector( 2, 15, 1), + + new Vector( 6.5, 15, 1), + new Vector( 11, 15, 1), + + new Vector( 11, 12, 1), + + new Vector( 11, 9, 1), + new Vector( 6.5, 9, 1), + + + new Vector( 2, 9, 1), + + new Vector( -10, 9, 1), + new Vector( -10, -6, 1), + + new Vector( 2, -6, 1), + + new Vector(6.5, -6, 1), + new Vector(11, -6, 1), + + new Vector(11, -9, 1), + + new Vector(11, -12, 1), + new Vector(6.5, -12, 1), + + new Vector(2, -12, 1), + + new Vector(-17, -12, 1), + new Vector(-17, 15, 1), + }; } /** |