From 741402b5daa1a210a2668ab0693caa19bad38279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Fri, 30 Sep 2022 13:02:57 +0200
Subject: [PATCH] Small refactoring
---
src/main/java/lab/DrawingThread.java | 37 +++++++++++++++++++++++++++
src/main/java/lab/GameController.java | 19 +-------------
src/main/java/lab/World.java | 15 ++---------
3 files changed, 40 insertions(+), 31 deletions(-)
create mode 100755 src/main/java/lab/DrawingThread.java
diff --git a/src/main/java/lab/DrawingThread.java b/src/main/java/lab/DrawingThread.java
new file mode 100755
index 0000000..5d6c0f0
--- /dev/null
+++ b/src/main/java/lab/DrawingThread.java
@@ -0,0 +1,37 @@
+package lab;
+
+import javafx.animation.AnimationTimer;
+import javafx.scene.canvas.Canvas;
+import javafx.scene.canvas.GraphicsContext;
+
+public class DrawingThread extends AnimationTimer {
+
+ private final Canvas canvas;
+
+ private final GraphicsContext gc;
+
+ private final World world;
+
+ private long lasttime = -1;
+
+ public DrawingThread(Canvas canvas, World world) {
+ this.canvas = canvas;
+ this.gc = canvas.getGraphicsContext2D();
+ this.world = world;
+ }
+
+ /**
+ * Draws objects into the canvas. Put you code here.
+ */
+ @Override
+ public void handle(long now) {
+ gc.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());
+ world.draw(gc);
+ if (lasttime > 0) {
+ //time are in nanoseconds and method simulate expects seconds
+ world.simulate((now - lasttime) / 1e9);
+ }
+ lasttime = now;
+ }
+
+}
diff --git a/src/main/java/lab/GameController.java b/src/main/java/lab/GameController.java
index 889d6a1..5385570 100644
--- a/src/main/java/lab/GameController.java
+++ b/src/main/java/lab/GameController.java
@@ -16,19 +16,7 @@ public class GameController {
public void startGame() {
this.world = new World(canvas.getWidth(), canvas.getHeight());
//Draw scene on a separate thread to avoid blocking UI.
- animationTimer = new AnimationTimer() {
- private Long previous;
-
- @Override
- public void handle(long now) {
- if (previous == null) {
- previous = now;
- } else {
- drawScene((now - previous)/1e9);
- previous = now;
- }
- }
- };
+ animationTimer = new DrawingThread(canvas, world);
animationTimer.start();
}
@@ -36,11 +24,6 @@ public class GameController {
public void stopGame() {
animationTimer.stop();
}
-
- private void drawScene(double deltaT) {
- world.draw(canvas);
- world.simulate(deltaT);
- }
}
diff --git a/src/main/java/lab/World.java b/src/main/java/lab/World.java
index ead7806..dd53bc3 100644
--- a/src/main/java/lab/World.java
+++ b/src/main/java/lab/World.java
@@ -3,7 +3,6 @@ package lab;
import java.util.Random;
import javafx.geometry.Point2D;
-import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext;
public class World {
@@ -37,9 +36,8 @@ public class World {
return new Point2D(worldPoint.getX(), height - worldPoint.getY());
}
- public void draw(Canvas canvas) {
- GraphicsContext gc = canvas.getGraphicsContext2D();
- gc.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());
+ public void draw(GraphicsContext gc) {
+ gc.clearRect(0, 0, width, height);
for(DrawableSimulable entity: entities) {
entity.draw(gc);
}
@@ -61,16 +59,7 @@ public class World {
}
}
}
- /*bulletAnimatted.simulate(timeDelta);
- cannon.simulate(timeDelta);
- for(Dragon dragon: dragons) {
- if (bulletAnimatted.overlaps(dragon)) {
- dragon.hit();
- bulletAnimatted.reload();
- }
- dragon.simulate(timeDelta);
- }*/
}
public double getWidth() {
--
GitLab