Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public partial class LyricLineDisplay
private float[] backingTilts = Array.Empty<float>();
private Vector2[] backingRest = Array.Empty<Vector2>();
private bool backingEnabled = true;
private float backingStageWidth;

/// <summary>The backing words this line shows (its source line's, see <see cref="LyricLine.BackingVocals"/>).</summary>
private IReadOnlyList<BackingVocal> backingWords => Line.Source.BackingVocals;
Expand Down Expand Up @@ -93,12 +94,14 @@ private void layoutBackingVocals()
if (backingTexts.Length == 0)
return;

float width = cellX[^1];
float lyricWidth = cellX[^1];
float span = backingStageWidth > 0 ? backingStageWidth : lyricWidth;
float left = (lyricWidth - span) * 0.5f;
float ruby = furigana.Count > 0 ? requestedFontSize * 0.36f * 1.15f + 2 * SizeRatio : 0;
float lift = ruby + BACKING_GAP * SizeRatio;

for (int i = 0; i < backingTexts.Length; i++)
backingRest[i] = new Vector2(width * (float)BackingVocals.AnchorOf(backingWords, i), -lift);
backingRest[i] = new Vector2(left + span * (float)BackingVocals.AnchorOf(backingWords, i), -lift);

updateBackingVocals(Time.Current);
}
Expand Down Expand Up @@ -132,6 +135,18 @@ public void SetBackingVocalsEnabled(bool enabled)
updateBackingVocals(Time.Current);
}

/// <summary>Sets the full stage width used to place backing vocals across the screen.</summary>
public void SetBackingStageWidth(float width)
{
if (width <= 0 || Math.Abs(backingStageWidth - width) < 0.1f)
return;

backingStageWidth = width;

if (IsLoaded)
layoutBackingVocals();
}

/// <summary>How many backing words this line draws (test support).</summary>
internal int BackingVocalCount => backingTexts.Length;

Expand Down
3 changes: 3 additions & 0 deletions typebeat.Game.Rulesets.TypeBeat/UI/LyricStage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,10 @@ protected override void Update()
bool resized = false;

foreach (var display in displays)
{
display.SetBackingStageWidth(DrawWidth);
resized |= display.SetMaximumWidth(lineWidth);
}

if (resized)
{
Expand Down