4375b73257
Implemented algorithm for checking if boat passes through a mark.
...
Mark rounding works for whole course (WITH BUGS)
Still some gate logic to work out.
Moved gate function to GeoUtil class
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-07 17:28:12 +12:00
f97b18d594
Sailsin graphics moving and working as expected.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 16:48:30 +12:00
c7857872ce
Luffing sails animation working correctly, working on sailsin animation now.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 15:24:01 +12:00
79105a1bdc
Created a simple collision detection by iterating each boats per update. Working but sequential checks can be costly.
...
#story[1117]
2017-08-07 12:01:26 +12:00
a4b22190c0
Changed the spawn point to behind start line and calculated quadrant to make sure yachts spawn behind start line in different map scenario.
...
#story[1117]
2017-08-07 11:50:07 +12:00
a3ce5998ff
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-07 10:58:07 +12:00
7f0329dda6
WIP: Implemented basic mark rounding algorithm.
...
Removed RacePosition class. Instead marks are just grabbed from the mark order class when necessary.
No marks are stored as an attribute in the yacht class but the 'currentMarkSeqID' which is used to get current, and surrounding marks.
Works for all marks in between but not including starting and finishing gate as no angle can be made with them. Still to work out how to implement this
#story[1124]
2017-08-07 00:23:54 +12:00
8a40119a98
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-06 22:17:08 +12:00
a470cb66a2
Updated initialise boat function so it can now initialise boats with distance apart in meters.
...
Created a second prototype function which is more testable compared to the initial design. New function takes in parameters (starting marks, yacht starting position, yacht) and initialise yacht correctly with position.
#story[1117]
2017-08-06 21:16:14 +12:00
ecf2c52cfa
Added tests, and sails to all clients.
...
#story[1111]
2017-08-06 15:43:22 +12:00
43788bd153
Added a method to test if a geo point is located in a triangle which is formed by other three geo points.
...
The method helps to check the mark rounding.
Also unit tests have been done for this method.
tags: #story[1124]
2017-08-06 12:36:57 +12:00
81c2a8e0fd
WIP: Added test initialise boat position test. Corrected ColorsTest after addition of two new colours.
2017-08-05 23:59:58 +12:00
e90a0ce435
Merge branch '1124_Mark_Sequence_From_RaceXML' into 'develop'
...
Loading mark sequence from RaceXML
# Loading mark sequence from RaceXML
## Change Log
1. Added MarkOrder class
* Mark order is read from the generated RaceXML and stored
* Added .getNextMark() to get the next mark in the race
* Added .equals() and .hashCode() for Marks
* NEW: Added RacePosition class to hold players position in the race
* NEW: Fixed issue where the duplicates weren't stored in the mark order
## Testing
* Unit tests in models/MarkOrderTest.java
## Acceptance Criteria
* Use the mark sequence in the raceXML
* Met by change log item (1)
* Store relevant mark details with each participating boat (Last mark, next mark)
* Method in MarkOrder to get next mark, however the last mark and next mark will need to be stored by whoever implements the second task.
See merge request !52
2017-08-05 15:18:26 +12:00
a727014fcb
Implemented boats spawning in parallel at the start line with spacing.
...
Added two more colours to support up to eight boats.
#story[1117]
2017-08-05 00:31:36 +12:00
ae28ccf228
Made sails luff in the right direction.
...
#story[1111]
2017-08-04 16:24:34 +12:00
281ce2d842
Loading course mark order from RaceXML
...
- Re-engineered code to work with the new marks
- Fixed bug where race order wasn't correct (added RacePosition class to fix)
- Rewrote tests to work with new RacePosition class
Tags: #story[1124] (Task 1)
2017-08-04 13:20:50 +12:00
f8af9cc259
Works for clients and server.
...
Due to the information being sent and received, it only currently works on client side boats.
#story[1111]
2017-08-03 19:07:30 +12:00
8af80e6c3a
WIP: Connected game client to main server thread to pass compound mark variable.
...
Boats are initialised in main server thread behind start line before game starts.
#story[1117]
2017-08-03 18:39:15 +12:00
874cdec654
Added booleans: has entered rounding zone, has crossed first line, has crossed second line
...
All for purposes of checking mark rounding.
Currently not yet finished
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-03 17:39:07 +12:00
99d5545ed3
Made the sails work properly by toggling.
...
Need to remove the unneeded code I added.
#story[1111]
2017-08-03 16:33:51 +12:00
423f1acdb6
Merge remote-tracking branch 'origin/develop' into develop
2017-08-03 16:29:22 +12:00
454e9ac9f1
Added an attribute to each yacht: 'DistanceToNextMark'
...
This attribute is calculated at each update of the boat as prompted by the game state regularly
Removed the lat and lng attribute from the Yacht class and replaced its usage with the GeoPoint object instead
Removed redundant test files and merged GeoUtility and testGeoUtil test classes into one
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-03 16:29:12 +12:00
1ab849fd0d
Added cucumber dependency.
2017-08-03 14:02:52 +12:00
db078538ff
Minor cleaning in yacht class
...
tags: #story[1124]
2017-08-03 13:53:30 +12:00
1c0d869894
Corrected a value in the race.xml
2017-08-03 13:49:53 +12:00
f9e6df46c1
Fixed issues caused by merge.
...
#bug
2017-08-03 13:23:43 +12:00
5228c078bc
Merge branch 'develop' into 1124_Mark_Sequence_From_RaceXML
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/server/simulator/Simulator.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/visualiser/map/CanvasMap.java
2017-08-03 12:27:11 +12:00
1160f274ee
Reformatted code in appropriate style
...
Build fails server side only due to some dependency issue. Internet problem server side?? (M I C H A E L?)
tags: #issue[34]
2017-08-03 12:06:07 +12:00
53f5d63f15
Fixed build. (Actually this time) ((NOW WERE READY TO MERGE)))
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:50:07 +12:00
1150ec3e43
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
2017-08-03 11:48:54 +12:00
c655cb3fab
Fixed build. (Actually this time)
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:45:14 +12:00
8e24c204fd
Fixed build.
...
Google map does not work
tags: #issue[34]
2017-08-03 11:26:44 +12:00
7885b3fae2
Loading course mark order from RaceXML
...
- Mark order is read from the generated RaceXML and stored
- Added .getNextMark() to get the next mark in the race
- Added .equals() and .hashCode() for Marks
Tags: #story[1124] (Task 1)
2017-08-02 22:03:10 +12:00
b01d39f19f
Merge remote-tracking branch 'origin/develop' into develop
2017-08-02 20:42:22 +12:00
eae201cb4b
Merge remote-tracking branch 'origin/develop' into develop
2017-08-02 20:32:43 +12:00
87ef37a689
Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of.
...
#refactor #bug #issue[34, 35]
2017-08-02 00:26:57 +12:00
908c0749cf
Boats now move on screen as intended.
...
TODO - Make the client connect to the server.
2017-08-01 02:37:55 +12:00
47c5e6f155
Reverting some new graphics classes back to how they were on master.
2017-07-31 23:35:28 +12:00
9deba732b0
Added dependencies for slf4j
2017-07-31 18:34:55 +12:00
b82d0d0137
Boats and map are now updated using the observer pattern.
...
#implement
2017-07-31 05:23:41 +12:00
f1ad03e913
Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.
...
#refactor
2017-07-31 02:19:19 +12:00
6cae338c1e
Began fixing bugs with caused by asynchronous listener calls.
...
#bug
2017-07-30 20:12:19 +12:00
7894e31926
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientState.java
# src/main/java/seng302/client/ClientStateQueryingRunnable.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/stream/StreamReceiver.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/test/java/seng302/model/stream/StreamReceiverTest.java
2017-07-30 18:07:28 +12:00
25d8c8f9c4
Minor bug fixes.
...
Server will now only save incoming connections if in lobbying mode as it should
Commented out boat status printing
tags: #story[1047]
2017-07-27 14:15:55 +12:00
1d9dd76356
For client's lobby view, it now can shows the connected host IP
...
#story[1055]
2017-07-27 13:12:53 +12:00
c2c34705d5
removed an unnecessary print statement and caught an exception
2017-07-27 13:01:04 +12:00
96ed5e445e
Replaced print stack trace with print statements
2017-07-27 12:47:18 +12:00
870dc07fd2
Slight improvements to hosting.
...
Allow a host/client to disconnect and reconnect/make lobby, leave lobby and play the game.
#pair[kre39,hyi25] #story[1047]
2017-07-27 12:45:22 +12:00
ecbb3f6658
Merge remote-tracking branch 'origin/develop' into develop
2017-07-27 11:06:00 +12:00
34704bd93d
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 23:32:32 +12:00
William Muir
Kusal Ekanayake
Zhi You Tan
Calum
Zhi You Tan
Haoming Yin
Michael Rausch