Connor Taylor-Brown
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
Joseph Gardner
bcc827b554
Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
8 years ago
Joseph
7a8ea7fea7
Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
Joseph
49cd19e1a8
Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Joseph Gardner
0da6931f8f
Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
Fan-Wu Yang
ae75bb86d3
Resized models to a similar size of the collision detectors. #story[1261]
8 years ago
Fan-Wu Yang
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
Fan-Wu Yang
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
Fan-Wu Yang
e2b868d815
Added boundaries to the map, which are drawn by the race #story[1261]
8 years ago
cbt24
70f4a00d12
Scaled down marks and boats to make 3rd person view more realistic
...
- Added boat and mark annotations to support selection at large camera distance
- Reduced collision radius to 15 m
- Fixed event startup and XML files as race was crashing on start
#story[1296]
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
Fan-Wu Yang
5bc382304b
Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
Connor Taylor-Brown
b034a452b6
Fixed problem with race pane registering non-control keys
...
#story[1190]
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
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
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
b8c99be201
Merge branch 'master' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
8 years ago
cbt24
971a061499
View3D within RaceController now tracks boat heading
...
- Race leaves lobby on Warning status for development
- Latest subject added is used as camera pivot
#story[1261]
8 years ago
Jessica Syder
addaaf0de3
Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
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
Jessica Syder
2188ddc3a3
Fixed errors in making the keybinding replaceable.
...
- Changed KeyFactory to not be a singleton
- Simplified keyBindings initializer
- Modified and simplified keyListener
- Added method to copy existing keyState
- Changed button events
- Changed to newer lambda functions
- Modified updateKey method
- Left option for multiple keys bound to one command
- Updated and wrote new JavaDoc
#story[1197]
8 years ago
Connor Taylor-Brown
b6e56d815c
ResizableRaceCanvas no longer depends on VisualiserRaceEvent
...
#story[1196]
8 years ago
David Wu
5234cdea66
Merge branch 'master' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
8 years ago
David Wu
598275591f
Updated javadoc.
8 years ago
David Wu
f1ef75fb81
Merge branch 'master' into new_issue#19
8 years ago
David Wu
9f813ab7aa
Merged in development.
8 years ago
David Wu
288979be3b
Merge branch 'Development' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
# racevisionGame/src/main/java/visualiser/app/App.java
8 years ago
Joseph Gardner
d41e52766b
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
# racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java
8 years ago
David Wu
5a188f0582
Merge branch 'master' into new_issue#19
8 years ago
Hamish Ball
2edb6b5249
Merge branch 'issue#40' into 'master'
...
Issue#40
See merge request !30
8 years ago
David Wu
c08bafa566
Fixed most of issue #19 with new master?
8 years ago
hba56
02ab0e8a00
added javadoc
8 years ago
hba56
3cf50c56f8
added a refresh for the info table so no new values are shown when the game is in full screen
8 years ago
Joseph Gardner
20c9870fea
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java
8 years ago
David Wu
6bc81f566e
Issue 19 changes.
8 years ago
hwball
df2b674b94
update scale for table displaying
8 years ago
Joseph
f60809bdd4
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/MockOutput.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/network/MessageDecoders/BoatActionDecoder.java
# racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java
# racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
# racevisionGame/src/main/resources/visualiser/scenes/connect.fxml
# racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
# racevisionGame/src/test/java/mock/model/MockRaceTest.java
# racevisionGame/src/test/java/network/Utils/AC35UnitConverterTest.java
# racevisionGame/src/test/java/network/XMLMessageEncoderTest.java
8 years ago
hba56
ee0cc4b704
Merge branch 'issue#40' into Development
8 years ago
cbt24
f44929f376
Spun off Locatable interface to make collision code more reusable
...
#story[1100]
8 years ago
hba56
fdd0b30a51
Added the ability to hide and show info table with a key press
...
-the wind arrow also scales with the new size of the screen
8 years ago