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
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
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
c07f13180f
Merged Story 30b branch into 30c branch
...
#story[820]
2017-05-01 15:32:23 +12:00
f672eafd6d
Merge remote-tracking branch 'origin/Story30A_InputStreamCheckingHead' into wake_remake
...
# Conflicts:
# src/main/java/seng302/models/parsers/StreamPacket.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/java/seng302/models/parsers/StreamReceiver.java
2017-05-01 15:27:51 +12:00
6a361c0d4b
Documented some RaceObject classes.
...
#documentation
2017-05-01 14:30:41 +12:00
b597f010dc
Added some missing fields. Added missing getters.
...
#story[820]
2017-05-01 00:36:10 +12:00
d5aa430d4a
Fixed a method that was converting the timestamp bytes incorrectly
...
- If an argument is passed to the application, it will use the internal mock server
Tags: #story[820]
2017-04-30 23:41:21 +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
0eb767b615
Finished tweaking wakes. Made marker movement smooth.
...
#implement #story[818]
2017-04-30 22:34:49 +12:00
45b77c05d4
Improvements to wake
2017-04-30 19:32:29 +12:00
b9900925b8
Fixing wakes, bug caused by attempting to fix a issue with jittery boats actually caused by parser.
...
#bug
2017-04-30 19:00:07 +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
f50aabff7b
Documentation added to graphics classes.
...
#document
2017-04-30 18:15:16 +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
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
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
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
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
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
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
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
a3ae015be8
Merge remote-tracking branch 'origin/30b/30c_boat_animation' into StreamReceiverMergeWithVisualiser
2017-04-26 15:06:55 +12:00
5eebab2748
Completed data extractors for: heartbeat, racestatus, display text msg, race start status, yacht event code, yacht action acode, chatter text, boat location, mark rounding, course wind and average wind. Some of the methods need to be validated but others have been tested. Will now need to link the parses with the model.
...
#story[820]
2017-04-25 17:57:22 +12:00
8cbd1cc4aa
Added support to import XML packet to XML Document object.
...
#story[820]
2017-04-25 17:38:26 +12:00
00c1a89f58
Fixed error in the switch (missing breaks)
...
#story[820]
2017-04-25 15:39:28 +12:00
Peter Galloway
Kusal Ekanayake
Zhi You Tan
Alistair McIntyre
Calum
alistairjmcintyre
Michael Rausch
William Muir