fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,180 Commits 1 Branch 0 Tags
3a6070a645ab37f3a1f1ca46c2a44ba5aee48f6c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196] 2017-09-12 22:10:13 +12:00
Fan-Wu Yang 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261] 2017-09-07 22:03:24 +12:00
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261] 2017-09-07 19:30:51 +12:00
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
 2017-09-06 17:48:11 +12:00
Fan-Wu Yang ba13713ba1 Merge branch 'wind_(story53)' into 'master' 
Wind (story53)

AC:

Note: "Back" means that the wind shifts counterclockwise while "veer" means clockwise. Shifts should follow the following patterns:

1. The wind should usually oscillate regularly around a mean (several minutes per oscillation and no more than 5 degrees either way.)
2. Occasionally it will either "back" or "veer" (a few degrees a minute, up to 180 degrees shift), and then return to oscillations.

Acceptance criteria:

- The wind direction follows the above patterns during a race.

* Test wind works at 0 to small degree amounts.


See merge request !36
 2017-09-06 17:45:09 +12:00
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187] 2017-09-06 17:41:48 +12:00
Fan-Wu Yang 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53) 2017-09-06 17:13:39 +12:00
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 17:00:56 +12:00
Fan-Wu Yang 2382585c15 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 16:58:27 +12:00
Fan-Wu Yang 06517b7b47 Tidied up code 
- Removed prints from tests
- Added Javadocs in necessary places
- Reenabled boat status message to send
- Added boat average angle
- pulled out modulateAngle function
- Commented harder to read loops
- Disabled toggled VMG
#story[1182]
 2017-09-05 21:37:33 +12:00
Fan-Wu Yang d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182] 2017-09-05 21:03:19 +12:00
Fan-Wu Yang 7331ad1a20 VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182] 2017-09-05 19:26:06 +12:00
Fan-Wu Yang 7aaa880f40 VMG now works with some edge cases issues #story[1182] 2017-09-05 13:05:37 +12:00
Fan-Wu Yang 71dcc8ee6c Added POlar Linear Interpolation #story[1186] 2017-09-04 14:17:13 +12:00
Fan-Wu Yang 34cfe48df0 Got VMG quad detection working, however, the speeds are completley wrong. #story[1186] 2017-09-01 20:30:28 +12:00
Fan-Wu Yang 9a5d20bdf2 Added new polar function, currently it does not distinguish between up wind and downwind and doesn't find it in the correct quadrant #story[1186] 2017-08-31 17:39:17 +12:00
Fan-Wu Yang 4910d2712c Changed STL Importers Version #story[1191] 2017-08-30 13:56:57 +12:00
Fan-Wu Yang 921e0999b8 Testing if dependency for stl works this time #story[1191] 2017-08-30 13:01:37 +12:00
Fan-Wu Yang 0927e62ea3 Changed dependency to see if it will pass the CI runner #story[1191] 2017-08-30 12:46:05 +12:00
Fan-Wu Yang 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D 2017-08-29 20:36:15 +12:00
Fan-Wu Yang ea41c64c34 Added dependency for stl converter #story[1191] 2017-08-29 20:36:08 +12:00
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven 2017-08-17 16:24:54 +12:00
Fan-Wu Yang 2e9c6fe593 Merged most recent master in, #story[1092] 2017-08-17 13:23:55 +12:00
Fan-Wu Yang 7546c65893 Merge branch 'master' into MapWindRotation 
# Conflicts:
#	racevisionGame/src/main/java/shared/model/CompoundMark.java
#	racevisionGame/src/main/java/shared/model/Mark.java
 2017-08-17 12:59:54 +12:00
Fan-Wu Yang 9f7c5d8c0c Fixed other javadocs that were causing the build to fail #story[1092] 2017-08-15 22:48:35 +12:00
Fan-Wu Yang 9e6bd10870 Merge branch 'master' into MapWindRotation 2017-08-15 22:45:01 +12:00
Fan-Wu Yang 8d87da6206 fixed java doc issues on my side #story[1092] 2017-08-15 22:44:56 +12:00
Fan-Wu Yang a4e1dfb3d7 Fixed import that was messing up the build #story[1092] 2017-08-15 20:46:10 +12:00
Fan-Wu Yang cdcd326b7c Merge branch 'story68' into 'master' 
Story68



See merge request !25
 2017-08-14 13:05:26 +12:00
Fan-Wu Yang a5b21799d3 Fixed java doc issue #story[1092] 2017-08-14 04:10:24 +12:00
Fan-Wu Yang eebdd3806e Added .idea/codeStyleSettings.xml to the git ignore 2017-08-14 04:06:14 +12:00
Fan-Wu Yang ac42c07c69 Merge branch 'master' into MapWindRotation 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
#	racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
 2017-08-14 03:54:02 +12:00
Fan-Wu Yang b5e414f97a Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class. 
#story[1092]
 2017-08-14 03:47:42 +12:00
Fan-Wu Yang 70d5447e88 Moving stuff from school pc to home 2017-08-13 23:03:16 +12:00
Fan-Wu Yang 8999cddf8b Pre merge commit 2017-08-13 22:16:16 +12:00
Fan-Wu Yang 820898d92c pushed work from school computer to do at home 2017-08-13 16:02:33 +12:00
Fan-Wu Yang 7c6f0931ba Transferring files from my laptop to desktop to work on, may be broken. 2017-08-12 23:18:54 +12:00
Fan-Wu Yang a460df3e4d Fixed Javadocs that were causing the build to fail. #story[1096] 2017-08-07 16:30:06 +12:00
Fan-Wu Yang 0f9b191ccb Added doc strings to RaceXML Creator #story[1096] 2017-08-07 16:13:15 +12:00
Fan-Wu Yang fef35d0b00 The race is rotated with it's initial rotation in mind 
- RaceXMLCreator now checks the bearing of the race with getLineAngle()
- Split some methods into functions so that it is more readable
#story[1096]
 2017-08-07 02:37:05 +12:00
Fan-Wu Yang 2ce1c0786e The course points can now be rotated, 
- Created markToGPSCoordinate Class
- Added Rotation to marks
#story[1092]
 2017-08-07 02:01:41 +12:00
Fan-Wu Yang f23c3f854d Seperated race xml creation into a class of its own 
- Created RaceXMLCreator class
- made a function to convert limit to GPS Coordinate (limitToGPSCoordinate)
- can rotate a GPS Coordinate around a point (rotate)
- can get center of a race with (getCenter)
#story[1092]
 2017-08-03 23:13:28 +12:00
Fan-Wu Yang 4e8d4f2433 Created Schema for Race xml's and generated classes for reading xml with xjc, made the RaceXMLReader read Corner classes in as well as making a corner class #story[1092] 2017-08-03 02:42:33 +12:00
Fan-Wu Yang a8701d8a1f Merge branch 'css' into 'master' 
CSS merge into master branch



See merge request !18
 2017-07-27 16:26:47 +12:00
Fan-Wu Yang 442920f9f6 DOD, and added javadocs/fixed javadocs #story[1087] 2017-07-27 16:24:19 +12:00
Fan-Wu Yang eec0cb3493 Added fairness to mockOuput list so the index will correspond to the player in order that they entered the hosted game, #story[1010] 2017-07-24 17:40:46 +12:00
Fan-Wu Yang cfd858194e Removed Unecessary Print Messages 
- Removed xml's printing at the start as well as the amount of visualisers connected from spamming the log.
- Issue of visualisers connecting when not actually connecting was actually an visual issue as the log spits out the number of visualisers right now before the loop has gotten rid of the useless sockets.
#story[1010]
 2017-07-24 17:36:47 +12:00
Fan-Wu Yang 9f99e21232 Added functionality for more than one visualiser to connect to the mock. 
- more than one visualiser can now connect to the mock.
- Created class ConnectionAcceptor that will accept and allocate to each socket
- Issue of sockets connecting after the race starts then disconnecting will use a socket slot.
#story[1010]
 2017-07-24 17:27:49 +12:00
Fan-Wu Yang ec50310137 Added Messages to Controller For Testing Purposes 
- Added Pressed, Released, and Held Messages to Controller
#story[1006]
 2017-07-24 02:16:02 +12:00
Fan-Wu Yang d6d195f381 Added Modularity to Input Checker. 
- Added onHold
 - Added onRelease
 - Added ManualTesting Class in the tests
 - Added Unimplemented new methods to classes
 #story[1006]
 2017-07-24 02:03:33 +12:00
Fan-Wu Yang f9b2a62f8d The Controller now takes in key presses. 
- Each key is now registered in an Abstract Factory which takes in an action to perform.
- Comments are added behind each function in to give some indication of how it could be extended/modified in the future.
#story[1006]
 2017-07-15 20:40:23 +12:00
Fan-Wu Yang 512169010c Fixed Annotations and bound windarrow 
- Wind arrow for the bermuda race is bound between 215 and 235 degrees
- annotations will not correctly highlight what they are showing
#story[877] #story[882]
 2017-05-25 14:45:13 +12:00
Fan-Wu Yang b9b03305b0 Fixed Annotations and bound windarrow 
- Wind arrow for the bermuda race is bound between 215 and 235 degrees
- annotations will not correctly highlight what they are showing
#story[877] story[882]
 2017-05-25 14:34:29 +12:00
Fan-Wu Yang 6e3d8dc75b Merged Refactors with master 2017-05-24 23:50:17 +12:00
Fan-Wu Yang 22e5996e64 Merge remote-tracking branch 'origin/sprint4_master' into AuditRefactors 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-24 23:49:00 +12:00
Fan-Wu Yang ba5e74ab9c Merge with master complete 
- merged with master
#story[877]
 2017-05-24 23:13:59 +12:00
Fan-Wu Yang a3ccd75f4c Merge remote-tracking branch 'origin/sprint4_master' into Story877 
# Conflicts:
#	mock/src/main/java/seng302/DataInput/BoatXMLReader.java
#	mock/src/main/java/seng302/DataInput/XMLReader.java
#	mock/src/main/java/seng302/Model/Boat.java
#	mock/src/main/java/seng302/Model/CompoundMark.java
#	mock/src/main/java/seng302/Model/Leg.java
#	mock/src/main/java/seng302/Model/Mark.java
#	mock/src/main/java/seng302/Model/Marker.java
#	mock/src/main/java/seng302/Model/Race.java
#	mock/src/test/java/seng302/Model/LegTest.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml
 2017-05-24 22:57:31 +12:00
Fan-Wu Yang 8a674bcaec Merge branch 'sprint4_master' into Story877 2017-05-24 22:30:23 +12:00
Fan-Wu Yang e3c3def184 Fixed capitalisation that was pointed out by Erika in the Tests 
- LegTest.java ORIGIN_Compound_MARKER is now ORIGIN_COMPOUND_MARKER
#story[877]
 2017-05-24 22:29:51 +12:00
Fan-Wu Yang debc5d9c38 Added adjustments that PO requested 
- hide will not deselect all checkboxes
- visible will now show all checkboxes that were deselected when hidden
- partial will now select abbreviation and speed only
- when another checkbox is selected/deselected from partial,hidden or important it will immediately jump to visible radio button.
#story[877]
 2017-05-24 22:24:37 +12:00
Fan-Wu Yang 671d62aeb1 Added Important and Partial Annotations and other refactors and documentation. 
- Important, Partial, Hidden, Visible are all radiobuttons
- Fixed bug where the Visualiser would end the race before the last boat had finished
- Refactored the visualiser and the mock to use the race finished status message
- Added and Changed many Javadocs
#story[877]
 2017-05-22 03:51:14 +12:00
Fan-Wu Yang 044d786043 Added Refactors that the Audit suggested 
- Created AC35RaceStatus class
- Deleted wait loop into a Thread.sleep()
- Deleted Entirely commented out class....
- Deleted duplicate draw that appeared again
#story[873]
 2017-05-19 01:05:45 +12:00
Fan-Wu Yang 7990ac9d2e Merge branch 'Story49Vis' into 'master' 
Story49



See merge request !1
 2017-05-15 15:58:21 +12:00
Fan-Wu Yang c0bc2b2c1e Merged Mock49 and fixed bugs 
- Error where mock would not read in the files when running from the jar.
- Error where the AC35 stream now no longer sends us packets with information that is set for 0 for boat location.
#story[881] #pair[fwy13, esa46]
 2017-05-15 15:53:49 +12:00
Fan-Wu Yang b065b8d9c7 Merged Mock49 and fixed bugs 
- Error where mock would not read in the files when running from the jar.
- Error where the AC35 stream now no longer sends us packets with information that is set for 0 for boat location.
#story[881] #pair[fwy13, esa46
 2017-05-15 15:49:38 +12:00
Fan-Wu Yang 7bfb6bb968 Merge remote-tracking branch 'origin/49Mock' into Story49Vis 
# Conflicts:
#	visualiser/src/test/java/seng302/Model/RaceXMLTest.java
 2017-05-15 14:01:16 +12:00
Fan-Wu Yang f011b4117e Added and removed javadoc tests that were making errors in the code, #story[881] 2017-05-14 16:24:17 +12:00
Fan-Wu Yang a7a065825a Fixed thread issue on windows 
- Added a Platform.runLater on the Visualiser loops so that the notifying observers do not try to call it, where it is a non java-fx loop
#story[881]
 2017-05-14 16:18:11 +12:00
Fan-Wu Yang 156e0bfdd5 removed blocking queue that somehow appeared again 
- Removed blolcking queue from Visualiser Input that had appeared miraculously
#story[881]
 2017-05-14 16:14:45 +12:00
Fan-Wu Yang 294627074d Commented out throws in the BinaryMessageDecoder for messages we ignore as they were not errors and instead were causing the program to stop if they're received 
- commented out throw from default, chatter text, yachactioncode, yachteventcode, displaytextmessage states
#story[881]
 2017-05-14 16:13:37 +12:00
Fan-Wu Yang b2d9e44d03 Deleted Unecessary code 
- StreamedRace no longer sets the positions of boats
- The Visualiser has blocking queue removed
- The Regatta XML Reader not longer has a variable to the deleted Regatta class
#story[881]
 2017-05-14 15:36:40 +12:00
Fan-Wu Yang 30beef29ba Deleted Regatta XMl reading that is deprecated 
- No longer in use XML reader has been deleted
#story[881]
 2017-05-14 15:29:52 +12:00
Fan-Wu Yang 3570e1283f Deleted Race class 
- Delete dependency on Race class from Streamed Race as there is no need for extention after the split of Visualiser and Mock.
#story[881]
 2017-05-14 15:24:19 +12:00
Fan-Wu Yang f8c6e500fb Deleted deprecated Race XML reader 
- Deleted RaceXMLReader class
- Deleted Corresponding Tests
#story[882]
 2017-05-14 15:14:32 +12:00
Fan-Wu Yang 045e69a637 Deleted and Fixed some redundant code 
- Deleted some unused functions
- Fixed NullPointerException for Marks
#story[881] #pair[fwy13,jam339]
 2017-05-10 15:51:55 +12:00
Fan-Wu Yang 9e19ddb1f4 Story 49 Marks move with boat location. 
- Commented out blocking array as it was unecessary
- Added Observable list for markers to the race canvas
- Added SourceId's to Marker
- Added updating Markers from the Streamed Race loop.
#story[881] #pair[fwy13, jam339]
 2017-05-10 14:45:42 +12:00
Fan-Wu Yang bdf215d0f1 TCP connection at the front menu will no longer bug out if the socket is bugged. 
- Timeout set on connection socket so that the socket will return false after 5 seconds.
#story[782]
 2017-05-06 16:55:12 +12:00
Fan-Wu Yang d52b09e74a Visualiser Closes All threads on exit now. 
- Added override for exiting the Visualiser which closes all threads: such as the TCP connection.
#story[782]
 2017-05-06 15:58:12 +12:00
Fan-Wu Yang a20dafea11 Annotations go on top and boundaries now update 
- Fixed FPS and other annotations being hidden under the map
- Fixed boundaries not updating with the visualiser.
#story[782]
 2017-05-06 15:46:38 +12:00
Fan-Wu Yang 982b47943a Fixed blocking issue 
- Fixed byte stream error where it would reinitilise every run
#story[782]
 2017-05-06 15:27:21 +12:00
Fan-Wu Yang b7f010a2fa Fixed Network While loops 
- Removed while blocking loops and replaced them with return statements
#story[782]
 2017-05-06 14:36:37 +12:00
Fan-Wu Yang 565b7adaa2 Merge remote-tracking branch 'origin/race-timer-fixes' into layeredCanvas 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/StartController.java
 2017-05-04 16:55:01 +12:00
Fan-Wu Yang 862391d7ef Canvas Layer Created 
- Canvas is created via layering.
- Resizable canvas is now a seperate abstract class
#story[782]
 2017-05-04 16:54:06 +12:00
Fan-Wu YangandErika Savell 284eb6d951 Added Test for AC35UnitConverter 
- Added tests to make sure it was working properly
#story[782]
 2017-05-04 16:30:42 +12:00
Fan-Wu Yang 037c09b059 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:42:28 +12:00
Fan-Wu Yang 6bbc2ac4be Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:40:48 +12:00
Fan-Wu Yang bb57685faf Added Test for AC35UnitConverter 
- Added tests to make sure it was working properly
#story[782]
 2017-05-04 13:40:43 +12:00
Fan-Wu Yang 43fb0df5be Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:07:13 +12:00
Fan-Wu Yang 874953f763 Fixed issue win ResizableRaceCanvas 
- Issue where the boat position may mess up if it is called before the server has sent us information about hte location.
#story[782]
 2017-05-04 13:07:05 +12:00
Fan-Wu Yang 44a5b9a38f Fixed merge issue 
- Strange Issue where there was a null pointer from convertGPS however it has resolved itself may crop in the future htough.
#story[782]
 2017-05-01 20:25:09 +12:00
Fan-Wu Yang 84bb4fdb8f Fixed merge issue 
- Strange Issue where there was a null pointer from convertGPS however it has resolved itself may crop in the future htough.
#story[782]
 2017-05-01 20:23:52 +12:00
Fan-Wu Yang 5444b872bd Fixed GPs Coordinates as well as got Boats to display 
- Fixed GPS conversion number being wrong (extra 1)
- Fixed Boats displaying as the boat = null (cough Joseph) was stopping it from working as well as track is broken.
#story[782]
 2017-05-01 20:13:16 +12:00
Fan-Wu Yang 04366c2e4c Fixed small Merge issue 
- Deleted a unfinished statement that caused hte build to fail
#story[782]
 2017-05-01 19:24:59 +12:00
Fan-Wu Yang 0fc1da4090 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-01 19:21:48 +12:00
Fan-Wu Yang 560af8c21d Added more data types to Visualiser Input that can be take from InputStream 
-Added AverageWind
-Added CourseWinds
-Added MarkRounding
-Added RaceStartStatus
#story[782]
 2017-05-01 19:21:43 +12:00
Fan-Wu Yang 2c414d3061 Added way to get the Race Status and Boat Status' 
- Added getters in Visualiser Input
- Added Hashmap for boat status messages
#story[782]
 2017-05-01 18:35:15 +12:00
Fan-Wu Yang 444a4432c6 Fixed stream from messing up 
- Stream was getting code before all of it came therefore a while loop was added t owait for the code
#story[782] #pair[hba56, fwy13]
 2017-05-01 15:07:59 +12:00
Fan-Wu Yang c3717b7fc5 Added Classes to help Visualiser 
- Added Get Boat GPS Coordinate
- Added Get Heading as Degrees
- Added Get True Wind Angle as Degrees
#story[782]
 2017-04-29 18:26:02 +12:00
Fan-Wu Yang 8569d3f2dc Added a few decoders and unit converters 
- Units can be converted from int to degrees as a double
- XML message now keeps the most recent XML file
#story[782]
 2017-04-28 17:00:04 +12:00
Fan-Wu Yang eab41315c5 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-28 13:44:19 +12:00