6d02f05f05
Quick change to stop adding course markers as they are dynamic and add them in the previous way
2017-05-02 21:51:04 +12:00
b3a89279d6
Quick change to stop adding course markers as they are dynamic and add them in the previous way
2017-05-02 21:31:38 +12:00
fe824a8f71
Finished implementing drawing of border from XML
...
Border is drawn onto canvas, it is static.
#story[469]
2017-05-02 21:05:53 +12:00
c5c2d4375d
Changed the canvas controller to read marks from the XML as received from the server (PROTOTYPE)
...
Gates appear to draw in the correct places although a bit jittery for some reason
Boundary marks are a bit sporadic and still need lines drawn in between
Large refactor of canvas controller and XMLParser still required if these two are going to work together well. Currently canvas controller is a bit of a mess.
#story[469]
2017-05-01 23:10:15 +12:00
1f71fd1967
Merge branch 'wake_remake' into Story30b_correcting_boat_movement
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/RaceObject.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/parsers/StreamParser.java
2017-05-01 20:33:09 +12:00
33ae7beeb4
merging with wake remake #story[820]
2017-05-01 20:09:51 +12:00
130efa3a51
Merge branch 'wake_remake' into Story30b_correcting_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/parsers/StreamParser.java
2017-05-01 19:09:09 +12:00
7df55fc1a3
problems appear to be fixed and the boats are updating properly from the timeValid field of the boat location. #story[820]
2017-05-01 18:55:21 +12:00
3adadcc1e1
Updated the timer to show two decimals for the seconds.
...
#story[572]
2017-05-01 18:49:58 +12:00
ee6a543f8d
Fixed timer separator instead of dot to semicolon, and fixed the timer position in race canvas, and updated the start screen so it does not grow vertically
...
#story[572]
2017-05-01 18:35:17 +12:00
d927531354
Removed broken time extracting method and replaced it with currently existing long extractor. Added speed to the setDestination method for the raceObject abstract class.
...
#story[820]
2017-05-01 18:22:08 +12:00
a06806c42d
Merge remote-tracking branch 'origin/wake_remake' into wake_remake
2017-05-01 17:35:51 +12:00
57de058582
Began figuring out how to implement XML data in place of mock data.
...
#story[820] #pair[ajm412, wmu16]
2017-05-01 17:35:39 +12:00
a5ca9218da
Discovered the time valid timestamp in the boat location packet is quite inconsistent and either the stream or my implementation is making the display really buggy. Because the way it was before I changed things is more reliable at the moment, I have decided to wait until our mock stream is merged before continuing this development. #story[820]
2017-05-01 16:56:53 +12:00
5fe330bfbb
Boat trials and wakes now work with both fast and slow data sets.
...
Instead of fixed, hard coded thresholds and scale factors dynamically changing values
that scale with the onscreen movement are used to determine how graphical objects
are drawn.
#implement #story[816]
2017-05-01 16:41:58 +12:00
c80cff87f7
Updated import statements after merge
2017-05-01 16:02:09 +12:00
9a864cc2bd
Merge remote-tracking branch 'origin/Mark_to_MarkGroup' into wake_remake
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/Controller.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/MainView.fxml
2017-05-01 15:59:14 +12:00
6a361c0d4b
Documented some RaceObject classes.
...
#documentation
2017-05-01 14:30:41 +12:00
ec57851de2
Created annotation slider to display different levels of annotations
...
Removed toggleAnnotations method as abstract from race object and made only for boat group as it didnt make sense for markgroup, at least not currently as they have no annotations to show
#story[558]
2017-04-30 23:24:24 +12:00
d94290c58d
Merge branch 'Mark_to_MarkGroup' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into Mark_to_MarkGroup
2017-04-30 18:15:24 +12:00
25038da2a1
Created BoatsParser.java to parse boats from server boat.xml and created a table on the start screen to display all the teams from server
...
#story[572]
2017-04-30 17:17:47 +12:00
1e1e482b79
Added a delay for reading packets from the packet buffer so packets that are recieved out of order have time to order by timestamp in the priority queue #story[820]
2017-04-29 18:56:41 +12:00
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
f3ee618900
Fixed broken race timer and timer now using stream timer data.
...
#story[818]
2017-04-28 21:44:23 +12:00
b939086e10
Updated welcome screen to show if race is finished or starting
...
#story[572]
2017-04-28 21:28:34 +12:00
ffdfc24e65
Created a start screen with a timer which shows the race progress
...
#story[572]
2017-04-28 20:09:17 +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
William Muir
Peter Galloway
Zhi You Tan
Kusal Ekanayake
Alistair McIntyre
Calum
Haoming Yin