a0624cfef6
Merge branch 'wake_remake' into Mark_to_MarkGroup
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Wake.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/resources/views/RaceView.fxml
2017-04-29 14:29:12 +12:00
80409c08a6
Removed a graphical object added for testing.
2017-04-29 02:17:55 +12:00
6149f7be60
Wakes no longer become out of sync with boats after extended periods of time. Added in
...
a limit to the length of boat trails.
#implement
2017-04-29 02:14:55 +12:00
474f0ee427
Further work on new wake system. Wakes turn correctly but need to scale with velocity and
...
eventually desync with the boats. Needs to reset to the boats position on straights.
2017-04-28 23:25:49 +12:00
0f4ad48de0
Fixed and enables the old wakes. Enabled the fps counter by implementing the team-27s fps counter from their code, fixed trails from starting at the start of the startline no matter at what point in the race the stream is connected to (this is means the map starts a lot cleaner). Added live tracked speeds which are taken from the boat location packet. Linked the speeds coming in to their specified boats and allowed the onscreen speed tracker to keep up with the speeds. Linked the current speeds to the wakes so the wakes are redrawn for each change in speed and size to match the speed. Also added the toggle functionality back to the fps counter so they can be toggled on an off.
...
#story[818]
2017-04-28 16:41:35 +12:00
d1289b0de1
Fixed boats moving in the correct heading as according to the stream and attempted to fix the wakes direction.
...
#story[818]
2017-04-27 18:52:37 +12:00
0a22812165
Got the live ac35 data working in paralell with the parse and the app. Boats move and the live data works correctly. We need to fix the markers now
...
#story[818]
2017-04-27 16:18:33 +12:00
104fd86179
Got the live ac35 data working in paralell with the parse and the app.
...
#story[820]
2017-04-27 14:40:26 +12:00
67a702ffcd
Wakes still broken. Implemented dashed lines that track the progress of individual boats.
...
#implement #story[483]
2017-04-27 13:57:19 +12:00
65c0e6f77d
Fixed markergroup bugs. Improved wakes. Still WIP
2017-04-27 11:58:50 +12:00
245bd184b4
Mark drawing moved to MarkGroup class. RaceObject and it's sub classes now describe
...
all functionality required for a on screen object. Improved wakes. Branch currently
untested.
#story[812, 820] #refactor #implement.
2017-04-27 02:44:25 +12:00
eaff4c5aac
Added abstract class for all javafx object that a displayed during race. Began refactoring of mark implementation to be a subclass of the aforementioned abstract class.
2017-04-26 21:16:22 +12:00
95bafdc0d1
Fixed bug which caused boats to all travel to the same position.
2017-04-26 19:19:03 +12:00
c776d22941
Linking up course stream with visualiser. Boats moving, and course drawing. Boats however are not moving as intended. Needs to be fixed/looked into.
...
#story[820] #pair[kre39,cir27]
2017-04-26 18:45:58 +12:00
749c6b7fef
Fixed bugs caused by horizontally scaling maps
2017-04-26 17:18:33 +12:00
c73bf7dd3e
Started merging received packets from the sample stream and reading lats and lons to move boats from them.
...
#story[820]
2017-04-26 15:51:15 +12:00
42569e6ad7
Changed BoatPolygon is now a group instead of a polygon and is called BoatGroup.
...
BoatPolygon's functionality was more maintainable and scalable by having it extend Group.
#story30c
2017-04-25 04:30:44 +12:00
ef874b4245
Added a transition time to rotational movement.
...
The aim is to make animations smoother when the boat turns. Unsure if current
implementation will look good without testing on a datastream.
#story30c
2017-04-25 03:12:30 +12:00
46037b5aea
Refactored Boat class to better fit the MVC model by moving all GUI parts to BoatPolygon. Changed the way animation works so that it will work with a constantly updated set of lats and lons.
...
TODO - Change Mark class to no longer store XY pixel data.
TODO - Add in a timer force updates boat position if a packet has not been recieved for a while.
#story30b #story30c #implement #refactor
2017-04-24 23:06:30 +12:00
b5129c5c80
Moved the canvas drawing implementation from team27's codebase to team13's.
...
#story30b
2017-04-20 19:06:32 +12:00
15ded667fe
Started to implement the group over the canvas in the code. Removed basic boat redrawing and timeline and replaced with boats being placed into a group and given coordinates.
2017-04-11 17:46:02 +12:00
971a3920a3
Fixed race timer to display real race time, and made race time scalable.
...
#story[445]
2017-03-30 16:12:01 +13:00
f8d3f53158
changed boat speed to a lower value
2017-03-30 14:45:33 +13:00
a95d030817
Controllers and Fxml nicely refactored, tests still broken #story[463]
2017-03-29 14:59:37 +13:00
4a6978ff79
Fxml refactored, partway through refactoring controllers (app does not run) #story[463]
2017-03-29 12:58:49 +13:00
48f7e41905
Merge branch 'master' of /home/cosc/student/zyt10/Documents/[SENG302]/team-13 with conflicts.
2017-03-27 16:52:31 +13:00
6fc55bb82c
Added toggle for fps #story[463]
2017-03-27 16:45:02 +13:00
65ac864bf2
added count for fps inside handle loop and displayed fps on the canvas #story[463]
2017-03-27 16:34:54 +13:00
bbe7cbee8f
Use canvas polygon to draw a triangle
...
#story[480]
2017-03-27 14:26:38 +13:00
e6ace5fb2f
Changed the team names to their abbreviated versions
...
- Also halved the size of the wake lines
- Updated tests to support the shorter team names
- Wake lines are now hidden with the other annotations
Tags: #story[23,21]
2017-03-24 20:56:52 +13:00
550ab59231
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-24 20:45:49 +13:00
5dd5e50738
Implemented wake lines
...
- Changed heading calculation in event class
- The boats now go to the marker, rather than the center of a gate
Tags: #story[466]
2017-03-24 20:27:17 +13:00
304f30ece6
Reformatted and refactored the fileparser to get xml from resource folder
...
#fix #refactor #story[377] #pair[xyi25, zyt10]
2017-03-24 12:55:11 +13:00
e8b1720fee
Created a toggle checkbox to show and hide all annotation
...
#story[477]
2017-03-24 12:15:39 +13:00
e0cea098c1
Merge remote-tracking branch 'origin/master'
2017-03-24 11:52:17 +13:00
50ab481b18
added knots beside boat name #story[447]
2017-03-24 11:51:07 +13:00
798fe4da0e
Changed FPS to 30
2017-03-24 11:15:46 +13:00
590ef557d3
fixed bugs from last commit and updated some tests #story[426]
2017-03-23 22:24:42 +13:00
7bc5c8f8a4
Merge remote-tracking branch 'refs/remotes/origin/master'
...
Conflicts:
src/main/java/seng302/controllers/CanvasController.java
src/main/java/seng302/models/Boat.java
2017-03-23 22:17:45 +13:00
bb8c681270
added a markpos value to event for use in displaying the team positions #story[426]
2017-03-23 21:19:39 +13:00
403aaa76ae
Display team name and speed beside boat
...
- Also slowed down the AnimationTimer
- Removed the need to scale the canvas
Tags: #implement #story[18] #story[19]
2017-03-23 18:04:00 +13:00
8578bc4a5b
changed the "sea" color of the canvas to be actually drawn on the canvas rather than the pane behind #story[377]
2017-03-23 16:18:42 +13:00
ed004d1423
Merge branch 'master'
...
Conflicts:
src/main/java/seng302/controllers/CanvasController.java
src/main/resources/RaceView.fxml
2017-03-23 15:16:11 +13:00
2384013139
Created race timer
...
- Race starts when timer reaches 1 second
- Race waits 10 seconds before it starts
Tags: #implement #story[16]
2017-03-23 14:11:12 +13:00
42ffd1b1f8
Add rotated wind direction arrow to race view.
...
#story[422]
2017-03-23 01:10:07 +13:00
9e22eac4d8
Added the race results to the RaceResultController. Also fixed some bugs
...
- Fixed a bug where the race results would be out of order.
- Changed the colour of the start and finish gates
- Added the race results to the RaceResultController and updated view
Tags: #fix #implement #story[13, 10, 11]
2017-03-22 22:30:49 +13:00
a41f2e4bde
Changed marks from circles to squares #fix
2017-03-22 15:10:57 +13:00
54d329c5cf
changed raceView javafx structure and added an example of how the handle function works with keyframes #story[426]
2017-03-22 14:44:40 +13:00
f46a98fad9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-22 14:39:37 +13:00
f6ea2953e9
Changed lat/long for gates to midpoint and added colours for the marks
...
Tags: #fix #implement #story[10,11]
2017-03-22 14:28:51 +13:00
cir27
Kusal Ekanayake
Haoming Yin
Peter
Zhi You Tan
Michael Rausch