Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #520 from FunkinCrew/ui+camera-fixes

Browse source 
UI+Camera fixes
This commit is contained in:
Eric 2024-04-28 22:24:00 -04:00 committed by GitHub
commit 347b1b59ac
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit ac8bf6e129113551e1c7971327b31096d703e433 Subproject commit 61eabfd454436c18470af769610fe23b0af9a8e7

4
source/funkin/play/components/PopUpStuff.hx
View file

@ -42,7 +42,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
if (PlayState.instance.currentStageId.startsWith('school')) if (PlayState.instance.currentStageId.startsWith('school'))
{ {
rating.setGraphicSize(Std.int(rating.width * Constants.PIXEL_ART_SCALE * 0.65)); rating.setGraphicSize(Std.int(rating.width * Constants.PIXEL_ART_SCALE * 0.7));
rating.antialiasing = false; rating.antialiasing = false;
} }
else else
@ -133,7 +133,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
if (PlayState.instance.currentStageId.startsWith('school')) if (PlayState.instance.currentStageId.startsWith('school'))
{ {
numScore.setGraphicSize(Std.int(numScore.width * Constants.PIXEL_ART_SCALE)); numScore.setGraphicSize(Std.int(numScore.width * Constants.PIXEL_ART_SCALE * 0.7));
numScore.antialiasing = false; numScore.antialiasing = false;
} }
else else

2
source/funkin/play/event/FocusCameraSongEvent.hx
View file

@ -127,7 +127,7 @@ class FocusCameraSongEvent extends SongEvent
switch (ease) switch (ease)
{ {
case 'CLASSIC': // Old-school. No ease. Just set follow point. case 'CLASSIC': // Old-school. No ease. Just set follow point.
PlayState.instance.resetCamera(); PlayState.instance.resetCamera(false, true);
PlayState.instance.cameraFollowPoint.setPosition(targetX, targetY); PlayState.instance.cameraFollowPoint.setPosition(targetX, targetY);
case 'INSTANT': // Instant ease. Duration is automatically 0. case 'INSTANT': // Instant ease. Duration is automatically 0.
PlayState.instance.tweenCameraToPosition(targetX, targetY, 0); PlayState.instance.tweenCameraToPosition(targetX, targetY, 0);

8
source/funkin/ui/options/FunkinSoundTray.hx
View file

@ -20,6 +20,7 @@ class FunkinSoundTray extends FlxSoundTray
{ {
var graphicScale:Float = 0.30; var graphicScale:Float = 0.30;
var lerpYPos:Float = 0; var lerpYPos:Float = 0;
var alphaTarget:Float = 0;
var volumeMaxSound:String; var volumeMaxSound:String;
@ -40,7 +41,7 @@ class FunkinSoundTray extends FlxSoundTray
// makes an alpha'd version of all the bars (bar_10.png) // makes an alpha'd version of all the bars (bar_10.png)
var backingBar:Bitmap = new Bitmap(Assets.getBitmapData(Paths.image("soundtray/bars_10"))); var backingBar:Bitmap = new Bitmap(Assets.getBitmapData(Paths.image("soundtray/bars_10")));
backingBar.x = 10; backingBar.x = 9;
backingBar.y = 5; backingBar.y = 5;
backingBar.scaleX = graphicScale; backingBar.scaleX = graphicScale;
backingBar.scaleY = graphicScale; backingBar.scaleY = graphicScale;
@ -56,7 +57,7 @@ class FunkinSoundTray extends FlxSoundTray
for (i in 1...11) for (i in 1...11)
{ {
var bar:Bitmap = new Bitmap(Assets.getBitmapData(Paths.image("soundtray/bars_" + i))); var bar:Bitmap = new Bitmap(Assets.getBitmapData(Paths.image("soundtray/bars_" + i)));
bar.x = 10; bar.x = 9;
bar.y = 5; bar.y = 5;
bar.scaleX = graphicScale; bar.scaleX = graphicScale;
bar.scaleY = graphicScale; bar.scaleY = graphicScale;
@ -77,15 +78,18 @@ class FunkinSoundTray extends FlxSoundTray
override public function update(MS:Float):Void override public function update(MS:Float):Void
{ {
y = MathUtil.coolLerp(y, lerpYPos, 0.1); y = MathUtil.coolLerp(y, lerpYPos, 0.1);
alpha = MathUtil.coolLerp(alpha, alphaTarget, 0.25);
// Animate sound tray thing // Animate sound tray thing
if (_timer > 0) if (_timer > 0)
{ {
_timer -= (MS / 1000); _timer -= (MS / 1000);
alphaTarget = 1;
} }
else if (y > -height) else if (y > -height)
{ {
lerpYPos = -height - 10; lerpYPos = -height - 10;
alphaTarget = 0;
if (y <= -height) if (y <= -height)
{ {