RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve smooth movement in beatmap carousel.

This commit is contained in:
Thomas Müller 2016-11-22 20:10:04 +01:00
parent 20be2f4628
commit 2596e71494
3 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 1d43e1ed56421fbbefdf6c23dab8deeeaa0f592a
Subproject commit 55414e2754eb5b24a0b9782389da9f3b2ae1a44a

4
osu.Game/Beatmaps/Drawable/BeatmapGroup.cs
View File

@ -73,15 +73,11 @@ public BeatmapGroup(WorkingBeatmap beatmap)
{
GainedSelection = headerGainedSelection,
RelativeSizeAxes = Axes.X,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
};
BeatmapPanels = beatmap.BeatmapSetInfo.Beatmaps.Select(b => new BeatmapPanel(b)
{
GainedSelection = panelGainedSelection,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
RelativeSizeAxes = Axes.X,
}).ToList();
}

45
osu.Game/Screens/Select/CarousellContainer.cs
View File

@ -5,7 +5,6 @@
using osu.Framework.Caching;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Transformations;
using osu.Game.Beatmaps.Drawable;
using osu.Game.Database;
@ -27,6 +26,8 @@ class CarousellContainer : ScrollContainer
public CarousellContainer()
{
DistanceDecayJump = 0.01;
Add(scrollableContent = new Container<Panel>
{
RelativeSizeAxes = Axes.X,
@ -42,6 +43,13 @@ public void AddGroup(BeatmapGroup group)
yPositions.Invalidate();
}
private static void addPanel(Panel panel, ref float currentY)
{
panel.Depth = -currentY;
panel.MoveToY(currentY, 750, EasingTypes.OutExpo);
currentY += panel.DrawHeight + 5;
}
private void computeYPositions()
{
float currentY = DrawHeight / 2;
@ -49,20 +57,24 @@ private void computeYPositions()
foreach (BeatmapGroup group in groups)
{
group.Header.MoveToY(currentY, 500, EasingTypes.OutExpo);
currentY += group.Header.DrawSize.Y + 5;
addPanel(group.Header, ref currentY);
if (group.State == BeatmapGroupState.Expanded)
{
group.Header.MoveToX(-100, 500, EasingTypes.OutExpo);
foreach (BeatmapPanel panel in group.BeatmapPanels)
{
if (panel == SelectedPanel)
selectedY = currentY + panel.DrawHeight - DrawHeight / 2;
selectedY = currentY + 1.5f * panel.DrawHeight - DrawHeight / 2;
panel.MoveToY(currentY, 500, EasingTypes.OutExpo);
currentY += panel.DrawHeight + 5;
addPanel(panel, ref currentY);
}
}
else
{
group.Header.MoveToX(0, 500, EasingTypes.OutExpo);
}
}
currentY += DrawHeight / 2;
@ -94,7 +106,11 @@ public void SelectBeatmap(BeatmapInfo beatmap)
public void SelectGroup(BeatmapGroup group, BeatmapPanel panel)
{
if (SelectedGroup != null && SelectedGroup != group)
{
SelectedGroup.State = BeatmapGroupState.Collapsed;
foreach (BeatmapPanel p in group.BeatmapPanels)
p.MoveToY(group.Header.Position.Y);
}
SelectedGroup = group;
panel.State = PanelSelectedState.Selected;
@ -111,13 +127,14 @@ protected override void UpdateLayout()
yPositions.Refresh(computeYPositions);
}
private static float offsetX(Vector2 pos, Panel panel, float dist)
private static float offsetX(Vector2 pos, Panel panel, float dist, float halfHeight)
{
float result = 25 + dist * 0.1f;
if (!(panel is BeatmapSetHeader) || panel.State != PanelSelectedState.Selected)
result += 100;
// The radius of the circle the carousel moves on.
const float CIRCLE_RADIUS = 4;
double discriminant = Math.Max(0, CIRCLE_RADIUS * CIRCLE_RADIUS - dist * dist);
float x = (CIRCLE_RADIUS - (float)Math.Sqrt(discriminant)) * halfHeight;
return result;
return 125 + x;
}
private Vector2 getScrollPos(Panel panel)
@ -154,10 +171,10 @@ protected override void Update()
Vector2 panelPos = getDrawPos(panel);
float halfHeight = DrawSize.Y / 2;
float dist = Math.Abs(panelPos.Y - halfHeight);
panel.Position = new Vector2(offsetX(panelPos, panel, dist), panelPosLocal.Y);
float dist = Math.Abs(1f - panelPos.Y / halfHeight);
panel.OriginPosition = new Vector2(-offsetX(panelPos, panel, dist, halfHeight), 0);
panel.Alpha = MathHelper.Clamp(1.75f - 1.5f * dist / halfHeight, 0, 1);
panel.Alpha = MathHelper.Clamp(1.75f - 1.5f * dist, 0, 1);
}
}
}