mirror of
https://github.com/ppy/osu.git
synced 2024-09-21 22:47:24 +08:00
Merge branch 'master' into crop-gameplay-textures
This commit is contained in:
commit
c195fbe76f
@ -41,7 +41,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
|
|||||||
X = xPositionData?.X ?? 0,
|
X = xPositionData?.X ?? 0,
|
||||||
NewCombo = comboData?.NewCombo ?? false,
|
NewCombo = comboData?.NewCombo ?? false,
|
||||||
ComboOffset = comboData?.ComboOffset ?? 0,
|
ComboOffset = comboData?.ComboOffset ?? 0,
|
||||||
LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0,
|
|
||||||
LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
|
LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
|
||||||
SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
|
SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
|
||||||
}.Yield();
|
}.Yield();
|
||||||
|
@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Catch.Objects
|
|||||||
int nodeIndex = 0;
|
int nodeIndex = 0;
|
||||||
SliderEventDescriptor? lastEvent = null;
|
SliderEventDescriptor? lastEvent = null;
|
||||||
|
|
||||||
foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken))
|
foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken))
|
||||||
{
|
{
|
||||||
// generate tiny droplets since the last point
|
// generate tiny droplets since the last point
|
||||||
if (lastEvent != null)
|
if (lastEvent != null)
|
||||||
@ -104,8 +104,8 @@ namespace osu.Game.Rulesets.Catch.Objects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// this also includes LegacyLastTick and this is used for TinyDroplet generation above.
|
// this also includes LastTick and this is used for TinyDroplet generation above.
|
||||||
// this means that the final segment of TinyDroplets are increasingly mistimed where LegacyLastTickOffset is being applied.
|
// this means that the final segment of TinyDroplets are increasingly mistimed where LastTick is being applied.
|
||||||
lastEvent = e;
|
lastEvent = e;
|
||||||
|
|
||||||
switch (e.Type)
|
switch (e.Type)
|
||||||
@ -162,7 +162,5 @@ namespace osu.Game.Rulesets.Catch.Objects
|
|||||||
public double Distance => Path.Distance;
|
public double Distance => Path.Distance;
|
||||||
|
|
||||||
public IList<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
|
public IList<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
|
||||||
|
|
||||||
public double? LegacyLastTickOffset { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -163,7 +163,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
|
|||||||
slider = new Slider
|
slider = new Slider
|
||||||
{
|
{
|
||||||
Position = new Vector2(0, 50),
|
Position = new Vector2(0, 50),
|
||||||
LegacyLastTickOffset = 36, // This is necessary for undo to retain the sample control point
|
|
||||||
Path = new SliderPath(new[]
|
Path = new SliderPath(new[]
|
||||||
{
|
{
|
||||||
new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
|
new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
|
||||||
|
BIN
osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png
Normal file
BIN
osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.7 KiB |
@ -44,7 +44,6 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
|
|||||||
Position = positionData?.Position ?? Vector2.Zero,
|
Position = positionData?.Position ?? Vector2.Zero,
|
||||||
NewCombo = comboData?.NewCombo ?? false,
|
NewCombo = comboData?.NewCombo ?? false,
|
||||||
ComboOffset = comboData?.ComboOffset ?? 0,
|
ComboOffset = comboData?.ComboOffset ?? 0,
|
||||||
LegacyLastTickOffset = (original as IHasLegacyLastTickOffset)?.LegacyLastTickOffset,
|
|
||||||
// prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
|
// prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
|
||||||
// this results in more (or less) ticks being generated in <v8 maps for the same time duration.
|
// this results in more (or less) ticks being generated in <v8 maps for the same time duration.
|
||||||
TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1,
|
TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1,
|
||||||
|
@ -315,7 +315,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
|
|||||||
StartTime = HitObject.StartTime,
|
StartTime = HitObject.StartTime,
|
||||||
Position = HitObject.Position + splitControlPoints[0].Position,
|
Position = HitObject.Position + splitControlPoints[0].Position,
|
||||||
NewCombo = HitObject.NewCombo,
|
NewCombo = HitObject.NewCombo,
|
||||||
LegacyLastTickOffset = HitObject.LegacyLastTickOffset,
|
|
||||||
Samples = HitObject.Samples.Select(s => s.With()).ToList(),
|
Samples = HitObject.Samples.Select(s => s.With()).ToList(),
|
||||||
RepeatCount = HitObject.RepeatCount,
|
RepeatCount = HitObject.RepeatCount,
|
||||||
NodeSamples = HitObject.NodeSamples.Select(n => (IList<HitSampleInfo>)n.Select(s => s.With()).ToList()).ToList(),
|
NodeSamples = HitObject.NodeSamples.Select(n => (IList<HitSampleInfo>)n.Select(s => s.With()).ToList()).ToList(),
|
||||||
|
@ -96,14 +96,13 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
Position = original.Position;
|
Position = original.Position;
|
||||||
NewCombo = original.NewCombo;
|
NewCombo = original.NewCombo;
|
||||||
ComboOffset = original.ComboOffset;
|
ComboOffset = original.ComboOffset;
|
||||||
LegacyLastTickOffset = original.LegacyLastTickOffset;
|
|
||||||
TickDistanceMultiplier = original.TickDistanceMultiplier;
|
TickDistanceMultiplier = original.TickDistanceMultiplier;
|
||||||
SliderVelocityMultiplier = original.SliderVelocityMultiplier;
|
SliderVelocityMultiplier = original.SliderVelocityMultiplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
|
protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken);
|
var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken);
|
||||||
|
|
||||||
foreach (var e in sliderEvents)
|
foreach (var e in sliderEvents)
|
||||||
{
|
{
|
||||||
@ -130,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SliderEventType.LegacyLastTick:
|
case SliderEventType.LastTick:
|
||||||
AddNested(TailCircle = new StrictTrackingSliderTailCircle(this)
|
AddNested(TailCircle = new StrictTrackingSliderTailCircle(this)
|
||||||
{
|
{
|
||||||
RepeatIndex = e.SpanIndex,
|
RepeatIndex = e.SpanIndex,
|
||||||
|
@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
|
|
||||||
d.HitObjectApplied += _ =>
|
d.HitObjectApplied += _ =>
|
||||||
{
|
{
|
||||||
// slider tails are a painful edge case, as their start time is offset 36ms back (see `LegacyLastTick`).
|
// slider tails are a painful edge case, as their start time is offset 36ms back (see `LastTick`).
|
||||||
// to work around this, look up the slider tail's parenting slider's end time instead to ensure proper snap.
|
// to work around this, look up the slider tail's parenting slider's end time instead to ensure proper snap.
|
||||||
double snapTime = d is DrawableSliderTail tail
|
double snapTime = d is DrawableSliderTail tail
|
||||||
? tail.Slider.GetEndTime()
|
? tail.Slider.GetEndTime()
|
||||||
|
@ -296,7 +296,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
|||||||
public override void PlaySamples()
|
public override void PlaySamples()
|
||||||
{
|
{
|
||||||
// rather than doing it this way, we should probably attach the sample to the tail circle.
|
// rather than doing it this way, we should probably attach the sample to the tail circle.
|
||||||
// this can only be done after we stop using LegacyLastTick.
|
// this can only be done if we stop using LastTick.
|
||||||
if (!TailCircle.SamplePlaysOnlyOnHit || TailCircle.IsHit)
|
if (!TailCircle.SamplePlaysOnlyOnHit || TailCircle.IsHit)
|
||||||
base.PlaySamples();
|
base.PlaySamples();
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
|||||||
|
|
||||||
public SkinnableDrawable CirclePiece { get; private set; }
|
public SkinnableDrawable CirclePiece { get; private set; }
|
||||||
|
|
||||||
public ReverseArrowPiece Arrow { get; private set; }
|
public SkinnableDrawable Arrow { get; private set; }
|
||||||
|
|
||||||
private Drawable scaleContainer;
|
private Drawable scaleContainer;
|
||||||
|
|
||||||
@ -65,7 +65,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
|||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre,
|
Origin = Anchor.Centre,
|
||||||
},
|
},
|
||||||
Arrow = new ReverseArrowPiece(),
|
Arrow = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new DefaultReverseArrow())
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -71,8 +71,6 @@ namespace osu.Game.Rulesets.Osu.Objects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public double? LegacyLastTickOffset { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The position of the cursor at the point of completion of this <see cref="Slider"/> if it was hit
|
/// The position of the cursor at the point of completion of this <see cref="Slider"/> if it was hit
|
||||||
/// with as few movements as possible. This is set and used by difficulty calculation.
|
/// with as few movements as possible. This is set and used by difficulty calculation.
|
||||||
@ -179,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects
|
|||||||
{
|
{
|
||||||
base.CreateNestedHitObjects(cancellationToken);
|
base.CreateNestedHitObjects(cancellationToken);
|
||||||
|
|
||||||
var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken);
|
var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken);
|
||||||
|
|
||||||
foreach (var e in sliderEvents)
|
foreach (var e in sliderEvents)
|
||||||
{
|
{
|
||||||
@ -206,10 +204,11 @@ namespace osu.Game.Rulesets.Osu.Objects
|
|||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SliderEventType.LegacyLastTick:
|
case SliderEventType.LastTick:
|
||||||
// we need to use the LegacyLastTick here for compatibility reasons (difficulty).
|
// Of note, we are directly mapping LastTick (instead of `SliderEventType.Tail`) to SliderTailCircle.
|
||||||
// it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
|
// It is required as difficulty calculation and gameplay relies on reading this value.
|
||||||
// if this is to change, we should revisit this.
|
// (although it is displayed in classic skins, which may be a concern).
|
||||||
|
// If this is to change, we should revisit this.
|
||||||
AddNested(TailCircle = new SliderTailCircle(this)
|
AddNested(TailCircle = new SliderTailCircle(this)
|
||||||
{
|
{
|
||||||
RepeatIndex = e.SpanIndex,
|
RepeatIndex = e.SpanIndex,
|
||||||
@ -264,7 +263,9 @@ namespace osu.Game.Rulesets.Osu.Objects
|
|||||||
if (HeadCircle != null)
|
if (HeadCircle != null)
|
||||||
HeadCircle.Samples = this.GetNodeSamples(0);
|
HeadCircle.Samples = this.GetNodeSamples(0);
|
||||||
|
|
||||||
// The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
|
// The samples should be attached to the slider tail, however this can only be done if LastTick is removed otherwise they would play earlier than they're intended to.
|
||||||
|
// (see mapping logic in `CreateNestedHitObjects` above)
|
||||||
|
//
|
||||||
// For now, the samples are played by the slider itself at the correct end time.
|
// For now, the samples are played by the slider itself at the correct end time.
|
||||||
TailSamples = this.GetNodeSamples(repeatCount + 1);
|
TailSamples = this.GetNodeSamples(repeatCount + 1);
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Objects
|
|||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Note that this should not be used for timing correctness.
|
/// Note that this should not be used for timing correctness.
|
||||||
/// See <see cref="SliderEventType.LegacyLastTick"/> usage in <see cref="Slider"/> for more information.
|
/// See <see cref="SliderEventType.LastTick"/> usage in <see cref="Slider"/> for more information.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SliderTailCircle : SliderEndCircle
|
public class SliderTailCircle : SliderEndCircle
|
||||||
{
|
{
|
||||||
|
@ -70,8 +70,11 @@ namespace osu.Game.Rulesets.Osu.Objects
|
|||||||
|
|
||||||
double secondsDuration = Duration / 1000;
|
double secondsDuration = Duration / 1000;
|
||||||
|
|
||||||
SpinsRequired = (int)(minRps * secondsDuration);
|
// Allow a 0.1ms floating point precision error in the calculation of the duration.
|
||||||
MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration) - SpinsRequired - bonus_spins_gap);
|
const double duration_error = 0.0001;
|
||||||
|
|
||||||
|
SpinsRequired = (int)(minRps * secondsDuration + duration_error);
|
||||||
|
MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration + duration_error) - SpinsRequired - bonus_spins_gap);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
|
protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
|
||||||
|
@ -4,10 +4,12 @@
|
|||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
|
using osu.Framework.Extensions.ObjectExtensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Framework.Graphics.Textures;
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
using osu.Game.Rulesets.Osu.Objects;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
@ -17,12 +19,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
|
|||||||
{
|
{
|
||||||
public partial class ArgonReverseArrow : CompositeDrawable
|
public partial class ArgonReverseArrow : CompositeDrawable
|
||||||
{
|
{
|
||||||
|
[Resolved]
|
||||||
|
private DrawableHitObject drawableObject { get; set; } = null!;
|
||||||
|
|
||||||
private Bindable<Color4> accentColour = null!;
|
private Bindable<Color4> accentColour = null!;
|
||||||
|
|
||||||
private SpriteIcon icon = null!;
|
private SpriteIcon icon = null!;
|
||||||
|
private Container main = null!;
|
||||||
|
private Sprite side = null!;
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(DrawableHitObject hitObject)
|
private void load(TextureStore textures)
|
||||||
{
|
{
|
||||||
Anchor = Anchor.Centre;
|
Anchor = Anchor.Centre;
|
||||||
Origin = Anchor.Centre;
|
Origin = Anchor.Centre;
|
||||||
@ -30,6 +37,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
|
|||||||
Size = OsuHitObject.OBJECT_DIMENSIONS;
|
Size = OsuHitObject.OBJECT_DIMENSIONS;
|
||||||
|
|
||||||
InternalChildren = new Drawable[]
|
InternalChildren = new Drawable[]
|
||||||
|
{
|
||||||
|
main = new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new Circle
|
new Circle
|
||||||
{
|
{
|
||||||
@ -45,10 +59,52 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
|
|||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre,
|
Origin = Anchor.Centre,
|
||||||
},
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
side = new Sprite
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Texture = textures.Get("Gameplay/osu/repeat-edge-piece"),
|
||||||
|
Size = new Vector2(ArgonMainCirclePiece.OUTER_GRADIENT_SIZE),
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
accentColour = hitObject.AccentColour.GetBoundCopy();
|
accentColour = drawableObject.AccentColour.GetBoundCopy();
|
||||||
accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
|
accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
|
||||||
|
|
||||||
|
drawableObject.ApplyCustomUpdateState += updateStateTransforms;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
|
||||||
|
{
|
||||||
|
const float move_distance = -12;
|
||||||
|
const double move_out_duration = 35;
|
||||||
|
const double move_in_duration = 250;
|
||||||
|
const double total = 300;
|
||||||
|
|
||||||
|
switch (state)
|
||||||
|
{
|
||||||
|
case ArmedState.Idle:
|
||||||
|
main.ScaleTo(1.3f, move_out_duration, Easing.Out)
|
||||||
|
.Then()
|
||||||
|
.ScaleTo(1f, move_in_duration, Easing.Out)
|
||||||
|
.Loop(total - (move_in_duration + move_out_duration));
|
||||||
|
side
|
||||||
|
.MoveToX(move_distance, move_out_duration, Easing.Out)
|
||||||
|
.Then()
|
||||||
|
.MoveToX(0, move_in_duration, Easing.Out)
|
||||||
|
.Loop(total - (move_in_duration + move_out_duration));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Dispose(bool isDisposing)
|
||||||
|
{
|
||||||
|
base.Dispose(isDisposing);
|
||||||
|
|
||||||
|
if (drawableObject.IsNotNull())
|
||||||
|
drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,69 @@
|
|||||||
|
// 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 osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Extensions.ObjectExtensions;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
|
using osu.Game.Rulesets.Osu.Objects;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Osu.Skinning.Default
|
||||||
|
{
|
||||||
|
public partial class DefaultReverseArrow : CompositeDrawable
|
||||||
|
{
|
||||||
|
[Resolved]
|
||||||
|
private DrawableHitObject drawableObject { get; set; } = null!;
|
||||||
|
|
||||||
|
public DefaultReverseArrow()
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre;
|
||||||
|
Origin = Anchor.Centre;
|
||||||
|
|
||||||
|
Size = OsuHitObject.OBJECT_DIMENSIONS;
|
||||||
|
|
||||||
|
InternalChild = new SpriteIcon
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Blending = BlendingParameters.Additive,
|
||||||
|
Icon = FontAwesome.Solid.ChevronRight,
|
||||||
|
Size = new Vector2(0.35f),
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
drawableObject.ApplyCustomUpdateState += updateStateTransforms;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
|
||||||
|
{
|
||||||
|
const double move_out_duration = 35;
|
||||||
|
const double move_in_duration = 250;
|
||||||
|
const double total = 300;
|
||||||
|
|
||||||
|
switch (state)
|
||||||
|
{
|
||||||
|
case ArmedState.Idle:
|
||||||
|
InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
|
||||||
|
.Then()
|
||||||
|
.ScaleTo(1f, move_in_duration, Easing.Out)
|
||||||
|
.Loop(total - (move_in_duration + move_out_duration));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Dispose(bool isDisposing)
|
||||||
|
{
|
||||||
|
base.Dispose(isDisposing);
|
||||||
|
|
||||||
|
if (drawableObject.IsNotNull())
|
||||||
|
drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,51 +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 osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Audio.Track;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Sprites;
|
|
||||||
using osu.Game.Beatmaps.ControlPoints;
|
|
||||||
using osu.Game.Graphics.Containers;
|
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
|
||||||
using osu.Game.Skinning;
|
|
||||||
using osuTK;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.Skinning.Default
|
|
||||||
{
|
|
||||||
public partial class ReverseArrowPiece : BeatSyncedContainer
|
|
||||||
{
|
|
||||||
[Resolved]
|
|
||||||
private DrawableHitObject drawableRepeat { get; set; } = null!;
|
|
||||||
|
|
||||||
public ReverseArrowPiece()
|
|
||||||
{
|
|
||||||
Divisor = 2;
|
|
||||||
MinimumBeatLength = 200;
|
|
||||||
|
|
||||||
Anchor = Anchor.Centre;
|
|
||||||
Origin = Anchor.Centre;
|
|
||||||
|
|
||||||
Size = OsuHitObject.OBJECT_DIMENSIONS;
|
|
||||||
|
|
||||||
Child = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Blending = BlendingParameters.Additive,
|
|
||||||
Icon = FontAwesome.Solid.ChevronRight,
|
|
||||||
Size = new Vector2(0.35f)
|
|
||||||
})
|
|
||||||
{
|
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
|
|
||||||
{
|
|
||||||
if (!drawableRepeat.IsHit)
|
|
||||||
Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -4,6 +4,7 @@
|
|||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Framework.Extensions.ObjectExtensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
@ -16,8 +17,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
|
|||||||
{
|
{
|
||||||
public partial class LegacyReverseArrow : CompositeDrawable
|
public partial class LegacyReverseArrow : CompositeDrawable
|
||||||
{
|
{
|
||||||
[Resolved(canBeNull: true)]
|
[Resolved]
|
||||||
private DrawableHitObject? drawableHitObject { get; set; }
|
private DrawableHitObject drawableObject { get; set; } = null!;
|
||||||
|
|
||||||
private Drawable proxy = null!;
|
private Drawable proxy = null!;
|
||||||
|
|
||||||
@ -27,6 +28,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
|
|||||||
|
|
||||||
private Drawable arrow = null!;
|
private Drawable arrow = null!;
|
||||||
|
|
||||||
|
private bool shouldRotate;
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(ISkinSource skinSource)
|
private void load(ISkinSource skinSource)
|
||||||
{
|
{
|
||||||
@ -36,8 +39,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
|
|||||||
|
|
||||||
var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
|
var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
|
||||||
|
|
||||||
InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty());
|
InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty()).With(d =>
|
||||||
|
{
|
||||||
|
d.Anchor = Anchor.Centre;
|
||||||
|
d.Origin = Anchor.Centre;
|
||||||
|
});
|
||||||
|
|
||||||
textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
|
textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
|
||||||
|
|
||||||
|
drawableObject.ApplyCustomUpdateState += updateStateTransforms;
|
||||||
|
|
||||||
|
shouldRotate = skinSource.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value <= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
@ -46,18 +58,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
|
|||||||
|
|
||||||
proxy = CreateProxy();
|
proxy = CreateProxy();
|
||||||
|
|
||||||
if (drawableHitObject != null)
|
drawableObject.HitObjectApplied += onHitObjectApplied;
|
||||||
{
|
onHitObjectApplied(drawableObject);
|
||||||
drawableHitObject.HitObjectApplied += onHitObjectApplied;
|
|
||||||
onHitObjectApplied(drawableHitObject);
|
|
||||||
|
|
||||||
accentColour = drawableHitObject.AccentColour.GetBoundCopy();
|
accentColour = drawableObject.AccentColour.GetBoundCopy();
|
||||||
accentColour.BindValueChanged(c =>
|
accentColour.BindValueChanged(c =>
|
||||||
{
|
{
|
||||||
arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
|
arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
|
||||||
}, true);
|
}, true);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void onHitObjectApplied(DrawableHitObject drawableObject)
|
private void onHitObjectApplied(DrawableHitObject drawableObject)
|
||||||
{
|
{
|
||||||
@ -68,11 +77,43 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
|
|||||||
.OverlayElementContainer.Add(proxy);
|
.OverlayElementContainer.Add(proxy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
|
||||||
|
{
|
||||||
|
const double duration = 300;
|
||||||
|
const float rotation = 5.625f;
|
||||||
|
|
||||||
|
switch (state)
|
||||||
|
{
|
||||||
|
case ArmedState.Idle:
|
||||||
|
if (shouldRotate)
|
||||||
|
{
|
||||||
|
InternalChild.ScaleTo(1.3f)
|
||||||
|
.RotateTo(rotation)
|
||||||
|
.Then()
|
||||||
|
.ScaleTo(1f, duration)
|
||||||
|
.RotateTo(-rotation, duration)
|
||||||
|
.Loop();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
InternalChild.ScaleTo(1.3f).Then()
|
||||||
|
.ScaleTo(1f, duration, Easing.Out)
|
||||||
|
.Loop();
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void Dispose(bool isDisposing)
|
protected override void Dispose(bool isDisposing)
|
||||||
{
|
{
|
||||||
base.Dispose(isDisposing);
|
base.Dispose(isDisposing);
|
||||||
if (drawableHitObject != null)
|
|
||||||
drawableHitObject.HitObjectApplied -= onHitObjectApplied;
|
if (drawableObject.IsNotNull())
|
||||||
|
{
|
||||||
|
drawableObject.HitObjectApplied -= onHitObjectApplied;
|
||||||
|
drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ namespace osu.Game.Tests.Beatmaps
|
|||||||
[Test]
|
[Test]
|
||||||
public void TestSingleSpan()
|
public void TestSingleSpan()
|
||||||
{
|
{
|
||||||
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, null).ToArray();
|
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
|
||||||
|
|
||||||
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
|
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
|
||||||
Assert.That(events[0].Time, Is.EqualTo(start_time));
|
Assert.That(events[0].Time, Is.EqualTo(start_time));
|
||||||
@ -31,7 +31,7 @@ namespace osu.Game.Tests.Beatmaps
|
|||||||
[Test]
|
[Test]
|
||||||
public void TestRepeat()
|
public void TestRepeat()
|
||||||
{
|
{
|
||||||
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2, null).ToArray();
|
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2).ToArray();
|
||||||
|
|
||||||
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
|
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
|
||||||
Assert.That(events[0].Time, Is.EqualTo(start_time));
|
Assert.That(events[0].Time, Is.EqualTo(start_time));
|
||||||
@ -52,7 +52,7 @@ namespace osu.Game.Tests.Beatmaps
|
|||||||
[Test]
|
[Test]
|
||||||
public void TestNonEvenTicks()
|
public void TestNonEvenTicks()
|
||||||
{
|
{
|
||||||
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2, null).ToArray();
|
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2).ToArray();
|
||||||
|
|
||||||
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
|
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
|
||||||
Assert.That(events[0].Time, Is.EqualTo(start_time));
|
Assert.That(events[0].Time, Is.EqualTo(start_time));
|
||||||
@ -83,12 +83,12 @@ namespace osu.Game.Tests.Beatmaps
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestLegacyLastTickOffset()
|
public void TestLastTickOffset()
|
||||||
{
|
{
|
||||||
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, 100).ToArray();
|
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
|
||||||
|
|
||||||
Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick));
|
Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LastTick));
|
||||||
Assert.That(events[2].Time, Is.EqualTo(900));
|
Assert.That(events[2].Time, Is.EqualTo(span_duration + SliderEventGenerator.LAST_TICK_OFFSET));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -97,7 +97,7 @@ namespace osu.Game.Tests.Beatmaps
|
|||||||
const double velocity = 5;
|
const double velocity = 5;
|
||||||
const double min_distance = velocity * 10;
|
const double min_distance = velocity * 10;
|
||||||
|
|
||||||
var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2, 0).ToArray();
|
var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2).ToArray();
|
||||||
|
|
||||||
Assert.Multiple(() =>
|
Assert.Multiple(() =>
|
||||||
{
|
{
|
||||||
|
@ -44,17 +44,23 @@ namespace osu.Game.Tests.Database
|
|||||||
createFile(subdirectory2, Path.Combine("beatmap5", "beatmap.osu"));
|
createFile(subdirectory2, Path.Combine("beatmap5", "beatmap.osu"));
|
||||||
createFile(subdirectory2, Path.Combine("beatmap6", "beatmap.osu"));
|
createFile(subdirectory2, Path.Combine("beatmap6", "beatmap.osu"));
|
||||||
|
|
||||||
|
// songs subdirectory with random file
|
||||||
|
var subdirectory3 = songsStorage.GetStorageForDirectory("subdirectory3");
|
||||||
|
createFile(subdirectory3, "silly readme.txt");
|
||||||
|
createFile(subdirectory3, Path.Combine("beatmap7", "beatmap.osu"));
|
||||||
|
|
||||||
// empty songs subdirectory
|
// empty songs subdirectory
|
||||||
songsStorage.GetStorageForDirectory("subdirectory3");
|
songsStorage.GetStorageForDirectory("subdirectory3");
|
||||||
|
|
||||||
string[] paths = importer.GetStableImportPaths(songsStorage).ToArray();
|
string[] paths = importer.GetStableImportPaths(songsStorage).ToArray();
|
||||||
Assert.That(paths.Length, Is.EqualTo(6));
|
Assert.That(paths.Length, Is.EqualTo(7));
|
||||||
Assert.That(paths.Contains(songsStorage.GetFullPath("beatmap1")));
|
Assert.That(paths.Contains(songsStorage.GetFullPath("beatmap1")));
|
||||||
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap2"))));
|
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap2"))));
|
||||||
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap3"))));
|
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap3"))));
|
||||||
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "sub-subdirectory", "beatmap4"))));
|
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "sub-subdirectory", "beatmap4"))));
|
||||||
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap5"))));
|
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap5"))));
|
||||||
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap6"))));
|
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap6"))));
|
||||||
|
Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory3", "beatmap7"))));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void createFile(Storage storage, string path)
|
static void createFile(Storage storage, string path)
|
||||||
|
Binary file not shown.
@ -52,7 +52,9 @@ namespace osu.Game.Tests.Skins
|
|||||||
// Covers player avatar and flag.
|
// Covers player avatar and flag.
|
||||||
"Archives/modified-argon-20230305.osk",
|
"Archives/modified-argon-20230305.osk",
|
||||||
// Covers key counters
|
// Covers key counters
|
||||||
"Archives/modified-argon-pro-20230618.osk"
|
"Archives/modified-argon-pro-20230618.osk",
|
||||||
|
// Covers "Argon" health display
|
||||||
|
"Archives/modified-argon-pro-20231001.osk"
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -0,0 +1,78 @@
|
|||||||
|
// 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 NUnit.Framework;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Framework.Testing;
|
||||||
|
using osu.Game.Rulesets.Judgements;
|
||||||
|
using osu.Game.Rulesets.Objects;
|
||||||
|
using osu.Game.Rulesets.Osu.Judgements;
|
||||||
|
using osu.Game.Rulesets.Osu.Objects;
|
||||||
|
using osu.Game.Rulesets.Scoring;
|
||||||
|
using osu.Game.Screens.Play.HUD;
|
||||||
|
using osuTK;
|
||||||
|
using osuTK.Graphics;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.Visual.Gameplay
|
||||||
|
{
|
||||||
|
public partial class TestSceneArgonHealthDisplay : OsuTestScene
|
||||||
|
{
|
||||||
|
[Cached(typeof(HealthProcessor))]
|
||||||
|
private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
|
||||||
|
|
||||||
|
[SetUpSteps]
|
||||||
|
public void SetUpSteps()
|
||||||
|
{
|
||||||
|
AddStep(@"Reset all", delegate
|
||||||
|
{
|
||||||
|
healthProcessor.Health.Value = 1;
|
||||||
|
healthProcessor.Failed += () => false; // health won't be updated if the processor gets into a "fail" state.
|
||||||
|
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = Color4.Gray,
|
||||||
|
},
|
||||||
|
new ArgonHealthDisplay
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Scale = new Vector2(2f),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestHealthDisplayIncrementing()
|
||||||
|
{
|
||||||
|
AddRepeatStep("apply miss judgement", delegate
|
||||||
|
{
|
||||||
|
healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
|
||||||
|
}, 5);
|
||||||
|
|
||||||
|
AddRepeatStep(@"decrease hp slightly", delegate
|
||||||
|
{
|
||||||
|
healthProcessor.Health.Value -= 0.01f;
|
||||||
|
}, 10);
|
||||||
|
|
||||||
|
AddRepeatStep(@"increase hp without flash", delegate
|
||||||
|
{
|
||||||
|
healthProcessor.Health.Value += 0.1f;
|
||||||
|
}, 3);
|
||||||
|
|
||||||
|
AddRepeatStep(@"increase hp with flash", delegate
|
||||||
|
{
|
||||||
|
healthProcessor.Health.Value += 0.1f;
|
||||||
|
healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
|
||||||
|
{
|
||||||
|
Type = HitResult.Perfect
|
||||||
|
});
|
||||||
|
}, 3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -2,6 +2,7 @@
|
|||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
@ -173,7 +174,7 @@ namespace osu.Game.Tests.Visual.Gameplay
|
|||||||
string? filePath = null;
|
string? filePath = null;
|
||||||
|
|
||||||
// Files starting with _ are temporary, created by CreateFileSafely call.
|
// Files starting with _ are temporary, created by CreateFileSafely call.
|
||||||
AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !f.StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
|
AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !Path.GetFileName(f).StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
|
||||||
AddAssert("filesize is non-zero", () =>
|
AddAssert("filesize is non-zero", () =>
|
||||||
{
|
{
|
||||||
using (var stream = LocalStorage.GetStream(filePath))
|
using (var stream = LocalStorage.GetStream(filePath))
|
||||||
|
@ -6,6 +6,7 @@ using osu.Framework.Allocation;
|
|||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Testing;
|
using osu.Framework.Testing;
|
||||||
using osu.Game.Rulesets.Judgements;
|
using osu.Game.Rulesets.Judgements;
|
||||||
|
using osu.Game.Rulesets.Objects;
|
||||||
using osu.Game.Rulesets.Osu.Judgements;
|
using osu.Game.Rulesets.Osu.Judgements;
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
using osu.Game.Rulesets.Osu.Objects;
|
||||||
using osu.Game.Rulesets.Scoring;
|
using osu.Game.Rulesets.Scoring;
|
||||||
@ -19,6 +20,7 @@ namespace osu.Game.Tests.Visual.Gameplay
|
|||||||
[Cached(typeof(HealthProcessor))]
|
[Cached(typeof(HealthProcessor))]
|
||||||
private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
|
private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
|
||||||
|
|
||||||
|
protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay();
|
||||||
protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay();
|
protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay();
|
||||||
protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay();
|
protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay();
|
||||||
|
|
||||||
@ -28,15 +30,21 @@ namespace osu.Game.Tests.Visual.Gameplay
|
|||||||
AddStep(@"Reset all", delegate
|
AddStep(@"Reset all", delegate
|
||||||
{
|
{
|
||||||
healthProcessor.Health.Value = 1;
|
healthProcessor.Health.Value = 1;
|
||||||
|
healthProcessor.Failed += () => false; // health won't be updated if the processor gets into a "fail" state.
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestHealthDisplayIncrementing()
|
public void TestHealthDisplayIncrementing()
|
||||||
{
|
{
|
||||||
AddRepeatStep(@"decrease hp", delegate
|
AddRepeatStep("apply miss judgement", delegate
|
||||||
{
|
{
|
||||||
healthProcessor.Health.Value -= 0.08f;
|
healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
|
||||||
|
}, 5);
|
||||||
|
|
||||||
|
AddRepeatStep(@"decrease hp slightly", delegate
|
||||||
|
{
|
||||||
|
healthProcessor.Health.Value -= 0.01f;
|
||||||
}, 10);
|
}, 10);
|
||||||
|
|
||||||
AddRepeatStep(@"increase hp without flash", delegate
|
AddRepeatStep(@"increase hp without flash", delegate
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using osu.Framework.IO.Stores;
|
|
||||||
using osu.Framework.Logging;
|
using osu.Framework.Logging;
|
||||||
using osu.Framework.Platform;
|
using osu.Framework.Platform;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
@ -34,9 +33,9 @@ namespace osu.Game.Database
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (!directoryStorage.GetFiles(string.Empty).ExcludeSystemFileNames().Any())
|
if (!directoryStorage.GetFiles(string.Empty, "*.osu").Any())
|
||||||
{
|
{
|
||||||
// if a directory doesn't contain files, attempt looking for beatmaps inside of that directory.
|
// if a directory doesn't contain any beatmap files, look for further nested beatmap directories.
|
||||||
// this is a special behaviour in stable for beatmaps only, see https://github.com/ppy/osu/issues/18615.
|
// this is a special behaviour in stable for beatmaps only, see https://github.com/ppy/osu/issues/18615.
|
||||||
foreach (string subDirectory in GetStableImportPaths(directoryStorage))
|
foreach (string subDirectory in GetStableImportPaths(directoryStorage))
|
||||||
paths.Add(subDirectory);
|
paths.Add(subDirectory);
|
||||||
|
@ -13,7 +13,7 @@ using osu.Game.Beatmaps.ControlPoints;
|
|||||||
|
|
||||||
namespace osu.Game.Rulesets.Objects.Legacy
|
namespace osu.Game.Rulesets.Objects.Legacy
|
||||||
{
|
{
|
||||||
internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset, IHasSliderVelocity
|
internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasSliderVelocity
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Scoring distance with a speed-adjusted beat length of 1 second.
|
/// Scoring distance with a speed-adjusted beat length of 1 second.
|
||||||
@ -59,7 +59,5 @@ namespace osu.Game.Rulesets.Objects.Legacy
|
|||||||
|
|
||||||
Velocity = scoringDistance / timingPoint.BeatLength;
|
Velocity = scoringDistance / timingPoint.BeatLength;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double LegacyLastTickOffset => 36;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,9 +10,17 @@ namespace osu.Game.Rulesets.Objects
|
|||||||
{
|
{
|
||||||
public static class SliderEventGenerator
|
public static class SliderEventGenerator
|
||||||
{
|
{
|
||||||
// ReSharper disable once MethodOverloadWithOptionalParameter
|
/// <summary>
|
||||||
|
/// Historically, slider's final tick (aka the place where the slider would receive a final judgement) was offset by -36 ms. Originally this was
|
||||||
|
/// done to workaround a technical detail (unimportant), but over the years it has become an expectation of players that you don't need to hold
|
||||||
|
/// until the true end of the slider. This very small amount of leniency makes it easier to jump away from fast sliders to the next hit object.
|
||||||
|
///
|
||||||
|
/// After discussion on how this should be handled going forward, players have unanimously stated that this lenience should remain in some way.
|
||||||
|
/// </summary>
|
||||||
|
public const double LAST_TICK_OFFSET = -36;
|
||||||
|
|
||||||
public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
|
public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
|
||||||
double? legacyLastTickOffset, CancellationToken cancellationToken = default)
|
CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
// A very lenient maximum length of a slider for ticks to be generated.
|
// A very lenient maximum length of a slider for ticks to be generated.
|
||||||
// This exists for edge cases such as /b/1573664 where the beatmap has been edited by the user, and should never be reached in normal usage.
|
// This exists for edge cases such as /b/1573664 where the beatmap has been edited by the user, and should never be reached in normal usage.
|
||||||
@ -76,14 +84,14 @@ namespace osu.Game.Rulesets.Objects
|
|||||||
|
|
||||||
int finalSpanIndex = spanCount - 1;
|
int finalSpanIndex = spanCount - 1;
|
||||||
double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
|
double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
|
||||||
double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) - (legacyLastTickOffset ?? 0));
|
double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + LAST_TICK_OFFSET);
|
||||||
double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
|
double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
|
||||||
|
|
||||||
if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
|
if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
|
||||||
|
|
||||||
yield return new SliderEventDescriptor
|
yield return new SliderEventDescriptor
|
||||||
{
|
{
|
||||||
Type = SliderEventType.LegacyLastTick,
|
Type = SliderEventType.LastTick,
|
||||||
SpanIndex = finalSpanIndex,
|
SpanIndex = finalSpanIndex,
|
||||||
SpanStartTime = finalSpanStartTime,
|
SpanStartTime = finalSpanStartTime,
|
||||||
Time = finalSpanEndTime,
|
Time = finalSpanEndTime,
|
||||||
@ -173,7 +181,11 @@ namespace osu.Game.Rulesets.Objects
|
|||||||
public enum SliderEventType
|
public enum SliderEventType
|
||||||
{
|
{
|
||||||
Tick,
|
Tick,
|
||||||
LegacyLastTick,
|
|
||||||
|
/// <summary>
|
||||||
|
/// Occurs just before the tail. See <see cref="SliderEventGenerator.LAST_TICK_OFFSET"/>.
|
||||||
|
/// </summary>
|
||||||
|
LastTick,
|
||||||
Head,
|
Head,
|
||||||
Tail,
|
Tail,
|
||||||
Repeat
|
Repeat
|
||||||
|
@ -1,14 +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.
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Objects.Types
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// A type of <see cref="HitObject"/> which may require the last tick to be offset.
|
|
||||||
/// This is specific to osu!stable conversion, and should not be used elsewhere.
|
|
||||||
/// </summary>
|
|
||||||
public interface IHasLegacyLastTickOffset
|
|
||||||
{
|
|
||||||
double LegacyLastTickOffset { get; }
|
|
||||||
}
|
|
||||||
}
|
|
323
osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
Normal file
323
osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
Normal file
@ -0,0 +1,323 @@
|
|||||||
|
// 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 System.Linq;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Colour;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Lines;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Framework.Threading;
|
||||||
|
using osu.Framework.Utils;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Rulesets.Judgements;
|
||||||
|
using osu.Game.Rulesets.Objects;
|
||||||
|
using osu.Game.Rulesets.Objects.Types;
|
||||||
|
using osu.Game.Skinning;
|
||||||
|
using osuTK;
|
||||||
|
using osuTK.Graphics;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.HUD
|
||||||
|
{
|
||||||
|
public partial class ArgonHealthDisplay : HealthDisplay, ISerialisableDrawable
|
||||||
|
{
|
||||||
|
public bool UsesFixedAnchor { get; set; }
|
||||||
|
|
||||||
|
private BarPath mainBar = null!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Used to show a glow at the end of the main bar, or red "damage" area when missing.
|
||||||
|
/// </summary>
|
||||||
|
private BarPath glowBar = null!;
|
||||||
|
|
||||||
|
private BackgroundPath background = null!;
|
||||||
|
|
||||||
|
private SliderPath barPath = null!;
|
||||||
|
|
||||||
|
private static readonly Colour4 main_bar_colour = Colour4.White;
|
||||||
|
private static readonly Colour4 main_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
|
||||||
|
|
||||||
|
private ScheduledDelegate? resetMissBarDelegate;
|
||||||
|
|
||||||
|
private readonly List<Vector2> missBarVertices = new List<Vector2>();
|
||||||
|
private readonly List<Vector2> healthBarVertices = new List<Vector2>();
|
||||||
|
|
||||||
|
private double glowBarValue = 1;
|
||||||
|
|
||||||
|
public double GlowBarValue
|
||||||
|
{
|
||||||
|
get => glowBarValue;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (glowBarValue == value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
glowBarValue = value;
|
||||||
|
updatePathVertices();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private double healthBarValue = 1;
|
||||||
|
|
||||||
|
public double HealthBarValue
|
||||||
|
{
|
||||||
|
get => healthBarValue;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (healthBarValue == value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
healthBarValue = value;
|
||||||
|
updatePathVertices();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both;
|
||||||
|
|
||||||
|
InternalChild = new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Spacing = new Vector2(4f, 0f),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Circle
|
||||||
|
{
|
||||||
|
Margin = new MarginPadding { Top = 8.5f, Left = -2 },
|
||||||
|
Size = new Vector2(50f, 3f),
|
||||||
|
},
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
background = new BackgroundPath
|
||||||
|
{
|
||||||
|
PathRadius = 10f,
|
||||||
|
},
|
||||||
|
glowBar = new BarPath
|
||||||
|
{
|
||||||
|
BarColour = Color4.White,
|
||||||
|
GlowColour = OsuColour.Gray(0.5f),
|
||||||
|
Blending = BlendingParameters.Additive,
|
||||||
|
Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
|
||||||
|
PathRadius = 40f,
|
||||||
|
// Kinda hacky, but results in correct positioning with increased path radius.
|
||||||
|
Margin = new MarginPadding(-30f),
|
||||||
|
GlowPortion = 0.9f,
|
||||||
|
},
|
||||||
|
mainBar = new BarPath
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.None,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Blending = BlendingParameters.Additive,
|
||||||
|
BarColour = main_bar_colour,
|
||||||
|
GlowColour = main_bar_glow_colour,
|
||||||
|
PathRadius = 10f,
|
||||||
|
GlowPortion = 0.6f,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
updatePath();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void LoadComplete()
|
||||||
|
{
|
||||||
|
base.LoadComplete();
|
||||||
|
|
||||||
|
Current.BindValueChanged(v =>
|
||||||
|
{
|
||||||
|
if (v.NewValue >= GlowBarValue)
|
||||||
|
finishMissDisplay();
|
||||||
|
|
||||||
|
this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
|
||||||
|
if (resetMissBarDelegate == null)
|
||||||
|
this.TransformTo(nameof(GlowBarValue), v.NewValue, 300, Easing.OutQuint);
|
||||||
|
}, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Update()
|
||||||
|
{
|
||||||
|
base.Update();
|
||||||
|
|
||||||
|
mainBar.Alpha = (float)Interpolation.DampContinuously(mainBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
|
||||||
|
glowBar.Alpha = (float)Interpolation.DampContinuously(glowBar.Alpha, GlowBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Flash(JudgementResult result)
|
||||||
|
{
|
||||||
|
base.Flash(result);
|
||||||
|
|
||||||
|
mainBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
|
||||||
|
.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
|
||||||
|
|
||||||
|
if (resetMissBarDelegate == null)
|
||||||
|
{
|
||||||
|
glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
|
||||||
|
.Then()
|
||||||
|
.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint);
|
||||||
|
|
||||||
|
glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
|
||||||
|
.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Miss(JudgementResult result)
|
||||||
|
{
|
||||||
|
base.Miss(result);
|
||||||
|
|
||||||
|
if (resetMissBarDelegate != null)
|
||||||
|
{
|
||||||
|
resetMissBarDelegate.Cancel();
|
||||||
|
resetMissBarDelegate = null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Reset any ongoing animation immediately, else things get weird.
|
||||||
|
this.TransformTo(nameof(GlowBarValue), HealthBarValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.Delay(500).Schedule(() =>
|
||||||
|
{
|
||||||
|
this.TransformTo(nameof(GlowBarValue), Current.Value, 300, Easing.OutQuint);
|
||||||
|
finishMissDisplay();
|
||||||
|
}, out resetMissBarDelegate);
|
||||||
|
|
||||||
|
glowBar.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 147, 147, 255), 100, Easing.OutQuint).Then()
|
||||||
|
.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 93, 93, 255), 800, Easing.OutQuint);
|
||||||
|
|
||||||
|
glowBar.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255).Lighten(0.2f))
|
||||||
|
.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255), 800, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void finishMissDisplay()
|
||||||
|
{
|
||||||
|
if (Current.Value > 0)
|
||||||
|
{
|
||||||
|
glowBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);
|
||||||
|
glowBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.In);
|
||||||
|
}
|
||||||
|
|
||||||
|
resetMissBarDelegate?.Cancel();
|
||||||
|
resetMissBarDelegate = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updatePath()
|
||||||
|
{
|
||||||
|
const float curve_start = 280;
|
||||||
|
const float curve_end = 310;
|
||||||
|
const float curve_smoothness = 10;
|
||||||
|
|
||||||
|
const float bar_length = 350;
|
||||||
|
const float bar_verticality = 32.5f;
|
||||||
|
|
||||||
|
Vector2 diagonalDir = (new Vector2(curve_end, bar_verticality) - new Vector2(curve_start, 0)).Normalized();
|
||||||
|
|
||||||
|
barPath = new SliderPath(new[]
|
||||||
|
{
|
||||||
|
new PathControlPoint(new Vector2(0, 0), PathType.Linear),
|
||||||
|
new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
|
||||||
|
new PathControlPoint(new Vector2(curve_start, 0)),
|
||||||
|
new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
|
||||||
|
new PathControlPoint(new Vector2(curve_end, bar_verticality) - diagonalDir * curve_smoothness, PathType.Bezier),
|
||||||
|
new PathControlPoint(new Vector2(curve_end, bar_verticality)),
|
||||||
|
new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_verticality), PathType.Linear),
|
||||||
|
new PathControlPoint(new Vector2(bar_length, bar_verticality)),
|
||||||
|
});
|
||||||
|
|
||||||
|
List<Vector2> vertices = new List<Vector2>();
|
||||||
|
barPath.GetPathToProgress(vertices, 0.0, 1.0);
|
||||||
|
|
||||||
|
background.Vertices = vertices;
|
||||||
|
mainBar.Vertices = vertices;
|
||||||
|
glowBar.Vertices = vertices;
|
||||||
|
|
||||||
|
updatePathVertices();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updatePathVertices()
|
||||||
|
{
|
||||||
|
barPath.GetPathToProgress(healthBarVertices, 0.0, healthBarValue);
|
||||||
|
barPath.GetPathToProgress(missBarVertices, healthBarValue, Math.Max(glowBarValue, healthBarValue));
|
||||||
|
|
||||||
|
if (healthBarVertices.Count == 0)
|
||||||
|
healthBarVertices.Add(Vector2.Zero);
|
||||||
|
|
||||||
|
if (missBarVertices.Count == 0)
|
||||||
|
missBarVertices.Add(Vector2.Zero);
|
||||||
|
|
||||||
|
glowBar.Vertices = missBarVertices.Select(v => v - missBarVertices[0]).ToList();
|
||||||
|
glowBar.Position = missBarVertices[0];
|
||||||
|
|
||||||
|
mainBar.Vertices = healthBarVertices.Select(v => v - healthBarVertices[0]).ToList();
|
||||||
|
mainBar.Position = healthBarVertices[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
private partial class BackgroundPath : SmoothPath
|
||||||
|
{
|
||||||
|
protected override Color4 ColourAt(float position)
|
||||||
|
{
|
||||||
|
if (position <= 0.128f)
|
||||||
|
return Color4.White.Opacity(0.8f);
|
||||||
|
|
||||||
|
return Interpolation.ValueAt(position,
|
||||||
|
Color4.White.Opacity(0.8f),
|
||||||
|
Color4.Black.Opacity(0.2f),
|
||||||
|
-0.5f, 1f, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private partial class BarPath : SmoothPath
|
||||||
|
{
|
||||||
|
private Colour4 barColour;
|
||||||
|
|
||||||
|
public Colour4 BarColour
|
||||||
|
{
|
||||||
|
get => barColour;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (barColour == value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
barColour = value;
|
||||||
|
InvalidateTexture();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Colour4 glowColour;
|
||||||
|
|
||||||
|
public Colour4 GlowColour
|
||||||
|
{
|
||||||
|
get => glowColour;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (glowColour == value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
glowColour = value;
|
||||||
|
InvalidateTexture();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public float GlowPortion { get; init; }
|
||||||
|
|
||||||
|
protected override Color4 ColourAt(float position)
|
||||||
|
{
|
||||||
|
if (position >= GlowPortion)
|
||||||
|
return BarColour;
|
||||||
|
|
||||||
|
return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion, Easing.InQuint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -29,10 +29,22 @@ namespace osu.Game.Screens.Play.HUD
|
|||||||
MaxValue = 1
|
MaxValue = 1
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="result">The judgement result.</param>
|
||||||
protected virtual void Flash(JudgementResult result)
|
protected virtual void Flash(JudgementResult result)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="result">The judgement result.</param>
|
||||||
|
protected virtual void Miss(JudgementResult result)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
[Resolved]
|
[Resolved]
|
||||||
private HUDOverlay? hudOverlay { get; set; }
|
private HUDOverlay? hudOverlay { get; set; }
|
||||||
|
|
||||||
@ -54,6 +66,8 @@ namespace osu.Game.Screens.Play.HUD
|
|||||||
{
|
{
|
||||||
if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
|
if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
|
||||||
Flash(judgement);
|
Flash(judgement);
|
||||||
|
else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
|
||||||
|
Miss(judgement);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Dispose(bool isDisposing)
|
protected override void Dispose(bool isDisposing)
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Realm" Version="11.5.0" />
|
<PackageReference Include="Realm" Version="11.5.0" />
|
||||||
<PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
|
<PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
|
||||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.928.0" />
|
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
|
||||||
<PackageReference Include="Sentry" Version="3.39.1" />
|
<PackageReference Include="Sentry" Version="3.39.1" />
|
||||||
<PackageReference Include="SharpCompress" Version="0.33.0" />
|
<PackageReference Include="SharpCompress" Version="0.33.0" />
|
||||||
<PackageReference Include="NUnit" Version="3.13.3" />
|
<PackageReference Include="NUnit" Version="3.13.3" />
|
||||||
|
Loading…
Reference in New Issue
Block a user