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

Improve slider placement test scene

Browse Source
This commit is contained in:
smoogipoo
2020-04-13 15:31:54 +09:00
parent 2c20328a70
commit bde0b259c1
2 changed files with 282 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
View File

@ -4,8 +4,6 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
@ -15,13 +13,11 @@ using osu.Game.Screens.Edit.Compose;
namespace osu.Game.Tests.Visual
{
[Cached(Type = typeof(IPlacementHandler))]
public abstract class PlacementBlueprintTestScene : OsuTestScene, IPlacementHandler
public abstract class PlacementBlueprintTestScene : OsuManualInputManagerTestScene, IPlacementHandler
{
protected Container HitObjectContainer;
protected readonly Container HitObjectContainer;
private PlacementBlueprint currentBlueprint;
private InputManager inputManager;
protected PlacementBlueprintTestScene()
{
Add(HitObjectContainer = CreateHitObjectContainer().With(c => c.Clock = new FramedClock(new StopwatchClock())));
@ -45,8 +41,7 @@ namespace osu.Game.Tests.Visual
{
base.LoadComplete();
inputManager = GetContainingInputManager();
Add(currentBlueprint = CreateBlueprint());
ResetPlacement();
}
public void BeginPlacement(HitObject hitObject)
@ -58,7 +53,13 @@ namespace osu.Game.Tests.Visual
if (commit)
AddHitObject(CreateHitObject(hitObject));
Remove(currentBlueprint);
ResetPlacement();
}
protected void ResetPlacement()
{
if (currentBlueprint != null)
Remove(currentBlueprint);
Add(currentBlueprint = CreateBlueprint());
}
@ -66,10 +67,11 @@ namespace osu.Game.Tests.Visual
{
}
protected override bool OnMouseMove(MouseMoveEvent e)
protected override void Update()
{
currentBlueprint.UpdatePosition(e.ScreenSpaceMousePosition);
return true;
base.Update();
currentBlueprint.UpdatePosition(InputManager.CurrentState.Mouse.Position);
}
public override void Add(Drawable drawable)
@ -79,7 +81,7 @@ namespace osu.Game.Tests.Visual
if (drawable is PlacementBlueprint blueprint)
{
blueprint.Show();
blueprint.UpdatePosition(inputManager.CurrentState.Mouse.Position);
blueprint.UpdatePosition(InputManager.CurrentState.Mouse.Position);
}
}