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
7a8ea7fea7
Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
49cd19e1a8
Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
0da6931f8f
Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
ae75bb86d3
Resized models to a similar size of the collision detectors. #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
e2b868d815
Added boundaries to the map, which are drawn by the race #story[1261]
8 years ago
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
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
643f145407
Added mark radius 3D annotation to improve bird's eye visibility
...
#story[1261]
8 years ago
14aaf26b73
Merge branch 'story40-zoom' into 'master'
...
40. [V] As Caleb or Gemma I'd like to zoom the view to follow a boat (my boat) around the course (revised).
Note: in this story we will select a boat and zoom the view to place the boat at the center of a display that shows only the boat's immediate surrounds. The default option will be to zoom on the player's boat.
Acceptance criteria:
- Any particular boat can be chosen (at any time during the race.)
- When a boat is selected for zooming, the view should change to show the boat at the center, with the scale of the view increased.
- The view should remain this way until the boat is unselected, at which point it should revert to the usual display.
- Other information (e.g., the position list) may be removed from the zoomed view.
- Zoomed view follows selected boat as a third person mode
- There must be a keyboard option to zoom in on the player's boat_
- The zoom amount can be fixed (jump between zoom in and zoom out) or scrollable (like control-mousewheel scrolling.)
See merge request !38
8 years ago
93883ee8b7
Added more descriptive documentation to new classes and functionality
...
#story[1190]
8 years ago
e149255240
Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
5bc382304b
Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
0c9e55093c
Set lobby anchor pane to invisible to allow races to start
8 years ago
b034a452b6
Fixed problem with race pane registering non-control keys
...
#story[1190]
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
e3e61e5b28
Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
dfd3cb96f3
removed System.out.println
8 years ago
ae1526c457
Merge branch 'master' into vmg_fix
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
8 years ago
7024cac426
Rotated image of arrow direction #story[1187]
8 years ago
8eee282977
Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53)
8 years ago
0886a60911
arrow Flip
8 years ago
86f495a551
javaDoc
8 years ago
5bb8ba44b8
Fixed Javadoc and also made some variables private #story[1187]
8 years ago
2382585c15
Fixed Javadoc and also made some variables private #story[1187]
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
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
8 years ago
dbd4703e74
javadoc fix
8 years ago
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]
8 years ago
d602c1ec6f
VMG is now working and fixed, however, it feels a bit odd #story[1182]
8 years ago
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]
8 years ago
19f4d0fc06
Added marks back to the race view
...
#story[1261]
8 years ago
05a0614246
Boats now rotate correctly in position rather than about the origin
...
#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
7aaa880f40
VMG now works with some edge cases issues #story[1182]
8 years ago
c74cc26bf1
Merged with master and changed View3D default background
...
- Removed sparkline from RaceController
#story[1261]
8 years ago
b8c99be201
Merge branch 'master' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
8 years ago
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
71dcc8ee6c
Added POlar Linear Interpolation #story[1186]
8 years ago
35c595adf8
Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D
8 years ago
Connor Taylor-Brown
Joseph Gardner
Fan-Wu Yang
Jessica Syder
hba56