fcb1e5e593
Removed unnecessary Position and GeoPoint classes to clear the code base.
...
- put utility classes in a package
#story[1047]
2017-07-10 23:51:01 +12:00
752863a0d3
WIP: Created some basic controllers for the UI and started implementing backend for server stuff
...
Created GameState Class. Static, contains all info about current state of game: list of players and their respective details (coords etc) also Host info
Clients will observe this GameState class
Upon pressing host, new GameState is created and new GameConnectionListener created which listens for connections
Player class created which will be used to take each connection and store it as a player with other info about them regarding the game in the GameState class
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 16:03:13 +12:00
1a3e330eb4
Created some basic UI for new start screen (host and connect) and a lobby
...
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 13:43:25 +12:00
5f9da6b40a
Fixed the bug where the polar file could not be read after being packaged
...
tags: #story[955] #pair[wmu16, zyt10]
2017-07-10 12:36:32 +12:00
fe76ef9cdc
Merge remote-tracking branch 'origin/develop'
2017-05-25 16:58:01 +12:00
acbaa838ec
Change default port to 4940
...
#story[956] #pair[wmu16, mra106]
2017-05-25 16:56:41 +12:00
24cc10e1cd
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-25 16:51:32 +12:00
c1aa1d8eae
merged with dev
2017-05-25 16:32:25 +12:00
4231c3ccd8
Merge remote-tracking branch 'origin/develop' into remove_observers
2017-05-25 16:30:15 +12:00
65223ceaaf
shifted annotation layers. Merged with dev.
2017-05-25 16:29:27 +12:00
559a9f38c0
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 16:12:44 +12:00
835f79b113
Swapped to the local stream as default
2017-05-25 15:56:02 +12:00
cec7014856
Set axis ons parkline style
2017-05-25 14:54:34 +12:00
b73e4c89db
Merge remote-tracking branch 'origin/develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/fxObjects/MarkGroup.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 14:52:54 +12:00
f1a9da83fc
Quick fixes before merge
2017-05-25 14:22:01 +12:00
6e903bfbed
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/Yacht.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 14:16:55 +12:00
23d62f552e
Merged develop onto this branch
...
Tidied code, removed print statements
#story[956] #pair[wmu16, mra106]
2017-05-25 14:06:33 +12:00
53f6a6b8c5
Implimented a new way to determine positions
...
#story[952]
2017-05-25 14:06:33 +12:00
af81bf5891
Merge remote-tracking branch 'origin/develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Event.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 13:56:08 +12:00
e72ac1def8
Laylines are now togglable. Still not completely fool proof
...
Laylines appear only for the selected boat. The dissapear if the boat is not seleccted. Laylines are the colour of the boat
Laylines do not yet automatically update for a selected boat when it passes a mark
There is still a polling interval of a second in which if you select a boat after it has just passed a mark it still thinks the next mark is that mark and laylines are displayed incorrectly
#story[956] #pair[wmu16, mra106]
2017-05-25 13:48:48 +12:00
f163dfdd11
Removed a print statement
2017-05-25 13:14:36 +12:00
a1eda8d91d
Fix boatPos in StreamParser.java being empty and affecting all the assessors
2017-05-25 12:58:11 +12:00
5ed02a1fe1
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-25 12:32:10 +12:00
66d4a4b958
Fix finish screen showing wrong ("-" as) position
2017-05-25 12:28:13 +12:00
adbb9ffe3b
Removed completed TODO request.
2017-05-25 10:31:37 +12:00
0cd2867ac0
Made annotations more readable when overlapping.
2017-05-25 10:30:01 +12:00
4d29354797
Merge branch 'develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 10:25:54 +12:00
a6d9c66fc9
Removed unused import statements and class variables. Removed non error print statements.
2017-05-25 10:20:39 +12:00
99588c7ff8
Laylines now working upon selecting a boat. Still need to make their visibility togglable
...
Currently just paints upon clicking
tags: #story[956]
2017-05-25 09:54:00 +12:00
68c3e3e999
Merged develop onto this branchk
...
tags: #story[956]
2017-05-25 09:21:47 +12:00
67b5650288
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 09:19:42 +12:00
3085125f3e
Merged with develop
2017-05-25 01:21:40 +12:00
5e26ad7c36
Merge remote-tracking branch 'origin/develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 01:12:10 +12:00
765ea06c3b
Several tweaks and improvements to a annotations and other visual aspects of them program. Fixed bug causing minimization crashes.
...
#implement #refactor #issue[23]
2017-05-25 01:02:33 +12:00
ffe70a8313
Trying to get laylines to display on proper respective sides of the gate
...
Having a great time here, Not quite working. There was an issue where the laylines are crossed and I think its tied to the fact that sometimes the two seperate points of the gate mark appear to have the same x y coordinate so the line function doesnt work? idk
tags: #story[956] #pair[wmu16]
2017-05-25 00:22:15 +12:00
b3fd735f5c
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-24 21:50:15 +12:00
3cbbdb070f
Basic implementation for mapping windspeed to draw a polar on a gate complete
...
Created functionality to grab the closest windspeed value to map to VMG values based off the current wind speed in the Polar Table
Created new RaceXML mark object which contains ALL marks for purposes of sequencing
Displaying correct (?) polars for one point only on a gate
Created functionality to receive leg data for each boat and then map that to the next gate. This may only work for the current race due to a slight fudge factor
Created functionality to receive wind speed
tags: #story[956] #pair[wmu16, mra106]
2017-05-24 20:31:07 +12:00
d2e55bf964
Removed the FPS background, and lowered the update frequency so it doesn't flip too fast.
...
#story[923]
2017-05-24 19:33:24 +12:00
e6aed88188
Merge with develop.
...
#story[952]
2017-05-24 18:56:56 +12:00
d032314ddb
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-24 18:56:04 +12:00
46f5fc5172
Merge with develop.
...
#story[952]
2017-05-24 18:47:27 +12:00
81c021b59a
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/resources/views/RaceView.fxml
2017-05-24 18:45:01 +12:00
8ab57e4e61
Cleaned up code for review.
...
#story[952]
2017-05-24 18:43:50 +12:00
14a7305a2d
Made FPS marker not draw on canvas.
...
Have to revert the use of the observer pattern since there is no time to change how and when data is passed.
2017-05-24 17:17:06 +12:00
13ff179840
Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard
2017-05-24 16:18:33 +12:00
e7060d4b6f
Finish screen will show when race finishes, added functionality to return to start screen when in finish screen, updated finishScreenView.fxml to have controller and also four corner anchors to fit to parent
2017-05-24 16:17:56 +12:00
641039720e
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
2017-05-24 16:12:37 +12:00
71637d7286
Removed dead code from canvas controller and canvas map
...
Tags: #story[928]
2017-05-24 15:04:12 +12:00
1cac7cc189
Calculation of upwind downwind leg given a boat, wind and next mark now works. created GeometryUtils class
...
Can accurately calculate if a boat is going upwind or downward using a line function for the wind vector from the gate and the boat position from the gate.
Requires knowledge of the next mark which requires the boat to have passed a mark. This could be fixed by extracting the leg number from the race status packet and mapping these to gates in an initalisation step
tags: #story[956]
2017-05-24 14:57:22 +12:00
7abb36c362
The axis is labeled correctly and is scaled accordingly.
...
The sparkline should work from the start of a race now also. We now have the boat in first place listed at the top along with the axis labeling and marking matching the position (eg, 1st at top. 6th at bottom). Boats picked up on the visualiser park way through the race are able to added and drawn onto the sparkline.
#story[952]
2017-05-24 14:42:41 +12:00
Haoming Yin
William Muir
Michael Rausch
Zhi You Tan
Calum
Kusal Ekanayake