sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix missed usages

Browse Source
This commit is contained in:
Dean Herbert
2020-10-09 18:50:05 +09:00
parent edaf6db5c6
commit 3838f405dd
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Edit
int minColumn = int.MaxValue; int minColumn = int.MaxValue;
int maxColumn = int.MinValue; int maxColumn = int.MinValue;
foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>()) foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
{ {
if (obj.Column < minColumn) if (obj.Column < minColumn)
minColumn = obj.Column; minColumn = obj.Column;
@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Edit
columnDelta = Math.Clamp(columnDelta, -minColumn, maniaPlayfield.TotalColumns - 1 - maxColumn); columnDelta = Math.Clamp(columnDelta, -minColumn, maniaPlayfield.TotalColumns - 1 - maxColumn);
foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>()) foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
obj.Column += columnDelta; obj.Column += columnDelta;
} }
} }

12
osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit
{ {
base.OnSelectionChanged(); base.OnSelectionChanged();
bool canOperate = SelectedHitObjects.Count() > 1 || SelectedHitObjects.Any(s => s is Slider); bool canOperate = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
SelectionBox.CanRotate = canOperate; SelectionBox.CanRotate = canOperate;
SelectionBox.CanScaleX = canOperate; SelectionBox.CanScaleX = canOperate;
@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Edit
/// <param name="points">The points to calculate a quad for.</param> /// <param name="points">The points to calculate a quad for.</param>
private Quad getSurroundingQuad(IEnumerable<Vector2> points) private Quad getSurroundingQuad(IEnumerable<Vector2> points)
{ {
if (!SelectedHitObjects.Any()) if (!EditorBeatmap.SelectedHitObjects.Any())
return new Quad(); return new Quad();
Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue); Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
@ -203,10 +203,10 @@ namespace osu.Game.Rulesets.Osu.Edit
/// <summary> /// <summary>
/// All osu! hitobjects which can be moved/rotated/scaled. /// All osu! hitobjects which can be moved/rotated/scaled.
/// </summary> /// </summary>
private OsuHitObject[] selectedMovableObjects => SelectedHitObjects private OsuHitObject[] selectedMovableObjects => EditorBeatmap.SelectedHitObjects
.OfType<OsuHitObject>() .OfType<OsuHitObject>()
.Where(h => !(h is Spinner)) .Where(h => !(h is Spinner))
.ToArray(); .ToArray();
/// <summary> /// <summary>
/// Rotate a point around an arbitrary origin. /// Rotate a point around an arbitrary origin.

8
osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
public void SetStrongState(bool state) public void SetStrongState(bool state)
{ {
var hits = SelectedHitObjects.OfType<Hit>(); var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
ChangeHandler.BeginChange(); ChangeHandler.BeginChange();
@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
public void SetRimState(bool state) public void SetRimState(bool state)
{ {
var hits = SelectedHitObjects.OfType<Hit>(); var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
ChangeHandler.BeginChange(); ChangeHandler.BeginChange();
@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
{ {
base.UpdateTernaryStates(); base.UpdateTernaryStates();
selectionRimState.Value = GetStateFromSelection(SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim); selectionRimState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
selectionStrongState.Value = GetStateFromSelection(SelectedHitObjects.OfType<TaikoHitObject>(), h => h.IsStrong); selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoHitObject>(), h => h.IsStrong);
} }
} }
} }

2
osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
View File

@ -436,7 +436,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
// Apply the start time at the newly snapped-to position // Apply the start time at the newly snapped-to position
double offset = result.Time.Value - draggedObject.StartTime; double offset = result.Time.Value - draggedObject.StartTime;
foreach (HitObject obj in SelectionHandler.SelectedHitObjects) foreach (HitObject obj in Beatmap.SelectedHitObjects)
obj.StartTime += offset; obj.StartTime += offset;
} }