RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move color snap logic from Note to DrawableNote

This commit is contained in:
Justus Franklin Tumacder 2021-04-24 19:53:21 +08:00
parent f9905ebe68
commit d6d81fb8e5
3 changed files with 93 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
View File

@ -1,12 +1,16 @@
// 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.Diagnostics;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Framework.Utils;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Mania.Skinning.Default;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Scoring;
@ -27,10 +31,21 @@ public class DrawableNote : DrawableManiaHitObject<Note>, IKeyBindingHandler<Man
[Resolved]
private Bindable<ManiaColourCode> configColourCode { get; set; }
[Resolved(canBeNull: true)]
private ManiaBeatmap beatmap { get; set; }
protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
private readonly Drawable headPiece;
public readonly Bindable<int> SnapBindable = new Bindable<int>();
public int Snap
{
get => SnapBindable.Value;
set => SnapBindable.Value = value;
}
public DrawableNote(Note hitObject)
: base(hitObject)
{
@ -48,20 +63,10 @@ protected override void LoadComplete()
{
base.LoadComplete();
HitObject.SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, HitObject.Snap));
}
HitObject.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
{
if (colourCode == ManiaColourCode.On)
{
Colour = BindableBeatDivisor.GetColourFor(HitObject.Snap, colours);
}
else
{
Colour = Colour4.White;
}
SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
}
protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
@ -103,5 +108,74 @@ public virtual bool OnPressed(ManiaAction action)
public virtual void OnReleased(ManiaAction action)
{
}
private void SnapToBeatmap()
{
if (beatmap != null)
{
TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(HitObject.StartTime);
int timeSignature = (int)currentTimingPoint.TimeSignature;
double startTime = currentTimingPoint.Time;
double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
double offset = startTime % secondsPerFourCounts;
double snapResult = HitObject.StartTime % secondsPerFourCounts - offset;
if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
{
Snap = 1;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
{
Snap = 2;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
{
Snap = 3;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
{
Snap = 4;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
{
Snap = 6;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
{
Snap = 8;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
{
Snap = 12;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
{
Snap = 16;
}
else
{
Snap = 0;
}
}
}
private const double LENIENCY_MS = 1.0;
private static bool AlmostDivisibleBy(double dividend, double divisor)
{
double remainder = Math.Abs(dividend) % divisor;
return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
}
private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
{
if (colourCode == ManiaColourCode.On)
{
Colour = BindableBeatDivisor.GetColourFor(Snap, colours);
}
else
{
Colour = Colour4.White;
}
}
}
}
}

78
osu.Game.Rulesets.Mania/Objects/Note.cs
View File

@ -1,11 +1,6 @@
// 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.Bindables;
using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.Judgements;
@ -17,78 +12,5 @@ namespace osu.Game.Rulesets.Mania.Objects
public class Note : ManiaHitObject
{
public override Judgement CreateJudgement() => new ManiaJudgement();
private IBeatmap Beatmap;
public readonly Bindable<int> SnapBindable = new Bindable<int>();
public int Snap
{
get => SnapBindable.Value;
set => SnapBindable.Value = value;
}
public Note()
{
this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
}
private void SnapToBeatmap()
{
if (Beatmap != null)
{
TimingControlPoint currentTimingPoint = Beatmap.ControlPointInfo.TimingPointAt(StartTime);
int timeSignature = (int)currentTimingPoint.TimeSignature;
double startTime = currentTimingPoint.Time;
double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
double offset = startTime % secondsPerFourCounts;
double snapResult = StartTime % secondsPerFourCounts - offset;
if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
{
Snap = 1;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
{
Snap = 2;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
{
Snap = 3;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
{
Snap = 4;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
{
Snap = 6;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
{
Snap = 8;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
{
Snap = 12;
}
else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
{
Snap = 16;
}
else
{
Snap = 0;
}
}
}
private const double LENIENCY_MS = 1.0;
private static bool AlmostDivisibleBy(double dividend, double divisor)
{
double remainder = Math.Abs(dividend) % divisor;
return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
}
}
}

5
osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
View File

@ -45,6 +45,9 @@ public class DrawableManiaRuleset : DrawableScrollingRuleset<ManiaHitObject>
public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
[Cached(typeof(ManiaBeatmap))]
private ManiaBeatmap CachedBeatmap { get; }
public IEnumerable<BarLine> BarLines;
protected override bool RelativeScaleBeatLengths => true;
@ -80,6 +83,8 @@ public DrawableManiaRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod
: base(ruleset, beatmap, mods)
{
BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
CachedBeatmap = Beatmap;
}
[BackgroundDependencyLoader]