mirror of
https://github.com/ppy/osu-tools.git
synced 2025-06-10 01:50:46 +09:00
final cleanup
This commit is contained in:
parent
a3001c6c8c
commit
10b1fb236f
4 changed files with 8 additions and 28 deletions
|
@ -1,7 +1,6 @@
|
||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
|
|
|
@ -4,9 +4,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Extensions.IEnumerableExtensions;
|
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
@ -14,7 +12,6 @@ using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Graphics.Containers;
|
using osu.Game.Graphics.Containers;
|
||||||
using osu.Game.Overlays;
|
using osu.Game.Overlays;
|
||||||
using osu.Game.Rulesets.Difficulty.Preprocessing;
|
|
||||||
using osuTK;
|
using osuTK;
|
||||||
|
|
||||||
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
|
@ -122,7 +119,8 @@ namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
RelativeSizeAxes = Axes.Both
|
RelativeSizeAxes = Axes.Both
|
||||||
});
|
});
|
||||||
|
|
||||||
for (int i = 1; i < InternalDict.Keys.Count; i++) {
|
for (int i = 1; i < InternalDict.Keys.Count; i++)
|
||||||
|
{
|
||||||
string group = InternalDict.Keys.ElementAt(i);
|
string group = InternalDict.Keys.ElementAt(i);
|
||||||
switchContainer.Add(new SpriteText
|
switchContainer.Add(new SpriteText
|
||||||
{
|
{
|
||||||
|
@ -147,7 +145,8 @@ namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
UpdateToggles();
|
UpdateToggles();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool GroupExists(string name) {
|
public bool GroupExists(string name)
|
||||||
|
{
|
||||||
return InternalDict.ContainsKey(name);
|
return InternalDict.ContainsKey(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using osu.Framework;
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
|
@ -13,13 +12,10 @@ using osu.Framework.Input.Events;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Graphics.Containers;
|
using osu.Game.Graphics.Containers;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using osu.Game.Overlays;
|
using osu.Game.Overlays;
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
using osu.Game.Rulesets.Catch.UI;
|
using osu.Game.Rulesets.Catch.UI;
|
||||||
using osu.Game.Rulesets.Difficulty;
|
using osu.Game.Rulesets.Difficulty;
|
||||||
using osu.Game.Rulesets.Difficulty.Skills;
|
|
||||||
using osu.Game.Rulesets.Objects;
|
|
||||||
using osu.Game.Rulesets.Mods;
|
using osu.Game.Rulesets.Mods;
|
||||||
using osu.Game.Rulesets.Osu.UI;
|
using osu.Game.Rulesets.Osu.UI;
|
||||||
using osu.Game.Rulesets.Taiko.UI;
|
using osu.Game.Rulesets.Taiko.UI;
|
||||||
|
@ -27,13 +23,8 @@ using osu.Game.Rulesets.UI;
|
||||||
using osu.Game.Screens.Edit;
|
using osu.Game.Screens.Edit;
|
||||||
using osu.Game.Screens.Edit.Components;
|
using osu.Game.Screens.Edit.Components;
|
||||||
using osu.Game.Screens.Edit.Components.Timelines.Summary;
|
using osu.Game.Screens.Edit.Components.Timelines.Summary;
|
||||||
using osu.Game.Screens.Menu;
|
|
||||||
using osuTK.Graphics.ES31;
|
|
||||||
using osuTK.Input;
|
using osuTK.Input;
|
||||||
using SharpGen.Runtime.Win32;
|
|
||||||
using osu.Game.Rulesets.Difficulty.Preprocessing;
|
using osu.Game.Rulesets.Difficulty.Preprocessing;
|
||||||
using FFmpeg.AutoGen;
|
|
||||||
using System;
|
|
||||||
using osu.Framework.Timing;
|
using osu.Framework.Timing;
|
||||||
|
|
||||||
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
|
@ -122,7 +113,7 @@ namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Masking = true,
|
Masking = true,
|
||||||
CornerRadius = 15f,
|
CornerRadius = 15f,
|
||||||
Padding = new MarginPadding() { Left = side_bar_width , Right = 0},
|
Padding = new MarginPadding() { Left = side_bar_width, Right = 0 },
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Child = clock,
|
Child = clock,
|
||||||
});
|
});
|
||||||
|
@ -303,8 +294,8 @@ namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
|
|
||||||
|
|
||||||
var amt = 0.25;
|
var amt = 0.25;
|
||||||
amt = e.ControlPressed ? amt * 2: amt;
|
amt = e.ControlPressed ? amt * 2 : amt;
|
||||||
amt = e.ShiftPressed ? amt * 0.5: amt;
|
amt = e.ShiftPressed ? amt * 0.5 : amt;
|
||||||
if (e.Key == Key.Q)
|
if (e.Key == Key.Q)
|
||||||
{
|
{
|
||||||
clock.SeekBackward(amount: amt);
|
clock.SeekBackward(amount: amt);
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
|
@ -16,18 +15,10 @@ using osu.Game.Rulesets.Osu.Objects;
|
||||||
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
||||||
using osu.Game.Rulesets.Osu.UI;
|
using osu.Game.Rulesets.Osu.UI;
|
||||||
using osu.Game.Rulesets.UI;
|
using osu.Game.Rulesets.UI;
|
||||||
using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
|
|
||||||
using System;
|
using System;
|
||||||
using osu.Game.Rulesets.Difficulty.Preprocessing;
|
using osu.Game.Rulesets.Difficulty.Preprocessing;
|
||||||
using osu.Game.Rulesets.Osu.Difficulty.Evaluators;
|
using osu.Game.Rulesets.Osu.Difficulty.Evaluators;
|
||||||
using SharpCompress.Common;
|
|
||||||
using osu.Framework.Utils;
|
using osu.Framework.Utils;
|
||||||
using Remotion.Linq.Clauses.ResultOperators;
|
|
||||||
using osu.Game.Rulesets.Taiko.Objects;
|
|
||||||
using osu.Game.Rulesets.Difficulty.Skills;
|
|
||||||
using osu.Game.Skinning;
|
|
||||||
using NUnit.Framework.Internal;
|
|
||||||
using osu.Game.Screens.Edit;
|
|
||||||
|
|
||||||
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
{
|
{
|
||||||
|
@ -79,7 +70,7 @@ namespace PerformanceCalculatorGUI.Screens.ObjectInspection
|
||||||
OsuHitObject baseHit = (OsuHitObject)osuDiffHit.BaseObject;
|
OsuHitObject baseHit = (OsuHitObject)osuDiffHit.BaseObject;
|
||||||
|
|
||||||
string groupName = osuDiffHit.BaseObject.GetType().Name;
|
string groupName = osuDiffHit.BaseObject.GetType().Name;
|
||||||
valueList.AddGroup(groupName,new string[] { "Slider", "HitCircle","Spinner" });
|
valueList.AddGroup(groupName, new string[] { "Slider", "HitCircle", "Spinner" });
|
||||||
valueList.SetValue(groupName, "Position", baseHit.StackedPosition);
|
valueList.SetValue(groupName, "Position", baseHit.StackedPosition);
|
||||||
valueList.SetValue(groupName, "Strain Time", osuDiffHit.StrainTime);
|
valueList.SetValue(groupName, "Strain Time", osuDiffHit.StrainTime);
|
||||||
valueList.SetValue(groupName, "Aim Difficulty", AimEvaluator.EvaluateDifficultyOf(osuDiffHit, true));
|
valueList.SetValue(groupName, "Aim Difficulty", AimEvaluator.EvaluateDifficultyOf(osuDiffHit, true));
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue