0bfe93da06
Merge branch 'master' into story1301-start
8 years ago
88d5a60696
Merge branch 'master' into story1301-start
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/View3D.java
8 years ago
5d9b574378
Zooming in while in birds eye no longer clips through sea surface.
...
Zooming with mouse wheel is the same speed as zooming with keyboard.
8 years ago
d6b0fec6d3
Start race in third person by default
...
- Third person zoom limit has been lowered
- Next mark highlighting and arrow only follows player boat
8 years ago
a1b6de5638
Merge branch 'master' into story1306_wind_arrow
8 years ago
915d61b9f3
Map can be zoomed out in birds eye view only to a specified distance.
...
#story[1312]
8 years ago
ab49d62c0d
Map can be zoomed in / out at all times.
...
- map can be zoomed when object is not selected
#story[1312]
8 years ago
e64e6ddbdb
Boat scaling is correct.
...
- scaling changes as a user zooms in or out to
- 3rd person view defaults to life size scale
#story[1312]
8 years ago
45ba3ae6ac
Added 3D wind arrow and it also rotates #story[1306]
8 years ago
4f229ad01c
Implemented basic 3D start screen with no background race
...
#story[1301]
8 years ago
86fc911f98
Minor changes to improve look of third person view.
...
#story[1312]
8 years ago
1ecd2dd7b6
Zooming motion is more natural.
...
- added limits for zoom in, zoom out and when to change to birds eye
- zooming smoothed by adjusting pitch each zoom
- when zoom out limit is reached, view returns to original
#story[1312]
8 years ago
90c258e9e9
Reset collision tag on visualiser boat after displaying collision
...
- Modified View3D to index subjects rather than shapes by source ID
- Enforced one collision per boat on server to reduce rendering load
- Changed collision radius to less than bounce radius
- Fixed game-breaking null command bug
#story[1195]
8 years ago
7bea2fee73
Merge branch 'storyA_sounds' into storyD-3D
8 years ago
14b5f4bdf1
Merge branch 'master' into storyD-3D
...
# Conflicts:
# .gitignore
# racevisionGame/src/main/java/mock/model/RaceServer.java
# racevisionGame/src/main/java/mock/model/collider/Collider.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/shared/model/Mark.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/layout/Plane3D.java
# racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
# racevisionGame/src/main/java/visualiser/layout/View3D.java
# racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
# racevisionGame/src/main/resources/visualiser/scenes/title.fxml
8 years ago
e354320d74
Replaced camera tracking listeners with animation timer
...
- Documented animation timers and mark arrow
#story[1195]
8 years ago
de9f4e22eb
Direction to mark arrow is now displayed relative to camera
...
#story[1195]
8 years ago
e657a0cc99
Added tracking for angle between third person boat and next mark
...
#story[1195]
8 years ago
70bbc89239
Fixed merge-related bugs
8 years ago
963c8a43ad
Boats and marks are sized realistically in 3rd person
...
- Changed SeaSurface to Subject3D to suppress scaling
- Cameras can now be selected through View3D interface
#story[1190]
8 years ago
bcc827b554
Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
8 years ago
0f316afb3c
Added colour indication to next mark
...
- Colour is swapped with end mark in leg when mark is passed
#story[1195]
8 years ago
7a8ea7fea7
Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
08ca42f786
Wrote some missing java docs #story[1261]
8 years ago
9ac9c25923
Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]
8 years ago
a7eefca13a
Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]
8 years ago
ddc3a6ae47
boxes in lobby are now boats
8 years ago
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
93883ee8b7
Added more descriptive documentation to new classes and functionality
...
#story[1190]
8 years ago
4780354452
Errors in this commit: mock threads get interrupted
...
#story[#1188 ]
8 years ago
68f434b6b6
Bound zooming action to zoom keys
...
- View3D subject selection is no longer enabled by default
- Added documentation
#story[1190]
8 years ago
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
23eabed3ff
View3D tracks selected boat at fixed distance, pitch, and relative yaw
...
#story[1190]
8 years ago
b59eca1a8b
Added Subject3D selection to View3D
...
- Changed how View3D is added to canvasBase to allow events to get through
#story[1190]
8 years ago
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
7bad0e53ff
The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
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
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
19f4d0fc06
Added marks back to the race view
...
#story[1261]
8 years ago
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
c74cc26bf1
Merged with master and changed View3D default background
...
- Removed sparkline from RaceController
#story[1261]
8 years ago
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
Connor Taylor-Brown
fjc40
Fan-Wu Yang
Jessica Syder
Joseph Gardner
hba56