cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-24 14:16:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #638 from FunkinCrew/cyn0x8/flash-fix

Browse source 
[PUBLIC PR] Make flashing effects look more consistent
This commit is contained in:
Cameron Taylor 2024-07-01 20:23:16 -04:00 committed by GitHub
parent 5134547071 dad8b0815d
commit 043c8e8ade
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/funkin/ui/MenuItem.hx
View file

@ -11,7 +11,6 @@ class MenuItem extends FlxSpriteGroup
{
public var targetY:Float = 0;
public var week:FlxSprite;
public var flashingInt:Int = 0;
public function new(x:Float, y:Float, weekNum:Int = 0, weekType:WeekType)
{
@ -30,28 +29,28 @@ class MenuItem extends FlxSpriteGroup
}
var isFlashing:Bool = false;
var flashTick:Float = 0;
final flashFramerate:Float = 20;
public function startFlashing():Void
{
isFlashing = true;
}
// if it runs at 60fps, fake framerate will be 6
// if it runs at 144 fps, fake framerate will be like 14, and will update the graphic every 0.016666 * 3 seconds still???
// so it runs basically every so many seconds, not dependant on framerate??
// I'm still learning how math works thanks whoever is reading this lol
var fakeFramerate:Int = Math.round((1 / FlxG.elapsed) / 10);
override function update(elapsed:Float)
{
super.update(elapsed);
y = MathUtil.coolLerp(y, (targetY * 120) + 480, 0.17);
if (isFlashing) flashingInt += 1;
if (flashingInt % fakeFramerate >= Math.floor(fakeFramerate / 2)) week.color = 0xFF33ffff;
else
week.color = FlxColor.WHITE;
if (isFlashing)
{
flashTick += elapsed;
if (flashTick >= 1 / flashFramerate)
{
flashTick %= 1 / flashFramerate;
week.color = (week.color == FlxColor.WHITE) ? 0xFF33ffff : FlxColor.WHITE;
}
}
}
}

24
source/funkin/ui/story/LevelTitle.hx
View file

@ -13,13 +13,10 @@ class LevelTitle extends FlxSpriteGroup
public final level:Level;
public var targetY:Float;
public var isFlashing:Bool = false;
var title:FlxSprite;
var lock:FlxSprite;
var flashingInt:Int = 0;
public function new(x:Int, y:Int, level:Level)
{
super(x, y);
@ -46,20 +43,23 @@ class LevelTitle extends FlxSpriteGroup
}
}
// if it runs at 60fps, fake framerate will be 6
// if it runs at 144 fps, fake framerate will be like 14, and will update the graphic every 0.016666 * 3 seconds still???
// so it runs basically every so many seconds, not dependant on framerate??
// I'm still learning how math works thanks whoever is reading this lol
var fakeFramerate:Int = Math.round((1 / FlxG.elapsed) / 10);
public var isFlashing:Bool = false;
var flashTick:Float = 0;
final flashFramerate:Float = 20;
public override function update(elapsed:Float):Void
{
this.y = MathUtil.coolLerp(y, targetY, 0.17);
if (isFlashing) flashingInt += 1;
if (flashingInt % fakeFramerate >= Math.floor(fakeFramerate / 2)) title.color = 0xFF33ffff;
else
title.color = FlxColor.WHITE;
if (isFlashing)
{
flashTick += elapsed;
if (flashTick >= 1 / flashFramerate)
{
flashTick %= 1 / flashFramerate;
title.color = (title.color == FlxColor.WHITE) ? 0xFF33ffff : FlxColor.WHITE;
}
}
}
public function showLock():Void