Skip to content

Commit

Permalink
Merge pull request #3140 from miterosan/ArrangeMod
Browse files Browse the repository at this point in the history
Add "transform" mod
  • Loading branch information
peppy committed Sep 14, 2018
2 parents ccabad6 + 328de07 commit 7a2d83d
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 2 deletions.
51 changes: 51 additions & 0 deletions osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -0,0 +1,51 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

using System;
using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects;
using OpenTK;

namespace osu.Game.Rulesets.Osu.Mods
{
internal class OsuModTransform : Mod, IApplicableToDrawableHitObjects
{
public override string Name => "Transform";
public override string ShortenedName => "TR";
public override FontAwesome Icon => FontAwesome.fa_arrows;
public override ModType Type => ModType.Fun;
public override string Description => "Everything rotates. EVERYTHING.";
public override double ScoreMultiplier => 1;
private float theta;

public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
{
foreach (var drawable in drawables)
{
var hitObject = (OsuHitObject) drawable.HitObject;

float appearDistance = (float)(hitObject.TimePreempt - hitObject.TimeFadeIn) / 2;

Vector2 originalPosition = drawable.Position;
Vector2 appearOffset = new Vector2((float)Math.Cos(theta), (float)Math.Sin(theta)) * appearDistance;

//the - 1 and + 1 prevents the hit objects to appear in the wrong position.
double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1;
double moveDuration = hitObject.TimePreempt + 1;

using (drawable.BeginAbsoluteSequence(appearTime, true))
{
drawable
.MoveToOffset(appearOffset)
.MoveTo(originalPosition, moveDuration, Easing.InOutSine);
}

theta += (float) hitObject.TimeFadeIn / 1000;
}
}
}
}
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Osu/OsuRuleset.cs
Expand Up @@ -118,8 +118,8 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
new OsuModAutopilot(),
};
case ModType.Fun:
return new Mod[]
{
return new Mod[] {
new OsuModTransform(),
new OsuModWiggle(),
};
default:
Expand Down

0 comments on commit 7a2d83d

Please sign in to comment.