diff --git a/src/main/java/lab/App.java b/src/main/java/lab/App.java
index fc4398cb0a3c2271f82be28c0751ebcee307597e..3369b55d2a2bf19cb66788501f1ae877b15410de 100644
--- a/src/main/java/lab/App.java
+++ b/src/main/java/lab/App.java
@@ -1,9 +1,11 @@
package lab;
import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
import javafx.scene.Group;
import javafx.scene.Scene;
import javafx.scene.canvas.Canvas;
+import javafx.scene.layout.BorderPane;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
@@ -17,7 +19,7 @@ public class App extends Application {
launch(args);
}
- private Canvas canvas;
+
private GameController controller;
@Override
public void start(Stage primaryStage) {
@@ -25,9 +27,12 @@ public class App extends Application {
//Construct a main window with a canvas.
- Group root = new Group();
- canvas = new Canvas(800, 600);
- root.getChildren().add(canvas);
+ //Group root = new Group();
+ //canvas = new Canvas(800, 600);
+ //root.getChildren().add(canvas);
+
+ FXMLLoader loader = new FXMLLoader(getClass().getResource("GameView.fxml"));
+ BorderPane root = loader.load();
Scene scene = new Scene(root);
@@ -35,7 +40,8 @@ public class App extends Application {
primaryStage.resizableProperty().set(false);
primaryStage.setTitle("Java 1 - 5th laboratory");
primaryStage.show();
- controller = new GameController(canvas);
+
+ controller = loader.getController();
controller.startGame();
//Exit program when main window is closed
primaryStage.setOnCloseRequest(this::exitProgram);
diff --git a/src/main/java/lab/BulletAnimated.java b/src/main/java/lab/BulletAnimated.java
index b778b081eeefd8ff848ed3eda0a07757d39df95c..98ac8775354739e46300716cf4e302d7fc261550 100644
--- a/src/main/java/lab/BulletAnimated.java
+++ b/src/main/java/lab/BulletAnimated.java
@@ -15,7 +15,7 @@ public class BulletAnimated implements DrawableSimulable, Collisionable{
private double mass = 2;
private double strenghtOfCannon = 100;
private double cannonLength = 100;
- private boolean accelerate = true;
+ private boolean accelerate = false;
private boolean hitToGround = false;
private double crossSectionalArea;
@@ -49,6 +49,9 @@ public class BulletAnimated implements DrawableSimulable, Collisionable{
}
public void simulate(double deltaT) {
+ if (!accelerate && position == start) {
+ return;
+ }
if (accelerate && start.distance(position) < cannonLength) {
double cannonAngle = cannon.getAngle();
speed = speed
@@ -90,7 +93,12 @@ public class BulletAnimated implements DrawableSimulable, Collisionable{
position = start;
speed = initialSpeed;
hitToGround = false;
+ }
+
+ public void fire() {
+ reload();
accelerate = true;
+
}
}
diff --git a/src/main/java/lab/Cannon.java b/src/main/java/lab/Cannon.java
index eb3f7894ff90af890ddf6ff1fda29560ed9e6ae1..0823c12e1f192e6612cd2001ff73e2d074c9767e 100644
--- a/src/main/java/lab/Cannon.java
+++ b/src/main/java/lab/Cannon.java
@@ -24,10 +24,7 @@ public class Cannon implements DrawableSimulable {
}
public void simulate(double timeStep) {
- angle = angle + direction*0.8;
- if(angle <=-90 || angle >= 0) {
- direction*=-1;
- }
+
}
public void draw(GraphicsContext gc) {
@@ -46,4 +43,9 @@ public class Cannon implements DrawableSimulable {
public double getAngle() {
return (angle * -1) / 180 * Math.PI;
}
+
+ public void setAngle(double value) {
+ angle = value;
+
+ }
}
diff --git a/src/main/java/lab/GameController.java b/src/main/java/lab/GameController.java
index 538557076a8345ca2c92ffc8fcdf4b450c7aebc8..765db638ffafa999b7cf33c48e828baf42ff43b0 100644
--- a/src/main/java/lab/GameController.java
+++ b/src/main/java/lab/GameController.java
@@ -1,21 +1,37 @@
package lab;
import javafx.animation.AnimationTimer;
+import javafx.fxml.FXML;
import javafx.scene.canvas.Canvas;
+import javafx.scene.control.Button;
+import javafx.scene.control.Slider;
public class GameController {
private World world;
+
+ @FXML
private Canvas canvas;
+
+ @FXML
+ private Slider angleSlider;
+
+ @FXML
+ private Slider forceSlider;
+
+
private AnimationTimer animationTimer;
- public GameController(Canvas canvas) {
- this.canvas = canvas;
+ public GameController() {
}
public void startGame() {
this.world = new World(canvas.getWidth(), canvas.getHeight());
+
+ this.angleSlider.valueProperty().addListener( (obj, oldValue, newValue) -> world.setCannonAngle(newValue.doubleValue()));
//Draw scene on a separate thread to avoid blocking UI.
+
+ world.setCannonAngle(this.angleSlider.getValue());
animationTimer = new DrawingThread(canvas, world);
animationTimer.start();
}
@@ -25,5 +41,8 @@ public class GameController {
animationTimer.stop();
}
-
+ @FXML
+ private void firePressed() {
+ world.fireBullet();
+ }
}
diff --git a/src/main/java/lab/World.java b/src/main/java/lab/World.java
index dd53bc3857b678cb9c898b7cfccc58b6978fe10b..41a682c23dcd7af126fdc723b00b5cda6d656d35 100644
--- a/src/main/java/lab/World.java
+++ b/src/main/java/lab/World.java
@@ -78,4 +78,20 @@ public class World {
this.height = height;
}
+ public void setCannonAngle(double doubleValue) {
+ for (DrawableSimulable entity: entities) {
+ if (entity instanceof Cannon cannon) {
+ cannon.setAngle(doubleValue);
+ }
+ }
+ }
+
+ public void fireBullet() {
+ for (DrawableSimulable entity: entities) {
+ if (entity instanceof BulletAnimated bullet) {
+ bullet.fire();
+ }
+ }
+ }
+
}
diff --git a/src/main/resources/lab/GameView.fxml b/src/main/resources/lab/GameView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..008bb5ec326693094ad4b25d1c2beddfebf004ca
--- /dev/null
+++ b/src/main/resources/lab/GameView.fxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.canvas.Canvas?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Slider?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="lab.GameController">
+ <center>
+ <Canvas fx:id="canvas" height="400.0" width="600.0" BorderPane.alignment="CENTER" />
+ </center>
+ <bottom>
+ <HBox BorderPane.alignment="CENTER">
+ <children>
+ <Slider fx:id="angleSlider" max="0.0" min="-90.0" showTickLabels="true" showTickMarks="true" value="45.0" HBox.hgrow="ALWAYS">
+ <HBox.margin>
+ <Insets bottom="13.0" left="13.0" right="13.0" top="13.0" />
+ </HBox.margin>
+ </Slider>
+ <Button onAction="#firePressed" mnemonicParsing="false" text="Fire" HBox.hgrow="ALWAYS">
+ <HBox.margin>
+ <Insets bottom="13.0" left="13.0" right="13.0" top="13.0" />
+ </HBox.margin>
+ </Button>
+ <Slider fx:id="forceSlider" max="210.0" min="10.0" showTickLabels="true" showTickMarks="true" value="50.0" HBox.hgrow="ALWAYS">
+ <HBox.margin>
+ <Insets bottom="13.0" left="13.0" right="13.0" top="13.0" />
+ </HBox.margin>
+ </Slider>
+ </children>
+ </HBox>
+ </bottom>
+</BorderPane>