Merged in master and realigned center of the boat #story[1306]
This commit is contained in:
@@ -191,6 +191,8 @@ public class InGameLobbyController extends Controller {
|
|||||||
public void handle(long now) {
|
public void handle(long now) {
|
||||||
subject.setHeading(subject.getHeading().getAngle() + 0.1);
|
subject.setHeading(subject.getHeading().getAngle() + 0.1);
|
||||||
sailsSubject.setHeading(subject.getHeading().getAngle() + 0.1);
|
sailsSubject.setHeading(subject.getHeading().getAngle() + 0.1);
|
||||||
|
sailsSubject.setX(subject.getX());
|
||||||
|
sailsSubject.setZ(subject.getZ());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
rotate.start();
|
rotate.start();
|
||||||
|
|||||||
@@ -77,14 +77,26 @@ public class Subject3D {
|
|||||||
position.setX(x);
|
position.setX(x);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double getX(){
|
||||||
|
return position.getX();
|
||||||
|
}
|
||||||
|
|
||||||
public void setY(double y) {
|
public void setY(double y) {
|
||||||
position.setY(y);
|
position.setY(y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double getY(){
|
||||||
|
return position.getY();
|
||||||
|
}
|
||||||
|
|
||||||
public void setZ(double z) {
|
public void setZ(double z) {
|
||||||
position.setZ(z);
|
position.setZ(z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double getZ(){
|
||||||
|
return position.getZ();
|
||||||
|
}
|
||||||
|
|
||||||
public void setHeading(double angle) {
|
public void setHeading(double angle) {
|
||||||
heading.setAngle(angle);
|
heading.setAngle(angle);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user