diff options
| author | Aidan Ross <aross02@fairport.org> | 2023-05-24 08:54:44 -0400 |
|---|---|---|
| committer | Aidan Ross <aross02@fairport.org> | 2023-05-24 08:54:44 -0400 |
| commit | b47c8be84cc5b269e32dc44f7e67a1dd426d5349 (patch) | |
| tree | 14d1eecd5182b92d4ee7c99cff1cbd3a758ffbb0 /src/fallTest | |
| parent | 4b24f4b8e14cdcb6f03db1a3bb14a7417c638672 (diff) | |
| download | NPEhero-b47c8be84cc5b269e32dc44f7e67a1dd426d5349.tar.gz NPEhero-b47c8be84cc5b269e32dc44f7e67a1dd426d5349.tar.bz2 NPEhero-b47c8be84cc5b269e32dc44f7e67a1dd426d5349.zip | |
Trying to combine every file oh my god
Diffstat (limited to '')
| -rw-r--r-- | src/fallTest/Driver.java | 4 | ||||
| -rw-r--r-- | src/fallTest/LaneInfo.java | 28 | ||||
| -rw-r--r-- | src/fallTest/NoteNode.java | 20 | ||||
| -rw-r--r-- | src/fallTest/newSongPlayer.java | 4 |
4 files changed, 4 insertions, 52 deletions
diff --git a/src/fallTest/Driver.java b/src/fallTest/Driver.java index 08a424b..bb1d73e 100644 --- a/src/fallTest/Driver.java +++ b/src/fallTest/Driver.java @@ -33,9 +33,9 @@ public class Driver extends Application Scene primaryScene = new Scene(primaryPane, 800, 600); primaryScene.getStylesheets().add("gui/style.css"); primaryStage.setScene(primaryScene); - newSongPlayer player = new newSongPlayer(); + //newSongPlayer player = new newSongPlayer(); primaryStage.setTitle("TEST"); - primaryPane.getChildren().add(player); + //primaryPane.getChildren().add(player); setBackground("assets/water.png"); primaryStage.show(); } diff --git a/src/fallTest/LaneInfo.java b/src/fallTest/LaneInfo.java deleted file mode 100644 index 7fe5567..0000000 --- a/src/fallTest/LaneInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -package fallTest;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Queue;
-
-import javax.swing.JButton;
-
-public class LaneInfo {
- //test
- Queue<NoteInfo> sends = new LinkedList<NoteInfo>(); //Queue that dictates when to send the notes
- ArrayList<Block> nodes = new ArrayList<Block>(); //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<Block> getNodes() {
- return nodes;
- }
-
- public Queue<NoteInfo> getSends() {
- return sends;
- }
-}
diff --git a/src/fallTest/NoteNode.java b/src/fallTest/NoteNode.java deleted file mode 100644 index 64e1b8a..0000000 --- a/src/fallTest/NoteNode.java +++ /dev/null @@ -1,20 +0,0 @@ -package fallTest;
-
-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));
- public NoteNode(NoteField newInfo, Block newVis) {
- vis=newVis;
- info = newInfo;
- anim.setNode(vis);
- anim.setByY(height);
- anim.setCycleCount(1);
- anim.setAutoReverse(false);
- anim.play();
- }
-}
diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java index 02f828a..d93d098 100644 --- a/src/fallTest/newSongPlayer.java +++ b/src/fallTest/newSongPlayer.java @@ -106,7 +106,7 @@ public class newSongPlayer extends Pane spaceSends.add(new NoteInfo(12000));
}
- public newSongPlayer(Level lvl, Difficulty d, Pane p, ScoreController cntrl){
+ public newSongPlayer(main.Level lvl, Difficulty d, Pane p, ScoreController cntrl){
}
@@ -129,7 +129,7 @@ public class newSongPlayer extends Pane this.getScene().setOnKeyPressed(e -> {
if (e.getCode() == KeyCode.D) {
System.out.println("D");
- if (dLane.size() > 0 && distanceToGoal(dLane.get(getClosestNote(dLane))) < ()) {
+ 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");
|