cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-11 16:05:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #241 from FunkinCrew/copy-preview

Browse source 
note highlight preview
This commit is contained in:
Eric 2023-12-12 19:29:06 -05:00 committed by GitHub
parent 8f85e09de8 796e1fcbab
commit a6e7fc6d2c
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -720,7 +720,23 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
/** /**
* The notes which are currently in the user's selection. * The notes which are currently in the user's selection.
*/ */
var currentNoteSelection:Array<SongNoteData> = []; var currentNoteSelection(default, set):Array<SongNoteData> = [];
function set_currentNoteSelection(value:Array<SongNoteData>):Array<SongNoteData>
{
currentNoteSelection = value;
if (currentNoteSelection.length > 0)
{
notePreview.addNotes(currentNoteSelection, Std.int(songLengthInMs), true);
}
else
{
notePreviewDirty = true;
}
return currentNoteSelection;
}
/** /**
* The events which are currently in the user's selection. * The events which are currently in the user's selection.

23
source/funkin/ui/debug/charting/components/ChartEditorNotePreview.hx
View file

@ -26,6 +26,7 @@ class ChartEditorNotePreview extends FlxSprite
static final UP_COLOR:FlxColor = 0xFF00CC00; static final UP_COLOR:FlxColor = 0xFF00CC00;
static final RIGHT_COLOR:FlxColor = 0xFFCC1111; static final RIGHT_COLOR:FlxColor = 0xFFCC1111;
static final EVENT_COLOR:FlxColor = 0xFF111111; static final EVENT_COLOR:FlxColor = 0xFF111111;
static final SELECTED_COLOR:FlxColor = 0xFFFFFF00;
var previewHeight:Int; var previewHeight:Int;
@ -57,11 +58,11 @@ class ChartEditorNotePreview extends FlxSprite
* @param note The data for the note. * @param note The data for the note.
* @param songLengthInMs The total length of the song in milliseconds. * @param songLengthInMs The total length of the song in milliseconds.
*/ */
public function addNote(note:SongNoteData, songLengthInMs:Int):Void public function addNote(note:SongNoteData, songLengthInMs:Int, ?isSelection:Bool = false):Void
{ {
var noteDir:Int = note.getDirection(); var noteDir:Int = note.getDirection();
var mustHit:Bool = note.getStrumlineIndex() == 0; var mustHit:Bool = note.getStrumlineIndex() == 0;
drawNote(noteDir, mustHit, Std.int(note.time), songLengthInMs); drawNote(noteDir, mustHit, Std.int(note.time), songLengthInMs, isSelection);
} }
/** /**
@ -79,11 +80,11 @@ class ChartEditorNotePreview extends FlxSprite
* @param notes The data for the notes. * @param notes The data for the notes.
* @param songLengthInMs The total length of the song in milliseconds. * @param songLengthInMs The total length of the song in milliseconds.
*/ */
public function addNotes(notes:Array<SongNoteData>, songLengthInMs:Int):Void public function addNotes(notes:Array<SongNoteData>, songLengthInMs:Int, ?isSelection:Bool = false):Void
{ {
for (note in notes) for (note in notes)
{ {
addNote(note, songLengthInMs); addNote(note, songLengthInMs, isSelection);
} }
} }
@ -106,8 +107,9 @@ class ChartEditorNotePreview extends FlxSprite
* @param mustHit False if opponent, true if player. * @param mustHit False if opponent, true if player.
* @param strumTimeInMs Time in milliseconds to strum the note. * @param strumTimeInMs Time in milliseconds to strum the note.
* @param songLengthInMs Length of the song in milliseconds. * @param songLengthInMs Length of the song in milliseconds.
* @param isSelection If current note is selected note, which then it's forced to be green
*/ */
function drawNote(dir:Int, mustHit:Bool, strumTimeInMs:Int, songLengthInMs:Int):Void public function drawNote(dir:Int, mustHit:Bool, strumTimeInMs:Int, songLengthInMs:Int, ?isSelection:Bool = false):Void
{ {
var color:FlxColor = switch (dir) var color:FlxColor = switch (dir)
{ {
@ -118,13 +120,20 @@ class ChartEditorNotePreview extends FlxSprite
default: EVENT_COLOR; default: EVENT_COLOR;
}; };
var noteHeight:Int = NOTE_HEIGHT;
if (isSelection != null && isSelection)
{
color = SELECTED_COLOR;
noteHeight += 1;
}
var noteX:Float = NOTE_WIDTH * dir; var noteX:Float = NOTE_WIDTH * dir;
if (mustHit) noteX += NOTE_WIDTH * 4; if (mustHit) noteX += NOTE_WIDTH * 4;
if (dir == -1) noteX = NOTE_WIDTH * 8; if (dir == -1) noteX = NOTE_WIDTH * 8;
var noteY:Float = FlxMath.remapToRange(strumTimeInMs, 0, songLengthInMs, 0, previewHeight); var noteY:Float = FlxMath.remapToRange(strumTimeInMs, 0, songLengthInMs, 0, previewHeight);
drawRect(noteX, noteY, NOTE_WIDTH, noteHeight, color);
drawRect(noteX, noteY, NOTE_WIDTH, NOTE_HEIGHT, color);
} }
function eraseNote(dir:Int, mustHit:Bool, strumTimeInMs:Int, songLengthInMs:Int):Void function eraseNote(dir:Int, mustHit:Bool, strumTimeInMs:Int, songLengthInMs:Int):Void