Update GameState
This commit is contained in:
parent
1e19b37301
commit
be325c87c6
15 changed files with 580 additions and 267 deletions
|
@ -25,14 +25,14 @@ public class Camera {
|
|||
}
|
||||
|
||||
public static void renderCamera() {
|
||||
if (position.getY() < (int)((new Noise(GameEngine.getGame().getWorld().seed, GameEngine
|
||||
.getGame().getWorld().octave,
|
||||
GameEngine.getGame().getWorld().amplitude).getNoise(position.getX(),
|
||||
if (position.getY() < (int)((new Noise(GameEngine.getGameState().getWorld().seed, GameEngine
|
||||
.getGameState().getWorld().octave,
|
||||
GameEngine.getGameState().getWorld().amplitude).getNoise(position.getX(),
|
||||
position.getZ())) + 1)) {
|
||||
|
||||
position.setY((int)((new Noise(GameEngine.getGame().getWorld().seed, GameEngine
|
||||
.getGame().getWorld().octave,
|
||||
GameEngine.getGame().getWorld().amplitude).getNoise(position.getX(),
|
||||
position.setY((int)((new Noise(GameEngine.getGameState().getWorld().seed, GameEngine
|
||||
.getGameState().getWorld().octave,
|
||||
GameEngine.getGameState().getWorld().amplitude).getNoise(position.getX(),
|
||||
position.getZ())) + 2));
|
||||
}
|
||||
glLoadIdentity();
|
||||
|
@ -119,7 +119,7 @@ public class Camera {
|
|||
}
|
||||
|
||||
public static boolean isColliding(float xa, float ya, float za) {
|
||||
World world = GameEngine.getGame().getWorld();
|
||||
World world = GameEngine.getGameState().getWorld();
|
||||
float r = 0.3f;
|
||||
|
||||
boolean nx = false, ny = false, nz = false;
|
||||
|
|
Reference in a new issue