diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .settings/org.eclipse.core.resources.prefs | 2 | ||||
| -rw-r--r-- | .settings/org.eclipse.jdt.core.prefs | 15 | ||||
| -rw-r--r-- | levels/intoMyArms/Medium/leaderboard.json | 1 | ||||
| -rw-r--r-- | levels/intoMyArms/Medium/metadata.json | 1 | ||||
| -rw-r--r-- | levels/intoMyArms/Medium/notes.txt | 0 | ||||
| -rw-r--r-- | levels/intoMyArms/metadata.json | 1 | ||||
| -rw-r--r-- | src/devmenu/NotesEditor.java | 25 | ||||
| -rw-r--r-- | src/main/Difficulty.java | 4 | ||||
| -rw-r--r-- | src/main/Level.java | 4 |
10 files changed, 27 insertions, 27 deletions
@@ -1,3 +1,4 @@ *.class /bin/ /.vscode/ +/.settings/ diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index a58ebdc..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,15 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/levels/intoMyArms/Medium/leaderboard.json b/levels/intoMyArms/Medium/leaderboard.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/levels/intoMyArms/Medium/leaderboard.json @@ -0,0 +1 @@ +[]
\ No newline at end of file diff --git a/levels/intoMyArms/Medium/metadata.json b/levels/intoMyArms/Medium/metadata.json new file mode 100644 index 0000000..fe3e406 --- /dev/null +++ b/levels/intoMyArms/Medium/metadata.json @@ -0,0 +1 @@ +{"numBeats":0,"title":"Medium","bpm":175}
\ No newline at end of file diff --git a/levels/intoMyArms/Medium/notes.txt b/levels/intoMyArms/Medium/notes.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/levels/intoMyArms/Medium/notes.txt diff --git a/levels/intoMyArms/metadata.json b/levels/intoMyArms/metadata.json new file mode 100644 index 0000000..e3f918a --- /dev/null +++ b/levels/intoMyArms/metadata.json @@ -0,0 +1 @@ +{"color1":"0xff0000ff","color2":"0x0000ffff","artist":"COIN","title":"Into My Arms","color5":"0xffff00ff","color3":"0x008000ff","desc":"No description","color4":"0x800080ff"}
\ No newline at end of file diff --git a/src/devmenu/NotesEditor.java b/src/devmenu/NotesEditor.java index 400d547..41bc1c3 100644 --- a/src/devmenu/NotesEditor.java +++ b/src/devmenu/NotesEditor.java @@ -5,6 +5,10 @@ import gameplay.Timer; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.layout.HBox; +import javafx.scene.layout.VBox; +import javafx.scene.media.Media; +import javafx.scene.media.MediaPlayer; +import javafx.scene.media.MediaView; import javafx.scene.text.Text; import javafx.stage.Stage; import main.Difficulty; @@ -12,23 +16,29 @@ import sound.AudioFilePlayer; public class NotesEditor { + MediaPlayer mediaPlayer; Difficulty diff; AudioFilePlayer music; Timer timer; public NotesEditor(Difficulty diff) { this.diff = diff; - - Text timerDisplay = new Text("TIMER"); Button start = new Button("Start"); start.setOnAction(e -> start()); - Button stop = new Button("Stop"); + Button stop = new Button("Pause"); stop.setOnAction(e -> stop()); - HBox main = new HBox(); - main.getChildren().addAll(timerDisplay,start,stop); + Button print = new Button("print"); + print.setOnAction(e -> System.out.println(timer.time())); + + Media song = new Media(diff.level.song.toURI().toString()); + mediaPlayer = new MediaPlayer(song); + new MediaView(mediaPlayer); + + VBox main = new VBox(); + main.getChildren().addAll(start,stop,print); Scene scene = new Scene(main); Stage primaryStage = new Stage(); @@ -38,12 +48,13 @@ public class NotesEditor private void start() { - music = new AudioFilePlayer(new File(diff.thisDir, "song.wav").toPath().toString()); + mediaPlayer.play(); + timer = new Timer(diff.bpm); } private void stop() { - + mediaPlayer.pause(); } }
\ No newline at end of file diff --git a/src/main/Difficulty.java b/src/main/Difficulty.java index 18dabb3..c7a289a 100644 --- a/src/main/Difficulty.java +++ b/src/main/Difficulty.java @@ -19,14 +19,16 @@ public class Difficulty public File notes; public int bpm; public int numBeats; + public Level level; /** * Creates a new Difficulty and gives it a file path * @param newDir: The file path of the Difficulty */ - public Difficulty(File newDir) + public Difficulty(File newDir, Level level) { thisDir = newDir; + this.level = level; } /** diff --git a/src/main/Level.java b/src/main/Level.java index 591bd9a..cb16489 100644 --- a/src/main/Level.java +++ b/src/main/Level.java @@ -46,7 +46,7 @@ public class Level { if (cur.isDirectory()) //all subfolders within a level folder are difficulties { - Difficulty diff = new Difficulty(cur); + Difficulty diff = new Difficulty(cur,this); diff.readData(); diffList.add(diff); } @@ -151,7 +151,7 @@ public class Level } catch (IOException e) { e.printStackTrace(); } - Difficulty temp = new Difficulty(diffDir); + Difficulty temp = new Difficulty(diffDir,this); temp.title = text; temp.writeMetadata(); temp.writeLeaderboard(); |