RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-25 16:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move placement handling events to a higher level

Browse Source
This commit is contained in:
smoogipoo 2018-10-17 15:46:30 +09:00
parent 08e3fe1def
commit 4ea4ec0d25
5 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
View File

@ -15,13 +15,15 @@ using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Edit;
using osu.Game.Rulesets.Osu.Edit.Masks;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Layers;
using osu.Game.Tests.Beatmaps;
namespace osu.Game.Tests.Visual
{
[TestFixture]
public class TestCaseHitObjectComposer : OsuTestCase
[Cached(Type = typeof(IPlacementHandler))]
public class TestCaseHitObjectComposer : OsuTestCase, IPlacementHandler
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
@ -36,6 +38,9 @@ namespace osu.Game.Tests.Visual
typeof(HitCirclePlacementMask),
};
public event Action<HitObject> PlacementStarted;
public event Action<HitObject> PlacementFinished;
[BackgroundDependencyLoader]
private void load()
{
@ -67,5 +72,9 @@ namespace osu.Game.Tests.Visual
Child = new OsuHitObjectComposer(new OsuRuleset());
}
public void BeginPlacement(HitObject hitObject) => PlacementStarted?.Invoke(hitObject);
public void EndPlacement(HitObject hitObject) => PlacementFinished?.Invoke(hitObject);
}
}

33
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -15,6 +15,7 @@ using osu.Game.Rulesets.Configuration;
using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Layers;
using osu.Game.Screens.Edit.Screens.Compose.RadioButtons;
@ -31,10 +32,15 @@ namespace osu.Game.Rulesets.Edit
private readonly List<Container> layerContainers = new List<Container>();
private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
[Resolved]
private IPlacementHandler placementHandler { get; set; }
private HitObjectMaskLayer maskLayer;
private Container placementContainer;
private EditRulesetContainer rulesetContainer;
private HitObjectCompositionTool compositionTool;
protected HitObjectComposer(Ruleset ruleset)
{
this.ruleset = ruleset;
@ -117,6 +123,16 @@ namespace osu.Game.Rulesets.Edit
.ToList();
toolboxCollection.Items[0].Select();
placementHandler.PlacementFinished += h =>
{
var drawableObject = rulesetContainer.AddHitObject(h);
maskLayer.AddMask(drawableObject);
// Re-construct the mask
setCompositionTool(compositionTool);
};
}
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@ -151,23 +167,12 @@ namespace osu.Game.Rulesets.Edit
private void setCompositionTool(HitObjectCompositionTool tool)
{
compositionTool = tool;
placementContainer.Clear(true);
if (tool != null)
{
var mask = tool.CreatePlacementMask();
mask.PlacementFinished += h =>
{
var drawableObject = rulesetContainer.AddHitObject(h);
maskLayer.AddMask(drawableObject);
// Re-construct the mask
setCompositionTool(tool);
};
placementContainer.Child = mask;
}
placementContainer.Child = tool.CreatePlacementMask();
}
protected abstract EditRulesetContainer CreateRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap);

27
osu.Game/Rulesets/Edit/PlacementMask.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
@ -9,22 +8,13 @@ using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Screens.Compose;
using OpenTK;
namespace osu.Game.Rulesets.Edit
{
public class PlacementMask : CompositeDrawable, IRequireHighFrequencyMousePosition
{
/// <summary>
/// Invoked when the placement of <see cref="HitObject"/> has started.
/// </summary>
public event Action<HitObject> PlacementStarted;
/// <summary>
/// Invoked when the placement of <see cref="HitObject"/> has finished.
/// </summary>
public event Action<HitObject> PlacementFinished;
/// <summary>
/// The <see cref="HitObject"/> that is being placed.
/// </summary>
@ -32,6 +22,9 @@ namespace osu.Game.Rulesets.Edit
protected IClock EditorClock { get; private set; }
[Resolved]
private IPlacementHandler placementHandler { get; set; }
public PlacementMask(HitObject hitObject)
{
HitObject = hitObject;
@ -52,7 +45,7 @@ namespace osu.Game.Rulesets.Edit
/// </summary>
protected void BeginPlacement()
{
PlacementStarted?.Invoke(HitObject);
placementHandler.BeginPlacement(HitObject);
placementBegun = true;
}
@ -64,7 +57,7 @@ namespace osu.Game.Rulesets.Edit
{
if (!placementBegun)
BeginPlacement();
PlacementFinished?.Invoke(HitObject);
placementHandler.EndPlacement(HitObject);
}
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent?.ReceivePositionalInputAt(screenSpacePos) ?? false;
@ -81,13 +74,5 @@ namespace osu.Game.Rulesets.Edit
return false;
}
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
PlacementStarted = null;
PlacementFinished = null;
}
}
}

19
osu.Game/Screens/Edit/Screens/Compose/Compose.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using OpenTK.Graphics;
@ -9,15 +10,27 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Screens.Compose.Timeline;
namespace osu.Game.Screens.Edit.Screens.Compose
{
public class Compose : EditorScreen
[Cached(Type = typeof(IPlacementHandler))]
public class Compose : EditorScreen, IPlacementHandler
{
private const float vertical_margins = 10;
private const float horizontal_margins = 20;
/// <summary>
/// Invoked when the placement of a <see cref="HitObject"/> has started.
/// </summary>
public event Action<HitObject> PlacementStarted;
/// <summary>
/// Invoked when the placement of a <see cref="HitObject"/> has finished.
/// </summary>
public event Action<HitObject> PlacementFinished;
private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
private Container composerContainer;
@ -111,5 +124,9 @@ namespace osu.Game.Screens.Edit.Screens.Compose
composerContainer.Child = composer;
}
public void BeginPlacement(HitObject hitObject) => PlacementStarted?.Invoke(hitObject);
public void EndPlacement(HitObject hitObject) => PlacementFinished?.Invoke(hitObject);
}
}

17
osu.Game/Screens/Edit/Screens/Compose/IPlacementHandler.cs Normal file
View File

@ -0,0 +1,17 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Game.Rulesets.Objects;
namespace osu.Game.Screens.Edit.Screens.Compose
{
public interface IPlacementHandler
{
event Action<HitObject> PlacementStarted;
event Action<HitObject> PlacementFinished;
void BeginPlacement(HitObject hitObject);
void EndPlacement(HitObject hitObject);
}
}