Commit Graph
1510 Commits
Author SHA1 Message Date
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw
#story[1190]
2017-09-08 12:58:06 +12:00
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
- Changed how View3D is added to canvasBase to allow events to get through

#story[1190]
2017-09-08 12:43:36 +12:00
hba56 a494eb4a6d games are now added on the correct port
#story[1188]
2017-09-08 12:04:54 +12:00
hba56 d3ddff8bf1 host game start button added margins
#story[1193]
2017-09-08 11:52:21 +12:00
zwu18 64ed1f9aa6 Improved map layout image. #story[1193] 2017-09-08 02:58:57 +12:00
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
- Race pane listens to scroll delta and sets View3D distance accordingly
- GPSConverter has more applicable property names for infinite 3D

#story[1190]
2017-09-07 23:22:27 +12:00
Jessica Syder a2b3ba44c0 RaceController scene separating
- removed a lot of unecessary parameters
- simplified set up functions
- racecontroller works on its own now
- made all the scenes visible by default

#story[1261]
2017-09-07 22:47:45 +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
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
- scenes do not load in at the same time
- scenes do not rely upon previous abstract controller class
- scenes are not a part of previous main controller class
- unecessary functions and code removed

#story[1261]
2017-09-07 21:40:10 +12:00
David Wu 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 2017-09-07 21:15:50 +12:00
David Wu 002cccd5a0 Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193] 2017-09-07 21:15:41 +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
hba56 d302a08a14 fix for ci builds
#story[1193]
2017-09-07 19:25:49 +12:00
hba56 e82c59a8a4 New css for the host game window
#story[1193]
2017-09-07 19:21:08 +12:00
hba56 cbfcd3aa0d Images
#story[1193]
2017-09-07 17:17:40 +12:00
cbt24 8c7345a30d Documented command classes
#story[1196]
2017-09-07 17:01:47 +12:00
cbt24 a6db06a82c Boats now reverse smoothly when colliding
- Collision objects specify which boat is colliding
- RaceLogic sets up an observable CollisionCommand when collision bubbles up
- Boats now selectively identify observers of collision

#story[1196]
2017-09-07 16:57:07 +12:00
cbt24 9cba3934ea Sails command now applies acceleration to boat
- Race only has control over speed while Sails command is not in action
- This is governed by a default velocity property on the boat
- Sails command returns control when sails are out and boat is up to speed
- Speed never falls below 0
- Speed never goes above VMG velocity to prevent exploitation

#story[1196]
2017-09-07 14:50:53 +12:00
cbt24 eba70ab2d4 Sails command now listens to race to check if goal velocity is met
#story[1196]
2017-09-07 14:27:20 +12:00
cbt24 b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-) 2017-09-07 13:29:23 +12:00
cbt24 844b48a81a Resolved issue #42 - "putting sails out changes boat bearing to face target gate"
#story[1196]
2017-09-07 13:23:56 +12:00
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D 2017-09-06 23:51:46 +12:00
Hamish Ball 321359be07 Merge branch 'vmg_fix' into 'master'
Vmg fix

Note: there should be a small deadzone between upwind and reaching/running where pressing the key has no effect so that issues in judging the exact TWA of the boat don't lead to a surprising direction change.

Turn off toggle

Remember to close Issue#43 when you have finished DoD'ing



See merge request !37
2017-09-06 20:10:42 +12:00
hba56 dfd3cb96f3 removed System.out.println 2017-09-06 20:05:54 +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
hba56 0886a60911 arrow Flip 2017-09-06 17:08:53 +12:00
hba56 86f495a551 javaDoc 2017-09-06 17:04:15 +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
Joseph Gardner 00cedf4d4d TackGybeCommand now smooths the rotation of the boat. #story[1196] 2017-09-06 15:19:30 +12:00
hba56 4ec2a50d20 Image Scales
#story[1193]
2017-09-06 14:53:02 +12:00
Connor Taylor-Brown d89186d8bf Finished playable 3D race with first person camera
- Camera pivot must be manually updated
- GPS coordinates are scaled by an arbitrary amount to make movement visible
- Model has to be flipped 180 degrees to move forward

#story[1261]
2017-09-06 14:36:24 +12:00
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
#story[1193]
2017-09-06 13:49:18 +12:00
hba56 9560486248 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 2017-09-06 11:57:04 +12:00
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/MockRace.java
2017-09-05 23:37:17 +12:00
hba56 dbd4703e74 javadoc fix 2017-09-05 23:21:49 +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
David Wu b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193] 2017-09-05 20:09:56 +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
cbt24 19f4d0fc06 Added marks back to the race view
#story[1261]
2017-09-05 16:50:26 +12:00
cbt24 05a0614246 Boats now rotate correctly in position rather than about the origin
#story[1261]
2017-09-05 16:02:20 +12:00
cbt24 3ecf203cba Recovered stable rotation of the player's boat
- Uses AnimationTimer rather than listeners
- Reduced pre-start time to speed up testing

#story[1261]
2017-09-05 15:19:04 +12:00
David Wu 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195] 2017-09-05 14:00:15 +12:00
Fan-Wu Yang 7aaa880f40 VMG now works with some edge cases issues #story[1182] 2017-09-05 13:05:37 +12:00
Joseph f4cb1a3ac4 Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196] 2017-09-05 12:40:34 +12:00
Connor Taylor-Brown c74cc26bf1 Merged with master and changed View3D default background
- Removed sparkline from RaceController

#story[1261]
2017-09-05 12:17:55 +12:00