sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename HitObject -> DrawableObject in selection blueprints

Browse Source
This commit is contained in:
smoogipoo
2019-10-21 17:04:56 +09:00
parent 7967c73f03
commit 38c2c328ff
12 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
private void removeBlueprintFor(HitObject hitObject)
{
var blueprint = selectionBlueprints.Single(m => m.HitObject.HitObject == hitObject);
var blueprint = selectionBlueprints.Single(m => m.DrawableObject.HitObject == hitObject);
if (blueprint == null)
return;
@ -252,7 +252,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
return d;
// Put earlier hitobjects towards the end of the list, so they handle input first
int i = y.HitObject.HitObject.StartTime.CompareTo(x.HitObject.HitObject.StartTime);
int i = y.DrawableObject.HitObject.StartTime.CompareTo(x.DrawableObject.HitObject.StartTime);
return i == 0 ? CompareReverseChildID(x, y) : i;
}
}

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

@ -40,7 +40,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
ScreenSpaceStartPosition = screenSpaceStartPosition;
ScreenSpacePosition = screenSpacePosition;
InstantDelta = Blueprint.HitObject.Parent.ToLocalSpace(ScreenSpacePosition) - Blueprint.HitObject.Position;
InstantDelta = Blueprint.DrawableObject.Parent.ToLocalSpace(ScreenSpacePosition) - Blueprint.DrawableObject.Position;
}
}
}

4
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
protected IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
private readonly List<SelectionBlueprint> selectedBlueprints;
protected IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.HitObject.HitObject);
protected IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.DrawableObject.HitObject);
private Drawable outline;
@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
case Key.Delete:
foreach (var h in selectedBlueprints.ToList())
placementHandler.Delete(h.HitObject.HitObject);
placementHandler.Delete(h.DrawableObject.HitObject);
return true;
}