Commit Graph

14 Commits

Author SHA1 Message Date
Peter 65ac864bf2 added count for fps inside handle loop and displayed fps on the canvas #story[463] 2017-03-27 16:34:54 +13:00
Peter 7bc5c8f8a4 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	src/main/java/seng302/controllers/CanvasController.java
	src/main/java/seng302/models/Boat.java
2017-03-23 22:17:45 +13:00
Peter bb8c681270 added a markpos value to event for use in displaying the team positions #story[426] 2017-03-23 21:19:39 +13:00
Michael Rausch 403aaa76ae Display team name and speed beside boat
- Also slowed down the AnimationTimer
- Removed the need to scale the canvas

Tags: #implement #story[18] #story[19]
2017-03-23 18:04:00 +13:00
Michael Rausch 2384013139 Created race timer
- Race starts when timer reaches 1 second
- Race waits 10 seconds before it starts

Tags: #implement #story[16]
2017-03-23 14:11:12 +13:00
Michael Rausch 9e22eac4d8 Added the race results to the RaceResultController. Also fixed some bugs
- Fixed a bug where the race results would be out of order.
- Changed the colour of the start and finish gates
- Added the race results to the RaceResultController and updated view

Tags: #fix #implement #story[13, 10, 11]
2017-03-22 22:30:49 +13:00
Michael Rausch ef098e63d7 Added finishing events #implement and rotated the map by 180 degrees#fix 2017-03-22 12:51:03 +13:00
zyt10 0e4bb0f942 Changed getMark to getThisMark. Added start point to KeyFrame. Race now starts from start point and ends at finish point
#story[377]
2017-03-20 17:34:24 +13:00
Haoming Yin ee34e5028f Reformatted and refactored the canvas controller
#fix #refactor #story[377]
2017-03-20 17:23:33 +13:00
zyt10 c08504293b Created canvas and race controllers to display boats on canvas and modified marks and parsers to support them.
#story[377] #pair[zyt10, ptg19]
2017-03-17 18:21:11 +13:00
zyt10 683f4ba94e Mostly got boats going to marks on the canvas (code currently broken) #story[377] #pair[zyt10, ptg19] 2017-03-17 16:18:01 +13:00
Haoming Yin 0b3ebf229f Refactor mark related classes.
- Mark is an abstract class which containing its name and type
- Single Mark is a sub class of Mark which containing only one GPS location
- Gate Mark is a sub class of Mark which containing two Single Marks

#refactor #fix #story[10] #story[11] #story[12]
2017-03-17 15:21:04 +13:00
Michael Rausch 94e4e853c3 Removed Legs from the race, using coordinates instead
Tags: #implement #refactor #test #story[9]
2017-03-16 20:29:17 +13:00
Peter 550812d8e1 Currently displaying basic javafx window with canvas. Also changed the file structure a bit.
At this point the javafx is not tied to the old code in any way #story[377]
2017-03-15 18:16:43 +13:00