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

Rename settings class

Browse Source
This commit is contained in:
Dean Herbert 2023-11-21 00:21:44 +09:00
parent 750bbc8a19
commit 6f5c468a83
No known key found for this signature in database
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
private IDistanceSnapProvider distanceSnapProvider { get; set; }
[Resolved(CanBeNull = true)]
private OsuSliderDrawingSettingsProvider drawingSettingsProvider { get; set; }
private FreehandSliderSettingsProvider freehandSettingsProvider { get; set; }
private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder();
@ -80,16 +80,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
base.LoadComplete();
inputManager = GetContainingInputManager();
if (drawingSettingsProvider != null)
if (freehandSettingsProvider != null)
{
drawingSettingsProvider.Tolerance.BindValueChanged(e =>
freehandSettingsProvider.Tolerance.BindValueChanged(e =>
{
if (bSplineBuilder.Tolerance != e.NewValue)
bSplineBuilder.Tolerance = e.NewValue;
updateSliderPathFromBSplineBuilder();
});
drawingSettingsProvider.CornerThreshold.BindValueChanged(e =>
freehandSettingsProvider.CornerThreshold.BindValueChanged(e =>
{
if (bSplineBuilder.CornerThreshold != e.NewValue)
bSplineBuilder.CornerThreshold = e.NewValue;

14
osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs → osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit;
namespace osu.Game.Rulesets.Osu.Edit
{
public partial class OsuSliderDrawingSettingsProvider : Drawable
public partial class FreehandSliderSettingsProvider : Drawable
{
public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
{
@ -19,12 +19,6 @@ namespace osu.Game.Rulesets.Osu.Edit
Precision = 0.01f
};
private readonly BindableInt sliderTolerance = new BindableInt(40)
{
MinValue = 5,
MaxValue = 100
};
public BindableFloat CornerThreshold { get; } = new BindableFloat(0.4f)
{
MinValue = 0.05f,
@ -32,6 +26,12 @@ namespace osu.Game.Rulesets.Osu.Edit
Precision = 0.01f
};
private readonly BindableInt sliderTolerance = new BindableInt(40)
{
MinValue = 5,
MaxValue = 100
};
private readonly BindableInt sliderCornerThreshold = new BindableInt(40)
{
MinValue = 5,

6
osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Edit
protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
[Cached]
protected readonly OsuSliderDrawingSettingsProvider SliderDrawingSettingsProvider = new OsuSliderDrawingSettingsProvider();
protected readonly FreehandSliderSettingsProvider FreehandSliderSettingsProvider = new FreehandSliderSettingsProvider();
[BackgroundDependencyLoader]
private void load()
@ -102,8 +102,8 @@ namespace osu.Game.Rulesets.Osu.Edit
RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler,
});
AddInternal(SliderDrawingSettingsProvider);
SliderDrawingSettingsProvider.AttachToToolbox(RightToolbox);
AddInternal(FreehandSliderSettingsProvider);
FreehandSliderSettingsProvider.AttachToToolbox(RightToolbox);
}
protected override ComposeBlueprintContainer CreateBlueprintContainer()