Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions osu.Game.Rulesets.Tau.Tests/Mods/TestSceneInverse.cs

This file was deleted.

5 changes: 0 additions & 5 deletions osu.Game.Rulesets.Tau.Tests/TestSceneKiaiEffects.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ public void SetUp()
[TestCase(true)]
public void TestEffect(bool isInversed)
{
AddStep("Set inverse effect", () =>
{
Properties.InverseModEnabled.Value = isInversed;
});

AddStep("Add beat result",
() => KiaiContainer.OnNewResult(
new DrawableBeat(new Beat()), new JudgementResult(new Beat(), new TauJudgement()) { Type = HitResult.Great }));
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Tau/Mods/TauModHidden.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.ComponentModel;
using System.Linq;
using System.Runtime.InteropServices;
using JetBrains.Annotations;
using osu.Framework.Allocation;
Expand All @@ -27,7 +26,6 @@ public abstract class TauModHidden : ModHidden, IApplicableToDrawableRuleset<Tau
{
public override string Name => Mode.GetDescription();
public override double ScoreMultiplier => 1.06;
public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(TauModInverse) }).ToArray();

public void ApplyToDrawableRuleset(DrawableRuleset<TauHitObject> drawableRuleset)
{
Expand Down
49 changes: 0 additions & 49 deletions osu.Game.Rulesets.Tau/Mods/TauModInverse.cs

This file was deleted.

7 changes: 0 additions & 7 deletions osu.Game.Rulesets.Tau/Objects/Drawables/DrawableBeat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ protected override void UpdateInitialTransforms()
base.UpdateInitialTransforms();

DrawableBox.FadeIn(HitObject.TimeFadeIn);

if (Properties != null && Properties.InverseModEnabled.Value)
DrawableBox.MoveToY(-1.0f);

DrawableBox.MoveToY(-0.5f, HitObject.TimePreempt);
}

Expand All @@ -71,9 +67,6 @@ protected override void UpdateHitStateTransforms(ArmedState state)
const double time_fade_hit = 250, time_fade_miss = 400;
var offset = new Vector2(0, -.1f);

if (Properties != null && Properties.InverseModEnabled.Value)
offset.Y = -offset.Y;

switch (state)
{
case ArmedState.Hit:
Expand Down
16 changes: 3 additions & 13 deletions osu.Game.Rulesets.Tau/Objects/Drawables/DrawableHardBeat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ protected override void UpdateInitialTransforms()
base.UpdateInitialTransforms();

this.FadeIn(HitObject.TimeFadeIn);

if (properties != null && properties.InverseModEnabled.Value)
this.ResizeTo(2);

this.ResizeTo(1, HitObject.TimePreempt);
}

Expand All @@ -59,13 +55,7 @@ protected override void UpdateHitStateTransforms(ArmedState state)
base.UpdateHitStateTransforms(state);

const double time_fade_hit = 250, time_fade_miss = 400;
float scaleHit = 1.25f, scaleMiss = 1.1f;

if (properties != null && properties.InverseModEnabled.Value)
{
scaleHit = 0.75f;
scaleMiss = 0.9f;
}
const float scale_hit = 1.25f, scale_miss = 1.1f;

switch (state)
{
Expand All @@ -75,15 +65,15 @@ protected override void UpdateHitStateTransforms(ArmedState state)
break;

case ArmedState.Hit:
this.ScaleTo(scaleHit, time_fade_hit, Easing.OutQuint)
this.ScaleTo(scale_hit, time_fade_hit, Easing.OutQuint)
.FadeColour(colour.ForHitResult(Result.Type), time_fade_hit, Easing.OutQuint)
.FadeOut(time_fade_hit);

break;

case ArmedState.Miss:
this.FadeColour(Color4.Red, time_fade_miss, Easing.OutQuint)
.ResizeTo(scaleMiss, time_fade_hit, Easing.OutQuint)
.ResizeTo(scale_miss, time_fade_hit, Easing.OutQuint)
.FadeOut(time_fade_miss);

break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ private void updatePath()

float radius = TauPlayfield.BASE_SIZE.X / 2;

float distanceAt(double t) => inversed
? (float)(2 * radius - (time - t) / HitObject.TimePreempt * radius)
: (float)((time - t) / HitObject.TimePreempt * radius);
float distanceAt(double t) => (float)((time - t) / HitObject.TimePreempt * radius);

void addVertex(double t, double angle)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,8 @@ private record struct SliderUniform
public UniformVector4 HitColor;
public UniformFloat Range;
public UniformFloat FadeRange;
public UniformBool Reverse;

private UniformPadding4 _p2;
private UniformPadding12 _p3;
private UniformPadding4 _p4;
private UniformPadding8 _p2;
}

// We multiply the size param by 3 such that the amount of vertices is a multiple of the amount of vertices
Expand All @@ -92,7 +89,6 @@ public SliderPathDrawNode(SliderPath source)
private Vector2 centerPos;
private float range;
private float fadeRange;
private bool reverse;

public override void ApplyState()
{
Expand Down Expand Up @@ -128,7 +124,6 @@ public override void ApplyState()
fadeRange = (Source.ToScreenSpace(fade) - centerPos).Length - range;
var c = Source.FadeColour;
hitColour = new Vector4(c.R, c.G, c.B, c.A);
reverse = Source.Reverse;
}

private Vector2 pointOnCircle(float angle) => new(MathF.Sin(angle), -MathF.Cos(angle));
Expand Down Expand Up @@ -346,7 +341,6 @@ protected override void Draw(IRenderer renderer)
Range = range,
FadeRange = fadeRange,
HitColor = hitColour,
Reverse = reverse
};

//maskData ??= renderer.CreateUniformBuffer<MaskUniform>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public IReadOnlyList<Vector3> Vertices

private float pathRadius = 10f;
public Colour4 FadeColour;
public bool Reverse;

/// <summary>
/// How wide this path is on each side of the line.
Expand Down
10 changes: 0 additions & 10 deletions osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ public partial class DrawableSlider : DrawableAngledTauHitObject<Slider>
private readonly Cached drawCache = new();
private readonly PausableSkinnableSound slidingSample;

private bool inversed;

public DrawableSlider()
: this(null)
{
Expand Down Expand Up @@ -159,14 +157,6 @@ protected override void OnApply()
path.FadeColour = colour.ForHitResult(HitResult.Great);

totalTimeHeld = 0;

if (properties.InverseModEnabled.Value)
{
inversed = true;
maskingContainer.Masking = false;
path.Reverse = inversed;
// PathDistance = path.PathDistance = TauPlayfield.BaseSize.X;
}
}

protected override void OnFree()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ protected override void OnApply()
{
base.OnApply();

DrawableBox.Y = Properties?.InverseModEnabled.Value == true ? -1.0f : 0;

DrawableBox.Alpha = 0;
}

Expand All @@ -120,9 +118,6 @@ protected override void UpdateHitStateTransforms(ArmedState state)
float velocity = -0.5f / (float)HitObject.TimePreempt;
float timeFadeHit = DrawableSlider.FADE_RANGE / Math.Abs(velocity);

if (Properties?.InverseModEnabled.Value == true)
velocity *= -1;

switch (state)
{
case ArmedState.Hit or ArmedState.Miss:
Expand Down
16 changes: 3 additions & 13 deletions osu.Game.Rulesets.Tau/Objects/Drawables/DrawableStrictHardBeat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ protected override void UpdateInitialTransforms()
base.UpdateInitialTransforms();

this.FadeIn(HitObject.TimeFadeIn);

if (properties != null && properties.InverseModEnabled.Value)
piece.ResizeTo(2);

piece.ResizeTo(1, HitObject.TimePreempt);
}

Expand All @@ -86,13 +82,7 @@ protected override void UpdateHitStateTransforms(ArmedState state)
base.UpdateHitStateTransforms(state);

const double time_fade_hit = 250, time_fade_miss = 400;
float scaleHit = 1.25f, scaleMiss = 1.1f;

if (properties != null && properties.InverseModEnabled.Value)
{
scaleHit = 0.75f;
scaleMiss = 0.9f;
}
const float scale_hit = 1.25f, scale_miss = 1.1f;

switch (state)
{
Expand All @@ -102,15 +92,15 @@ protected override void UpdateHitStateTransforms(ArmedState state)
break;

case ArmedState.Hit:
this.ScaleTo(scaleHit, time_fade_hit, Easing.OutQuint)
this.ScaleTo(scale_hit, time_fade_hit, Easing.OutQuint)
.FadeColour(colour.ForHitResult(Result.Type), time_fade_hit, Easing.OutQuint)
.FadeOut(time_fade_hit);

break;

case ArmedState.Miss:
this.FadeColour(Color4.Red, time_fade_miss, Easing.OutQuint)
.ResizeTo(scaleMiss, time_fade_hit, Easing.OutQuint)
.ResizeTo(scale_miss, time_fade_hit, Easing.OutQuint)
.FadeOut(time_fade_miss);

break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.Tau.Configuration;
using osu.Game.Rulesets.Tau.Objects.Drawables.Pieces;
using osu.Game.Rulesets.Tau.UI;
using osuTK;

namespace osu.Game.Rulesets.Tau.Objects.Drawables
Expand Down Expand Up @@ -39,13 +38,6 @@ public DrawableTauJudgement()
});
}

[BackgroundDependencyLoader(true)]
private void load(TauCachedProperties properties)
{
if (properties != null && properties.InverseModEnabled.Value)
distance = 0.4f;
}

public override void Apply(JudgementResult result, DrawableHitObject judgedObject)
{
base.Apply(result, judgedObject);
Expand Down
3 changes: 1 addition & 2 deletions osu.Game.Rulesets.Tau/Resources/Shaders/sh_Slider.fs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ layout(std140, set = 0, binding = 0) uniform m_sliderParameters {
highp vec4 hitColor;
highp float range;
highp float fadeRange;
bool reverse;
};

layout(set = 1, binding = 0) uniform lowp texture2D m_texture;
Expand All @@ -28,7 +27,7 @@ void main(void)
vec2 diff = v_Position - centerPos;
float dist = sqrt(diff.x * diff.x + diff.y * diff.y);

if ( reverse != dist <= range )
if ( dist <= range )
{
o_colour = colour;
}
Expand Down
1 change: 0 additions & 1 deletion osu.Game.Rulesets.Tau/TauRuleset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
{
new MultiMod(new ModWindUp(), new ModWindDown()),
new ModAdaptiveSpeed(),
new TauModInverse(),
new TauModImpossibleSliders(),
new TauModRoundabout(),
new TauModNoScope(),
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Tau/UI/Effects/ClassicKiaiEffect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected override void ApplyHitAnimation(Drawable particle)
private void addTransformsForAngled(Drawable particle)
{
particle.MoveTo(Extensions.FromPolarCoordinates(
(RNG.NextSingle() * 0.15f) * (Settings.Inversed ? -1f : 1f) + Distance,
RNG.NextSingle() * 0.15f + Distance,
RNG.NextSingle(Settings.Angle - 10, Settings.Angle + 10)),
Duration, Easing.OutQuint)
.ResizeTo(new Vector2(RNG.Next(0, 5)), Duration, Easing.OutQuint);
Expand All @@ -59,7 +59,7 @@ private void addTransformsForCircular(Drawable particle)
{
particle.MoveTo(
Extensions.FromPolarCoordinates(
(RNG.NextSingle() * 0.15f) * (Settings.Inversed ? -1f : 2f) + Distance,
(RNG.NextSingle() * 0.15f) * 2f + Distance,
Vector2.Zero.GetDegreesFromPosition(particle.Position)), Duration,
Easing.OutQuint)
.ScaleTo(new Vector2(RNG.Next(1, 2)), Duration, Easing.OutQuint);
Expand Down
Loading
Loading