cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-31 14:56:55 +00:00
Code Issues Releases Wiki Activity

scaling of capsules

Browse source
This commit is contained in:
Cameron Taylor 2023-08-04 16:19:48 -04:00 committed by EliteMasterEric
parent 7ac2e91c8d
commit 9571eb70e0
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/FreeplayState.hx
View file

@ -974,7 +974,7 @@ class FreeplayState extends MusicBeatSubState
capsule.selected = false;
capsule.targetPos.y = ((index - curSelected) * 150) + 160;
capsule.targetPos.y = ((index - curSelected) * ((capsule.height * capsule.realScaled) + 10)) + 160;
capsule.targetPos.x = 270 + (60 * (Math.sin(index - curSelected)));
// capsule.targetPos.x = 320 + (40 * (index - curSelected));

10
source/funkin/freeplayStuff/SongMenuItem.hx
View file

@ -38,7 +38,7 @@ class SongMenuItem extends FlxSpriteGroup
// capsule.animation
add(capsule);
songText = new FlxText(120, 40, 0, songTitle, 40);
songText = new FlxText(capsule.width * 0.1, 40, 0, songTitle, Std.int(40 * realScaled));
songText.font = "5by7";
songText.color = 0xFF43C1EA;
add(songText);
@ -63,6 +63,8 @@ class SongMenuItem extends FlxSpriteGroup
var xPosLerpLol:Array<Float> = [0.9, 0.4, 0.16, 0.16, 0.22, 0.22, 0.245]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER
var xPosOutLerpLol:Array<Float> = [0.245, 0.75, 0.98, 0.98, 1.2]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER
public final realScaled:Float = 0.8;
override function update(elapsed:Float)
{
if (doJumpIn)
@ -77,6 +79,9 @@ class SongMenuItem extends FlxSpriteGroup
scale.y = 1 / xFrames[frameInTypeBeat];
x = FlxG.width * xPosLerpLol[Std.int(Math.min(frameInTypeBeat, xPosLerpLol.length - 1))];
scale.x *= realScaled;
scale.y *= realScaled;
frameInTypeBeat += 1;
}
}
@ -93,6 +98,9 @@ class SongMenuItem extends FlxSpriteGroup
scale.y = 1 / xFrames[frameOutTypeBeat];
x = FlxG.width * xPosOutLerpLol[Std.int(Math.min(frameOutTypeBeat, xPosOutLerpLol.length - 1))];
scale.x *= realScaled;
scale.y *= realScaled;
frameOutTypeBeat += 1;
}
}