From 2252c381315a14e822498613ccf5c69924d9a138 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Sat, 4 Jul 2020 16:38:28 +0200 Subject: [PATCH] Testing JavaFX stuff --- build.gradle | 7 +++++ .../java/de/siphalor/was/WhatAStorage.java | 2 +- .../de/siphalor/was/visual/CanvasVisual.java | 2 +- .../de/siphalor/was/visual/JFXVisual.java | 29 +++++++++++++++++++ .../java/de/siphalor/was/visual/Visual.java | 2 +- src/main/resources/assets/jfx/main.fxml | 9 ++++++ 6 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/siphalor/was/visual/JFXVisual.java create mode 100644 src/main/resources/assets/jfx/main.fxml diff --git a/build.gradle b/build.gradle index 988bb05..005536f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java' id 'application' + id 'org.openjfx.javafxplugin' version '0.0.8' } group 'de.siphalor' @@ -19,6 +20,11 @@ dependencies { testImplementation('org.junit.jupiter:junit-jupiter:5.6.2') } +javafx { + version '14' + modules = [ "javafx.controls", "javafx.graphics", "javafx.fxml" ] +} + test { useJUnitPlatform() testLogging { @@ -45,3 +51,4 @@ jar { ) } } + diff --git a/src/main/java/de/siphalor/was/WhatAStorage.java b/src/main/java/de/siphalor/was/WhatAStorage.java index 2d4cd13..6724e9a 100644 --- a/src/main/java/de/siphalor/was/WhatAStorage.java +++ b/src/main/java/de/siphalor/was/WhatAStorage.java @@ -72,7 +72,7 @@ public class WhatAStorage { } public void start() { - visual.start(this); + visual.setup(this); } public void run() { diff --git a/src/main/java/de/siphalor/was/visual/CanvasVisual.java b/src/main/java/de/siphalor/was/visual/CanvasVisual.java index 2678274..3f9d513 100644 --- a/src/main/java/de/siphalor/was/visual/CanvasVisual.java +++ b/src/main/java/de/siphalor/was/visual/CanvasVisual.java @@ -20,7 +20,7 @@ public class CanvasVisual implements Visual { private boolean fullScreen = false; @Override - public void start(WhatAStorage whatAStorage) { + public void setup(WhatAStorage whatAStorage) { main = whatAStorage; frame.addWindowListener(new WindowAdapter() { @Override diff --git a/src/main/java/de/siphalor/was/visual/JFXVisual.java b/src/main/java/de/siphalor/was/visual/JFXVisual.java new file mode 100644 index 0000000..32aa78e --- /dev/null +++ b/src/main/java/de/siphalor/was/visual/JFXVisual.java @@ -0,0 +1,29 @@ +package de.siphalor.was.visual; + +import de.siphalor.was.WhatAStorage; +import de.siphalor.was.assets.AssetsManager; +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.HBox; +import javafx.stage.Stage; + +public class JFXVisual extends Application implements Visual { + private Scene mainScene; + + @Override + public void setup(WhatAStorage whatAStorage) { + } + + @Override + public void run() { + launch(); + } + + @Override + public void start(Stage primaryStage) throws Exception { + FXMLLoader loader = new FXMLLoader(); + + HBox hb = loader.load(AssetsManager.getResource("jfx/main.fxml")); + } +} diff --git a/src/main/java/de/siphalor/was/visual/Visual.java b/src/main/java/de/siphalor/was/visual/Visual.java index 8309809..07e63b1 100644 --- a/src/main/java/de/siphalor/was/visual/Visual.java +++ b/src/main/java/de/siphalor/was/visual/Visual.java @@ -3,6 +3,6 @@ package de.siphalor.was.visual; import de.siphalor.was.WhatAStorage; public interface Visual { - void start(WhatAStorage whatAStorage); + void setup(WhatAStorage whatAStorage); void run(); } diff --git a/src/main/resources/assets/jfx/main.fxml b/src/main/resources/assets/jfx/main.fxml new file mode 100644 index 0000000..ec8b75a --- /dev/null +++ b/src/main/resources/assets/jfx/main.fxml @@ -0,0 +1,9 @@ + + + + + + + +