mirror of
https://github.com/ppy/osu.git
synced 2025-01-13 17:13:06 +08:00
Tidy up interpolation and move const
to new home
This commit is contained in:
parent
f22ff4e087
commit
0c335592b3
@ -18,6 +18,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
|
|||||||
{
|
{
|
||||||
public class HitCircleOverlapMarker : BlueprintPiece<HitCircle>
|
public class HitCircleOverlapMarker : BlueprintPiece<HitCircle>
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Hit objects are intentionally made to fade out at a constant slower rate than in gameplay.
|
||||||
|
/// This allows a mapper to gain better historical context and use recent hitobjects as reference / snap points.
|
||||||
|
/// </summary>
|
||||||
|
public const double FADE_OUT_EXTENSION = 700;
|
||||||
|
|
||||||
private readonly Circle circle;
|
private readonly Circle circle;
|
||||||
private readonly RingPiece ring;
|
private readonly RingPiece ring;
|
||||||
|
|
||||||
@ -64,16 +70,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
|
|||||||
if ((hitObject is IHasComboInformation combo))
|
if ((hitObject is IHasComboInformation combo))
|
||||||
ring.BorderColour = combo.GetComboColour(skin);
|
ring.BorderColour = combo.GetComboColour(skin);
|
||||||
|
|
||||||
bool hasReachedObject = editorClock.CurrentTime >= hitObject.StartTime;
|
double editorTime = editorClock.CurrentTime;
|
||||||
float interpolation = Interpolation.ValueAt(editorClock.CurrentTime, 0, 1f, hitObject.StartTime, hitObject.StartTime + DrawableOsuEditorRuleset.EDITOR_HIT_OBJECT_FADE_OUT_EXTENSION, Easing.In);
|
double hitObjectTime = hitObject.StartTime;
|
||||||
float interpolation2 = MathHelper.Clamp(Interpolation.ValueAt(editorClock.CurrentTime, 0, 1f, hitObject.StartTime, hitObject.StartTime + DrawableOsuEditorRuleset.EDITOR_HIT_OBJECT_FADE_OUT_EXTENSION / 2, Easing.OutQuint), 0, 1);
|
bool hasReachedObject = editorTime >= hitObjectTime;
|
||||||
float interpolation3 = Interpolation.ValueAt(editorClock.CurrentTime, 0, 1f, hitObject.StartTime, hitObject.StartTime + DrawableOsuEditorRuleset.EDITOR_HIT_OBJECT_FADE_OUT_EXTENSION);
|
|
||||||
|
|
||||||
if (hasReachedObject)
|
if (hasReachedObject)
|
||||||
{
|
{
|
||||||
circle.Scale = new Vector2(1 - 0.05f * interpolation3);
|
float alpha = Interpolation.ValueAt(editorTime, 0, 1f, hitObjectTime, hitObjectTime + FADE_OUT_EXTENSION, Easing.In);
|
||||||
ring.Scale = new Vector2(1 + 0.1f * interpolation2);
|
float circleScale = Interpolation.ValueAt(editorTime, 0, 1f, hitObjectTime, hitObjectTime + FADE_OUT_EXTENSION);
|
||||||
Alpha = 0.9f * (1 - (interpolation));
|
float ringScale = MathHelper.Clamp(Interpolation.ValueAt(editorTime, 0, 1f, hitObjectTime, hitObjectTime + FADE_OUT_EXTENSION / 2, Easing.OutQuint), 0, 1);
|
||||||
|
|
||||||
|
circle.Scale = new Vector2(1 - 0.05f * circleScale);
|
||||||
|
ring.Scale = new Vector2(1 + 0.1f * ringScale);
|
||||||
|
Alpha = 0.9f * (1 - alpha);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
Alpha = 0;
|
Alpha = 0;
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Game.Rulesets.Edit;
|
using osu.Game.Rulesets.Edit;
|
||||||
using osu.Game.Rulesets.Objects;
|
using osu.Game.Rulesets.Objects;
|
||||||
|
using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
using osu.Game.Rulesets.Osu.Objects;
|
||||||
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
||||||
using osu.Game.Screens.Edit;
|
using osu.Game.Screens.Edit;
|
||||||
@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
|
|||||||
|
|
||||||
protected override bool AlwaysShowWhenSelected => true;
|
protected override bool AlwaysShowWhenSelected => true;
|
||||||
|
|
||||||
protected override bool ShouldBeAlive => base.ShouldBeAlive || editorClock.CurrentTime - Item.GetEndTime() < DrawableOsuEditorRuleset.EDITOR_HIT_OBJECT_FADE_OUT_EXTENSION;
|
protected override bool ShouldBeAlive => base.ShouldBeAlive || editorClock.CurrentTime - Item.GetEndTime() < HitCircleOverlapMarker.FADE_OUT_EXTENSION;
|
||||||
|
|
||||||
protected OsuSelectionBlueprint(T hitObject)
|
protected OsuSelectionBlueprint(T hitObject)
|
||||||
: base(hitObject)
|
: base(hitObject)
|
||||||
|
@ -12,12 +12,6 @@ namespace osu.Game.Rulesets.Osu.Edit
|
|||||||
{
|
{
|
||||||
public class DrawableOsuEditorRuleset : DrawableOsuRuleset
|
public class DrawableOsuEditorRuleset : DrawableOsuRuleset
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Hit objects are intentionally made to fade out at a constant slower rate than in gameplay.
|
|
||||||
/// This allows a mapper to gain better historical context and use recent hitobjects as reference / snap points.
|
|
||||||
/// </summary>
|
|
||||||
public const double EDITOR_HIT_OBJECT_FADE_OUT_EXTENSION = 700;
|
|
||||||
|
|
||||||
public DrawableOsuEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
|
public DrawableOsuEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
|
||||||
: base(ruleset, beatmap, mods)
|
: base(ruleset, beatmap, mods)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user