aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rwxr-xr-xsrc/main/java/net/sowgro/npehero/editor/NotesEditor.java62
-rwxr-xr-xsrc/main/java/net/sowgro/npehero/gameplay/SongPlayer.java360
2 files changed, 210 insertions, 212 deletions
diff --git a/src/main/java/net/sowgro/npehero/editor/NotesEditor.java b/src/main/java/net/sowgro/npehero/editor/NotesEditor.java
index da5af33..ca7ddac 100755
--- a/src/main/java/net/sowgro/npehero/editor/NotesEditor.java
+++ b/src/main/java/net/sowgro/npehero/editor/NotesEditor.java
@@ -9,7 +9,6 @@ import javafx.scene.input.KeyEvent;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.media.Media;
-import net.sowgro.npehero.gameplay.Timer;
import net.sowgro.npehero.Driver;
import javafx.scene.Scene;
import javafx.scene.control.Button;
@@ -26,7 +25,6 @@ public class NotesEditor extends Page
String t1 = "Press Start to begin recording. Use the same keys. Note: existing notes will be overwritten.";
String t2 = "Now recording. Press Stop or " + Control.LEGACY_STOP.getKey().toString() + " to finish";
Difficulty diff;
- Timer timer;
PrintWriter writer;
private HBox content = new HBox();
@@ -71,33 +69,33 @@ public class NotesEditor extends Page
// }
Scene scene = Driver.primaryStage.getScene();
- scene.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
- if (e.getCode() == Control.LANE0.getKey()) {
- writer.println("d"+timer);
- cur.setText("d"+timer);
- }
- if (e.getCode() == Control.LANE1.getKey()) {
- writer.println("f"+timer);
- cur.setText("f"+timer);
- }
- if (e.getCode() == Control.LANE2.getKey()) {
- writer.println("s"+timer);
- cur.setText("s"+timer);
- }
- if (e.getCode() == Control.LANE3.getKey()) {
- writer.println("j"+timer);
- cur.setText("j"+timer);
- }
- if (e.getCode() == Control.LANE4.getKey()) {
- writer.println("k"+timer);
- cur.setText("k"+timer);
- }
- if (e.getCode() == Control.LEGACY_STOP.getKey())
- {
- stop();
- }
- e.consume();
- });
+// scene.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
+// if (e.getCode() == Control.LANE0.getKey()) {
+// writer.println("d"+timer);
+// cur.setText("d"+timer);
+// }
+// if (e.getCode() == Control.LANE1.getKey()) {
+// writer.println("f"+timer);
+// cur.setText("f"+timer);
+// }
+// if (e.getCode() == Control.LANE2.getKey()) {
+// writer.println("s"+timer);
+// cur.setText("s"+timer);
+// }
+// if (e.getCode() == Control.LANE3.getKey()) {
+// writer.println("j"+timer);
+// cur.setText("j"+timer);
+// }
+// if (e.getCode() == Control.LANE4.getKey()) {
+// writer.println("k"+timer);
+// cur.setText("k"+timer);
+// }
+// if (e.getCode() == Control.LEGACY_STOP.getKey())
+// {
+// stop();
+// }
+// e.consume();
+// });
Driver.primaryStage.setOnCloseRequest(e -> stop());
}
@@ -110,17 +108,17 @@ public class NotesEditor extends Page
private void start()
{
Sound.playSong(new Media(diff.level.song.toString()));
- timer = new Timer(diff.bpm);
+// timer = new Timer(diff.bpm);
help.setText(t2);
}
private void stop()
{
- try
+ try
{
Sound.stopSong();
// diff.numBeats = (int)Double.parseDouble(timer.toString());
- timer = null;
+// timer = null;
writer.close();
help.setText(t1);
}
diff --git a/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java b/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
index 5361b96..91a3ecc 100755
--- a/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
+++ b/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
@@ -27,200 +27,200 @@ import javafx.util.*;
public class SongPlayer extends HBox {
- static class Lane {
- Target target; //Initializes the button, each parameter is a placeholder that is changed later
- ArrayList<Block> blocks = new ArrayList<>(); //Array list containing all the notes currently on the field for that lane
- Pane pane = new Pane();
- }
+ static class Lane {
+ Target target; //Initializes the button, each parameter is a placeholder that is changed later
+ ArrayList<Block> blocks = new ArrayList<>(); //Array list containing all the notes currently on the field for that lane
+ Pane pane = new Pane();
+ }
- private final int FALL_TIME = 1; // delay for notes falling down the screen (seconds)
- private final double START_DELAY = 1; // seconds
+ private final int FALL_TIME = 1; // delay for notes falling down the screen (seconds)
+ private final double START_DELAY = 1; // seconds
- private final Level level;
- private final Media song;
+ private final Level level;
+ private final Media song;
private final ScoreController scoreCounter;
private final EventHandler<KeyEvent> eventHandler;
- private final Timeline timeline;
+ private final Timeline timeline;
- private boolean done = false;
- private final Lane[] lanes = new Lane[5];
+ private boolean done = false;
+ private final Lane[] lanes = new Lane[5];
- public SongPlayer(Difficulty diff, Page prev, ScoreController scoreController) {
- this.level = diff.level;
- this.song = diff.level.song;
- this.scoreCounter = scoreController; // Uses the song's designated scoreCounter
- double songLength = diff.endTime != 0 ? diff.endTime : diff.level.song.getDuration().toSeconds();
+ public SongPlayer(Difficulty diff, Page prev, ScoreController scoreController) {
+ this.level = diff.level;
+ this.song = diff.level.song;
+ this.scoreCounter = scoreController; // Uses the song's designated scoreCounter
+ double songLength = diff.endTime != 0 ? diff.endTime : diff.level.song.getDuration().toSeconds();
Notes notes = diff.notes;
- Sound.stopSong();
- if (level.background != null) {
- Driver.setBackground(level.background);
- }
- // create targets
+ Sound.stopSong();
+ if (level.background != null) {
+ Driver.setBackground(level.background);
+ }
+ // create targets
for (int i = 0; i < lanes.length; i++) {
- lanes[i] = new Lane();
- var tmp = new Target(level.colors[i], 50, 50, 20, Control.lanes[i].targetString());
- bindTarget(tmp);
- lanes[i].target = tmp;
- }
-
- // create timeline
- timeline = new Timeline();
- for (Note note : notes.list) {
- // schedule each note to send at its time
- KeyFrame kf = new KeyFrame(Duration.seconds(note.getTime() + START_DELAY), _ -> sendNote(note));
- timeline.getKeyFrames().add(kf);
- }
- // schedule the song to start after the delay
- timeline.getKeyFrames().add(new KeyFrame(Duration.seconds(FALL_TIME + START_DELAY), _ -> {
+ lanes[i] = new Lane();
+ var tmp = new Target(level.colors[i], 50, 50, 20, Control.lanes[i].targetString());
+ bindTarget(tmp);
+ lanes[i].target = tmp;
+ }
+
+ // create timeline
+ timeline = new Timeline();
+ for (Note note : notes.list) {
+ // schedule each note to send at its time
+ KeyFrame kf = new KeyFrame(Duration.seconds(note.getTime() + START_DELAY), _ -> sendNote(note));
+ timeline.getKeyFrames().add(kf);
+ }
+ // schedule the song to start after the delay
+ timeline.getKeyFrames().add(new KeyFrame(Duration.seconds(FALL_TIME + START_DELAY), _ -> {
if (!done) {
Sound.playSong(song);
}
}));
- // schedule the game over screen to show at the end
- timeline.getKeyFrames().add(new KeyFrame(Duration.seconds(songLength + START_DELAY), _ -> {
- Driver.setMenu(new GameOver(level, diff, prev, scoreCounter.getScore()));
- cancel();
- }));
-
- // handle keyboard input
- eventHandler = e -> {
- for (int i = 0; i < lanes.length; i++) {
- if (e.getCode() == Control.lanes[i].getKey()) {
- checkNote(lanes[i]);
- }
- }
- if (e.getCode() == Control.LEGACY_PRINT.getKey()) {
- System.out.println("" + timeline.getCurrentTime());
- }
- e.consume();
- };
- Driver.primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, eventHandler);
-
- // layout
- HBox buttonBox = new HBox();
- buttonBox.setAlignment(Pos.BOTTOM_CENTER); //puts the buttons in the center of the screen
- for (Lane lane : lanes) { //places the buttons in the correct row order
- Line line = new Line();
- line.setStroke(lane.target.getFillColor());
- line.setStrokeWidth(2);
- line.setStartY(0);
- line.endYProperty().bind(lane.target.layoutYProperty().subtract(2));
- VBox back = new VBox(line, lane.target);
- back.setAlignment(Pos.BOTTOM_CENTER);
- StackPane stackPane = new StackPane(back, lane.pane);
- buttonBox.getChildren().add(stackPane);
- }
- buttonBox.spacingProperty().bind(super.heightProperty().multiply(20/1080.0));
- super.getChildren().add(buttonBox);
- super.setPadding(new Insets(0, 20, 10, 20));
- super.setAlignment(Pos.BOTTOM_CENTER);
- }
-
- /**
- * Checks if a note should be sent at the current time, and sends the note if it
- * needs to be
- */
- public void sendNote(Note note) {
- Lane lane = lanes[note.lane];
-
- Block block = new Block(lane.target.getColor(), 50, 50, 15);
- block.setCache(true);
- block.setCacheHint(CacheHint.SPEED);
- block.xProperty().bind(lane.pane.widthProperty().subtract(block.widthProperty()).divide(2));
- block.yProperty().bind(block.heightProperty().negate());
- bindBlock(block);
-
- lane.blocks.add(block);
-
- TranslateTransition anim = new TranslateTransition(Duration.seconds(FALL_TIME + 0.105));
- anim.setInterpolator(Interpolator.LINEAR);
- anim.byYProperty().bind(super.heightProperty().add(block.getHeight()).add(75));
- anim.setNode(block);
- anim.play();
- anim.setOnFinished(_ -> {
- if (lane.pane.getChildren().remove(block) && !done) {
- scoreCounter.miss();
- FillTransition ft = new FillTransition(Duration.millis(500), lane.target.rect);
- ft.setFromValue(Color.RED);
- ft.setToValue(lane.target.getFillColor());
- ft.play();
- }
- });
- lane.pane.getChildren().add(block);
- }
-
- /**
- * Binds properties of the target to the screen
- * @param target The target to bind
- */
- private void bindTarget(Target target) {
- bindBlock(target.rect);
+ // schedule the game over screen to show at the end
+ timeline.getKeyFrames().add(new KeyFrame(Duration.seconds(songLength + START_DELAY), _ -> {
+ Driver.setMenu(new GameOver(level, diff, prev, scoreCounter.getScore()));
+ cancel();
+ }));
+
+ // handle keyboard input
+ eventHandler = e -> {
+ for (int i = 0; i < lanes.length; i++) {
+ if (e.getCode() == Control.lanes[i].getKey()) {
+ checkNote(lanes[i]);
+ }
+ }
+ if (e.getCode() == Control.LEGACY_PRINT.getKey()) {
+ System.out.println("" + timeline.getCurrentTime());
+ }
+ e.consume();
+ };
+ Driver.primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, eventHandler);
+
+ // layout
+ HBox buttonBox = new HBox();
+ buttonBox.setAlignment(Pos.BOTTOM_CENTER); //puts the buttons in the center of the screen
+ for (Lane lane : lanes) { //places the buttons in the correct row order
+ Line line = new Line();
+ line.setStroke(lane.target.getFillColor());
+ line.setStrokeWidth(2);
+ line.setStartY(0);
+ line.endYProperty().bind(lane.target.layoutYProperty().subtract(2));
+ VBox back = new VBox(line, lane.target);
+ back.setAlignment(Pos.BOTTOM_CENTER);
+ StackPane stackPane = new StackPane(back, lane.pane);
+ buttonBox.getChildren().add(stackPane);
+ }
+ buttonBox.spacingProperty().bind(super.heightProperty().multiply(20/1080.0));
+ super.getChildren().add(buttonBox);
+ super.setPadding(new Insets(0, 20, 10, 20));
+ super.setAlignment(Pos.BOTTOM_CENTER);
+ }
+
+ /**
+ * Checks if a note should be sent at the current time, and sends the note if it
+ * needs to be
+ */
+ public void sendNote(Note note) {
+ Lane lane = lanes[note.lane];
+
+ Block block = new Block(lane.target.getColor(), 50, 50, 15);
+ block.setCache(true);
+ block.setCacheHint(CacheHint.SPEED);
+ block.xProperty().bind(lane.pane.widthProperty().subtract(block.widthProperty()).divide(2));
+ block.yProperty().bind(block.heightProperty().negate());
+ bindBlock(block);
+
+ lane.blocks.add(block);
+
+ TranslateTransition anim = new TranslateTransition(Duration.seconds(FALL_TIME + 0.105));
+ anim.setInterpolator(Interpolator.LINEAR);
+ anim.byYProperty().bind(super.heightProperty().add(block.getHeight()).add(75));
+ anim.setNode(block);
+ anim.play();
+ anim.setOnFinished(_ -> {
+ if (lane.pane.getChildren().remove(block) && !done) {
+ scoreCounter.miss();
+ FillTransition ft = new FillTransition(Duration.millis(500), lane.target.rect);
+ ft.setFromValue(Color.RED);
+ ft.setToValue(lane.target.getFillColor());
+ ft.play();
+ }
+ });
+ lane.pane.getChildren().add(block);
+ }
+
+ /**
+ * Binds properties of the target to the screen
+ * @param target The target to bind
+ */
+ private void bindTarget(Target target) {
+ bindBlock(target.rect);
// target.rect.strokeWidthProperty().bind(super.widthProperty().divide(120));
- }
-
- private void bindBlock(Rectangle block) {
- var sizeBind = super.heightProperty().multiply(87/1080.0);
- block.heightProperty().bind(sizeBind);
- block.widthProperty().bind(sizeBind);
- var arcBind = super.heightProperty().multiply(20/1080.0);
- block.arcHeightProperty().bind(arcBind);
- block.arcWidthProperty().bind(arcBind);
- }
-
- /**
- * starts the gameLoop, a periodic background task runner that runs the methods within it 60 times every second
- */
- public void start() {
- timeline.play();
- }
-
- /**
- * Stops the gameLoop
- */
- public void cancel() {
- Driver.primaryStage.removeEventFilter(KeyEvent.KEY_PRESSED, eventHandler);
- done = true;
- Sound.stopSong();
- Sound.playSong(Sound.MENU_SONG);
- Driver.setMenuBackground();
- timeline.stop();
- timeline.getKeyFrames().clear(); // for some reason other instances of Timeline will have these keyframes if I don't clear.
- }
-
- /**
- * returns the pos in the lane array of the closest note to the goal
- * @param searchLane The list of blocks to search in
- * @return the position of the note
- */
- private int getClosestNote(ArrayList<Block> searchLane) {
- int pos = 0;
-
- for (int i = 0; i < searchLane.size(); i++) {
- if (distanceToTarget(searchLane.get(i)) < distanceToTarget(searchLane.get(pos))) {
- pos = i;
- }
- }
- return pos;
- }
-
- /**
- * Returns the distance to the goal of the given note
- * @param note Note to check the distance of
- * @return The distance between the note and the target in pixels
- */
- private double distanceToTarget(Block note) {
- return Math.abs((super.getHeight() - note.getTranslateY() + note.getHeight()/2) - lanes[0].target.rect.getLayoutY());
- }
-
- /**
- * When the player hits the key, checks the quality of the hit
- * @param lane the lane 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(Lane lane) {
- ArrayList<Block> blocks = lane.blocks;
+ }
+
+ private void bindBlock(Rectangle block) {
+ var sizeBind = super.heightProperty().multiply(87/1080.0);
+ block.heightProperty().bind(sizeBind);
+ block.widthProperty().bind(sizeBind);
+ var arcBind = super.heightProperty().multiply(20/1080.0);
+ block.arcHeightProperty().bind(arcBind);
+ block.arcWidthProperty().bind(arcBind);
+ }
+
+ /**
+ * starts the gameLoop, a periodic background task runner that runs the methods within it 60 times every second
+ */
+ public void start() {
+ timeline.play();
+ }
+
+ /**
+ * Stops the gameLoop
+ */
+ public void cancel() {
+ Driver.primaryStage.removeEventFilter(KeyEvent.KEY_PRESSED, eventHandler);
+ done = true;
+ Sound.stopSong();
+ Sound.playSong(Sound.MENU_SONG);
+ Driver.setMenuBackground();
+ timeline.stop();
+ timeline.getKeyFrames().clear(); // for some reason other instances of Timeline will have these keyframes if I don't clear.
+ }
+
+ /**
+ * returns the pos in the lane array of the closest note to the goal
+ * @param searchLane The list of blocks to search in
+ * @return the position of the note
+ */
+ private int getClosestNote(ArrayList<Block> searchLane) {
+ int pos = 0;
+
+ for (int i = 0; i < searchLane.size(); i++) {
+ if (distanceToTarget(searchLane.get(i)) < distanceToTarget(searchLane.get(pos))) {
+ pos = i;
+ }
+ }
+ return pos;
+ }
+
+ /**
+ * Returns the distance to the goal of the given note
+ * @param note Note to check the distance of
+ * @return The distance between the note and the target in pixels
+ */
+ private double distanceToTarget(Block note) {
+ return Math.abs((super.getHeight() - note.getTranslateY() + note.getHeight()/2) - lanes[0].target.rect.getLayoutY());
+ }
+
+ /**
+ * When the player hits the key, checks the quality of the hit
+ * @param lane the lane 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(Lane lane) {
+ ArrayList<Block> blocks = lane.blocks;
if (blocks.isEmpty() || done) {
return -1;
}
@@ -250,6 +250,6 @@ public class SongPlayer extends HBox {
return 0;
}
return -1;
- }
+ }
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 22:25:54 +0000