Removed unnecesary files in the gameplay class, as well as merged gameplay.score with main.scoreController such that score and combo are now displayed properly on the screen

1 files changed, 0 insertions, 289 deletions

diff --git a/src/gameplay/newSongPlayer.java b/src/gameplay/newSongPlayer.java
deleted file mode 100644
index 5bb4e9f..0000000
--- a/src/gameplay/newSongPlayer.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package gameplay;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Queue;
-
-import javafx.geometry.Pos;
-import javafx.scene.input.KeyCode;
-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.animation.*;
-import javafx.util.*;
-import main.Difficulty;
-import main.ScoreController;
-
-public class newSongPlayer extends Pane {
-	final int BPM = 80; //TEMPORARY BPM, this will be eventually read in from the metadata of the song
-
-	Timer timer = new Timer(BPM);
-	final int TIME = 1500; // delay for notes falling down the screen
-
-	Score scoreCounter = new Score();
-
-	Rectangle goalPerfect = new Rectangle();
-	HBox buttonBox = new HBox();
-	VBox polish = new VBox();
-	VBox place = new VBox();
-
-	TButton dButton = new TButton(Color.RED, 50, 50, 5);
-	Queue<NoteInfo> dSends = new LinkedList<NoteInfo>(); // Queue that dictates when to send the notes
-	ArrayList<Block> dLane = new ArrayList<Block>(); // Array list containing all the notes currently on the field
-
-	TButton fButton = new TButton(Color.BLUE, 50, 50, 5);
-	Queue<NoteInfo> fSends = new LinkedList<NoteInfo>();
-	ArrayList<Block> fLane = new ArrayList<Block>();
-
-	TButton sButton = new TButton(Color.GREEN, 50, 50, 5);
-	Queue<NoteInfo> spaceSends = new LinkedList<NoteInfo>();
-	ArrayList<Block> spaceLane = new ArrayList<Block>();
-
-	TButton jButton = new TButton(Color.PURPLE, 50, 50, 5);
-	Queue<NoteInfo> jSends = new LinkedList<NoteInfo>();
-	ArrayList<Block> jLane = new ArrayList<Block>();
-
-	TButton kButton = new TButton(Color.YELLOW, 50, 50, 5);
-	Queue<NoteInfo> kSends = new LinkedList<NoteInfo>();
-	ArrayList<Block> kLane = new ArrayList<Block>();
-
-	/**
-	 * Establishes what the chart for the song is going to look like
-	 */
-	public void loadSong() {
-		dSends.add(new NoteInfo(4.000));
-		dSends.add(new NoteInfo(4.333));
-		dSends.add(new NoteInfo(4.666));
-		fSends.add(new NoteInfo(5.000));
-		kSends.add(new NoteInfo(5.500));
-		spaceSends.add(new NoteInfo(6.000));
-		jSends.add(new NoteInfo(6.000));
-		jSends.add(new NoteInfo(6.250));
-		dSends.add(new NoteInfo(6.500));
-		jSends.add(new NoteInfo(6.750));
-		spaceSends.add(new NoteInfo(7.000));
-		fSends.add(new NoteInfo(7.500));
-		jSends.add(new NoteInfo(7.750));
-		spaceSends.add(new NoteInfo(8.000));
-		fSends.add(new NoteInfo(8.500));
-		jSends.add(new NoteInfo(8.500));
-		dSends.add(new NoteInfo(9.000));
-		spaceSends.add(new NoteInfo(9.000));
-		kSends.add(new NoteInfo(9.000));
-		spaceSends.add(new NoteInfo(9.500));
-
-		kSends.add(new NoteInfo(10.000));
-		dSends.add(new NoteInfo(10.000));
-		kSends.add(new NoteInfo(10.333));
-		fSends.add(new NoteInfo(10.333));
-		kSends.add(new NoteInfo(10.666));
-		spaceSends.add(new NoteInfo(10.666));
-		dSends.add(new NoteInfo(11.000));
-		spaceSends.add(new NoteInfo(11.000));
-		dSends.add(new NoteInfo(11.333));
-
-		jSends.add(new NoteInfo(11.333));
-		dSends.add(new NoteInfo(11.666));
-		kSends.add(new NoteInfo(11.666));
-		spaceSends.add(new NoteInfo(12.000));
-	}
-
-	public newSongPlayer(main.Level lvl, Difficulty d, Pane p, ScoreController cntrl) {
-	}
-
-	public newSongPlayer() {
-	}
-
-	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));
-
-		goalPerfect.heightProperty().bind(this.getScene().getWindow().heightProperty().divide(32));
-		goalPerfect.heightProperty().bind(this.getScene().getWindow().widthProperty());
-
-		genButton(dButton);
-		genButton(fButton);
-		genButton(sButton);
-		genButton(jButton);
-		genButton(kButton);
-
-		this.getScene().setOnKeyPressed(e -> {
-			if (e.getCode() == KeyCode.D) {
-				checkNote(dLane, dButton);
-			}
-			if (e.getCode() == KeyCode.F) {
-				checkNote(fLane, fButton);
-			}
-			if (e.getCode() == KeyCode.SPACE) {
-				checkNote(spaceLane, sButton);
-			}
-			if (e.getCode() == KeyCode.J) {
-				checkNote(jLane, jButton);
-			}
-			if (e.getCode() == KeyCode.K) {
-				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;");
-		buttonBox.setAlignment(Pos.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.setAlignment(Pos.BOTTOM_CENTER);
-		place.setSpacing(10);
-
-		StackPane root = new StackPane();
-		root.getChildren().addAll(polish, place);
-
-		goalPerfect.setY(dButton.getY());
-		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<NoteInfo> sends, ArrayList<Block> 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;
-			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(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.play();
-
-			anim.setOnFinished(e -> {
-				if (super.getChildren().removeAll(anim.getNode())){
-					scoreCounter.miss();
-					System.out.println();
-				}
-			});
-			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));
-		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));
-	}
-
-	/**
-	 * The background test that is run on every frame of the game
-	 */
-	AnimationTimer gameLoop = new AnimationTimer() {
-
-		@Override
-		public void handle(long arg0) {
-			sendNote(dSends, dLane, dButton.getLayoutX(), Color.RED);
-			sendNote(fSends, fLane, fButton.getLayoutX(), Color.BLUE);
-			sendNote(spaceSends, spaceLane, sButton.getLayoutX(), Color.GREEN);
-			sendNote(jSends, jLane, jButton.getLayoutX(), Color.PURPLE);
-			sendNote(kSends, kLane, kButton.getLayoutX(), Color.YELLOW);
-		}
-	};
-
-	/**
-	 * 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<Block> searchLane) {
-		int pos = 0;
-
-		for (int i = 0; i < searchLane.size(); i++) {
-			if (distanceToGoal(searchLane.get(i)) < distanceToGoal(searchLane.get(pos))) {
-				pos = i;
-			}
-		}
-		return pos;
-	}
-
-	/**
-	 * Returns the distance to the goal of the given note
-	 * 
-	 * @param note
-	 * @return
-	 */
-	private double distanceToGoal(Block note) {
-		return Math.abs((this.getScene().getHeight() - note.getTranslateY()) - dButton.getY());
-	}
-
-	/**
-	 * 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<Block> 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)));
-			if (distance < this.getScene().getHeight() / 18) {
-				ft.setFromValue(Color.WHITE);
-				ft.play();
-				scoreCounter.combo();
-				scoreCounter.perfect();
-				return 2;
-			}
-			if (distance < this.getScene().getHeight() / 6) {
-				ft.setFromValue(Color.CYAN);
-				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