h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00
Code Issues Releases Wiki Activity

Rename ReplaySomething -> PlayerSomething

Browse Source
This commit is contained in:
TocoToucan 2018-01-13 22:25:09 +03:00
parent affbb7a847
commit 43d2ae348a
13 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/TestCaseReplaySettingsOverlay.cs
View File

@ -4,7 +4,7 @@
using osu.Framework.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Play.HUD;
using osu.Game.Screens.Play.ReplaySettings;
using osu.Game.Screens.Play.PlayerSettings;
namespace osu.Game.Tests.Visual
{
@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual
{
ExampleContainer container;
Add(new ReplaySettingsOverlay
Add(new PlayerSettingsOverlay
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual
Text = @"Button",
}));
AddStep(@"Add checkbox", () => container.Add(new ReplayCheckbox
AddStep(@"Add checkbox", () => container.Add(new PlayerCheckbox
{
LabelText = "Checkbox",
}));
@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual
}));
}
private class ExampleContainer : ReplayGroup
private class ExampleContainer : PlayerGroup
{
protected override string Title => @"example";
}

4
osu.Game/Rulesets/Edit/ToolboxGroup.cs
View File

@ -2,11 +2,11 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Game.Screens.Play.ReplaySettings;
using osu.Game.Screens.Play.PlayerSettings;
namespace osu.Game.Rulesets.Edit
{
public class ToolboxGroup : ReplayGroup
public class ToolboxGroup : PlayerGroup
{
protected override string Title => "toolbox";

10
osu.Game/Screens/Play/HUD/ReplaySettingsOverlay.cs → osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
View File

@ -3,14 +3,14 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Screens.Play.ReplaySettings;
using OpenTK;
using osu.Framework.Input;
using osu.Game.Screens.Play.PlayerSettings;
using OpenTK.Input;
namespace osu.Game.Screens.Play.HUD
{
public class ReplaySettingsOverlay : VisibilityContainer
public class PlayerSettingsOverlay : VisibilityContainer
{
private const int fade_duration = 200;
@ -21,12 +21,12 @@ namespace osu.Game.Screens.Play.HUD
//public readonly CollectionSettings CollectionSettings;
//public readonly DiscussionSettings DiscussionSettings;
public ReplaySettingsOverlay()
public PlayerSettingsOverlay()
{
AlwaysPresent = true;
RelativeSizeAxes = Axes.Both;
Child = new FillFlowContainer<ReplayGroup>
Child = new FillFlowContainer<PlayerGroup>
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 20),
Margin = new MarginPadding { Top = 100, Right = 10 },
Children = new ReplayGroup[]
Children = new PlayerGroup[]
{
//CollectionSettings = new CollectionSettings(),
//DiscussionSettings = new DiscussionSettings(),

12
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Play
public readonly HealthDisplay HealthDisplay;
public readonly SongProgress Progress;
public readonly ModDisplay ModDisplay;
public readonly ReplaySettingsOverlay ReplaySettingsOverlay;
public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
private Bindable<bool> showHud;
private bool replayLoaded;
@ -56,7 +56,7 @@ namespace osu.Game.Screens.Play
HealthDisplay = CreateHealthDisplay(),
Progress = CreateProgress(),
ModDisplay = CreateModsContainer(),
ReplaySettingsOverlay = CreateReplaySettingsOverlay(),
PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
}
});
}
@ -97,13 +97,13 @@ namespace osu.Game.Screens.Play
replayLoaded = rulesetContainer.HasReplayLoaded;
ReplaySettingsOverlay.ReplayLoaded = replayLoaded;
PlayerSettingsOverlay.ReplayLoaded = replayLoaded;
// in the case a replay isn't loaded, we want some elements to only appear briefly.
if (!replayLoaded)
{
ReplaySettingsOverlay.PlaybackSettings.Hide();
ReplaySettingsOverlay.VisualSettings.Autohide = true;
PlayerSettingsOverlay.PlaybackSettings.Hide();
PlayerSettingsOverlay.VisualSettings.Autohide = true;
ModDisplay.Delay(2000).FadeOut(200);
}
}
@ -183,7 +183,7 @@ namespace osu.Game.Screens.Play
Margin = new MarginPadding { Top = 20, Right = 10 },
};
protected virtual ReplaySettingsOverlay CreateReplaySettingsOverlay() => new ReplaySettingsOverlay();
protected virtual PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
public virtual void BindProcessor(ScoreProcessor processor)
{

6
osu.Game/Screens/Play/Player.cs
View File

@ -230,9 +230,9 @@ namespace osu.Game.Screens.Play
breakOverlay.BindProcessor(scoreProcessor);
hudOverlay.ReplaySettingsOverlay.PlaybackSettings.AdjustableClock = adjustableSourceClock;
hudOverlay.ReplaySettingsOverlay.VisualSettings.AudioClock = decoupledClock;
hudOverlay.ReplaySettingsOverlay.VisualSettings.FramedClock = offsetClock;
hudOverlay.PlayerSettingsOverlay.PlaybackSettings.AdjustableClock = adjustableSourceClock;
hudOverlay.PlayerSettingsOverlay.VisualSettings.AudioClock = decoupledClock;
hudOverlay.PlayerSettingsOverlay.VisualSettings.FramedClock = offsetClock;
// Bind ScoreProcessor to ourselves
scoreProcessor.AllJudged += onCompletion;

6
osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs → osu.Game/Screens/Play/PlayerSettings/CollectionSettings.cs
View File

@ -1,15 +1,15 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Music;
using System.Collections.Generic;
namespace osu.Game.Screens.Play.ReplaySettings
namespace osu.Game.Screens.Play.PlayerSettings
{
public class CollectionSettings : ReplayGroup
public class CollectionSettings : PlayerGroup
{
protected override string Title => @"collections";

6
osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs → osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
View File

@ -6,9 +6,9 @@ using osu.Framework.Graphics;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings
namespace osu.Game.Screens.Play.PlayerSettings
{
public class DiscussionSettings : ReplayGroup
public class DiscussionSettings : PlayerGroup
{
protected override string Title => @"discussions";
@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
{
Children = new Drawable[]
{
new ReplayCheckbox
new PlayerCheckbox
{
LabelText = "Show floating comments",
Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)

10
osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs → osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
View File

@ -1,15 +1,15 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Timing;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Timing;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Play.ReplaySettings
namespace osu.Game.Screens.Play.PlayerSettings
{
public class PlaybackSettings : ReplayGroup
public class PlaybackSettings : PlayerGroup
{
private const int padding = 10;
@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
public IAdjustableClock AdjustableClock { set; get; }
private readonly ReplaySliderBar<double> sliderbar;
private readonly PlayerSliderBar<double> sliderbar;
public PlaybackSettings()
{
@ -47,7 +47,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
}
},
},
sliderbar = new ReplaySliderBar<double>
sliderbar = new PlayerSliderBar<double>
{
Bindable = new BindableDouble(1)
{

4
osu.Game/Screens/Play/ReplaySettings/ReplayCheckbox.cs → osu.Game/Screens/Play/PlayerSettings/PlayerCheckbox.cs
View File

@ -5,9 +5,9 @@ using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings
namespace osu.Game.Screens.Play.PlayerSettings
{
public class ReplayCheckbox : OsuCheckbox
public class PlayerCheckbox : OsuCheckbox
{
[BackgroundDependencyLoader]
private void load(OsuColour colours)

10
osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs → osu.Game/Screens/Play/PlayerSettings/PlayerGroup.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -10,10 +8,12 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Screens.Play.ReplaySettings
namespace osu.Game.Screens.Play.PlayerSettings
{
public abstract class ReplayGroup : Container
public abstract class PlayerGroup : Container
{
/// <summary>
/// The title to be displayed in the header of this group.
@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
private Color4 buttonActiveColour;
protected ReplayGroup()
protected PlayerGroup()
{
AutoSizeAxes = Axes.Y;
Width = container_width;

10
osu.Game/Screens/Play/ReplaySettings/ReplaySliderBar.cs → osu.Game/Screens/Play/PlayerSettings/PlayerSliderBar.cs
View File

@ -1,16 +1,16 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Game.Graphics.UserInterface;
using System;
using osu.Game.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Settings;
namespace osu.Game.Screens.Play.ReplaySettings
namespace osu.Game.Screens.Play.PlayerSettings
{
public class ReplaySliderBar<T> : SettingsSlider<T>
public class PlayerSliderBar<T> : SettingsSlider<T>
where T : struct, IEquatable<T>
{
protected override Drawable CreateControl() => new Sliderbar

21
osu.Game/Screens/Play/HUD/VisualSettings.cs → osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
View File

@ -8,11 +8,10 @@ using osu.Framework.Graphics;
using osu.Framework.Timing;
using osu.Game.Configuration;
using osu.Game.Graphics.Sprites;
using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Game.Screens.Play.HUD
namespace osu.Game.Screens.Play.PlayerSettings
{
public class VisualSettings : ReplayGroup
public class VisualSettings : PlayerGroup
{
protected override string Title => "Visual settings";
@ -37,10 +36,10 @@ namespace osu.Game.Screens.Play.HUD
private readonly TimeSpan hideTimeSpan = TimeSpan.FromSeconds(3);
private Stopwatch hideStopWatch;
private readonly ReplaySliderBar<double> dimSliderBar;
private readonly ReplaySliderBar<double> blurSliderBar;
private readonly ReplayCheckbox showStoryboardToggle;
private readonly ReplayCheckbox mouseWheelDisabledToggle;
private readonly PlayerSliderBar<double> dimSliderBar;
private readonly PlayerSliderBar<double> blurSliderBar;
private readonly PlayerCheckbox showStoryboardToggle;
private readonly PlayerCheckbox mouseWheelDisabledToggle;
public VisualSettings()
{
@ -50,18 +49,18 @@ namespace osu.Game.Screens.Play.HUD
{
Text = "Background dim:"
},
dimSliderBar = new ReplaySliderBar<double>(),
dimSliderBar = new PlayerSliderBar<double>(),
new OsuSpriteText
{
Text = "Background blur:"
},
blurSliderBar = new ReplaySliderBar<double>(),
blurSliderBar = new PlayerSliderBar<double>(),
new OsuSpriteText
{
Text = "Toggles:"
},
showStoryboardToggle = new ReplayCheckbox { LabelText = "Storyboards" },
mouseWheelDisabledToggle = new ReplayCheckbox { LabelText = "Disable mouse wheel" }
showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" },
mouseWheelDisabledToggle = new PlayerCheckbox { LabelText = "Disable mouse wheel" }
};
}

16
osu.Game/osu.Game.csproj
View File

@ -315,7 +315,7 @@
<Compile Include="Rulesets\Mods\IApplicableMod.cs" />
<Compile Include="Rulesets\Mods\IApplicableToBeatmapConverter.cs" />
<Compile Include="Rulesets\Mods\IApplicableToDrawableHitObject.cs" />
<Compile Include="Screens\Play\HUD\VisualSettings.cs" />
<Compile Include="Screens\Play\PlayerSettings\VisualSettings.cs" />
<Compile Include="Screens\Select\ImportFromStablePopup.cs" />
<Compile Include="Overlays\Settings\SettingsButton.cs" />
<Compile Include="Rulesets\Edit\Layers\Selection\OriginHandle.cs" />
@ -743,13 +743,13 @@
<Compile Include="Screens\Play\Player.cs" />
<Compile Include="Screens\Play\PlayerLoader.cs" />
<Compile Include="Screens\Play\ReplayPlayer.cs" />
<Compile Include="Screens\Play\HUD\ReplaySettingsOverlay.cs" />
<Compile Include="Screens\Play\ReplaySettings\CollectionSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\DiscussionSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\PlaybackSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplayCheckbox.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplayGroup.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySliderBar.cs" />
<Compile Include="Screens\Play\HUD\PlayerSettingsOverlay.cs" />
<Compile Include="Screens\Play\PlayerSettings\CollectionSettings.cs" />
<Compile Include="Screens\Play\PlayerSettings\DiscussionSettings.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlaybackSettings.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlayerCheckbox.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlayerGroup.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlayerSliderBar.cs" />
<Compile Include="Screens\Play\SkipButton.cs" />
<Compile Include="Screens\Play\SongProgress.cs" />
<Compile Include="Screens\Play\SongProgressBar.cs" />