f50aabff7b
Documentation added to graphics classes.
...
#document
2017-04-30 18:15:16 +12:00
d07c660eb9
Merge remote-tracking branch 'origin/Story29' into Story29
2017-04-30 17:47:05 +12:00
6491efec4c
Fixed race status sent in race status messages
...
#story[829]
2017-04-30 17:46:56 +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
85f461c88c
Fixed bug so XML messages are located and sent properly on the server
...
Imported appache commons to read inputstream to a bytearray
#story[829]
2017-04-30 17:08:06 +12:00
1cf55f3e96
Fixed an issue where buffers aren't being sent properly
...
Tags #Story[829]
2017-04-30 16:16:44 +12:00
9a995ddcc1
Boat status changes to finished when a boat finishes the race
...
Tags: #story[829]
2017-04-30 01:55:49 +12:00
0b2ef3de00
XML data types are done. Easily navigated for future use. Some documentation has been done, tests aren't yet completed just yet.
...
#story[820]
2017-04-30 00:52:18 +12:00
a898290c0b
partway through fixing boat movement to be updated from the data valid timestamp rather than the data sent timestamp #pair[kre39, ptg19] #story[820]
2017-04-29 20:21:26 +12:00
1d28334346
Removed the parser from queing packets incorrectly. Used the marker boat location packets to get the live updates of the marker positions and implemented the markers being updated much like the boats currently are. This means the course more closely resembles the actual intended course design.
...
#story[820]
2017-04-29 20:10:39 +12:00
3e97f016d5
Getting boat locations from race simulator & bug fixes
...
- Boat locations that are generated by the simulator are sent to the client as they happen
- Fixed heading and lat/lon encoding
- Fixed a bug where the header wasn't included in the sent byte stream
- Fixed the format of data as it's sent to the client.
- Data is now sent using a channel
- Removed tests that don't work with channels
Tags: #story[829]
2017-04-29 19:38:21 +12:00
ab0d4634d6
Moved XML parsing to non static class to create objects. Changed the abstraction as using generics in maps lead to more headaches than anything. Still not quite completed. Needs documentation and validation for tags too.
...
#story[820]
2017-04-29 19:02:30 +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
02a35b4c02
Reduced the cost of updating wakes. Improved the logic for controlling indices.
...
#implement #story[820]
2017-04-29 14:20:52 +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
07bbd7e06d
Added reasonable testing for StreamReciever, further testing would probably need StreamReciever to be rewritten #story[817]
2017-04-28 18:29:35 +12:00
765f27f987
Starting new wake implementation.
2017-04-28 17:08:08 +12:00
d204bee55d
Started documentation on the stream parser.
...
#story[820]
2017-04-28 17:01:28 +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
fe480d5cb6
Finished parsing the Race XML data. Began making some optimizations to hopefully make parsing the Boat Data a quicker and simpler task.
...
#story[820]
2017-04-28 15:41:12 +12:00
8a04a0e5b7
Added documents for Boat, RaceParser and Simulator classes.
...
#story[828]
2017-04-28 14:53:26 +12:00
705a0a2eaf
Added document and unit tests for GeoUtility class.
...
- three methods in GeoUtility have been tested and passed.
#story[828]
2017-04-28 14:34:24 +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
e1de5e0989
Parsed more course data from XML messages
...
#story[820]
2017-04-27 18:31:13 +12:00
f5b9160304
Started parsing the different types of XML messages to Map objects so that we can extract the relevant data for the visualizer.
...
#story[820]
2017-04-27 17:22:46 +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
8c8f253233
Created simulator to generate mock data.
...
- simulator runs as a background thread and sleep for a given time lapse.
- simulator extends observable, so it can notify all its observers when boats positions have been updated
#story[828]
2017-04-26 22:58:13 +12:00
8b8422de3a
Renamed course parser to race parser
...
- because in AC35 spec. race xml file contain course set up and all other general race settings
#story[828]
2017-04-26 22:52:18 +12:00
7bf2d4c40e
Added Position class to better use GeoUtility.
...
- mark now inherit from Position
#story[828]
2017-04-26 22:52:18 +12:00
2a67f04d15
Create GeoUtility to process all geo calculations.
...
- calculate distance between two geo positions
- calculate the bearing from one geo position to another
- calculate the new geo position by passing original position, bearing and
distance
#story[828]
2017-04-26 22:52:18 +12:00
b2ea8196d5
Fixed a bug of getCourse method as it didn't parse xml correctly.
...
- a typo 'CompoundmarkID'(should be 'CompoundMarkID') which caused parser failed to parse file.
- add typeOf method in RoundingType to convert strings to types
#story[828]
2017-04-26 22:52:18 +12:00
7f38191d03
Rewrote course parser to parse race xml file specified in AC35 spec.
...
#story[828]
2017-04-26 22:52:18 +12:00
f6b7a3042f
Rewrote all kind of marks to fit marks specified in AC35 spec.
...
- added compound mark
- added corner
- rewrote mark as a single mark
- added rounding type enum
#story[828]
2017-04-26 22:52:18 +12:00
3bdc6ce5cc
Created a new course parser to parse race xml file specified in AC35 spec.
...
#story[828]
2017-04-26 22:52:18 +12:00
bc31987f96
Added Boat location messages to the mock streaming data interface
...
- Added static methods to convert between binary packed lat/longs and floating point numbers
Tags: #story[829]
2017-04-26 22:38:39 +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
912c081606
Added marks with the test data coords to the xml
...
#story[820]
2017-04-26 15:55:51 +12:00
cir27
Michael Rausch
Zhi You Tan
William Muir
Michael Rausch
alistairjmcintyre
Peter Galloway
Kusal Ekanayake
Alistair McIntyre
Haoming Yin