osu/osu-tools
1
0
Fork 0
mirror of https://github.com/ppy/osu-tools.git synced 2025-06-11 18:20:35 +09:00
Code Activity

Bind to DI mods bindable

Browse source
This commit is contained in:
StanR 2022-03-08 22:06:38 +03:00
parent 12169ffd4c
commit aaa9c4f43a
3 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PerformanceCalculatorGUI/PerformanceCalculatorSceneManager.cs
View file

@ -59,7 +59,7 @@ namespace PerformanceCalculatorGUI
Height = CONTROL_AREA_HEIGHT,
Children = new Drawable[]
{
new Box()
new Box
{
Colour = OsuColour.Gray(0.1f),
RelativeSizeAxes = Axes.Both,

2
PerformanceCalculatorGUI/Screens/ProfileScreen.cs
View file

@ -22,7 +22,7 @@ namespace PerformanceCalculatorGUI.Screens
{
InternalChildren = new Drawable[]
{
new OsuSpriteText()
new OsuSpriteText
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,

39
PerformanceCalculatorGUI/Screens/SimulateScreen.cs
View file

@ -49,7 +49,8 @@ namespace PerformanceCalculatorGUI.Screens
private ModDisplay modDisplay;
private readonly Bindable<IReadOnlyList<Mod>> appliedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
[Resolved]
private Bindable<IReadOnlyList<Mod>> appliedMods { get; set; }
[Resolved]
private Bindable<RulesetInfo> ruleset { get; set; }
@ -86,7 +87,7 @@ namespace PerformanceCalculatorGUI.Screens
Height = 20,
Children = new Drawable[]
{
beatmapTitle = new OsuSpriteText()
beatmapTitle = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -95,7 +96,7 @@ namespace PerformanceCalculatorGUI.Screens
},
}
},
beatmapDataContainer = new FillFlowContainer()
beatmapDataContainer = new FillFlowContainer
{
Name = "Beatmap data",
Y = 60,
@ -108,7 +109,7 @@ namespace PerformanceCalculatorGUI.Screens
Name = "Score params",
RelativeSizeAxes = Axes.Both,
Width = 0.5f,
Child = new FillFlowContainer()
Child = new FillFlowContainer
{
Padding = new MarginPadding(10.0f),
RelativeSizeAxes = Axes.X,
@ -116,7 +117,7 @@ namespace PerformanceCalculatorGUI.Screens
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
new OsuSpriteText()
new OsuSpriteText
{
Margin = new MarginPadding(10.0f),
Origin = Anchor.TopLeft,
@ -143,7 +144,7 @@ namespace PerformanceCalculatorGUI.Screens
modDisplay = new ModDisplay()
}
},
accuracyTextBox = new LabelledFractionalNumberBox()
accuracyTextBox = new LabelledFractionalNumberBox
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.TopLeft,
@ -153,7 +154,7 @@ namespace PerformanceCalculatorGUI.Screens
MinValue = 0.0,
Value = { Value = 100.0 }
},
missesTextBox = new LimitedLabelledNumberBox()
missesTextBox = new LimitedLabelledNumberBox
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.TopLeft,
@ -161,7 +162,7 @@ namespace PerformanceCalculatorGUI.Screens
PlaceholderText = "0",
MinValue = 0
},
comboTextBox = new LimitedLabelledNumberBox()
comboTextBox = new LimitedLabelledNumberBox
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.TopLeft,
@ -169,7 +170,7 @@ namespace PerformanceCalculatorGUI.Screens
PlaceholderText = "0",
MinValue = 0
},
scoreTextBox = new LimitedLabelledNumberBox()
scoreTextBox = new LimitedLabelledNumberBox
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.TopLeft,
@ -187,7 +188,7 @@ namespace PerformanceCalculatorGUI.Screens
Name = "Difficulty calculation results",
RelativeSizeAxes = Axes.Both,
Width = 0.5f,
Child = new FillFlowContainer()
Child = new FillFlowContainer
{
Padding = new MarginPadding(10.0f),
RelativeSizeAxes = Axes.X,
@ -195,28 +196,28 @@ namespace PerformanceCalculatorGUI.Screens
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
new OsuSpriteText()
new OsuSpriteText
{
Margin = new MarginPadding(10.0f),
Origin = Anchor.TopLeft,
Height = 20,
Text = "Difficulty Attributes"
},
difficultyAttributesContainer = new FillFlowContainer()
difficultyAttributesContainer = new FillFlowContainer
{
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X,
Anchor = Anchor.TopLeft,
AutoSizeAxes = Axes.Y
},
new OsuSpriteText()
new OsuSpriteText
{
Margin = new MarginPadding(10.0f),
Origin = Anchor.TopLeft,
Height = 20,
Text = "Performance Attributes"
},
performanceAttributesContainer = new FillFlowContainer()
performanceAttributesContainer = new FillFlowContainer
{
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X,
@ -233,7 +234,7 @@ namespace PerformanceCalculatorGUI.Screens
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Child = userModsSelectOverlay = new UserModSelectOverlay()
Child = userModsSelectOverlay = new UserModSelectOverlay
{
IsValidMod = (mod) => mod.HasImplementation && ModUtils.FlattenMod(mod).All(m => m.UserPlayable),
SelectedMods = { BindTarget = appliedMods }
@ -263,6 +264,7 @@ namespace PerformanceCalculatorGUI.Screens
public override void Hide()
{
userModsSelectOverlay.Hide();
beatmapTextBox.Current.Value = string.Empty;
base.Hide();
}
@ -291,6 +293,7 @@ namespace PerformanceCalculatorGUI.Screens
working = null;
beatmapTitle.Text = "No beatmap loaded!";
beatmapDataContainer.Hide();
appliedMods.Value = Array.Empty<Mod>();
return;
}
@ -320,7 +323,7 @@ namespace PerformanceCalculatorGUI.Screens
var diffAttributeValues = JsonConvert.DeserializeObject<Dictionary<string, object>>(JsonConvert.SerializeObject(difficultyAttributes)) ?? new Dictionary<string, object>();
difficultyAttributesContainer.Children = diffAttributeValues.Select(x =>
new LabelledTextBox()
new LabelledTextBox
{
ReadOnly = true,
Origin = Anchor.TopLeft,
@ -369,7 +372,7 @@ namespace PerformanceCalculatorGUI.Screens
var perfAttributeValues = JsonConvert.DeserializeObject<Dictionary<string, object>>(JsonConvert.SerializeObject(ppAttributes)) ?? new Dictionary<string, object>();
performanceAttributesContainer.Children = perfAttributeValues.Select(x =>
new LabelledTextBox()
new LabelledTextBox
{
ReadOnly = true,
Origin = Anchor.TopLeft,
@ -386,6 +389,8 @@ namespace PerformanceCalculatorGUI.Screens
missesTextBox.Hide();
scoreTextBox.Hide();
// TODO: other rulesets?
if (ruleset.Value.ShortName == "osu" || ruleset.Value.ShortName == "taiko" || ruleset.Value.ShortName == "fruits")
{
accuracyTextBox.Text = string.Empty;