michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed Merge Errors and some broken lighting

Browse Source 
#tags [1276]
This commit is contained in:
alistairjmcintyre
2017-09-28 02:05:47 +13:00
parent a08a38c985
commit 4018dd783e
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatObject.java
+4 -4
View File
@@ -39,7 +39,7 @@ public class BoatObject extends Group {
// This stuff only matters to the players boat object.
private Group markIndicator;
private MeshView playerIndicator;
private Color indicatorColor = Color.LIGHTBLUE;
private Color indicatorColor = Color.BLACK;
private ReadOnlyDoubleWrapper rotationProperty;
private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
@@ -104,8 +104,8 @@ public class BoatObject extends Group {
markIndicator.getTransforms().clear();
markIndicator.getTransforms().addAll(
new Rotate(angle, new Point3D(0, 0, 1)),
new Translate(0, -radius, -0.1),
new Scale(scale, scale, scale / 3)
new Translate(0, -radius, 0.3`),
new Scale(scale, scale, scale / 10)
);
}
@@ -160,7 +160,7 @@ public class BoatObject extends Group {
torus.getAssets().getTransforms().addAll(
new Rotate(90, new Point3D(1, 0, 0)),
new Scale(0.7, 0.7, 0.7),
new Translate(0, 0, 0)
new Translate(0, 0.5, 0)
);
this.getChildren().add(torus.getAssets());