Merge branch 'main' of

https://gitlab.sowgro.net/guitarheros/guitarhero.git into main

Conflicts:
	.classpath

1 files changed, 39 insertions, 6 deletions

diff --git a/src/fallTest/Driver.java b/src/fallTest/Driver.java
index 0ad60f0..3bc7c25 100644
--- a/src/fallTest/Driver.java
+++ b/src/fallTest/Driver.java
@@ -6,16 +6,49 @@
  */
 package fallTest;
 
+import javafx.application.*;
+import javafx.geometry.Side;
+import javafx.scene.Scene;
+import javafx.scene.image.Image;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundImage;
+import javafx.scene.layout.BackgroundPosition;
+import javafx.scene.layout.BackgroundRepeat;
+import javafx.scene.layout.BackgroundSize;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
 
-public class Driver
+public class Driver extends Application
 {
 
+    static Pane primaryPane = new Pane();
+
     public static void main(String[] args)
     {
-        // TODO Auto-generated method stub
-        SongPlayer g = new SongPlayer();
-        g.loadSong();
-        g.createAndShowGui();
-    }
+        launch(args);
 
+    }
+	@Override
+	public void start(Stage primaryStage) throws Exception {
+		Scene primaryScene = new Scene(primaryPane, 800, 600);
+        primaryScene.getStylesheets().add("gui/style.css");
+        primaryStage.setScene(primaryScene);
+        newSongPlayer player = new newSongPlayer();
+        primaryStage.setTitle("TEST");
+        primaryPane.getChildren().add(player);     
+        setBackground("assets/water.png");   
+        player.init();
+        primaryStage.show();
+	}
+	
+	  public static void setBackground(String url)
+      {
+          primaryPane.setBackground(new Background(
+              new BackgroundImage(
+                      new Image(url),
+                      BackgroundRepeat.REPEAT, BackgroundRepeat.NO_REPEAT,
+                      new BackgroundPosition(Side.LEFT, 0, true, Side.BOTTOM, 0, true),
+                      new BackgroundSize(BackgroundSize.AUTO, BackgroundSize.AUTO, true, true, false, true)
+              )));
+      }
 }