mirror of
https://github.com/ppy/osu.git
synced 2025-01-06 07:42:55 +08:00
Merge pull request #12632 from EVAST9919/barrel-roll
This commit is contained in:
commit
bb6f28d76b
@ -2,53 +2,15 @@
|
|||||||
// 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.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using osu.Framework.Bindables;
|
|
||||||
using osu.Framework.Extensions;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Rulesets.Mods;
|
using osu.Game.Rulesets.Mods;
|
||||||
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 osu.Game.Rulesets.Osu.Objects.Drawables;
|
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
||||||
using osu.Game.Rulesets.Osu.UI;
|
|
||||||
using osu.Game.Rulesets.UI;
|
|
||||||
using osuTK;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.Mods
|
namespace osu.Game.Rulesets.Osu.Mods
|
||||||
{
|
{
|
||||||
public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToDrawableHitObjects
|
public class OsuModBarrelRoll : ModBarrelRoll<OsuHitObject>, IApplicableToDrawableHitObjects
|
||||||
{
|
{
|
||||||
private float currentRotation;
|
|
||||||
|
|
||||||
[SettingSource("Roll speed", "Rotations per minute")]
|
|
||||||
public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
|
|
||||||
{
|
|
||||||
MinValue = 0.02,
|
|
||||||
MaxValue = 12,
|
|
||||||
Precision = 0.01,
|
|
||||||
};
|
|
||||||
|
|
||||||
[SettingSource("Direction", "The direction of rotation")]
|
|
||||||
public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
|
|
||||||
|
|
||||||
public override string Name => "Barrel Roll";
|
|
||||||
public override string Acronym => "BR";
|
|
||||||
public override string Description => "The whole playfield is on a wheel!";
|
|
||||||
public override double ScoreMultiplier => 1;
|
|
||||||
|
|
||||||
public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
|
|
||||||
|
|
||||||
public void Update(Playfield playfield)
|
|
||||||
{
|
|
||||||
playfield.Rotation = currentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
|
|
||||||
{
|
|
||||||
// scale the playfield to allow all hitobjects to stay within the visible region.
|
|
||||||
drawableRuleset.Playfield.Scale = new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
|
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
|
||||||
{
|
{
|
||||||
foreach (var d in drawables)
|
foreach (var d in drawables)
|
||||||
@ -58,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
switch (d)
|
switch (d)
|
||||||
{
|
{
|
||||||
case DrawableHitCircle circle:
|
case DrawableHitCircle circle:
|
||||||
circle.CirclePiece.Rotation = -currentRotation;
|
circle.CirclePiece.Rotation = -CurrentRotation;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
57
osu.Game/Rulesets/Mods/ModBarrelRoll.cs
Normal file
57
osu.Game/Rulesets/Mods/ModBarrelRoll.cs
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
// 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.Extensions;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Game.Configuration;
|
||||||
|
using osu.Game.Rulesets.Objects;
|
||||||
|
using osu.Game.Rulesets.UI;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Mods
|
||||||
|
{
|
||||||
|
public abstract class ModBarrelRoll<TObject> : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<TObject>
|
||||||
|
where TObject : HitObject
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The current angle of rotation being applied by this mod.
|
||||||
|
/// Generally should be used to apply inverse rotation to elements which should not be rotated.
|
||||||
|
/// </summary>
|
||||||
|
protected float CurrentRotation { get; private set; }
|
||||||
|
|
||||||
|
[SettingSource("Roll speed", "Rotations per minute")]
|
||||||
|
public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
|
||||||
|
{
|
||||||
|
MinValue = 0.02,
|
||||||
|
MaxValue = 12,
|
||||||
|
Precision = 0.01,
|
||||||
|
};
|
||||||
|
|
||||||
|
[SettingSource("Direction", "The direction of rotation")]
|
||||||
|
public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
|
||||||
|
|
||||||
|
public override string Name => "Barrel Roll";
|
||||||
|
public override string Acronym => "BR";
|
||||||
|
public override string Description => "The whole playfield is on a wheel!";
|
||||||
|
public override double ScoreMultiplier => 1;
|
||||||
|
|
||||||
|
public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
|
||||||
|
|
||||||
|
public void Update(Playfield playfield)
|
||||||
|
{
|
||||||
|
playfield.Rotation = CurrentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
|
||||||
|
{
|
||||||
|
// scale the playfield to allow all hitobjects to stay within the visible region.
|
||||||
|
|
||||||
|
var playfieldSize = drawableRuleset.Playfield.DrawSize;
|
||||||
|
var minSide = MathF.Min(playfieldSize.X, playfieldSize.Y);
|
||||||
|
var maxSide = MathF.Max(playfieldSize.X, playfieldSize.Y);
|
||||||
|
drawableRuleset.Playfield.Scale = new Vector2(minSide / maxSide);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user