diff --git a/source/funkin/ui/debug/latency/LatencyState.hx b/source/funkin/ui/debug/latency/LatencyState.hx index 91cf2013b..9d1bcde71 100644 --- a/source/funkin/ui/debug/latency/LatencyState.hx +++ b/source/funkin/ui/debug/latency/LatencyState.hx @@ -27,7 +27,7 @@ class LatencyState extends MusicBeatSubState { var visualOffsetText:FlxText; var offsetText:FlxText; - var noteGrp:Array; + var noteGrp:Array = []; var strumLine:Strumline; var blocks:FlxTypedGroup; @@ -39,7 +39,7 @@ class LatencyState extends MusicBeatSubState var beatTrail:FlxSprite; var diffGrp:FlxTypedGroup; var offsetsPerBeat:Array> = []; - var swagSong:FlxSound; + var swagSong:HomemadeMusic; var previousVolume:Float; @@ -84,7 +84,7 @@ class LatencyState extends MusicBeatSubState else previousVolume = 1; // defaults to 1 if no music is playing 🤔 also fuck it, emoji in code comment - swagSong = new FlxSound(); + swagSong = new HomemadeMusic(); swagSong.loadEmbedded(Paths.sound('soundTest'), true); swagSong.looped = true; swagSong.play(); @@ -99,7 +99,7 @@ class LatencyState extends MusicBeatSubState FlxG.stage.addEventListener(KeyboardEvent.KEY_DOWN, key -> { trace(key.charCode); - if (key.charCode == 120) generateBeatStuff(); + // if (key.charCode == 120) generateBeatStuff(); trace("\tEVENT PRESS: \t" + FlxG.sound.music.time + " " + Timer.stamp()); // trace(FlxG.sound.music.prevTimestamp); @@ -116,9 +116,6 @@ class LatencyState extends MusicBeatSubState Conductor.instance.forceBPM(60); - noteGrp = new FlxTypedGroup(); - add(noteGrp); - diffGrp = new FlxTypedGroup(); add(diffGrp); @@ -264,7 +261,7 @@ class LatencyState extends MusicBeatSubState trace(FlxG.sound.music._channel.position); */ - localConductor.update(swagSong.time, false, true); + localConductor.update(swagSong.time, false); // localConductor.songPosition += (Timer.stamp() * 1000) - FlxG.sound.music.prevTimestamp; @@ -334,18 +331,6 @@ class LatencyState extends MusicBeatSubState { close(); } - noteGrp.forEach(function(daNote:NoteSprite) { - daNote.y = (strumLine.y - ((Conductor.instance.songPosition - Conductor.instance.instrumentalOffset) - daNote.noteData.time) * 0.45); - daNote.x = strumLine.x + 30; - - if (daNote.y < strumLine.y) daNote.alpha = 0.5; - - if (daNote.y < 0 - daNote.height) - { - daNote.alpha = 1; - // daNote.data.strumTime += Conductor.instance.beatLengthMs * 8; - } - }); super.update(elapsed); } diff --git a/source/funkin/ui/freeplay/SongMenuItem.hx b/source/funkin/ui/freeplay/SongMenuItem.hx index f8b3d7ac3..bfb40c9ac 100644 --- a/source/funkin/ui/freeplay/SongMenuItem.hx +++ b/source/funkin/ui/freeplay/SongMenuItem.hx @@ -82,7 +82,7 @@ class SongMenuItem extends FlxSpriteGroup grayscaleShader = new Grayscale(1); diffRatingSprite = new FlxSprite(145, 90).loadGraphic(Paths.image('freeplay/diffRatings/diff00')); - diffRatingSprite.shader = grayscaleShader; + // diffRatingSprite.shader = grayscaleShader; diffRatingSprite.origin.set(capsule.origin.x - diffRatingSprite.x, capsule.origin.y - diffRatingSprite.y); // TODO: Readd once ratings are fully implemented // add(diffRatingSprite);