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

- Fixed Merge Errors and some broken lighting AGAIN

Browse Source 
#tags [1276]
This commit is contained in:
alistairjmcintyre
2017-09-28 02:20:34 +13:00
parent 73861b2ef3
commit 00e2af9c14
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatObject.java
+2 -12
View File
@@ -35,8 +35,6 @@ public class BoatObject extends Group {
private Color colour = Color.BLACK; private Color colour = Color.BLACK;
private Boolean isSelected = false; private Boolean isSelected = false;
private Rotate rotation = new Rotate(0, new Point3D(0,0,1)); private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
// private Rotate tilt = new Rotate(0, new Point3D(0, 1, 0));
private double previousRotation = 0;
// This stuff only matters to the players boat object. // This stuff only matters to the players boat object.
private Group markIndicator; private Group markIndicator;
@@ -106,7 +104,7 @@ public class BoatObject extends Group {
markIndicator.getTransforms().clear(); markIndicator.getTransforms().clear();
markIndicator.getTransforms().addAll( markIndicator.getTransforms().addAll(
new Rotate(angle, new Point3D(0, 0, 1)), new Rotate(angle, new Point3D(0, 0, 1)),
new Translate(0, -radius, 0.3`), new Translate(0, -radius, 0.1),
new Scale(scale, scale, scale / 10) new Scale(scale, scale, scale / 10)
); );
} }
@@ -121,14 +119,6 @@ public class BoatObject extends Group {
private void rotateTo(double heading, boolean sailsIn, double windDir) { private void rotateTo(double heading, boolean sailsIn, double windDir) {
rotationProperty.set(heading); rotationProperty.set(heading);
rotation.setAngle(heading); rotation.setAngle(heading);
// if (heading == previousRotation) {
// tilt.setAngle(0);
// } else if (heading < previousRotation) {
// tilt.setAngle(-10);
// } else {
// tilt.setAngle(10);
// }
// previousRotation = heading;
wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1))); wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1)));
if (sailsIn) { if (sailsIn) {
boatAssets.showSail(); boatAssets.showSail();
@@ -170,7 +160,7 @@ public class BoatObject extends Group {
torus.getAssets().getTransforms().addAll( torus.getAssets().getTransforms().addAll(
new Rotate(90, new Point3D(1, 0, 0)), new Rotate(90, new Point3D(1, 0, 0)),
new Scale(0.7, 0.7, 0.7), new Scale(0.7, 0.7, 0.7),
new Translate(0, 0.5, 0) new Translate(0, 0.1, 0)
); );
this.getChildren().add(torus.getAssets()); this.getChildren().add(torus.getAssets());