From f710ad78bce5e2e385896550ec2ae4a3418981b7 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Thu, 3 Feb 2022 19:51:16 -0500 Subject: [PATCH] side preview (needs optimization) --- source/SongLoad.hx | 39 ++++++++++++++++++++++++-------- source/charting/ChartingState.hx | 5 +++- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/source/SongLoad.hx b/source/SongLoad.hx index 55601394e..1fa1aa3fc 100644 --- a/source/SongLoad.hx +++ b/source/SongLoad.hx @@ -237,6 +237,21 @@ class SongLoad } } + public static function castNoteDataToNoteData(noteStuff:Array) + { + if (noteStuff == null) + return; + + for (sectionIndex => section in noteStuff) + { + for (noteIndex => noteTypedefShit in section.sectionNotes) + { + trace(noteTypedefShit); + noteStuff[sectionIndex].sectionNotes[noteIndex] = noteTypedefShit; + } + } + } + public static function parseJSONshit(rawJson:String):SwagSong { var songParsed:Dynamic = Json.parse(rawJson); @@ -248,18 +263,24 @@ class SongLoad { swagShit.difficulties.push(diff); swagShit.noteMap[diff] = cast Reflect.field(songParsed.song.notes, diff); + trace(swagShit.noteMap[diff]); + castArrayToNoteData(swagShit.noteMap[diff]); - switch (diff) - { - case "easy": - castArrayToNoteData(swagShit.notes.hard); + // castNoteDataToNoteData(swagShit.noteMap[diff]); - case "normal": - castArrayToNoteData(swagShit.notes.normal); - case "hard": - castArrayToNoteData(swagShit.notes.hard); - } + /* + switch (diff) + { + case "easy": + castArrayToNoteData(swagShit.notes.hard); + + case "normal": + castArrayToNoteData(swagShit.notes.normal); + case "hard": + castArrayToNoteData(swagShit.notes.hard); + } + */ } for (diff in swagShit.difficulties) diff --git a/source/charting/ChartingState.hx b/source/charting/ChartingState.hx index c91f845e5..799486f14 100644 --- a/source/charting/ChartingState.hx +++ b/source/charting/ChartingState.hx @@ -1177,7 +1177,10 @@ class ChartingState extends MusicBeatState 0xFFFF0000; } - sidePreview.drawRect(5 * notes.noteData, FlxMath.remapToRange(notes.strumTime, 0, FlxG.sound.music.length, 0, FlxG.height), 5, 1, col); + var noteFlip:Int = (sideSection.mustHitSection ? 1 : -1); + var noteX:Float = 5 * (((notes.noteData - 4) * noteFlip) + 4); + + sidePreview.drawRect(noteX, FlxMath.remapToRange(notes.strumTime, 0, FlxG.sound.music.length, 0, FlxG.height), 5, 1, col); } } }