cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-04-07 12:44:29 +00:00
Code Issues Releases Wiki Activity

Fixes and improvements to LatencyState

Browse source
This commit is contained in:
EliteMasterEric 2024-04-04 19:46:08 -04:00
parent 9a874d5293
commit 72a3742890
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
source/funkin/ui/debug/latency/LatencyState.hx
View file

@ -27,7 +27,7 @@ class LatencyState extends MusicBeatSubState
{ {
var visualOffsetText:FlxText; var visualOffsetText:FlxText;
var offsetText:FlxText; var offsetText:FlxText;
var noteGrp:Array<SongNoteData>; var noteGrp:Array<SongNoteData> = [];
var strumLine:Strumline; var strumLine:Strumline;
var blocks:FlxTypedGroup<FlxSprite>; var blocks:FlxTypedGroup<FlxSprite>;
@ -39,7 +39,7 @@ class LatencyState extends MusicBeatSubState
var beatTrail:FlxSprite; var beatTrail:FlxSprite;
var diffGrp:FlxTypedGroup<FlxText>; var diffGrp:FlxTypedGroup<FlxText>;
var offsetsPerBeat:Array<Null<Int>> = []; var offsetsPerBeat:Array<Null<Int>> = [];
var swagSong:FlxSound; var swagSong:HomemadeMusic;
var previousVolume:Float; var previousVolume:Float;
@ -84,7 +84,7 @@ class LatencyState extends MusicBeatSubState
else else
previousVolume = 1; // defaults to 1 if no music is playing 🤔 also fuck it, emoji in code comment 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.loadEmbedded(Paths.sound('soundTest'), true);
swagSong.looped = true; swagSong.looped = true;
swagSong.play(); swagSong.play();
@ -99,7 +99,7 @@ class LatencyState extends MusicBeatSubState
FlxG.stage.addEventListener(KeyboardEvent.KEY_DOWN, key -> { FlxG.stage.addEventListener(KeyboardEvent.KEY_DOWN, key -> {
trace(key.charCode); trace(key.charCode);
if (key.charCode == 120) generateBeatStuff(); // if (key.charCode == 120) generateBeatStuff();
trace("\tEVENT PRESS: \t" + FlxG.sound.music.time + " " + Timer.stamp()); trace("\tEVENT PRESS: \t" + FlxG.sound.music.time + " " + Timer.stamp());
// trace(FlxG.sound.music.prevTimestamp); // trace(FlxG.sound.music.prevTimestamp);
@ -116,9 +116,6 @@ class LatencyState extends MusicBeatSubState
Conductor.instance.forceBPM(60); Conductor.instance.forceBPM(60);
noteGrp = new FlxTypedGroup<NoteSprite>();
add(noteGrp);
diffGrp = new FlxTypedGroup<FlxText>(); diffGrp = new FlxTypedGroup<FlxText>();
add(diffGrp); add(diffGrp);
@ -264,7 +261,7 @@ class LatencyState extends MusicBeatSubState
trace(FlxG.sound.music._channel.position); 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; // localConductor.songPosition += (Timer.stamp() * 1000) - FlxG.sound.music.prevTimestamp;
@ -334,18 +331,6 @@ class LatencyState extends MusicBeatSubState
{ {
close(); 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); super.update(elapsed);
} }

2
source/funkin/ui/freeplay/SongMenuItem.hx
View file

@ -82,7 +82,7 @@ class SongMenuItem extends FlxSpriteGroup
grayscaleShader = new Grayscale(1); grayscaleShader = new Grayscale(1);
diffRatingSprite = new FlxSprite(145, 90).loadGraphic(Paths.image('freeplay/diffRatings/diff00')); 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); diffRatingSprite.origin.set(capsule.origin.x - diffRatingSprite.x, capsule.origin.y - diffRatingSprite.y);
// TODO: Readd once ratings are fully implemented // TODO: Readd once ratings are fully implemented
// add(diffRatingSprite); // add(diffRatingSprite);