From 33a969310a788ae5c10be87f04dd0ff5cbcc6399 Mon Sep 17 00:00:00 2001 From: Aidan Ross Date: Wed, 24 May 2023 13:33:59 -0400 Subject: Scoring now almost works, and finished the visuals for hitting a note --- src/fallTest/newSongPlayer.java | 289 +++++++++++++++++++++------------------- 1 file changed, 154 insertions(+), 135 deletions(-) (limited to 'src/fallTest/newSongPlayer.java') diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java index d93d098..423355f 100644 --- a/src/fallTest/newSongPlayer.java +++ b/src/fallTest/newSongPlayer.java @@ -1,43 +1,27 @@ package fallTest; -import javafx.event.EventHandler; - -import java.awt.Insets; 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; -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; -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; import javafx.animation.*; -import javafx.animation.KeyFrame; import javafx.util.*; import main.Difficulty; import main.ScoreController; -public class newSongPlayer extends Pane -{ +public class newSongPlayer extends Pane { Timer timer = new Timer(); - final int TIME = 1500; //delay for notes falling down the screen + final int TIME = 1500; // delay for notes falling down the screen + + Score scoreCounter = new Score(); Rectangle goalPerfect = new Rectangle(); HBox buttonBox = new HBox(); @@ -45,8 +29,8 @@ public class newSongPlayer extends Pane VBox place = new VBox(); TButton dButton = new TButton(Color.RED, 50, 50, 5); - 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 + 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 TButton fButton = new TButton(Color.BLUE, 50, 50, 5); Queue fSends = new LinkedList(); @@ -64,55 +48,56 @@ public class newSongPlayer extends Pane Queue kSends = new LinkedList(); ArrayList kLane = new ArrayList(); + /** + * 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)); - /** - * 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)); - } - - public newSongPlayer(main.Level lvl, Difficulty d, Pane p, ScoreController cntrl){ - + jSends.add(new NoteInfo(11333)); + dSends.add(new NoteInfo(11666)); + kSends.add(new NoteInfo(11666)); + spaceSends.add(new NoteInfo(12000)); + } + + public newSongPlayer(main.Level lvl, Difficulty d, Pane p, ScoreController cntrl) { + } + + public newSongPlayer() { } - public void init() { + public void init() { loadSong(); - + Rectangle field = new Rectangle(50, 50, new Color(0, 0, 0, 0.7)); field.heightProperty().bind(this.getScene().getWindow().heightProperty()); field.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(2.7).add(50)); @@ -125,102 +110,92 @@ public class newSongPlayer extends Pane genButton(sButton); genButton(jButton); genButton(kButton); - - this.getScene().setOnKeyPressed(e -> { + + this.getScene().setOnKeyPressed(e -> { if (e.getCode() == KeyCode.D) { - System.out.println("D"); - if (dLane.size() > 0 && distanceToGoal(dLane.get(getClosestNote(dLane))) < 20) { - super.getChildren().removeAll(dLane.get(getClosestNote(dLane))); - dLane.remove(dLane.get(getClosestNote(dLane))); - System.out.println("Hit"); - } + checkNote(dLane, dButton); } if (e.getCode() == KeyCode.F) { - System.out.println("F"); - if (fLane.size() > 0 && fLane.get(getClosestNote(fLane)).intersects(buttonBox.getBoundsInLocal())) { - super.getChildren().removeAll(fLane.get(getClosestNote(fLane))); - fLane.remove(fLane.get(getClosestNote(fLane))); - System.out.println("Hit"); - } + checkNote(fLane, fButton); } if (e.getCode() == KeyCode.SPACE) { - System.out.println("SPC"); - if (spaceLane.size() > 0 && spaceLane.get(getClosestNote(spaceLane)).intersects(buttonBox.getBoundsInLocal())) { - super.getChildren().removeAll(spaceLane.get(getClosestNote(spaceLane))); - spaceLane.remove(spaceLane.get(getClosestNote(spaceLane))); - System.out.println("Hit"); - } + checkNote(spaceLane, sButton); } if (e.getCode() == KeyCode.J) { - System.out.println("J"); - if (jLane.size() > 0 && jLane.get(getClosestNote(jLane)).intersects(buttonBox.getBoundsInLocal())) { - super.getChildren().removeAll(jLane.get(getClosestNote(jLane))); - jLane.remove(jLane.get(getClosestNote(jLane))); - System.out.println("Hit"); - } + checkNote(jLane, jButton); } if (e.getCode() == KeyCode.K) { - System.out.println("K"); - if (kLane.size() > 0 && kLane.get(getClosestNote(kLane)).intersects(buttonBox.getBoundsInLocal())) { - super.getChildren().removeAll(kLane.get(getClosestNote(kLane))); - kLane.remove(kLane.get(getClosestNote(kLane))); - System.out.println("Hit"); - } + checkNote(kLane, kButton); } + System.out.println("Score: " + scoreCounter.getScore() + "\nCombo: " + scoreCounter.getCombo() + "\n"); }); buttonBox.setStyle("-fx-padding: 0;" + "-fx-border-style: solid inside;" - + "-fx-border-width: 0;" + "-fx-border-insets: 20;" - + "-fx-background-color: black;" + "-fx-opacity: 0.67;"); + + "-fx-border-width: 0;" + "-fx-border-insets: 20;" + + "-fx-background-color: black;" + "-fx-opacity: 0.67;"); buttonBox.setAlignment(Pos.CENTER); - buttonBox.getChildren().addAll(dButton, fButton, sButton, jButton, kButton); - buttonBox.setSpacing(10); - - polish.getChildren().addAll(field); - polish.setAlignment(Pos.BASELINE_CENTER); - + buttonBox.getChildren().addAll(dButton, fButton, sButton, jButton, kButton); + buttonBox.setSpacing(10); + + polish.getChildren().addAll(field); + polish.setAlignment(Pos.BASELINE_CENTER); + place.prefWidthProperty().bind(this.getScene().widthProperty()); place.prefHeightProperty().bind(this.getScene().heightProperty()); - place.getChildren().addAll(buttonBox); + place.getChildren().addAll(buttonBox); place.setAlignment(Pos.BOTTOM_CENTER); - place.setSpacing(10); - - StackPane root = new StackPane(); - root.getChildren().addAll(polish, place); + place.setSpacing(10); + + StackPane root = new StackPane(); + root.getChildren().addAll(polish, place); goalPerfect.setY(dButton.getY()); - super.getChildren().addAll(root, goalPerfect); + super.getChildren().addAll(root, goalPerfect); gameLoop.start(); } - + + /** + * Checks if a note should be sent at the current time, and sends the note if it + * needs to be + * + * @param sends the queue to check + * @param lane the lane to send the note to + * @param pos the x pos of the note to be sent + * @param c the color of the sent note + */ public void sendNote(Queue sends, ArrayList lane, double pos, Color c) { if (sends.peek() != null && timer.time() > sends.peek().getTime()) { TranslateTransition anim = new TranslateTransition(Duration.millis(TIME)); lane.add(new Block(c, 50, 50, 5)); - int index = lane.size()-1; + int index = lane.size() - 1; sends.remove(); - 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); + 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); lane.get(index).setY(-lane.get(index).getHeight()); anim.setByY(this.getScene().getHeight() + lane.get(index).getHeight()); anim.setCycleCount(1); anim.setAutoReverse(false); - anim.setNode(lane.get(lane.size()-1)); + anim.setNode(lane.get(lane.size() - 1)); anim.play(); anim.setOnFinished(e -> { super.getChildren().removeAll(anim.getNode()); + }); - super.getChildren().add(lane.get(lane.size()-1)); + super.getChildren().add(lane.get(lane.size() - 1)); } } - + /** + * Sets up the given button + * + * @param button + */ public void genButton(TButton button) { button.heightProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); button.widthProperty().bind(this.getScene().getWindow().widthProperty().divide(16)); @@ -229,6 +204,9 @@ public class newSongPlayer extends Pane button.strokeWidthProperty().bind(this.getScene().getWindow().widthProperty().divide(210)); } + /** + * The background test that is run on every frame of the game + */ AnimationTimer gameLoop = new AnimationTimer() { @Override @@ -241,26 +219,67 @@ public class newSongPlayer extends Pane } }; + /** + * returns the pos in the lane array of the closest note to the goal + * + * @param searchLane + * @return the position of the note + */ private int getClosestNote(ArrayList searchLane) { - int pos = 0; - - for (int i=0; i lane) { - if (lane.size() > 0 && distanceToGoal(lane.get(getClosestNote(lane))) < 50) { + /** + * When the player hits the key, checks the quality of the hit + * @param lane the lane checking for a hit + * @param button the button checking for a hit + * @return 2 for a perfect hit, 1 for a good hit, 0 for a miss, and -1 if there are no notes to hit + */ + private int checkNote(ArrayList lane, TButton button) { + double distance = distanceToGoal(lane.get(getClosestNote(lane))); + if (lane.size() > 0 && distance < this.getScene().getHeight() / 3) { + + FillTransition ft = new FillTransition(Duration.millis(500), button); + ft.setToValue(button.getColor()); + super.getChildren().removeAll(lane.get(getClosestNote(lane))); lane.remove(lane.get(getClosestNote(lane))); - System.out.println("Hit"); + if (distance < this.getScene().getHeight() / 16) { + ft.setFromValue(Color.WHITE); + ft.play(); + scoreCounter.combo(); + scoreCounter.perfect(); + return 2; + } + if (distance < this.getScene().getHeight() / 5) { + ft.setFromValue(Color.PINK); + ft.play(); + scoreCounter.combo(); + scoreCounter.good(); + return 1; + } + ft.setFromValue(Color.RED); + ft.play(); + scoreCounter.miss(); + return 0; } + return -1; } } \ No newline at end of file -- cgit v1.2.3