sigonasr2/LLSIG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Provide song previewing in the editor.

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2, Sig, Sigo 2021-10-14 06:29:16 +00:00
parent a895afca5b
commit e1e59888df
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
LLSIG/src/main/java/LLSIG/LLSIG.java
View File

@ -53,6 +53,7 @@ public class LLSIG implements KeyListener{
public boolean EDITOR = true; //Whether or not we are in beatmap editing mode. public boolean EDITOR = true; //Whether or not we are in beatmap editing mode.
public static double EDITOR_CURSOR_BEAT = 0; public static double EDITOR_CURSOR_BEAT = 0;
public static double PREVIOUS_CURSOR_BEAT = 0;
public static int EDITOR_BEAT_DIVISIONS = 4; public static int EDITOR_BEAT_DIVISIONS = 4;
public static BeatTiming EDITOR_CURSOR_WINDOW; public static BeatTiming EDITOR_CURSOR_WINDOW;
@ -85,7 +86,7 @@ public class LLSIG implements KeyListener{
public final static long TIMEPERTICK = 16666667l; public final static long TIMEPERTICK = 16666667l;
public static double DRAWTIME=0; public static double DRAWTIME=0;
public static Clip metronome_click1,metronome_click2; public static Clip metronome_click1,metronome_click2,clap;
LLSIG(JFrame f) { LLSIG(JFrame f) {
@ -102,6 +103,9 @@ public class LLSIG implements KeyListener{
audioInputStream = AudioSystem.getAudioInputStream(new File("se/metronome_click2.wav").getAbsoluteFile()); audioInputStream = AudioSystem.getAudioInputStream(new File("se/metronome_click2.wav").getAbsoluteFile());
metronome_click2 = AudioSystem.getClip(); metronome_click2 = AudioSystem.getClip();
metronome_click2.open(audioInputStream); metronome_click2.open(audioInputStream);
audioInputStream = AudioSystem.getAudioInputStream(new File("se/clap.wav").getAbsoluteFile());
clap = AudioSystem.getClip();
clap.open(audioInputStream);
} catch (LineUnavailableException e) { } catch (LineUnavailableException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -135,6 +139,11 @@ public class LLSIG implements KeyListener{
while (true) { while (true) {
long startTime = System.nanoTime(); long startTime = System.nanoTime();
frameCount++; frameCount++;
if (PLAYING&&EDITOR) {
if (!musicPlayer.isPaused()) {
EDITOR_CURSOR_BEAT = (musicPlayer.getPlayPosition()-offset)/beatDelay;
}
}
canvas.update(); canvas.update();
if (PLAYING) { if (PLAYING) {
for (BeatTiming bt : timings) { for (BeatTiming bt : timings) {
@ -297,7 +306,7 @@ public class LLSIG implements KeyListener{
case KeyEvent.VK_K:{lane=6;}break; case KeyEvent.VK_K:{lane=6;}break;
case KeyEvent.VK_L:{lane=7;}break; case KeyEvent.VK_L:{lane=7;}break;
case KeyEvent.VK_SEMICOLON:{lane=8;}break; case KeyEvent.VK_SEMICOLON:{lane=8;}break;
case KeyEvent.VK_P:{if (LLSIG.game.PLAYING&&musicPlayer.isPaused()) {musicPlayer.resume();} else {musicPlayer.pause();}}break; case KeyEvent.VK_P:{if (LLSIG.game.PLAYING&&musicPlayer.isPaused()) {musicPlayer.seek((long)(Math.floor(EDITOR_CURSOR_BEAT*beatDelay)));PREVIOUS_CURSOR_BEAT=EDITOR_CURSOR_BEAT;musicPlayer.resume();} else {musicPlayer.pause();EDITOR_CURSOR_BEAT=PREVIOUS_CURSOR_BEAT;}}break;
case KeyEvent.VK_Q:{if (LLSIG.game.PLAYING) {musicPlayer.pause();SaveSongData(song,lanes);}}break; case KeyEvent.VK_Q:{if (LLSIG.game.PLAYING) {musicPlayer.pause();SaveSongData(song,lanes);}}break;
case KeyEvent.VK_DOWN:{EDITOR_CURSOR_BEAT+=1d/EDITOR_BEAT_DIVISIONS;}break; case KeyEvent.VK_DOWN:{EDITOR_CURSOR_BEAT+=1d/EDITOR_BEAT_DIVISIONS;}break;
case KeyEvent.VK_RIGHT:{EDITOR_BEAT_DIVISIONS=Math.max(EDITOR_BEAT_DIVISIONS*2,1);EDITOR_CURSOR_BEAT=Math.floor(EDITOR_CURSOR_BEAT*EDITOR_BEAT_DIVISIONS)/EDITOR_BEAT_DIVISIONS;}break; case KeyEvent.VK_RIGHT:{EDITOR_BEAT_DIVISIONS=Math.max(EDITOR_BEAT_DIVISIONS*2,1);EDITOR_CURSOR_BEAT=Math.floor(EDITOR_CURSOR_BEAT*EDITOR_BEAT_DIVISIONS)/EDITOR_BEAT_DIVISIONS;}break;

6
LLSIG/src/main/java/LLSIG/Player.java
View File

@ -32,11 +32,7 @@ public class Player {
return jlpp.getStatus()==Status.PAUSED; return jlpp.getStatus()==Status.PAUSED;
} }
public void resume() { public void resume() {
new Thread() { jlpp.play();
public void run() {
jlpp.play();
}
}.start();
} }
public void kill() { public void kill() {
jlpp.dispose(); jlpp.dispose();