Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into replaystuff

Browse Source
This commit is contained in:
yugecin 2017-02-26 00:34:21 +01:00
commit 00f34296fb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/yugecin/opsudance/core/state/specialstates/BubbleNotificationState.java
View File

@ -222,13 +222,15 @@ public class BubbleNotificationState implements EventListener<BubbleNotification
float progress = (float) timeShown / BubbleNotificationState.IN_TIME; float progress = (float) timeShown / BubbleNotificationState.IN_TIME;
this.x = finalX + (int) ((1 - AnimationEquation.OUT_BACK.calc(progress)) * width / 2); this.x = finalX + (int) ((1 - AnimationEquation.OUT_BACK.calc(progress)) * width / 2);
textColor.a = borderColor.a = bgcol.a = progress; textColor.a = borderColor.a = bgcol.a = progress;
bgcol.a = borderColor.a * 0.8f;
return; return;
} }
x = Notification.finalX; x = Notification.finalX;
if (timeShown > BubbleNotificationState.DISPLAY_TIME) { if (timeShown > BubbleNotificationState.DISPLAY_TIME) {
isFading = true; isFading = true;
float progress = (float) (timeShown - BubbleNotificationState.DISPLAY_TIME) / BubbleNotificationState.OUT_TIME; float progress = (float) (timeShown - BubbleNotificationState.DISPLAY_TIME) / BubbleNotificationState.OUT_TIME;
textColor.a = borderColor.a = bgcol.a = 1f - progress; textColor.a = borderColor.a = 1f - progress;
bgcol.a = borderColor.a * 0.8f;
} }
} }