Skip to content

optimize __notePerStrum #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HEIHUAa wants to merge 4 commits into
base: main
Choose a base branch
from
+38 −24
Open

optimize __notePerStrum #901

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d6b425
Update StrumLine.hx
HEIHUAa Feb 5, 2026
c1ec3e1
Update StrumLine.hx
HEIHUAa Feb 5, 2026
60a5267
Update StrumLine.hx
HEIHUAa Feb 5, 2026
98e879a
Update StrumLine.hx
HEIHUAa Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 38 additions & 24 deletions source/funkin/game/StrumLine.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,21 +258,28 @@ class StrumLine extends FlxTypedGroup<Strum> {
}
}
function __inputProcessJustPressed(note:Note) {
if (__justPressed[note.strumID] && !note.isSustainNote && !note.wasGoodHit && note.canBeHit) {
var cur = __notePerStrum[note.strumID];
var songPos = __updateNote_songPos;

var noteDist = Math.abs(note.strumTime - songPos);
var curDist = cur != null ? Math.abs(cur.strumTime - songPos) : 999999;
var strumID = note.strumID;
if (!__justPressed[strumID] || note.isSustainNote || note.wasGoodHit || !note.canBeHit) return;

var cur = __notePerStrum[strumID];
if (cur == null) {
__notePerStrum[strumID] = note;
return;
}

var notePenalty = note.avoid ? 1 : 0;
var curPenalty = (cur != null && cur.avoid) ? 1 : 0;
var songPos = __updateNote_songPos;
var noteDist = Math.abs(note.strumTime - songPos);

if (cur == null
|| notePenalty < curPenalty
|| (notePenalty == curPenalty && noteDist < curDist))
__notePerStrum[note.strumID] = note;
var noteShouldAvoid = note.avoid;
var curShouldAvoid = cur.avoid;
if (!noteShouldAvoid && curShouldAvoid) {
__notePerStrum[strumID] = note;
return;
}

var curDist = Math.abs(cur.strumTime - songPos);
if (noteShouldAvoid == curShouldAvoid && noteDist < curDist)
__notePerStrum[strumID] = note;
}

/**
Expand All @@ -284,13 +291,18 @@ class StrumLine extends FlxTypedGroup<Strum> {

if (cpu) return;

if (__pressed.length != members.length) {
__pressed.resize(members.length);
__justPressed.resize(members.length);
__justReleased.resize(members.length);
final membersLength = members.length;

if (__pressed.length != membersLength) {
__pressed.resize(membersLength);
__justPressed.resize(membersLength);
__justReleased.resize(membersLength);
}

for (i in 0...members.length) {
if (__notePerStrum.length != membersLength)
__notePerStrum = cast new haxe.ds.Vector(membersLength); // [for(_ in 0...members.length) null];

for (i in 0...membersLength) {
__pressed[i] = members[i].__getPressed(this);
__justPressed[i] = members[i].__getJustPressed(this);
__justReleased[i] = members[i].__getJustReleased(this);
Expand All @@ -304,18 +316,20 @@ class StrumLine extends FlxTypedGroup<Strum> {
__justPressed = CoolUtil.getDefault(event.justPressed, []);
__justReleased = CoolUtil.getDefault(event.justReleased, []);

__notePerStrum = cast new haxe.ds.Vector(members.length); // [for(_ in 0...members.length) null];

if (__pressed.contains(true)) {
if (__justPressed.contains(true)) {
notes.forEachAlive(__inputProcessJustPressed);

if (!ghostTapping) for (k => pr in __justPressed) if (pr && __notePerStrum[k] == null)
PlayState.instance.noteMiss(this, null, k, ID); // FUCK YOU
for (k => pr in __justPressed)
{
var note = __notePerStrum[k];

for (e in __notePerStrum)
if (e != null)
PlayState.instance.goodNoteHit(this, e);
if (note != null) {
PlayState.instance.goodNoteHit(this, note);
__notePerStrum[k] = null;
} else if (pr && !ghostTapping)
PlayState.instance.noteMiss(this, null, k, ID);
}
}

for (c in characters)
Expand Down