Merge branch 'deferred_loading' of https://github.com/Geokureli/Funkin into Geokureli-deferred_loading

This commit is contained in:
Cameron Taylor
2021-02-23 23:34:08 -05:00
465 changed files with 697 additions and 229 deletions

View File

@ -4,7 +4,9 @@ import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.math.FlxMath;
import flixel.util.FlxColor;
#if polymod
import polymod.format.ParseRules.TargetSignatureElement;
#end
using StringTools;
@ -52,7 +54,7 @@ class Note extends FlxSprite
switch (daStage)
{
case 'school' | 'schoolEvil':
loadGraphic('assets/images/weeb/pixelUI/arrows-pixels.png', true, 17, 17);
loadGraphic(Paths.image('weeb/pixelUI/arrows-pixels'), true, 17, 17);
animation.add('greenScroll', [6]);
animation.add('redScroll', [7]);
@ -61,7 +63,7 @@ class Note extends FlxSprite
if (isSustainNote)
{
loadGraphic('assets/images/weeb/pixelUI/arrowEnds.png', true, 7, 6);
loadGraphic(Paths.image('weeb/pixelUI/arrowEnds'), true, 7, 6);
animation.add('purpleholdend', [4]);
animation.add('greenholdend', [6]);
@ -78,7 +80,7 @@ class Note extends FlxSprite
updateHitbox();
default:
frames = FlxAtlasFrames.fromSparrow('assets/images/NOTE_assets.png', 'assets/images/NOTE_assets.xml');
frames = Paths.getSparrowAtlas('NOTE_assets');
animation.addByPrefix('greenScroll', 'green0');
animation.addByPrefix('redScroll', 'red0');