From c8bb8c01f661d4a4f99802066fe1e9591e19bfca Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Tue, 19 Oct 2021 18:38:39 +0900 Subject: [PATCH] Multiple hold note markers for deleting and hold notes --- LLSIG/src/main/java/LLSIG/LLSIG.java | 13 ++++++++++++- LLSIG/src/main/java/LLSIG/Lane.java | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/LLSIG/src/main/java/LLSIG/LLSIG.java b/LLSIG/src/main/java/LLSIG/LLSIG.java index 824558b..0c064d8 100644 --- a/LLSIG/src/main/java/LLSIG/LLSIG.java +++ b/LLSIG/src/main/java/LLSIG/LLSIG.java @@ -471,6 +471,11 @@ public class LLSIG implements KeyListener,MouseWheelListener{ List map = noteBeatMap.getOrDefault(n.beatSnapStart, new ArrayList()); map.add(n); noteBeatMap.putIfAbsent(n.beatSnapStart, map); + if (n.getNoteType()==NoteType.HOLD) { + map = noteBeatMap.getOrDefault(n.beatSnapEnd, new ArrayList()); + map.add(n); + noteBeatMap.putIfAbsent(n.beatSnapEnd, map); + } } } for (Double d : noteBeatMap.keySet()) { @@ -487,6 +492,10 @@ public class LLSIG implements KeyListener,MouseWheelListener{ } } lastHold=!lastHold; + } else { + for (Note n : notes) { + n.multiple=n.multiple2=false; + } } } } @@ -549,6 +558,7 @@ public class LLSIG implements KeyListener,MouseWheelListener{ lastNote.active2=false; clap.setFramePosition(0); clap.start(); + updateMultipleNoteMarkers(); } } LLSIG.game.lanes.get(lane).keyPressed=false; @@ -564,6 +574,7 @@ public class LLSIG implements KeyListener,MouseWheelListener{ lastNote.setBeatSnapEnd(noteBeat); lastNote.active2=false; //LLSIG.game.lanes.get(lane).lastNoteAdded=null; + updateMultipleNoteMarkers(); } } LLSIG.game.lanes.get(lane).keyPressed=false; @@ -589,7 +600,7 @@ public class LLSIG implements KeyListener,MouseWheelListener{ public void mouseWheelMoved(MouseWheelEvent e) { if (EDITOR) { if (e.getWheelRotation()!=0) { - if (Math.abs(e.getWheelRotation())<0) { + if (e.getWheelRotation()<0) { //Rotated up. EDITOR_CURSOR_BEAT=Math.max(EDITOR_CURSOR_BEAT-(1d/EDITOR_BEAT_DIVISIONS),0); } else { diff --git a/LLSIG/src/main/java/LLSIG/Lane.java b/LLSIG/src/main/java/LLSIG/Lane.java index 35e341a..bcd8a12 100644 --- a/LLSIG/src/main/java/LLSIG/Lane.java +++ b/LLSIG/src/main/java/LLSIG/Lane.java @@ -23,6 +23,7 @@ public class Lane{ public void clearOutDeletedNotes() { if (noteChart.removeIf(note->note.deleted)) { System.out.println("Deleted note from "+this); + LLSIG.updateMultipleNoteMarkers(); } } public boolean noteExists() {