added collision
This commit is contained in:
@@ -31,6 +31,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
TileManager tileM = new TileManager(this);
|
||||
KeyHandler keyH = new KeyHandler();
|
||||
Thread gameThread;
|
||||
public CollisionHandler collisionH = new CollisionHandler(this);
|
||||
public Player player = new Player(this, keyH);
|
||||
|
||||
public GamePanel() {
|
||||
@@ -48,7 +49,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
double drawInterval = 1000000000 / FPS;
|
||||
double drawInterval = (double) 1000000000 / FPS;
|
||||
double delta = 0;
|
||||
double lastTime = System.nanoTime();
|
||||
long currentTime;
|
||||
@@ -58,7 +59,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
while(gameThread != null) {
|
||||
currentTime = System.nanoTime();
|
||||
delta += (currentTime - lastTime) / drawInterval;
|
||||
timer += currentTime - lastTime;
|
||||
timer += (long) (currentTime - lastTime);
|
||||
lastTime = currentTime;
|
||||
|
||||
if(delta >= 1) {
|
||||
@@ -68,7 +69,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
drawCount++;
|
||||
}
|
||||
if(timer >= 1000000000) {
|
||||
System.out.println("FPS: " + drawCount);
|
||||
//System.out.println("FPS: " + drawCount);
|
||||
drawCount = 0;
|
||||
timer = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user