RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-16 03:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust various visuals of summary timeline in a hope for user acceptance

Browse Source 
.. with a somewhat appealing design.
This commit is contained in:
Dean Herbert 2024-07-12 13:57:36 +09:00
parent e6b7d2530e
commit 685b19a571
No known key found for this signature in database
7 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
RelativeSizeAxes = Axes.Both;
InternalChild = new Circle { RelativeSizeAxes = Axes.Both };
Colour = colours.Gray7;
Colour = colours.Gray6;
}
}
}

4
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics;
using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
@ -15,7 +16,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
public ControlPointVisualisation(ControlPoint point)
{
Point = point;
Width = 2;
Alpha = 0.3f;
Blending = BlendingParameters.Additive;
}
[BackgroundDependencyLoader]

6
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs
View File

@ -3,7 +3,6 @@
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@ -96,10 +95,9 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomLeft,
Origin = Anchor.CentreLeft,
Width = 1,
Height = 0.75f,
Height = 0.4f,
Depth = float.MaxValue,
Colour = effect.GetRepresentingColour(colours).Darken(0.5f),
Colour = effect.GetRepresentingColour(colours),
});
}
}

5
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
View File

@ -39,7 +39,10 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
switch (point)
{
case TimingControlPoint:
AddInternal(new ControlPointVisualisation(point));
AddInternal(new ControlPointVisualisation(point)
{
Y = -0.4f,
});
break;
case EffectControlPoint effect:

2
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/PreviewTimePart.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
public PreviewTimeVisualisation(double time)
: base(time)
{
Width = 2;
Alpha = 0.8f;
}
[BackgroundDependencyLoader]

42
osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
View File

@ -23,27 +23,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
Children = new Drawable[]
{
new ControlPointPart
{
Anchor = Anchor.Centre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.Both,
Height = 0.35f
},
new BookmarkPart
{
Anchor = Anchor.Centre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.Both,
Height = 0.35f
},
new PreviewTimePart
{
Anchor = Anchor.Centre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.Both,
Height = 0.35f
},
new Container
{
Name = "centre line",
@ -73,6 +52,27 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
},
}
},
new PreviewTimePart
{
Anchor = Anchor.Centre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.Both,
Height = 0.4f,
},
new ControlPointPart
{
Anchor = Anchor.Centre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.Both,
Height = 0.4f
},
new BookmarkPart
{
Anchor = Anchor.Centre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.Both,
Height = 0.35f
},
new BreakPart
{
Anchor = Anchor.Centre,

5
osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
View File

@ -11,12 +11,15 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
/// </summary>
public partial class PointVisualisation : Circle
{
public readonly double StartTime;
public const float MAX_WIDTH = 4;
public PointVisualisation(double startTime)
: this()
{
X = (float)startTime;
StartTime = startTime;
}
public PointVisualisation()
@ -28,7 +31,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
Origin = Anchor.Centre;
Width = MAX_WIDTH;
Height = 0.75f;
Height = 0.4f;
}
}
}