hba56
ddc3a6ae47
boxes in lobby are now boats
8 years ago
hba56
e5d8a4028d
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/layout/Subject3D.java
# racevisionGame/src/main/java/visualiser/layout/View3D.java
# racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
8 years ago
cbt24
2508b847b8
Merge branch 'master' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
# racevisionGame/src/main/java/visualiser/layout/Subject3D.java
8 years ago
cbt24
643f145407
Added mark radius 3D annotation to improve bird's eye visibility
...
#story[1261]
8 years ago
Connor Taylor-Brown
93883ee8b7
Added more descriptive documentation to new classes and functionality
...
#story[1190]
8 years ago
Fan-Wu Yang
e149255240
Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
hba56
4780354452
Errors in this commit: mock threads get interrupted
...
#story[#1188 ]
8 years ago
Connor Taylor-Brown
68f434b6b6
Bound zooming action to zoom keys
...
- View3D subject selection is no longer enabled by default
- Added documentation
#story[1190]
8 years ago
Connor Taylor-Brown
1efec06bdc
View3D can untrack objects and zoom in different modes
...
- updateDistance zooms between 0 and infinity
- Camera switches from third person to bird's eye when reaching a set distance
- Only one subject can be tracked at a time
#story[1190]
8 years ago
Connor Taylor-Brown
23eabed3ff
View3D tracks selected boat at fixed distance, pitch, and relative yaw
...
#story[1190]
8 years ago
Connor Taylor-Brown
b59eca1a8b
Added Subject3D selection to View3D
...
- Changed how View3D is added to canvasBase to allow events to get through
#story[1190]
8 years ago
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]
8 years ago
Fan-Wu Yang
7bad0e53ff
The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
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]
8 years ago
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]
8 years ago
cbt24
19f4d0fc06
Added marks back to the race view
...
#story[1261]
8 years ago
cbt24
05a0614246
Boats now rotate correctly in position rather than about the origin
...
#story[1261]
8 years ago
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]
8 years ago
Connor Taylor-Brown
c74cc26bf1
Merged with master and changed View3D default background
...
- Removed sparkline from RaceController
#story[1261]
8 years ago
Connor Taylor-Brown
0ee448e17d
Created wrapper for controlling the position and heading of rendered 3D models.
...
- Updated View3D to use Subject3D wrappers instead of Shape3D
- Fixed HostController for the new architecture
- Made position and heading observable in VisualiserBoat
- Attached listeners to each VisualiserBoat in RaceController
#story[1261]
8 years ago