From 228091f5594c4c20e6c51682e487d8325a8a3230 Mon Sep 17 00:00:00 2001 From: sowgro Date: Tue, 16 May 2023 07:08:18 -0400 Subject: unfinnished commit --- src/fallTest/Hbox.java | 5 + src/gui/Driver.java | 16 +++- src/gui/LevelDetails.java | 9 +- src/gui/LevelSurround.java | 74 +++++++++++++++ src/gui/SongPlayer2.java | 232 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 332 insertions(+), 4 deletions(-) create mode 100644 src/fallTest/Hbox.java create mode 100644 src/gui/LevelSurround.java create mode 100644 src/gui/SongPlayer2.java (limited to 'src') diff --git a/src/fallTest/Hbox.java b/src/fallTest/Hbox.java new file mode 100644 index 0000000..a7a97a7 --- /dev/null +++ b/src/fallTest/Hbox.java @@ -0,0 +1,5 @@ +package fallTest; + +public class Hbox { + +} diff --git a/src/gui/Driver.java b/src/gui/Driver.java index 77fe0b0..59002c2 100644 --- a/src/gui/Driver.java +++ b/src/gui/Driver.java @@ -17,6 +17,7 @@ import javafx.stage.Stage; public class Driver extends Application { + static Stage primaryStage; static HashMap menus = new HashMap(); static Pane primaryPane = new Pane(); @@ -26,8 +27,9 @@ public class Driver extends Application } @Override - public void start(Stage primaryStage) + public void start(Stage newPrimaryStage) { + primaryStage = newPrimaryStage; menus.put("MainMenu", new MainMenu()); menus.put("LevelSelector", new LevelSelector()); menus.put("Settings", new Settings()); @@ -61,6 +63,18 @@ public class Driver extends Application primaryPane.requestFocus(); } + public static void setCustomMenu(Pane pane) + { + if (! primaryPane.getChildren().isEmpty()) + { + primaryPane.getChildren().remove(0); + } + pane.minWidthProperty().bind(primaryStage.widthProperty()); + pane.minHeightProperty().bind(primaryStage.heightProperty()); + primaryPane.getChildren().add(pane); + primaryPane.requestFocus(); + } + public static void setBackground(String url) { primaryPane.setBackground(new Background( diff --git a/src/gui/LevelDetails.java b/src/gui/LevelDetails.java index dee2f00..5623261 100644 --- a/src/gui/LevelDetails.java +++ b/src/gui/LevelDetails.java @@ -1,5 +1,6 @@ package gui; +import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.control.ListView; @@ -22,6 +23,7 @@ public class LevelDetails extends VBox details.maxWidthProperty().bind(super.widthProperty()); details.maxHeightProperty().bind(super.heightProperty().multiply(0.75)); details.getStyleClass().add("textBox"); + details.setPadding(new Insets(10)); Button play = new Button(); play.setText("Play"); @@ -31,7 +33,7 @@ public class LevelDetails extends VBox Text desc = new Text(); desc.setText("Select a level from the left pane"); desc.setFill(Color.WHITE); - desc.wrappingWidthProperty().bind(super.widthProperty()); + desc.wrappingWidthProperty().bind(super.widthProperty().subtract(10)); desc.setTextAlignment(TextAlignment.CENTER); details.setAlignment(Pos.CENTER); details.getChildren().addAll(desc); @@ -44,12 +46,12 @@ public class LevelDetails extends VBox title.setText("Test level 1"); title.setFill(Color.WHITE); title.setFont(new Font(50)); - title.wrappingWidthProperty().bind(super.widthProperty()); + title.wrappingWidthProperty().bind(super.widthProperty().subtract(10)); Text desc = new Text(); desc.setText("long description with lots of words. what we write does not actually need to be long i just wan t make sure it can word wrap"); desc.setFill(Color.WHITE); - desc.wrappingWidthProperty().bind(super.widthProperty()); + desc.wrappingWidthProperty().bind(super.widthProperty().subtract(10)); ImageView previewView = new ImageView(); Image preview = new Image("assets/pico.png"); @@ -58,6 +60,7 @@ public class LevelDetails extends VBox previewView.fitWidthProperty().bind(super.widthProperty().multiply(0.5)); previewView.setPreserveRatio(true); details.getChildren().addAll(title,desc,previewView); + play.setOnAction(e -> Driver.setCustomMenu(new LevelSurround())); } VBox rightBox = new VBox(); diff --git a/src/gui/LevelSurround.java b/src/gui/LevelSurround.java new file mode 100644 index 0000000..22fcf97 --- /dev/null +++ b/src/gui/LevelSurround.java @@ -0,0 +1,74 @@ +package gui; + +import fallTest.Hbox; +import javafx.geometry.Insets; +import javafx.geometry.Pos; +import javafx.scene.control.Button; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; +import javafx.scene.layout.StackPane; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.text.Font; +import javafx.scene.text.Text; + +public class LevelSurround extends Pane +{ + //will have param (Level l) + public LevelSurround() + { + Button exit = new Button(); + exit.setText("Exit"); + exit.setOnAction(e -> Driver.setMenu("LevelSelector")); + + Button pause = new Button(); + pause.setText("Pause"); + + HBox buttonBox = new HBox(); + buttonBox.getChildren().addAll(exit,pause); + buttonBox.setAlignment(Pos.TOP_LEFT); + buttonBox.setSpacing(10); + + Text title = new Text(); + title.setText("Test level 1"); + title.setFill(Color.WHITE); + title.setFont(new Font(50)); + + Text diff = new Text(); + diff.setText("Easy"); + diff.setFill(Color.WHITE); + + VBox textBox = new VBox(); + textBox.setAlignment(Pos.TOP_RIGHT); + textBox.getChildren().addAll(title,diff); + + BorderPane topBar = new BorderPane(); + topBar.setLeft(buttonBox); + topBar.setRight(textBox); + topBar.setPadding(new Insets(10)); + + Text title = new Text(); + title.setText("Test level 1"); + title.setFill(Color.WHITE); + title.setFont(new Font(50)); + + Text diff = new Text(); + diff.setText("Easy"); + diff.setFill(Color.WHITE); + + VBox textBox = new VBox(); + textBox.setAlignment(Pos.TOP_RIGHT); + textBox.getChildren().addAll(title,diff); + + HBox centerBox = new HBox(); + centerBox.getStyleClass().add("textBox"); + + StackPane root = new StackPane(); + root.getChildren().addAll(topBar,centerBox); + + super.getChildren().add(root); + root.minWidthProperty().bind(super.minWidthProperty()); + root.minHeightProperty().bind(super.minHeightProperty()); + } +} \ No newline at end of file diff --git a/src/gui/SongPlayer2.java b/src/gui/SongPlayer2.java new file mode 100644 index 0000000..ed6476d --- /dev/null +++ b/src/gui/SongPlayer2.java @@ -0,0 +1,232 @@ +/*Name: Guitar Hero Project + *Description: Contains the main game loop for gameplay + */ +package gui; + +import javafx.scene.control.Button; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; + +import java.util.*; + +import fallTest.NoteField; +import fallTest.NoteInfo; +import fallTest.Score; +import fallTest.Timer; +//test +public class SongPlayer2 extends Pane +{ + Timer time = new Timer(); + + public static final int HEIGHT = 650; + public static final int LENGTH = 400; + + private final int BLENGTH = LENGTH/7; + private final int BHEIGHT = HEIGHT/20; + + Button d = new Button("D"); + Button f = new Button("F"); + Button space= new Button("..."); + Button j = new Button("J"); + Button k = new Button("K"); + + Queue dSends = new LinkedList(); //Queue that dictates when to send the notes + ArrayList dLane = new ArrayList(); //Array list containing all the notes currently on the field + ArrayList dVis = new ArrayList(); //Array list containing the visual representations of the notes in lanes + + Queue fSends = new LinkedList(); + ArrayList fLane = new ArrayList(); + ArrayList fVis = new ArrayList(); + + Queue spaceSends = new LinkedList(); + ArrayList spaceLane = new ArrayList(); + ArrayList spaceVis = new ArrayList(); + + Queue jSends = new LinkedList(); + ArrayList jLane = new ArrayList(); + ArrayList jVis = new ArrayList(); + + Queue kSends = new LinkedList(); + ArrayList kLane = new ArrayList(); + ArrayList kVis = new ArrayList(); + + Score score = new Score(); + + /** + * Establishes what the chart for the song is going to look like + */ + public void loadSong() { + dSends.add(new NoteInfo(4000)); + dSends.add(new NoteInfo(4333)); + dSends.add(new NoteInfo(4666)); + fSends.add(new NoteInfo(5000)); + kSends.add(new NoteInfo(5500)); + spaceSends.add(new NoteInfo(6000)); + jSends.add(new NoteInfo(6000)); + jSends.add(new NoteInfo(6250)); + dSends.add(new NoteInfo(6500)); + jSends.add(new NoteInfo(6750)); + spaceSends.add(new NoteInfo(7000)); + fSends.add(new NoteInfo(7500)); + jSends.add(new NoteInfo(7750)); + spaceSends.add(new NoteInfo(8000)); + fSends.add(new NoteInfo(8500)); + jSends.add(new NoteInfo(8500)); + dSends.add(new NoteInfo(9000)); + spaceSends.add(new NoteInfo(9000)); + kSends.add(new NoteInfo(9000)); + spaceSends.add(new NoteInfo(9500)); + + kSends.add(new NoteInfo(10000)); + dSends.add(new NoteInfo(10000)); + kSends.add(new NoteInfo(10333)); + fSends.add(new NoteInfo(10333)); + kSends.add(new NoteInfo(10666)); + spaceSends.add(new NoteInfo(10666)); + dSends.add(new NoteInfo(11000)); + spaceSends.add(new NoteInfo(11000)); + dSends.add(new NoteInfo(11333)); + jSends.add(new NoteInfo(11333)); + dSends.add(new NoteInfo(11666)); + kSends.add(new NoteInfo(11666)); + spaceSends.add(new NoteInfo(12000)); + } + + + /** + * Creates the GUI used to play the game + */ + public SongPlayer2() { + + // d.setBounds(1*BLENGTH, (5*HEIGHT)/6, BLENGTH, BHEIGHT); //makes the button bounds for each button + // f.setBounds(2*BLENGTH, (5*HEIGHT)/6, BLENGTH, BHEIGHT); + // space.setBounds(3*BLENGTH, (5*HEIGHT)/6, BLENGTH, BHEIGHT); + // j.setBounds(4*BLENGTH, (5*HEIGHT)/6, BLENGTH, BHEIGHT); + // k.setBounds(5*BLENGTH, (5*HEIGHT)/6, BLENGTH, BHEIGHT); + // d.setFocusable(false); //makes it so you can't focus on the button + // f.setFocusable(false); + // space.setFocusable(false); + // j.setFocusable(false); + // k.setFocusable(false); + + + HBox bottom = new HBox(); + bottom.getChildren().add(d); //adds the buttons to the frame + bottom.getChildren().add(f); + bottom.getChildren().add(space); + bottom.getChildren().add(j); + bottom.getChildren().add(k); + super.getChildren().add(bottom); + //frame.setSize(LENGTH, HEIGHT); //sets the size of the frame + //frame.setLayout(null); + //frame.setVisible(true); //makes the frame visible + + + //while (true) { //TRY TO FIND A BETTER SOLUTION FOR THIS?? maybe something like sends.size() > 0 || lanes.size() > 0 + + // update(d, dSends, dLane, dVis, 'd', "dPress", 1); //updates the provided lane + // update(f, fSends, fLane, fVis, 'f', "fPress", 2); + // update(space, spaceSends, spaceLane, spaceVis, ' ', "spacePress", 3); + // update(j, jSends, jLane, jVis, 'j', "jPress", 4); + // update(k, kSends, kLane, kVis, 'k', "kPress", 5); + + // frame.repaint(); //updates the visuals every frame + + // try { + // Thread.sleep(10); //THIS IS PROBABLY NOT THE BEST WAY TO DO THIS + // } catch (InterruptedException e) + // { + // e.printStackTrace(); + // } + //} + } + + /** + * Updates a lane. An update involves: + * Checking to see if a note needs to be sent down a lane + * Checking to see if the user hit the button + * Checking to see if any notes have moved past the lane + * @param sends The sending queue for the given lane + * @param lane The place where note information is stored for notes currently in that lane + * @param vis The place where the visual representation for a note is stored in that lane + * @param key The button on the keyboard corresponding to the button for the lane being updated + * @param id The id for the action map + * @param k The lane number + */ + /* + private void update(JButton button, Queue sends, ArrayList lane, ArrayList vis, char key, String id, int k) { + if (!sends.isEmpty() && sends.peek().getTime()-time.time()<3) { //checks if any notes in the queue need to be sent at this time + lane.add(new NoteField()); //adds that note's information to the lane list + + vis.add(new JButton()); //creates a visual representation of that note in the visualizer list + frame.add(vis.get(vis.size()-1)); + + sends.remove(); //removes the note just sent from the sending queue + } + + if (lane.size() > 0) { //if there are any notes in the lanes, tests for a button press + button.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(key), id); //Input map and Action map setting + button.getActionMap().put(id, new AbstractAction() { //Defines what happens when the proper button is pressed + public void actionPerformed(ActionEvent e) + { + if (lane.size() > 0) { + int i = getClosestNote(lane); + int dist = (int)Math.abs(lane.get(i).goalDistance()); + + lane.remove(i); //removes the notes and visual representation from the playing field when the button is pressed + frame.remove(vis.get(i)); + vis.remove(i); + + if (dist > 2*BHEIGHT) { //Determines what to add to the score depending on the proximity of the note + score.miss(); + } + else if (dist > BHEIGHT) { + score.combo(); + score.close(); + } + else { + score.combo(); + score.perfect(); + } + + System.out.println("Score: " + score.getScore() + " Combo: " + score.getCombo()); + } + } + }); + } + + for (int i=0; i 0 && lane.get(i).getFailed()) { //if the note has passed into the fail boundary, removes the note from the field + score.miss(); + System.out.println(score.getScore() + " Combo: " + score.getCombo()); + + + lane.remove(i); + frame.remove(vis.get(i)); + vis.remove(i); + + i--; + } + } + } + + /** + * Finds the note closest to the goal + * @return the location in the array list of the closest note + + private int getClosestNote(ArrayList searchLane) { + int pos = 0; + + for (int i=0; i Date: Tue, 16 May 2023 19:35:33 -0400 Subject: Preliminary testing with converting the songPlayer class to JavaFX Code --- src/fallTest/Block.java | 27 ++++++++++ src/fallTest/Driver.java | 26 ++++++++-- src/fallTest/Level.java | 106 ++++++++++++++++++++++++++++++++++++++++ src/fallTest/NoteNode.java | 19 +++++++ src/fallTest/TButton.java | 23 +++++++++ src/fallTest/newSongPlayer.java | 85 ++++++++++++++++++++++++++++++++ 6 files changed, 281 insertions(+), 5 deletions(-) create mode 100644 src/fallTest/Block.java create mode 100644 src/fallTest/Level.java create mode 100644 src/fallTest/NoteNode.java create mode 100644 src/fallTest/TButton.java create mode 100644 src/fallTest/newSongPlayer.java (limited to 'src') diff --git a/src/fallTest/Block.java b/src/fallTest/Block.java new file mode 100644 index 0000000..ab2f902 --- /dev/null +++ b/src/fallTest/Block.java @@ -0,0 +1,27 @@ +//glowing block of color c (jfx node) + +package fallTest; + +import javafx.scene.effect.BlurType; +import javafx.scene.effect.DropShadow; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; + +public class Block extends Rectangle +{ + public Block(Color c, double a, double b, int r) + { + super(); + DropShadow dropShadow = new DropShadow(); + dropShadow.setRadius(200.0); + dropShadow.setColor(c); + dropShadow.setBlurType(BlurType.GAUSSIAN); + + super.setFill(c); + super.setWidth(a); + super.setHeight(b); + super.setArcHeight(r); + super.setArcWidth(r); + super.setEffect(dropShadow); + } +} \ No newline at end of file diff --git a/src/fallTest/Driver.java b/src/fallTest/Driver.java index 0ad60f0..44a68e1 100644 --- a/src/fallTest/Driver.java +++ b/src/fallTest/Driver.java @@ -6,16 +6,32 @@ */ package fallTest; +import javafx.application.*; +import javafx.scene.Scene; +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"); + primaryStage.show(); + primaryPane.getChildren().add(player); + player.init(); + + } } diff --git a/src/fallTest/Level.java b/src/fallTest/Level.java new file mode 100644 index 0000000..71ee0a8 --- /dev/null +++ b/src/fallTest/Level.java @@ -0,0 +1,106 @@ +package fallTest; + +import javafx.application.Application; +import javafx.event.ActionEvent; +import javafx.event.EventHandler; +import javafx.geometry.Insets; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.effect.BlurType; +import javafx.scene.effect.DropShadow; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundFill; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.CornerRadii; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.Pane; +import javafx.scene.layout.StackPane; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; +import javafx.scene.text.Text; +import javafx.stage.Stage; + +// will eventually extend pane +public class Level extends Pane { + + + public Level() { + + BorderPane background = new BorderPane(); + Scene game = new Scene(background, 800, 600); + GridPane blockGrid = new GridPane(); + blockGrid.setBackground(new Background(new BackgroundFill(Color.BLACK, CornerRadii.EMPTY, Insets.EMPTY))); + background.setCenter(blockGrid); + + blockGrid.maxWidthProperty().bind(game.heightProperty().multiply(0.53)); + blockGrid.maxHeightProperty().bind(game.heightProperty()); + System.out.println(game.heightProperty()); + + //blockGrid.setMaxHeight(700); + //blockGrid.setMaxWidth(500); + //blockGrid.setScaleX(1); + //blockGrid.setScaleY(1); + //blockGrid.scaleXProperty().bind(game.heightProperty().divide(1000)); + //blockGrid.scaleYProperty().bind(game.heightProperty().divide(1000)); + //blockGrid.hgapProperty().bind(blockGrid.heightProperty().divide(11)); + //blockGrid.vgapProperty().bind(blockGrid.widthProperty().divide(21)); + blockGrid.setVgap(10); + blockGrid.setHgap(25); + + int blocksize = 50; + //AnchorPane b11 = new AnchorPane(); + //b11.getChildren().add(new Block(Color.ORANGE, b11, 10)); + Block b1 = new Block(Color.RED, blocksize, blocksize, 10); + //b1.heightProperty().bind(blockGrid.heightProperty().divide((blockGrid.getColumnCount()*2)+1)); + //b1.widthProperty().bind(blockGrid.widthProperty().divide((blockGrid.getRowCount()*2)+1)); + + Block b2 = new Block(Color.BLUE, blocksize, blocksize, 10); + //b2.heightProperty().bind(blockGrid.heightProperty().divide(21)); + //b2.widthProperty().bind(blockGrid.widthProperty().divide(11)); + + Block b3 = new Block(Color.GREEN, blocksize, blocksize, 10); + //b3.heightProperty().bind(blockGrid.heightProperty().divide(21)); + //b3.widthProperty().bind(blockGrid.widthProperty().divide(11)); + + Block b4 = new Block(Color.YELLOW, blocksize, blocksize, 10); + //b4.heightProperty().bind(blockGrid.heightProperty().divide(21)); + //b4.widthProperty().bind(blockGrid.widthProperty().divide(11)); + + Pane test = new Pane(); + + Block b5 = new Block(Color.ORANGE, blocksize, blocksize, 10); + DropShadow dropShadow = new DropShadow(); + dropShadow.setRadius(200.0); + dropShadow.setColor(Color.ORANGE); + dropShadow.setBlurType(BlurType.GAUSSIAN); + test.getChildren().add(b5); + test.setEffect(dropShadow); + + + + blockGrid.add(b1, 0, 0); + blockGrid.add(b2, 1, 0); + blockGrid.add(b3, 0, 1); + blockGrid.add(b4, 1, 1); + blockGrid.add(test, 1, 2); + + Button btn = new Button(); + btn.setText("Test"); + btn.setOnAction(new EventHandler() + { + @Override + public void handle(ActionEvent event) + { + System.out.println("test"); + } + }); + + background.setLeft(btn); + + + + } +} \ No newline at end of file diff --git a/src/fallTest/NoteNode.java b/src/fallTest/NoteNode.java new file mode 100644 index 0000000..c24e10f --- /dev/null +++ b/src/fallTest/NoteNode.java @@ -0,0 +1,19 @@ +package fallTest; + +import javafx.animation.*; +import javafx.util.Duration; + +public class NoteNode { + private NoteField info; + private Block vis; + TranslateTransition anim = new TranslateTransition(Duration.millis(TIME)); + public NoteNode(NoteField newInfo, Block newVis) { + vis=newVis; + info = newInfo; + anim.setNode(vis); + anim.setByY(); + anim.setCycleCount(1); + anim.setAutoReverse(false); + anim.play(); + } +} diff --git a/src/fallTest/TButton.java b/src/fallTest/TButton.java new file mode 100644 index 0000000..7859f03 --- /dev/null +++ b/src/fallTest/TButton.java @@ -0,0 +1,23 @@ +//glowing block of color c (jfx node) + +package fallTest; + +import javafx.scene.effect.BlurType; +import javafx.scene.effect.DropShadow; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; + +public class TButton extends Rectangle +{ + public TButton(Color c, double a, double b, int r) + { + super(); + + super.setFill(c); + super.setWidth(a); + super.setHeight(b); + super.setArcHeight(r); + super.setArcWidth(r); + super.setStroke(Color.BLACK); + } +} \ No newline at end of file diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java new file mode 100644 index 0000000..89f0097 --- /dev/null +++ b/src/fallTest/newSongPlayer.java @@ -0,0 +1,85 @@ +package fallTest; + +import javafx.event.EventHandler; +import javafx.event.ActionEvent; +import javafx.geometry.Pos; +import javafx.scene.control.Button; +import javafx.scene.effect.BlurType; +import javafx.scene.effect.DropShadow; +import javafx.scene.layout.Border; +import javafx.scene.layout.BorderStroke; +import javafx.scene.layout.BorderStrokeStyle; +import javafx.scene.layout.BorderWidths; +import javafx.scene.layout.CornerRadii; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.text.Font; +import javafx.scene.text.Text; + +public class newSongPlayer extends Pane +{ + + public newSongPlayer() { + /*TButton dButton = new TButton(Color.RED, 50, 50, 5); + System.out.println(super.widthProperty()); + dButton.heightProperty().bind(super.widthProperty().divide(1)); + dButton.widthProperty().bind(super.widthProperty().divide(1)); + + HBox buttonBox = new HBox(); + buttonBox.getChildren().addAll(dButton); + buttonBox.setAlignment(Pos.CENTER); + buttonBox.setSpacing(10); + + super.getChildren().add(buttonBox); + //buttonBox.setBorder(border);*/ + } + + public void init() { + TButton dButton = new TButton(Color.RED, 50, 50, 5); + dButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + dButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + dButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + dButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + + TButton fButton = new TButton(Color.BLUE, 50, 50, 5); + fButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + fButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + fButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + fButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + + TButton sButton = new TButton(Color.GREEN, 50, 50, 5); + sButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + sButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + sButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + sButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + + TButton jButton = new TButton(Color.PURPLE, 50, 50, 5); + jButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + jButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + jButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + jButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + + TButton kButton = new TButton(Color.YELLOW, 50, 50, 5); + kButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + kButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); + kButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + kButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + + + + HBox buttonBox = new HBox(); + buttonBox.getChildren().addAll(dButton, fButton, sButton, jButton, kButton); + buttonBox.setAlignment(Pos.CENTER); + buttonBox.setSpacing(10); + + VBox root = new VBox(); + root.getChildren().addAll(buttonBox); + root.setAlignment(Pos.BOTTOM_CENTER); + root.setSpacing(10); + + + super.getChildren().add(root); + } +} -- cgit v1.2.3 From fbd52c44150e463b2c24da2ff38f1acc11edac4d Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Tue, 16 May 2023 20:06:19 -0400 Subject: Improved Button Look --- src/fallTest/TButton.java | 7 +++++-- src/fallTest/newSongPlayer.java | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/fallTest/TButton.java b/src/fallTest/TButton.java index 7859f03..5998282 100644 --- a/src/fallTest/TButton.java +++ b/src/fallTest/TButton.java @@ -6,6 +6,7 @@ import javafx.scene.effect.BlurType; import javafx.scene.effect.DropShadow; import javafx.scene.paint.Color; import javafx.scene.shape.Rectangle; +import javafx.scene.paint.*; public class TButton extends Rectangle { @@ -13,11 +14,13 @@ public class TButton extends Rectangle { super(); - super.setFill(c); + Color newCol = new Color(c.darker().getRed(), c.darker().getGreen(), c.darker().getBlue(), 0.15); + super.setFill(newCol); super.setWidth(a); super.setHeight(b); super.setArcHeight(r); super.setArcWidth(r); - super.setStroke(Color.BLACK); + super.setStroke(c); + super.setStrokeWidth(5); } } \ No newline at end of file diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java index 89f0097..d98b235 100644 --- a/src/fallTest/newSongPlayer.java +++ b/src/fallTest/newSongPlayer.java @@ -6,6 +6,7 @@ import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.effect.BlurType; import javafx.scene.effect.DropShadow; +import javafx.scene.input.KeyCode; import javafx.scene.layout.Border; import javafx.scene.layout.BorderStroke; import javafx.scene.layout.BorderStrokeStyle; @@ -42,41 +43,70 @@ public class newSongPlayer extends Pane dButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); dButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); dButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + dButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + dButton.setOnKeyPressed(e -> { + if (e.getCode() == KeyCode.D) { + System.out.println("D"); + } + }); TButton fButton = new TButton(Color.BLUE, 50, 50, 5); fButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); fButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); fButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); fButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + fButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + fButton.setOnKeyPressed(e -> { + if (e.getCode() == KeyCode.F) { + System.out.println("F"); + } + }); TButton sButton = new TButton(Color.GREEN, 50, 50, 5); sButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); sButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); sButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); sButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + sButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + sButton.setOnKeyPressed(e -> { + if (e.getCode() == KeyCode.SPACE) { + System.out.println("SPC"); + } + }); TButton jButton = new TButton(Color.PURPLE, 50, 50, 5); jButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); jButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); jButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); jButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); + jButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + jButton.setOnKeyPressed(e -> { + if (e.getCode() == KeyCode.J) { + System.out.println("J"); + } + }); TButton kButton = new TButton(Color.YELLOW, 50, 50, 5); kButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); kButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); kButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); kButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - + kButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + kButton.setOnKeyPressed(e -> { + if (e.getCode() == KeyCode.K) { + System.out.println("K"); + } + }); HBox buttonBox = new HBox(); + buttonBox.setAlignment(Pos.CENTER_LEFT); buttonBox.getChildren().addAll(dButton, fButton, sButton, jButton, kButton); - buttonBox.setAlignment(Pos.CENTER); buttonBox.setSpacing(10); VBox root = new VBox(); + root.setAlignment(Pos.CENTER); root.getChildren().addAll(buttonBox); - root.setAlignment(Pos.BOTTOM_CENTER); root.setSpacing(10); -- cgit v1.2.3 From 0ec11156c87afc066b1a6ef8f569aedad3a16ae5 Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Tue, 16 May 2023 22:48:41 -0400 Subject: Overhaul of the look of the gui, I need to rename the boxes --- src/fallTest/Driver.java | 25 ++++++++-- src/fallTest/TButton.java | 3 +- src/fallTest/newSongPlayer.java | 107 +++++++++++++++++++++++----------------- 3 files changed, 84 insertions(+), 51 deletions(-) (limited to 'src') diff --git a/src/fallTest/Driver.java b/src/fallTest/Driver.java index 44a68e1..3bc7c25 100644 --- a/src/fallTest/Driver.java +++ b/src/fallTest/Driver.java @@ -7,7 +7,14 @@ 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; @@ -28,10 +35,20 @@ public class Driver extends Application primaryStage.setScene(primaryScene); newSongPlayer player = new newSongPlayer(); primaryStage.setTitle("TEST"); - primaryStage.show(); - primaryPane.getChildren().add(player); + 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) + ))); + } } diff --git a/src/fallTest/TButton.java b/src/fallTest/TButton.java index 5998282..d18771f 100644 --- a/src/fallTest/TButton.java +++ b/src/fallTest/TButton.java @@ -6,6 +6,7 @@ import javafx.scene.effect.BlurType; import javafx.scene.effect.DropShadow; import javafx.scene.paint.Color; import javafx.scene.shape.Rectangle; +import javafx.scene.text.Text; import javafx.scene.paint.*; public class TButton extends Rectangle @@ -14,7 +15,7 @@ public class TButton extends Rectangle { super(); - Color newCol = new Color(c.darker().getRed(), c.darker().getGreen(), c.darker().getBlue(), 0.15); + Color newCol = new Color(c.darker().getRed(), c.darker().getGreen(), c.darker().getBlue(), 0.25); super.setFill(newCol); super.setWidth(a); super.setHeight(b); diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java index d98b235..ff96d63 100644 --- a/src/fallTest/newSongPlayer.java +++ b/src/fallTest/newSongPlayer.java @@ -1,6 +1,10 @@ package fallTest; import javafx.event.EventHandler; + +import java.awt.Insets; + +import javafx.event.*; import javafx.event.ActionEvent; import javafx.geometry.Pos; import javafx.scene.control.Button; @@ -14,36 +18,27 @@ import javafx.scene.layout.BorderWidths; import javafx.scene.layout.CornerRadii; import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; +import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; import javafx.scene.text.Font; import javafx.scene.text.Text; public class newSongPlayer extends Pane { - - public newSongPlayer() { - /*TButton dButton = new TButton(Color.RED, 50, 50, 5); - System.out.println(super.widthProperty()); - dButton.heightProperty().bind(super.widthProperty().divide(1)); - dButton.widthProperty().bind(super.widthProperty().divide(1)); - - HBox buttonBox = new HBox(); - buttonBox.getChildren().addAll(dButton); - buttonBox.setAlignment(Pos.CENTER); - buttonBox.setSpacing(10); - - super.getChildren().add(buttonBox); - //buttonBox.setBorder(border);*/ - } - public void init() { + Rectangle field = new Rectangle(50, 50, new Color(0, 0, 0, 0.7)); + field.heightProperty().bind(this.getScene().getWindow().heightProperty().multiply(0.95)); + field.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(2.).add(50)); + TButton dButton = new TButton(Color.RED, 50, 50, 5); - dButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - dButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - dButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - dButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - dButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + dButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + dButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + dButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + dButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + dButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); + //Text dButtonText = new Text("D"); dButton.setOnKeyPressed(e -> { if (e.getCode() == KeyCode.D) { System.out.println("D"); @@ -51,11 +46,11 @@ public class newSongPlayer extends Pane }); TButton fButton = new TButton(Color.BLUE, 50, 50, 5); - fButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - fButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - fButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - fButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - fButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + fButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + fButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + fButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + fButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + fButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); fButton.setOnKeyPressed(e -> { if (e.getCode() == KeyCode.F) { System.out.println("F"); @@ -63,11 +58,11 @@ public class newSongPlayer extends Pane }); TButton sButton = new TButton(Color.GREEN, 50, 50, 5); - sButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - sButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - sButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - sButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - sButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + sButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + sButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + sButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + sButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + sButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); sButton.setOnKeyPressed(e -> { if (e.getCode() == KeyCode.SPACE) { System.out.println("SPC"); @@ -75,11 +70,11 @@ public class newSongPlayer extends Pane }); TButton jButton = new TButton(Color.PURPLE, 50, 50, 5); - jButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - jButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - jButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - jButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - jButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + jButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + jButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + jButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + jButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + jButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); jButton.setOnKeyPressed(e -> { if (e.getCode() == KeyCode.J) { System.out.println("J"); @@ -87,29 +82,49 @@ public class newSongPlayer extends Pane }); TButton kButton = new TButton(Color.YELLOW, 50, 50, 5); - kButton.heightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - kButton.widthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(20)); - kButton.arcHeightProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - kButton.arcWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(100)); - kButton.strokeWidthProperty().bind(this.getScene().getWindow().heightProperty().add(this.getScene().getWindow().widthProperty()).divide(420)); + kButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + kButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); + kButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + kButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + kButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); kButton.setOnKeyPressed(e -> { if (e.getCode() == KeyCode.K) { System.out.println("K"); } }); + //StackPane dButtonComplete = new StackPane(); + //dButtonComplete.getChildren().addAll(dButtonText, dButton); HBox buttonBox = new HBox(); - buttonBox.setAlignment(Pos.CENTER_LEFT); + + buttonBox.setStyle("-fx-padding: 0;" + "-fx-border-style: solid inside;" + + "-fx-border-width: 0;" + "-fx-border-insets: 20;" + + "-fx-border-radius: 0;" + "-fx-border-color: black;" + + "-fx-background-color: black;" + "-fx-opacity: 0.67;"); + buttonBox.setAlignment(Pos.CENTER); buttonBox.getChildren().addAll(dButton, fButton, sButton, jButton, kButton); buttonBox.setSpacing(10); - VBox root = new VBox(); - root.setAlignment(Pos.CENTER); - root.getChildren().addAll(buttonBox); - root.setSpacing(10); + VBox polish = new VBox(); + polish.prefHeightProperty().bind(this.getScene().heightProperty()); + polish.getChildren().addAll(field); + polish.setAlignment(Pos.TOP_CENTER); + + VBox place = new VBox(); + place.prefWidthProperty().bind(this.getScene().widthProperty()); + place.prefHeightProperty().bind(this.getScene().heightProperty()); + //root.setStyle("-fx-padding: 0;" + "-fx-border-style: solid inside;" + // + "-fx-border-width: 2;" + "-fx-border-insets: 0;" + // + "-fx-border-radius: 2;" + "-fx-border-color: red;"); + place.setAlignment(Pos.BOTTOM_CENTER); + place.getChildren().addAll(buttonBox); + place.setSpacing(10); + StackPane root = new StackPane(); + root.getChildren().addAll(polish, place); super.getChildren().add(root); + } } -- cgit v1.2.3 From 39a01b860b1d348088202d89ac3e3fa10410f9ed Mon Sep 17 00:00:00 2001 From: sowgro Date: Wed, 17 May 2023 08:54:49 -0400 Subject: add LevelSurround --- src/gui/LevelSurround.java | 55 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/gui/LevelSurround.java b/src/gui/LevelSurround.java index 22fcf97..bf71f2f 100644 --- a/src/gui/LevelSurround.java +++ b/src/gui/LevelSurround.java @@ -39,33 +39,56 @@ public class LevelSurround extends Pane diff.setText("Easy"); diff.setFill(Color.WHITE); - VBox textBox = new VBox(); - textBox.setAlignment(Pos.TOP_RIGHT); - textBox.getChildren().addAll(title,diff); + VBox titleTextBox = new VBox(); + titleTextBox.setAlignment(Pos.TOP_RIGHT); + titleTextBox.getChildren().addAll(title,diff); BorderPane topBar = new BorderPane(); topBar.setLeft(buttonBox); - topBar.setRight(textBox); + topBar.setRight(titleTextBox); topBar.setPadding(new Insets(10)); - Text title = new Text(); - title.setText("Test level 1"); - title.setFill(Color.WHITE); - title.setFont(new Font(50)); - Text diff = new Text(); - diff.setText("Easy"); - diff.setFill(Color.WHITE); + Text scoreLabel = new Text(); + scoreLabel.setText("Score:"); + scoreLabel.setFill(Color.WHITE); + + Text score = new Text(); + score.setText("100000"); + score.setFill(Color.WHITE); + score.setFont(new Font(50)); + + VBox scoreTextBox = new VBox(); + scoreTextBox.setAlignment(Pos.BOTTOM_LEFT); + scoreTextBox.getChildren().addAll(scoreLabel,score); + scoreTextBox.setPadding(new Insets(10)); + + + Text comboLabel = new Text(); + comboLabel.setText("Combo:"); + comboLabel.setFill(Color.WHITE); + + Text combo = new Text(); + combo.setText("100000"); + combo.setFill(Color.WHITE); + combo.setFont(new Font(50)); + + VBox comboTextBox = new VBox(); + comboTextBox.setAlignment(Pos.BOTTOM_RIGHT); + comboTextBox.getChildren().addAll(comboLabel,combo); + comboTextBox.setPadding(new Insets(10)); - VBox textBox = new VBox(); - textBox.setAlignment(Pos.TOP_RIGHT); - textBox.getChildren().addAll(title,diff); + Pane game = new Pane(); + game.minWidthProperty().bind(super.heightProperty().multiply(0.66)); + game.minHeightProperty().bind(super.heightProperty()); + game.getStyleClass().add("textBox"); HBox centerBox = new HBox(); - centerBox.getStyleClass().add("textBox"); + centerBox.getChildren().addAll(comboTextBox,game, scoreTextBox); + centerBox.setAlignment(Pos.BOTTOM_CENTER); StackPane root = new StackPane(); - root.getChildren().addAll(topBar,centerBox); + root.getChildren().addAll(centerBox, topBar); super.getChildren().add(root); root.minWidthProperty().bind(super.minWidthProperty()); -- cgit v1.2.3 From a7b4e891e02811222a2fcde1335b97ac1575bba9 Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Wed, 17 May 2023 08:55:09 -0400 Subject: Making the buttons smaller, and began setting up the note visualization --- src/fallTest/LaneInfo.java | 27 ++++++++++++ src/fallTest/NoteNode.java | 1 + src/fallTest/newSongPlayer.java | 97 ++++++++++++++++------------------------- 3 files changed, 66 insertions(+), 59 deletions(-) create mode 100644 src/fallTest/LaneInfo.java (limited to 'src') diff --git a/src/fallTest/LaneInfo.java b/src/fallTest/LaneInfo.java new file mode 100644 index 0000000..5eef143 --- /dev/null +++ b/src/fallTest/LaneInfo.java @@ -0,0 +1,27 @@ +package fallTest; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.Queue; + +import javax.swing.JButton; + +public class LaneInfo { + Queue sends = new LinkedList(); //Queue that dictates when to send the notes + ArrayList nodes = new ArrayList(); //Array list containing all the notes currently on the field + public void addSends(int t) { + sends.add(new NoteInfo(t)); + } + + public void addNodes(int t) { + nodes.add(new Block()); + } + + public ArrayList getNodes() { + return nodes; + } + + public Queue getSends() { + return sends; + } +} diff --git a/src/fallTest/NoteNode.java b/src/fallTest/NoteNode.java index c24e10f..3a29142 100644 --- a/src/fallTest/NoteNode.java +++ b/src/fallTest/NoteNode.java @@ -4,6 +4,7 @@ import javafx.animation.*; import javafx.util.Duration; public class NoteNode { + private final int TIME = 20; private NoteField info; private Block vis; TranslateTransition anim = new TranslateTransition(Duration.millis(TIME)); diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java index ff96d63..f9affad 100644 --- a/src/fallTest/newSongPlayer.java +++ b/src/fallTest/newSongPlayer.java @@ -3,6 +3,9 @@ package fallTest; import javafx.event.EventHandler; import java.awt.Insets; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.Queue; import javafx.event.*; import javafx.event.ActionEvent; @@ -27,96 +30,54 @@ import javafx.scene.text.Text; public class newSongPlayer extends Pane { + Timer time = new Timer(); + + private double dLaneX; + + public void init() { + Queue dSends = new LinkedList(); //Queue that dictates when to send the notes + ArrayList dLane = new ArrayList(); //Array list containing all the notes currently on the field + Rectangle field = new Rectangle(50, 50, new Color(0, 0, 0, 0.7)); field.heightProperty().bind(this.getScene().getWindow().heightProperty().multiply(0.95)); - field.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(2.).add(50)); - + field.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(2.7).add(50)); TButton dButton = new TButton(Color.RED, 50, 50, 5); - dButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - dButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - dButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - dButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - dButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); - //Text dButtonText = new Text("D"); - dButton.setOnKeyPressed(e -> { + genButton(dButton); + /*dButton.setOnKeyPressed(e -> { if (e.getCode() == KeyCode.D) { System.out.println("D"); } - }); + });*/ TButton fButton = new TButton(Color.BLUE, 50, 50, 5); - fButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - fButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - fButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - fButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - fButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); - fButton.setOnKeyPressed(e -> { - if (e.getCode() == KeyCode.F) { - System.out.println("F"); - } - }); + genButton(fButton); TButton sButton = new TButton(Color.GREEN, 50, 50, 5); - sButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - sButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - sButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - sButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - sButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); - sButton.setOnKeyPressed(e -> { - if (e.getCode() == KeyCode.SPACE) { - System.out.println("SPC"); - } - }); + genButton(sButton); TButton jButton = new TButton(Color.PURPLE, 50, 50, 5); - jButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - jButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - jButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - jButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - jButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); - jButton.setOnKeyPressed(e -> { - if (e.getCode() == KeyCode.J) { - System.out.println("J"); - } - }); + genButton(jButton); TButton kButton = new TButton(Color.YELLOW, 50, 50, 5); - kButton.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - kButton.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(12)); - kButton.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - kButton.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); - kButton.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); - kButton.setOnKeyPressed(e -> { - if (e.getCode() == KeyCode.K) { - System.out.println("K"); - } - }); - - //StackPane dButtonComplete = new StackPane(); - //dButtonComplete.getChildren().addAll(dButtonText, dButton); + genButton(kButton); + HBox buttonBox = new HBox(); - buttonBox.setStyle("-fx-padding: 0;" + "-fx-border-style: solid inside;" + "-fx-border-width: 0;" + "-fx-border-insets: 20;" - + "-fx-border-radius: 0;" + "-fx-border-color: black;" + "-fx-background-color: black;" + "-fx-opacity: 0.67;"); buttonBox.setAlignment(Pos.CENTER); buttonBox.getChildren().addAll(dButton, fButton, sButton, jButton, kButton); buttonBox.setSpacing(10); VBox polish = new VBox(); - polish.prefHeightProperty().bind(this.getScene().heightProperty()); polish.getChildren().addAll(field); polish.setAlignment(Pos.TOP_CENTER); VBox place = new VBox(); place.prefWidthProperty().bind(this.getScene().widthProperty()); place.prefHeightProperty().bind(this.getScene().heightProperty()); - //root.setStyle("-fx-padding: 0;" + "-fx-border-style: solid inside;" - // + "-fx-border-width: 2;" + "-fx-border-insets: 0;" - // + "-fx-border-radius: 2;" + "-fx-border-color: red;"); place.setAlignment(Pos.BOTTOM_CENTER); place.getChildren().addAll(buttonBox); place.setSpacing(10); @@ -126,5 +87,23 @@ public class newSongPlayer extends Pane super.getChildren().add(root); + sendNote(dLane); + } + + public void sendNote(ArrayList lane) { + lane.add(new Block(Color.PINK, 50, 50, 5)); + lane.get(lane.size()-1).heightProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); + lane.get(lane.size()-1).widthProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); + lane.get(lane.size()-1).arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + lane.get(lane.size()-1).arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + super.getChildren().add(lane.get(lane.size()-1)); + } + + public void genButton(TButton button) { + button.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); + button.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); + button.arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + button.arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + button.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); } } -- cgit v1.2.3 From bc7c7d96419a10d85e6b4a2ec5e1a2cbe78de9b1 Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Wed, 17 May 2023 09:05:37 -0400 Subject: resized buttons and set up infrastructure for the note animation --- src/fallTest/LaneInfo.java | 1 + src/fallTest/NoteNode.java | 2 +- src/fallTest/newSongPlayer.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/fallTest/LaneInfo.java b/src/fallTest/LaneInfo.java index 5eef143..7fe5567 100644 --- a/src/fallTest/LaneInfo.java +++ b/src/fallTest/LaneInfo.java @@ -7,6 +7,7 @@ import java.util.Queue; import javax.swing.JButton; public class LaneInfo { + //test Queue sends = new LinkedList(); //Queue that dictates when to send the notes ArrayList nodes = new ArrayList(); //Array list containing all the notes currently on the field public void addSends(int t) { diff --git a/src/fallTest/NoteNode.java b/src/fallTest/NoteNode.java index 3a29142..64e1b8a 100644 --- a/src/fallTest/NoteNode.java +++ b/src/fallTest/NoteNode.java @@ -12,7 +12,7 @@ public class NoteNode { vis=newVis; info = newInfo; anim.setNode(vis); - anim.setByY(); + anim.setByY(height); anim.setCycleCount(1); anim.setAutoReverse(false); anim.play(); diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java index f9affad..46d6e4b 100644 --- a/src/fallTest/newSongPlayer.java +++ b/src/fallTest/newSongPlayer.java @@ -32,7 +32,7 @@ public class newSongPlayer extends Pane { Timer time = new Timer(); - private double dLaneX; + private double dLaneX = 0; public void init() { -- cgit v1.2.3 From 33b5b82b1a2c511c6de0c1f744aec1f04bee12f7 Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Wed, 17 May 2023 09:38:56 -0400 Subject: resized buttons and testing note displays --- src/fallTest/newSongPlayer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java index 46d6e4b..3f6d4ed 100644 --- a/src/fallTest/newSongPlayer.java +++ b/src/fallTest/newSongPlayer.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.Queue; +import javafx.beans.property.DoubleProperty; import javafx.event.*; import javafx.event.ActionEvent; import javafx.geometry.Pos; @@ -33,7 +34,7 @@ public class newSongPlayer extends Pane Timer time = new Timer(); private double dLaneX = 0; - + TButton dButton = new TButton(Color.RED, 50, 50, 5); public void init() { Queue dSends = new LinkedList(); //Queue that dictates when to send the notes @@ -42,7 +43,6 @@ public class newSongPlayer extends Pane Rectangle field = new Rectangle(50, 50, new Color(0, 0, 0, 0.7)); field.heightProperty().bind(this.getScene().getWindow().heightProperty().multiply(0.95)); field.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(2.7).add(50)); - TButton dButton = new TButton(Color.RED, 50, 50, 5); genButton(dButton); /*dButton.setOnKeyPressed(e -> { if (e.getCode() == KeyCode.D) { @@ -86,16 +86,17 @@ public class newSongPlayer extends Pane root.getChildren().addAll(polish, place); super.getChildren().add(root); - - sendNote(dLane); + sendNote(dLane, buttonBox.getLayoutX()); } - public void sendNote(ArrayList lane) { + public void sendNote(ArrayList lane, double pos) { lane.add(new Block(Color.PINK, 50, 50, 5)); lane.get(lane.size()-1).heightProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); lane.get(lane.size()-1).widthProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); lane.get(lane.size()-1).arcHeightProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); lane.get(lane.size()-1).arcWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(50)); + lane.get(lane.size()-1).setX(pos); + System.out.println(pos); super.getChildren().add(lane.get(lane.size()-1)); } -- cgit v1.2.3