michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 130efa3a51 Merge branch 'wake_remake' into Story30b_correcting_boat_movement Peter Galloway 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] Peter Galloway 2017-05-01 18:55:21 +12:00
  • 3adadcc1e1 Updated the timer to show two decimals for the seconds. Zhi You Tan 2017-05-01 18:49:58 +12:00
  • 5b027a29d8 Merge remote-tracking branch 'origin/wake_remake' into wake_remake Kusal Ekanayake 2017-05-01 18:35:56 +12:00
  • 2a9d0fb82c Removed 2 bad import statements that halted the build form building. Kusal Ekanayake 2017-05-01 18:35:48 +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 Zhi You Tan 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. Kusal Ekanayake 2017-05-01 18:22:08 +12:00
  • 1d47df09eb Merge branch 'merge_branch_front' into wake_remake Haoming Yin 2017-05-01 17:46:16 +12:00
  • a9709c4f84 Merged the mock server to visualisation. Haoming Yin 2017-05-01 17:42:07 +12:00
  • a06806c42d Merge remote-tracking branch 'origin/wake_remake' into wake_remake Alistair McIntyre 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] Alistair McIntyre 2017-05-01 17:35:39 +12:00
  • 978493853d Merge branch 'Story29' into merge_branch_front Haoming Yin 2017-05-01 17:06:17 +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] Peter Galloway 2017-05-01 16:56:53 +12:00
  • 5fe330bfbb Boat trials and wakes now work with both fast and slow data sets. Kusal Ekanayake 2017-05-01 16:41:58 +12:00
  • c80cff87f7 Updated import statements after merge Zhi You Tan 2017-05-01 16:02:09 +12:00
  • 9a864cc2bd Merge remote-tracking branch 'origin/Mark_to_MarkGroup' into wake_remake Zhi You Tan 2017-05-01 15:59:14 +12:00
  • c07f13180f Merged Story 30b branch into 30c branch #story[820] Alistair McIntyre 2017-05-01 15:32:23 +12:00
  • f672eafd6d Merge remote-tracking branch 'origin/Story30A_InputStreamCheckingHead' into wake_remake Alistair McIntyre 2017-05-01 15:27:51 +12:00
  • 6a361c0d4b Documented some RaceObject classes. Calum 2017-05-01 14:30:41 +12:00
  • b597f010dc Added some missing fields. Added missing getters. #story[820] alistairjmcintyre 2017-05-01 00:36:10 +12:00
  • a670f677e9 Added other email to .mailmap Michael Rausch 2017-05-01 00:10:07 +12:00
  • a77423b937 Added other email to .mailmap Michael Rausch 2017-05-01 00:07:56 +12:00
  • 50083a9297 Added tests for reverse and intToBytes Michael Rausch 2017-04-30 23:54:32 +12:00
  • d5aa430d4a Fixed a method that was converting the timestamp bytes incorrectly Michael Rausch 2017-04-30 23:41:21 +12:00
  • e7f9954970 Removed unneeded files, also fixed heading calculation Michael Rausch 2017-04-30 23:29:15 +12:00
  • ec57851de2 Created annotation slider to display different levels of annotations William Muir 2017-04-30 23:24:24 +12:00
  • 0eb767b615 Finished tweaking wakes. Made marker movement smooth. Calum 2017-04-30 22:34:49 +12:00
  • 45b77c05d4 Improvements to wake Calum 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. Calum 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 cir27 2017-04-30 18:15:24 +12:00
  • f50aabff7b Documentation added to graphics classes. cir27 2017-04-30 18:15:16 +12:00
  • d07c660eb9 Merge remote-tracking branch 'origin/Story29' into Story29 Michael Rausch 2017-04-30 17:47:05 +12:00
  • 6491efec4c Fixed race status sent in race status messages Michael Rausch 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 Zhi You Tan 2017-04-30 17:17:47 +12:00
  • 85f461c88c Fixed bug so XML messages are located and sent properly on the server William Muir 2017-04-30 17:08:06 +12:00
  • 1cf55f3e96 Fixed an issue where buffers aren't being sent properly Michael Rausch 2017-04-30 16:16:44 +12:00
  • 9a995ddcc1 Boat status changes to finished when a boat finishes the race Michael Rausch 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] alistairjmcintyre 2017-04-30 00:52:18 +12:00
  • 99e50aa7ac Merge remote-tracking branch 'origin/Story30b_correcting_boat_movement' into Story30b_correcting_boat_movement Peter 2017-04-29 20:21:49 +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] Peter Galloway 2017-04-29 20:13:34 +12:00
  • 6cbff1097b Fixed error'd tests which were based off old xml data. Kusal Ekanayake 2017-04-29 20:16:14 +12:00
  • 246083460e partway through fixing boat movement to be updated from the data valid timestamp rather than the data sent timestamp #story[820] Peter Galloway 2017-04-29 20:13:34 +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. Kusal Ekanayake 2017-04-29 20:10:39 +12:00
  • 3e97f016d5 Getting boat locations from race simulator & bug fixes Michael Rausch 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] Alistair McIntyre 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] Peter Galloway 2017-04-29 18:56:41 +12:00
  • a0624cfef6 Merge branch 'wake_remake' into Mark_to_MarkGroup cir27 2017-04-29 14:29:12 +12:00
  • 02a35b4c02 Reduced the cost of updating wakes. Improved the logic for controlling indices. cir27 2017-04-29 14:20:52 +12:00
  • 80409c08a6 Removed a graphical object added for testing. cir27 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. cir27 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. Calum 2017-04-28 23:25:49 +12:00
  • f3ee618900 Fixed broken race timer and timer now using stream timer data. Zhi You Tan 2017-04-28 21:44:23 +12:00
  • b939086e10 Updated welcome screen to show if race is finished or starting Zhi You Tan 2017-04-28 21:28:34 +12:00
  • ffdfc24e65 Created a start screen with a timer which shows the race progress Zhi You Tan 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] Peter Galloway 2017-04-28 18:29:35 +12:00
  • 765f27f987 Starting new wake implementation. Calum 2017-04-28 17:08:08 +12:00
  • d204bee55d Started documentation on the stream parser. #story[820] Kusal Ekanayake 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. Kusal Ekanayake 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] Alistair McIntyre 2017-04-28 15:41:12 +12:00
  • 8a04a0e5b7 Added documents for Boat, RaceParser and Simulator classes. Haoming Yin 2017-04-28 14:53:26 +12:00
  • 705a0a2eaf Added document and unit tests for GeoUtility class. Haoming Yin 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. Kusal Ekanayake 2017-04-27 18:52:37 +12:00
  • e1de5e0989 Parsed more course data from XML messages #story[820] Alistair McIntyre 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] Alistair McIntyre 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 Kusal Ekanayake 2017-04-27 16:18:33 +12:00
  • 104fd86179 Got the live ac35 data working in paralell with the parse and the app. Kusal Ekanayake 2017-04-27 14:40:26 +12:00
  • 67a702ffcd Wakes still broken. Implemented dashed lines that track the progress of individual boats. Calum 2017-04-27 13:57:19 +12:00
  • 65c0e6f77d Fixed markergroup bugs. Improved wakes. Still WIP Calum 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. cir27 2017-04-27 02:44:25 +12:00
  • 8c8f253233 Created simulator to generate mock data. Haoming Yin 2017-04-26 22:58:13 +12:00
  • 8b8422de3a Renamed course parser to race parser Haoming Yin 2017-04-26 22:47:39 +12:00
  • 7bf2d4c40e Added Position class to better use GeoUtility. Haoming Yin 2017-04-26 22:46:04 +12:00
  • 2a67f04d15 Create GeoUtility to process all geo calculations. Haoming Yin 2017-04-26 20:56:58 +12:00
  • b2ea8196d5 Fixed a bug of getCourse method as it didn't parse xml correctly. Haoming Yin 2017-04-25 11:36:27 +12:00
  • 7f38191d03 Rewrote course parser to parse race xml file specified in AC35 spec. Haoming Yin 2017-04-25 01:04:30 +12:00
  • f6b7a3042f Rewrote all kind of marks to fit marks specified in AC35 spec. Haoming Yin 2017-04-25 01:03:37 +12:00
  • 3bdc6ce5cc Created a new course parser to parse race xml file specified in AC35 spec. Haoming Yin 2017-04-25 00:56:44 +12:00
  • bc31987f96 Added Boat location messages to the mock streaming data interface Michael Rausch 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. cir27 2017-04-26 21:16:22 +12:00
  • 95bafdc0d1 Fixed bug which caused boats to all travel to the same position. Calum 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. Kusal Ekanayake 2017-04-26 18:45:58 +12:00
  • 749c6b7fef Fixed bugs caused by horizontally scaling maps Calum 2017-04-26 17:18:33 +12:00
  • 912c081606 Added marks with the test data coords to the xml Kusal Ekanayake 2017-04-26 15:55:51 +12:00
  • c73bf7dd3e Started merging received packets from the sample stream and reading lats and lons to move boats from them. Kusal Ekanayake 2017-04-26 15:51:15 +12:00
  • a3ae015be8 Merge remote-tracking branch 'origin/30b/30c_boat_animation' into StreamReceiverMergeWithVisualiser Kusal Ekanayake 2017-04-26 15:06:55 +12:00
  • 1f8f1f0f86 Added boat location, and race start messages to the mock data interface Michael Rausch 2017-04-25 21:49:51 +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. Kusal Ekanayake 2017-04-25 17:57:22 +12:00
  • 8cbd1cc4aa Added support to import XML packet to XML Document object. #story[820] Alistair McIntyre 2017-04-25 17:38:26 +12:00
  • 00c1a89f58 Fixed error in the switch (missing breaks) Kusal Ekanayake 2017-04-25 15:39:28 +12:00
  • d51825ffb7 Created separate streams for each different data type to be parsed into so the exact needed data would be able to be extracted. Kusal Ekanayake 2017-04-25 15:32:04 +12:00
  • 42569e6ad7 Changed BoatPolygon is now a group instead of a polygon and is called BoatGroup. cir27 2017-04-25 04:30:44 +12:00
  • ef874b4245 Added a transition time to rotational movement. cir27 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. Calum 2017-04-24 23:06:30 +12:00
  • 6874f288ee Added Race Status messages to the mock streaming data interface Michael Rausch 2017-04-24 21:53:42 +12:00
  • b6fd90e9d7 Updated .mailmap for Zhi You Tan's information Zhi You Tan 2017-04-24 18:33:06 +12:00
  • f078c34bf9 the stream receiver can now be passed a threadsafe priorityQueue that it will add the packets to as they are received (note the priority queue passed should be initialized with a comparitor for "StreamPacket"s) #story[817] Peter Galloway 2017-04-24 18:29:50 +12:00
  • c1e4a6156c re-engineered stream receiver to make it cleaner and ready to be used with the rest of the program. #story[817] Peter Galloway 2017-04-24 17:38:29 +12:00
  • 71e14259f6 Started looking into boat location packets, am able to extract the lats an lons but needs validations. Can also see the device type, timestamp, and sequence number. Code needs to be cleaned up and will need to start looking into the set up packets, specifically the packets containing xml data so the course can be created. Kusal Ekanayake 2017-04-24 16:47:41 +12:00
  • 403dc480c4 Created packet enum to class packets and started progress on how the packets are read and parsed according to the type of packet. Kusal Ekanayake 2017-04-24 15:50:21 +12:00
  • 3dc1a7f9c0 StreamPacket class created so that we can store all packets generically. The timestamp has also been extracted and stored with the packet so that in the future we may turn the current ArrayList into a priority que. Kusal Ekanayake 2017-04-23 20:14:41 +12:00