elmgates/BetterLyrics
1
0
Fork 0
mirror of https://github.com/jayfunc/BetterLyrics.git synced 2026-01-12 19:24:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: lyrics animation gpu usage

Browse Source
This commit is contained in:
Zhe Fang
2026-01-09 17:31:07 -05:00
parent bc32a3f34c
commit 094fe7b7a1
4 changed files with 112 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest
View File

@@ -12,7 +12,7 @@
<Identity <Identity
Name="37412.BetterLyrics" Name="37412.BetterLyrics"
Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9" Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
Version="1.2.250.0" /> Version="1.2.251.0" />
<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/> <mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

201
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs
View File

@@ -36,38 +36,73 @@ namespace BetterLyrics.WinUI3.Logic
double currentPositionMs double currentPositionMs
) )
{ {
if (lines == null) return; if (lines == null || lines.Count == 0) return;
var currentPlayingLine = lines.ElementAtOrDefault(primaryPlayingLineIndex); if (primaryPlayingLineIndex < 0 || primaryPlayingLineIndex >= lines.Count) return;
if (currentPlayingLine == null) return; var primaryPlayingLine = lines[primaryPlayingLineIndex];
var phoneticOpacity = lyricsStyle.PhoneticLyricsOpacity / 100.0; var phoneticOpacity = lyricsStyle.PhoneticLyricsOpacity / 100.0;
var originalOpacity = lyricsStyle.OriginalLyricsOpacity / 100.0; var originalOpacity = lyricsStyle.OriginalLyricsOpacity / 100.0;
var translatedOpacity = lyricsStyle.TranslatedLyricsOpacity / 100.0; var translatedOpacity = lyricsStyle.TranslatedLyricsOpacity / 100.0;
for (int i = startIndex; i <= endIndex + 1; i++) double topHeightFactor = canvasHeight * playingLineTopOffsetFactor;
double bottomHeightFactor = canvasHeight * (1 - playingLineTopOffsetFactor);
double scrollTopDurationSec = lyricsEffect.LyricsScrollTopDuration / 1000.0;
double scrollTopDelaySec = lyricsEffect.LyricsScrollTopDelay / 1000.0;
double scrollBottomDurationSec = lyricsEffect.LyricsScrollBottomDuration / 1000.0;
double scrollBottomDelaySec = lyricsEffect.LyricsScrollBottomDelay / 1000.0;
double canvasTransDuration = canvasYScrollTransition.DurationSeconds;
bool isBlurEnabled = lyricsEffect.IsLyricsBlurEffectEnabled;
bool isOutOfSightEnabled = lyricsEffect.IsLyricsOutOfSightEffectEnabled;
bool isFanEnabled = lyricsEffect.IsFanLyricsEnabled;
double fanAngleRad = Math.PI * (lyricsEffect.FanLyricsAngle / 180.0);
bool isGlowEnabled = lyricsEffect.IsLyricsGlowEffectEnabled;
bool isFloatEnabled = lyricsEffect.IsLyricsFloatAnimationEnabled;
bool isScaleEnabled = lyricsEffect.IsLyricsScaleEffectEnabled;
int safeStart = Math.Max(0, startIndex);
int safeEnd = Math.Min(lines.Count - 1, endIndex + 1);
for (int i = safeStart; i <= safeEnd; i++)
{ {
var line = lines.ElementAtOrDefault(i); var line = lines[i];
if (line == null) continue;
var lineHeight = line.PrimaryLineHeight;
if (lineHeight == null || lineHeight <= 0) continue;
double targetCharFloat = lyricsEffect.IsLyricsFloatAnimationAmountAutoAdjust
? lineHeight.Value * 0.1
: lyricsEffect.LyricsFloatAnimationAmount;
double targetCharGlow = lyricsEffect.IsLyricsGlowEffectAmountAutoAdjust
? lineHeight.Value * 0.2
: lyricsEffect.LyricsGlowEffectAmount;
double targetCharScale = lyricsEffect.IsLyricsScaleEffectAmountAutoAdjust
? 1.15
: lyricsEffect.LyricsScaleEffectAmount / 100.0;
var maxAnimationDurationMs = Math.Max(line.EndMs - currentPositionMs, 0);
bool isSecondaryLinePlaying = line.GetIsPlaying(currentPositionMs); bool isSecondaryLinePlaying = line.GetIsPlaying(currentPositionMs);
bool isSecondaryLinePlayingChanged = line.IsPlayingLastFrame != isSecondaryLinePlaying; bool isSecondaryLinePlayingChanged = line.IsPlayingLastFrame != isSecondaryLinePlaying;
line.IsPlayingLastFrame = isSecondaryLinePlaying; line.IsPlayingLastFrame = isSecondaryLinePlaying;
// 行动画 // 行动画
if (isLayoutChanged || isPrimaryPlayingLineChanged || isMouseScrollingChanged || isSecondaryLinePlayingChanged) if (isLayoutChanged || isPrimaryPlayingLineChanged || isMouseScrollingChanged)
{ {
int lineCountDelta = i - primaryPlayingLineIndex; int lineCountDelta = i - primaryPlayingLineIndex;
double distanceFromPlayingLine = Math.Abs(line.PrimaryPosition.Y - currentPlayingLine.PrimaryPosition.Y); double distanceFromPlayingLine = Math.Abs(line.PrimaryPosition.Y - primaryPlayingLine.PrimaryPosition.Y);
double distanceFactor; double distanceFactor;
if (lineCountDelta < 0) if (lineCountDelta < 0)
{ {
distanceFactor = Math.Clamp(distanceFromPlayingLine / (canvasHeight * playingLineTopOffsetFactor), 0, 1); distanceFactor = Math.Clamp(distanceFromPlayingLine / topHeightFactor, 0, 1);
} }
else else
{ {
distanceFactor = Math.Clamp(distanceFromPlayingLine / (canvasHeight * (1 - playingLineTopOffsetFactor)), 0, 1); distanceFactor = Math.Clamp(distanceFromPlayingLine / bottomHeightFactor, 0, 1);
} }
double yScrollDuration; double yScrollDuration;
@@ -76,34 +111,34 @@ namespace BetterLyrics.WinUI3.Logic
if (lineCountDelta < 0) if (lineCountDelta < 0)
{ {
yScrollDuration = yScrollDuration =
canvasYScrollTransition.DurationSeconds + canvasTransDuration +
distanceFactor * (lyricsEffect.LyricsScrollTopDuration / 1000.0 - canvasYScrollTransition.DurationSeconds); distanceFactor * (scrollTopDurationSec - canvasTransDuration);
yScrollDelay = distanceFactor * lyricsEffect.LyricsScrollTopDelay / 1000.0; yScrollDelay = distanceFactor * scrollTopDelaySec;
} }
else if (lineCountDelta == 0) else if (lineCountDelta == 0)
{ {
yScrollDuration = canvasYScrollTransition.DurationSeconds; yScrollDuration = canvasTransDuration;
yScrollDelay = 0; yScrollDelay = 0;
} }
else else
{ {
yScrollDuration = yScrollDuration =
canvasYScrollTransition.DurationSeconds + canvasTransDuration +
distanceFactor * (lyricsEffect.LyricsScrollBottomDuration / 1000.0 - canvasYScrollTransition.DurationSeconds); distanceFactor * (scrollBottomDurationSec - canvasTransDuration);
yScrollDelay = distanceFactor * lyricsEffect.LyricsScrollBottomDelay / 1000.0; yScrollDelay = distanceFactor * scrollBottomDelaySec;
} }
line.BlurAmountTransition.SetDuration(yScrollDuration); line.BlurAmountTransition.SetDuration(yScrollDuration);
line.BlurAmountTransition.SetDelay(yScrollDelay); line.BlurAmountTransition.SetDelay(yScrollDelay);
line.BlurAmountTransition.Start( line.BlurAmountTransition.Start(
(isMouseScrolling || isSecondaryLinePlaying) ? 0 : (isMouseScrolling || isSecondaryLinePlaying) ? 0 :
(lyricsEffect.IsLyricsBlurEffectEnabled ? (5 * distanceFactor) : 0)); (isBlurEnabled ? (5 * distanceFactor) : 0));
line.ScaleTransition.SetDuration(yScrollDuration); line.ScaleTransition.SetDuration(yScrollDuration);
line.ScaleTransition.SetDelay(yScrollDelay); line.ScaleTransition.SetDelay(yScrollDelay);
line.ScaleTransition.Start( line.ScaleTransition.Start(
isSecondaryLinePlaying ? _highlightedScale : isSecondaryLinePlaying ? _highlightedScale :
(lyricsEffect.IsLyricsOutOfSightEffectEnabled ? (isOutOfSightEnabled ?
(_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale)) : (_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale)) :
_highlightedScale)); _highlightedScale));
@@ -140,8 +175,8 @@ namespace BetterLyrics.WinUI3.Logic
line.AngleTransition.SetDuration(yScrollDuration); line.AngleTransition.SetDuration(yScrollDuration);
line.AngleTransition.SetDelay(yScrollDelay); line.AngleTransition.SetDelay(yScrollDelay);
line.AngleTransition.Start( line.AngleTransition.Start(
(lyricsEffect.IsFanLyricsEnabled && !isMouseScrolling) ? (isFanEnabled && !isMouseScrolling) ?
Math.PI * (lyricsEffect.FanLyricsAngle / 180.0) * distanceFactor * (i > primaryPlayingLineIndex ? 1 : -1) : Math.PI * (fanAngleRad / 180.0) * distanceFactor * (i > primaryPlayingLineIndex ? 1 : -1) :
0); 0);
line.YOffsetTransition.SetEasingType(canvasYScrollTransition.EasingType); line.YOffsetTransition.SetEasingType(canvasYScrollTransition.EasingType);
@@ -152,7 +187,33 @@ namespace BetterLyrics.WinUI3.Logic
line.YOffsetTransition.Start(targetYScrollOffset); line.YOffsetTransition.Start(targetYScrollOffset);
} }
var maxAnimationDurationMs = Math.Max(line.EndMs - currentPositionMs, 0); if (isLayoutChanged || isSecondaryLinePlayingChanged)
{
// 辉光动画
if (isGlowEnabled && lyricsEffect.LyricsGlowEffectScope == Enums.LyricsEffectScope.LineStartToCurrentChar
&& isSecondaryLinePlaying)
{
foreach (var renderChar in line.PrimaryRenderChars)
{
var stepInOutDuration = Math.Min(Time.AnimationDuration.TotalMilliseconds, maxAnimationDurationMs) / 2.0 / 1000.0;
var stepLastingDuration = Math.Max(maxAnimationDurationMs / 1000.0 - stepInOutDuration * 2, 0);
renderChar.GlowTransition.Start(
new Models.Keyframe<double>(targetCharGlow, stepInOutDuration),
new Models.Keyframe<double>(targetCharGlow, stepLastingDuration),
new Models.Keyframe<double>(0, stepInOutDuration)
);
}
}
// 浮动动画
if (isFloatEnabled)
{
foreach (var renderChar in line.PrimaryRenderChars)
{
renderChar.FloatTransition.Start(isSecondaryLinePlaying ? targetCharFloat : 0);
}
}
}
// 字符动画 // 字符动画
foreach (var renderChar in line.PrimaryRenderChars) foreach (var renderChar in line.PrimaryRenderChars)
@@ -162,50 +223,15 @@ namespace BetterLyrics.WinUI3.Logic
bool isCharPlaying = renderChar.GetIsPlaying(currentPositionMs); bool isCharPlaying = renderChar.GetIsPlaying(currentPositionMs);
bool isCharPlayingChanged = renderChar.IsPlayingLastFrame != isCharPlaying; bool isCharPlayingChanged = renderChar.IsPlayingLastFrame != isCharPlaying;
if (isSecondaryLinePlayingChanged || isCharPlayingChanged) if (isCharPlayingChanged)
{ {
if (lyricsEffect.IsLyricsGlowEffectEnabled) if (isFloatEnabled)
{ {
double targetGlow = lyricsEffect.IsLyricsGlowEffectAmountAutoAdjust ? renderChar.LayoutRect.Height * 0.2 : lyricsEffect.LyricsGlowEffectAmount; renderChar.FloatTransition.SetDurationMs(Math.Min(lyricsEffect.LyricsFloatAnimationDuration, maxAnimationDurationMs));
switch (lyricsEffect.LyricsGlowEffectScope) renderChar.FloatTransition.Start(0);
{
case Enums.LyricsEffectScope.LineStartToCurrentChar:
if (isSecondaryLinePlayingChanged && isSecondaryLinePlaying)
{
var stepInOutDuration = Math.Min(Time.AnimationDuration.TotalMilliseconds, maxAnimationDurationMs) / 2.0 / 1000.0;
var stepLastingDuration = Math.Max(maxAnimationDurationMs / 1000.0 - stepInOutDuration * 2, 0);
renderChar.GlowTransition.Start(
new Models.Keyframe<double>(targetGlow, stepInOutDuration),
new Models.Keyframe<double>(targetGlow, stepLastingDuration),
new Models.Keyframe<double>(0, stepInOutDuration)
);
}
break;
default:
break;
}
} }
if (lyricsEffect.IsLyricsFloatAnimationEnabled) renderChar.IsPlayingLastFrame = isCharPlaying;
{
double targetFloat =
lyricsEffect.IsLyricsFloatAnimationAmountAutoAdjust ? renderChar.LayoutRect.Height * 0.1 : lyricsEffect.LyricsFloatAnimationAmount;
if (isSecondaryLinePlayingChanged)
{
renderChar.FloatTransition.Start(isSecondaryLinePlaying ? targetFloat : 0);
}
if (isCharPlayingChanged)
{
renderChar.FloatTransition.SetDurationMs(Math.Min(lyricsEffect.LyricsFloatAnimationDuration, maxAnimationDurationMs));
renderChar.FloatTransition.Start(0);
}
}
if (isCharPlayingChanged)
{
renderChar.IsPlayingLastFrame = isCharPlaying;
}
} }
} }
@@ -217,52 +243,31 @@ namespace BetterLyrics.WinUI3.Logic
if (isSyllablePlayingChanged) if (isSyllablePlayingChanged)
{ {
var syllableHeight = syllable.ChildrenRenderLyricsChars.FirstOrDefault()?.LayoutRect.Height ?? 0; if (isScaleEnabled && isSyllablePlaying)
if (lyricsEffect.IsLyricsScaleEffectEnabled)
{ {
double targetScale =
lyricsEffect.IsLyricsScaleEffectAmountAutoAdjust ? 1.15 : lyricsEffect.LyricsScaleEffectAmount / 100.0;
foreach (var renderChar in syllable.ChildrenRenderLyricsChars) foreach (var renderChar in syllable.ChildrenRenderLyricsChars)
{ {
if (syllable.DurationMs >= lyricsEffect.LyricsScaleEffectLongSyllableDuration) if (syllable.DurationMs >= lyricsEffect.LyricsScaleEffectLongSyllableDuration)
{ {
if (isSyllablePlaying) var stepDuration = Math.Min(syllable.DurationMs, maxAnimationDurationMs) / 2.0 / 1000.0;
{ renderChar.ScaleTransition.Start(
var stepDuration = Math.Min(syllable.DurationMs, maxAnimationDurationMs) / 2.0 / 1000.0; new Models.Keyframe<double>(targetCharScale, stepDuration),
renderChar.ScaleTransition.Start( new Models.Keyframe<double>(1.0, stepDuration)
new Models.Keyframe<double>(targetScale, stepDuration), );
new Models.Keyframe<double>(1.0, stepDuration)
);
}
} }
} }
} }
if (lyricsEffect.IsLyricsGlowEffectEnabled) if (isGlowEnabled && isSyllablePlaying && lyricsEffect.LyricsGlowEffectScope == Enums.LyricsEffectScope.LongDurationSyllable
&& syllable.DurationMs >= lyricsEffect.LyricsGlowEffectLongSyllableDuration)
{ {
double targetGlow = lyricsEffect.IsLyricsGlowEffectAmountAutoAdjust ? syllableHeight * 0.2 : lyricsEffect.LyricsGlowEffectAmount; foreach (var renderChar in syllable.ChildrenRenderLyricsChars)
switch (lyricsEffect.LyricsGlowEffectScope)
{ {
case Enums.LyricsEffectScope.LongDurationSyllable: var stepDuration = Math.Min(syllable.DurationMs, maxAnimationDurationMs) / 2.0 / 1000.0;
if (syllable.DurationMs >= lyricsEffect.LyricsGlowEffectLongSyllableDuration) renderChar.GlowTransition.Start(
{ new Models.Keyframe<double>(targetCharGlow, stepDuration),
foreach (var renderChar in syllable.ChildrenRenderLyricsChars) new Models.Keyframe<double>(0, stepDuration)
{ );
if (isSyllablePlaying)
{
var stepDuration = Math.Min(syllable.DurationMs, maxAnimationDurationMs) / 2.0 / 1000.0;
renderChar.GlowTransition.Start(
new Models.Keyframe<double>(targetGlow, stepDuration),
new Models.Keyframe<double>(0, stepDuration)
);
}
}
}
break;
default:
break;
} }
} }
@@ -270,7 +275,7 @@ namespace BetterLyrics.WinUI3.Logic
} }
} }
// 更新动画 // 使动画步进一帧
foreach (var renderChar in line.PrimaryRenderChars) foreach (var renderChar in line.PrimaryRenderChars)
{ {
renderChar.Update(elapsedTime); renderChar.Update(elapsedTime);

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs
View File

@@ -74,6 +74,8 @@ namespace BetterLyrics.WinUI3.Models.Lyrics
/// </summary> /// </summary>
public int LaneIndex { get; set; } = 0; public int LaneIndex { get; set; } = 0;
public double? PrimaryLineHeight => PrimaryRenderChars.FirstOrDefault()?.LayoutRect.Height;
public RenderLyricsLine(LyricsLine lyricsLine) : base(lyricsLine) public RenderLyricsLine(LyricsLine lyricsLine) : base(lyricsLine)
{ {
AngleTransition = new( AngleTransition = new(

12
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs
View File

@@ -26,12 +26,12 @@ namespace BetterLyrics.WinUI3.Renderer
Color fgColor, Color fgColor,
LyricsEffectSettings settings) LyricsEffectSettings settings)
{ {
DrawPhonetic(ds, textOnlyLayer, line); DrawTertiaryText(ds, textOnlyLayer, line);
DrawOriginalText(control, ds, textOnlyLayer, line, playbackState, bgColor, fgColor, settings); DrawPrimaryText(control, ds, textOnlyLayer, line, playbackState, bgColor, fgColor, settings);
DrawTranslated(ds, textOnlyLayer, line); DrawSecondaryText(ds, textOnlyLayer, line);
} }
private void DrawPhonetic(CanvasDrawingSession ds, ICanvasImage source, RenderLyricsLine line) private void DrawTertiaryText(CanvasDrawingSession ds, ICanvasImage source, RenderLyricsLine line)
{ {
if (line.TertiaryTextLayout == null) return; if (line.TertiaryTextLayout == null) return;
@@ -65,7 +65,7 @@ namespace BetterLyrics.WinUI3.Renderer
}); });
} }
private void DrawTranslated(CanvasDrawingSession ds, ICanvasImage source, RenderLyricsLine line) private void DrawSecondaryText(CanvasDrawingSession ds, ICanvasImage source, RenderLyricsLine line)
{ {
if (line.SecondaryTextLayout == null) return; if (line.SecondaryTextLayout == null) return;
@@ -99,7 +99,7 @@ namespace BetterLyrics.WinUI3.Renderer
}); });
} }
private void DrawOriginalText( private void DrawPrimaryText(
ICanvasResourceCreator resourceCreator, ICanvasResourceCreator resourceCreator,
CanvasDrawingSession ds, CanvasDrawingSession ds,
ICanvasImage source, ICanvasImage source,