Skip to content
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.

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

make pixel note animations have consistent framerates #15400

Open
wants to merge 2 commits into
base: experimental
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions source/objects/Note.hx
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,9 @@ class Note extends FlxSprite

if(isSustainNote)
{
animation.add(colArray[noteData] + 'holdend', [noteData + 4], 24, true);
animation.add(colArray[noteData] + 'hold', [noteData], 24, true);
} else animation.add(colArray[noteData] + 'Scroll', [noteData + 4], 24, true);
animation.add(colArray[noteData] + 'holdend', [noteData + 4], 12, true);
animation.add(colArray[noteData] + 'hold', [noteData], 12, true);
} else animation.add(colArray[noteData] + 'Scroll', [noteData + 4], 12, true);
}

function attemptToAddAnimationByPrefix(name:String, prefix:String, framerate:Float = 24, doLoop:Bool = true)
Expand Down
6 changes: 3 additions & 3 deletions source/objects/StrumNote.hx
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@ class StrumNote extends FlxSprite
case 0:
animation.add('static', [0]);
animation.add('pressed', [4, 8], 12, false);
animation.add('confirm', [12, 16], 24, false);
animation.add('confirm', [12, 16], 12, false);
case 1:
animation.add('static', [1]);
animation.add('pressed', [5, 9], 12, false);
animation.add('confirm', [13, 17], 24, false);
animation.add('confirm', [13, 17], 12, false);
case 2:
animation.add('static', [2]);
animation.add('pressed', [6, 10], 12, false);
animation.add('confirm', [14, 18], 12, false);
case 3:
animation.add('static', [3]);
animation.add('pressed', [7, 11], 12, false);
animation.add('confirm', [15, 19], 24, false);
animation.add('confirm', [15, 19], 12, false);
}
}
else
Expand Down