mirror of
https://github.com/ppy/osu.git
synced 2025-01-31 12:52:53 +08:00
remove old files
This commit is contained in:
Sheepposu
parent
4d669c56a2
commit
c95e85368f
@ -1,135 +0,0 @@
|
|||||||
// 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.
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using NUnit.Framework;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Input.Events;
|
|
||||||
using osu.Framework.Input.States;
|
|
||||||
using osu.Framework.Logging;
|
|
||||||
using osu.Framework.Testing.Input;
|
|
||||||
using osu.Game.Rulesets.Osu.UI;
|
|
||||||
using osu.Game.Rulesets.UI;
|
|
||||||
using osuTK;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.Tests
|
|
||||||
{
|
|
||||||
public partial class TestSceneHitMarker : OsuSkinnableTestScene
|
|
||||||
{
|
|
||||||
[Test]
|
|
||||||
public void TestHitMarkers()
|
|
||||||
{
|
|
||||||
var markerContainers = new List<HitMarkerContainer>();
|
|
||||||
|
|
||||||
AddStep("Create hit markers", () =>
|
|
||||||
{
|
|
||||||
markerContainers.Clear();
|
|
||||||
SetContents(_ =>
|
|
||||||
{
|
|
||||||
markerContainers.Add(new TestHitMarkerContainer(new HitObjectContainer())
|
|
||||||
{
|
|
||||||
HitMarkerEnabled = { Value = true },
|
|
||||||
AimMarkersEnabled = { Value = true },
|
|
||||||
AimLinesEnabled = { Value = true },
|
|
||||||
RelativeSizeAxes = Axes.Both
|
|
||||||
});
|
|
||||||
|
|
||||||
return new HitMarkerInputManager
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Size = new Vector2(0.95f),
|
|
||||||
Child = markerContainers[^1],
|
|
||||||
};
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
AddUntilStep("Until skinnable expires", () =>
|
|
||||||
{
|
|
||||||
if (markerContainers.Count == 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
Logger.Log("How many: " + markerContainers.Count);
|
|
||||||
|
|
||||||
foreach (var markerContainer in markerContainers)
|
|
||||||
{
|
|
||||||
if (markerContainer.Children.Count != 0)
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class HitMarkerInputManager : ManualInputManager
|
|
||||||
{
|
|
||||||
private double? startTime;
|
|
||||||
|
|
||||||
public HitMarkerInputManager()
|
|
||||||
{
|
|
||||||
UseParentInput = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
|
||||||
{
|
|
||||||
base.LoadComplete();
|
|
||||||
|
|
||||||
MoveMouseTo(ToScreenSpace(DrawSize / 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Update()
|
|
||||||
{
|
|
||||||
base.Update();
|
|
||||||
|
|
||||||
const float spin_angle = 4 * MathF.PI;
|
|
||||||
|
|
||||||
startTime ??= Time.Current;
|
|
||||||
|
|
||||||
float fraction = (float)((Time.Current - startTime) / 5_000);
|
|
||||||
|
|
||||||
float angle = fraction * spin_angle;
|
|
||||||
float radius = fraction * Math.Min(DrawSize.X, DrawSize.Y) / 2;
|
|
||||||
|
|
||||||
Vector2 pos = radius * new Vector2(MathF.Cos(angle), MathF.Sin(angle)) + DrawSize / 2;
|
|
||||||
MoveMouseTo(ToScreenSpace(pos));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class TestHitMarkerContainer : HitMarkerContainer
|
|
||||||
{
|
|
||||||
private double? lastClick;
|
|
||||||
private double? startTime;
|
|
||||||
private bool finishedDrawing;
|
|
||||||
private bool leftOrRight;
|
|
||||||
|
|
||||||
public TestHitMarkerContainer(HitObjectContainer hitObjectContainer)
|
|
||||||
: base(hitObjectContainer)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Update()
|
|
||||||
{
|
|
||||||
base.Update();
|
|
||||||
|
|
||||||
if (finishedDrawing)
|
|
||||||
return;
|
|
||||||
|
|
||||||
startTime ??= lastClick ??= Time.Current;
|
|
||||||
|
|
||||||
if (startTime + 5_000 <= Time.Current)
|
|
||||||
{
|
|
||||||
finishedDrawing = true;
|
|
||||||
HitMarkerEnabled.Value = AimMarkersEnabled.Value = AimLinesEnabled.Value = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lastClick + 400 <= Time.Current)
|
|
||||||
{
|
|
||||||
OnPressed(new KeyBindingPressEvent<OsuAction>(new InputState(), leftOrRight ? OsuAction.LeftButton : OsuAction.RightButton));
|
|
||||||
leftOrRight = !leftOrRight;
|
|
||||||
lastClick = Time.Current;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,195 +0,0 @@
|
|||||||
// 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.
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Bindables;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Framework.Graphics.Shapes;
|
|
||||||
using osu.Framework.Input;
|
|
||||||
using osu.Framework.Input.Bindings;
|
|
||||||
using osu.Framework.Input.Events;
|
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
|
||||||
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
|
||||||
using osu.Game.Rulesets.Osu.Skinning;
|
|
||||||
using osu.Game.Rulesets.Osu.Skinning.Default;
|
|
||||||
using osu.Game.Rulesets.UI;
|
|
||||||
using osu.Game.Skinning;
|
|
||||||
using osuTK;
|
|
||||||
using osuTK.Graphics;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.UI
|
|
||||||
{
|
|
||||||
public partial class HitMarkerContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
|
|
||||||
{
|
|
||||||
private Vector2 lastMousePosition;
|
|
||||||
private Vector2? lastlastMousePosition;
|
|
||||||
private double timePreempt;
|
|
||||||
|
|
||||||
public Bindable<bool> HitMarkerEnabled = new BindableBool();
|
|
||||||
public Bindable<bool> AimMarkersEnabled = new BindableBool();
|
|
||||||
public Bindable<bool> AimLinesEnabled = new BindableBool();
|
|
||||||
|
|
||||||
private const double default_time_preempt = 1000;
|
|
||||||
|
|
||||||
private readonly HitObjectContainer hitObjectContainer;
|
|
||||||
|
|
||||||
public override bool ReceivePositionalInputAt(Vector2 _) => true;
|
|
||||||
|
|
||||||
public HitMarkerContainer(HitObjectContainer hitObjectContainer)
|
|
||||||
{
|
|
||||||
this.hitObjectContainer = hitObjectContainer;
|
|
||||||
timePreempt = default_time_preempt;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
|
|
||||||
{
|
|
||||||
if (HitMarkerEnabled.Value && (e.Action == OsuAction.LeftButton || e.Action == OsuAction.RightButton))
|
|
||||||
{
|
|
||||||
updateTimePreempt();
|
|
||||||
addMarker(e.Action);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnReleased(KeyBindingReleaseEvent<OsuAction> e)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override bool OnMouseMove(MouseMoveEvent e)
|
|
||||||
{
|
|
||||||
lastlastMousePosition = lastMousePosition;
|
|
||||||
lastMousePosition = e.MousePosition;
|
|
||||||
|
|
||||||
if (AimMarkersEnabled.Value)
|
|
||||||
{
|
|
||||||
updateTimePreempt();
|
|
||||||
addMarker(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AimLinesEnabled.Value && lastlastMousePosition != null && lastlastMousePosition != lastMousePosition)
|
|
||||||
{
|
|
||||||
if (!AimMarkersEnabled.Value)
|
|
||||||
updateTimePreempt();
|
|
||||||
Add(new AimLineDrawable((Vector2)lastlastMousePosition, lastMousePosition, timePreempt));
|
|
||||||
}
|
|
||||||
|
|
||||||
return base.OnMouseMove(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addMarker(OsuAction? action)
|
|
||||||
{
|
|
||||||
var component = OsuSkinComponents.AimMarker;
|
|
||||||
|
|
||||||
switch (action)
|
|
||||||
{
|
|
||||||
case OsuAction.LeftButton:
|
|
||||||
component = OsuSkinComponents.HitMarkerLeft;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case OsuAction.RightButton:
|
|
||||||
component = OsuSkinComponents.HitMarkerRight;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
Add(new HitMarkerDrawable(action, component, timePreempt)
|
|
||||||
{
|
|
||||||
Position = lastMousePosition,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
Depth = action == null ? float.MaxValue : float.MinValue
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateTimePreempt()
|
|
||||||
{
|
|
||||||
var hitObject = getHitObject();
|
|
||||||
if (hitObject == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
timePreempt = hitObject.TimePreempt;
|
|
||||||
}
|
|
||||||
|
|
||||||
private OsuHitObject? getHitObject()
|
|
||||||
{
|
|
||||||
foreach (var dho in hitObjectContainer.Objects)
|
|
||||||
return (dho as DrawableOsuHitObject)?.HitObject;
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class HitMarkerDrawable : SkinnableDrawable
|
|
||||||
{
|
|
||||||
private readonly double lifetimeDuration;
|
|
||||||
private readonly double fadeOutTime;
|
|
||||||
|
|
||||||
public override bool RemoveWhenNotAlive => true;
|
|
||||||
|
|
||||||
public HitMarkerDrawable(OsuAction? action, OsuSkinComponents componenet, double timePreempt)
|
|
||||||
: base(new OsuSkinComponentLookup(componenet), _ => new DefaultHitMarker(action))
|
|
||||||
{
|
|
||||||
fadeOutTime = timePreempt / 2;
|
|
||||||
lifetimeDuration = timePreempt + fadeOutTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
|
||||||
{
|
|
||||||
base.LoadComplete();
|
|
||||||
|
|
||||||
LifetimeStart = Time.Current;
|
|
||||||
LifetimeEnd = LifetimeStart + lifetimeDuration;
|
|
||||||
|
|
||||||
Scheduler.AddDelayed(() =>
|
|
||||||
{
|
|
||||||
this.FadeOut(fadeOutTime);
|
|
||||||
}, lifetimeDuration - fadeOutTime);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class AimLineDrawable : CompositeDrawable
|
|
||||||
{
|
|
||||||
private readonly double lifetimeDuration;
|
|
||||||
private readonly double fadeOutTime;
|
|
||||||
|
|
||||||
public override bool RemoveWhenNotAlive => true;
|
|
||||||
|
|
||||||
public AimLineDrawable(Vector2 fromP, Vector2 toP, double timePreempt)
|
|
||||||
{
|
|
||||||
fadeOutTime = timePreempt / 2;
|
|
||||||
lifetimeDuration = timePreempt + fadeOutTime;
|
|
||||||
|
|
||||||
float distance = Vector2.Distance(fromP, toP);
|
|
||||||
Vector2 direction = (toP - fromP);
|
|
||||||
InternalChild = new Box
|
|
||||||
{
|
|
||||||
Position = fromP + (direction / 2),
|
|
||||||
Size = new Vector2(distance, 1),
|
|
||||||
Rotation = (float)(Math.Atan(direction.Y / direction.X) * (180 / Math.PI)),
|
|
||||||
Origin = Anchor.Centre
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(ISkinSource skin)
|
|
||||||
{
|
|
||||||
var color = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.ReplayAimLine)?.Value ?? Color4.White;
|
|
||||||
color.A = 127;
|
|
||||||
InternalChild.Colour = color;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
|
||||||
{
|
|
||||||
base.LoadComplete();
|
|
||||||
|
|
||||||
LifetimeStart = Time.Current;
|
|
||||||
LifetimeEnd = LifetimeStart + lifetimeDuration;
|
|
||||||
|
|
||||||
Scheduler.AddDelayed(() =>
|
|
||||||
{
|
|
||||||
this.FadeOut(fadeOutTime);
|
|
||||||
}, lifetimeDuration - fadeOutTime);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user