Skip to content

Add fading in and out to the vocal needle #1500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Supersonicboss1 wants to merge 1 commit into
base: dev
Choose a base branch
from
+12 −13
Open

Add fading in and out to the vocal needle #1500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions Assets/Script/Gameplay/Player/VocalsPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using DG.Tweening;
using UnityEngine;
using UnityEngine.AddressableAssets;
using YARG.Core;
Expand All @@ -11,6 +12,7 @@
using YARG.Core.Replays;
using YARG.Gameplay.HUD;
using YARG.Helpers;
using YARG.Helpers.Extensions;
using YARG.Input;
using YARG.Player;
using YARG.Settings;
Expand Down Expand Up @@ -397,8 +399,9 @@ private void UpdateSingNeedle()
{
const float NEEDLE_POS_LERP = 30f;
const float NEEDLE_POS_SNAP_MULTIPLIER = 10f;

const float NEEDLE_ROT_LERP = 25f;
const float NEEDLE_FADE_IN_MULTIPLIER = 40f;
const float NEEDLE_FADE_OUT_MULTIPLIER = 15f;

// Get the appropriate sing time
var singTime = GameManager.InputTime;
Expand All @@ -408,22 +411,18 @@ private void UpdateSingNeedle()
// not in a constant stream.
if (!IsInThreshold(singTime, _lastSingTime) || _shouldHideNeedle)
{
// Hide the needle if there's no singing
if (_needleVisualContainer.activeSelf)
{
_needleVisualContainer.SetActive(false);
_hittingParticleGroup.Stop();
}
var color = _needleRenderer.material.color;
_needleRenderer.material.color = color.WithAlpha(DOVirtual.EasedValue(color.a, 0, Time.deltaTime * NEEDLE_FADE_IN_MULTIPLIER, Ease.InSine));
_hittingParticleGroup.Stop();
}
else
{
float lerpRate = NEEDLE_POS_LERP;

// Show needle
if (!_needleVisualContainer.activeSelf)
var lerpRate = NEEDLE_POS_LERP;
var color = _needleRenderer.material.color;
var alpha = DOVirtual.EasedValue(color.a, 1, Time.deltaTime * NEEDLE_FADE_OUT_MULTIPLIER, Ease.OutSine);
_needleRenderer.material.color = color.WithAlpha(alpha);
if (!Mathf.Approximately(1, alpha))
{
_needleVisualContainer.SetActive(true);

// Lerp X times faster if we've just started showing the needle
lerpRate *= NEEDLE_POS_SNAP_MULTIPLIER;
}
Expand Down