h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Code Issues Releases Wiki Activity

Update transforms to not accept clock.

Browse Source
This commit is contained in:
Dean Herbert 2016-10-28 17:42:00 +09:00
parent 0e39c5cc9c
commit 13b5fb0578
10 changed files with 34 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs
View File

@ -34,8 +34,8 @@ namespace osu.Game.Beatmaps.Objects.Catch.Drawable
Texture = game.Textures.Get(@"Menu/logo");
Transforms.Add(new TransformPosition(Clock) { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = new Vector2(h.Position, -0.1f), EndValue = new Vector2(h.Position, 0.9f) });
Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + h.Duration + 200, EndTime = h.StartTime + h.Duration + 400, StartValue = 1, EndValue = 0 });
Transforms.Add(new TransformPosition { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = new Vector2(h.Position, -0.1f), EndValue = new Vector2(h.Position, 0.9f) });
Transforms.Add(new TransformAlpha { StartTime = h.StartTime + h.Duration + 200, EndTime = h.StartTime + h.Duration + 400, StartValue = 1, EndValue = 0 });
Expire(true);
}
}

4
osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs
View File

@ -25,8 +25,8 @@ namespace osu.Game.Beatmaps.Objects.Mania.Drawable
base.Load(game);
Texture = game.Textures.Get(@"Menu/logo");
Transforms.Add(new TransformPositionY(Clock) { StartTime = note.StartTime - 200, EndTime = note.StartTime, StartValue = -0.1f, EndValue = 0.9f });
Transforms.Add(new TransformAlpha(Clock) { StartTime = note.StartTime + note.Duration + 200, EndTime = note.StartTime + note.Duration + 400, StartValue = 1, EndValue = 0 });
Transforms.Add(new TransformPositionY() { StartTime = note.StartTime - 200, EndTime = note.StartTime, StartValue = -0.1f, EndValue = 0.9f });
Transforms.Add(new TransformAlpha() { StartTime = note.StartTime + note.Duration + 200, EndTime = note.StartTime + note.Duration + 400, StartValue = 1, EndValue = 0 });
Expire(true);
}
}

28
osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
View File

@ -77,36 +77,36 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
Flush(); //move to DrawableHitObject
Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime - 1000, EndTime = h.StartTime - 800, StartValue = 0, EndValue = 1 });
Transforms.Add(new TransformAlpha { StartTime = h.StartTime - 1000, EndTime = h.StartTime - 800, StartValue = 0, EndValue = 1 });
approachCircle.Transforms.Add(new TransformScale(Clock) { StartTime = h.StartTime - 1000, EndTime = h.StartTime, StartValue = new Vector2(2f), EndValue = new Vector2(0.6f) });
approachCircle.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime, EndTime = h.StartTime, StartValue = 1, EndValue = 0 });
approachCircle.Transforms.Add(new TransformScale { StartTime = h.StartTime - 1000, EndTime = h.StartTime, StartValue = new Vector2(2f), EndValue = new Vector2(0.6f) });
approachCircle.Transforms.Add(new TransformAlpha { StartTime = h.StartTime, EndTime = h.StartTime, StartValue = 1, EndValue = 0 });
glow.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime, EndTime = h.StartTime + 400, StartValue = glow.Alpha, EndValue = 0 });
glow.Transforms.Add(new TransformAlpha { StartTime = h.StartTime, EndTime = h.StartTime + 400, StartValue = glow.Alpha, EndValue = 0 });
switch (state)
{
case ArmedState.Disarmed:
Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + h.Duration + 200, EndTime = h.StartTime + h.Duration + 400, StartValue = 1, EndValue = 0 });
Transforms.Add(new TransformAlpha { StartTime = h.StartTime + h.Duration + 200, EndTime = h.StartTime + h.Duration + 400, StartValue = 1, EndValue = 0 });
break;
case ArmedState.Armed:
const float flashIn = 30;
const float fadeOut = 800;
//Transforms.Add(new TransformScale(Clock) { StartTime = h.StartTime, EndTime = h.StartTime + 400, StartValue = Scale, EndValue = Scale * 1.1f });
//Transforms.Add(new TransformScale() { StartTime = h.StartTime, EndTime = h.StartTime + 400, StartValue = Scale, EndValue = Scale * 1.1f });
ring.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0 });
circle.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0 });
number.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0 });
ring.Transforms.Add(new TransformAlpha { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0 });
circle.Transforms.Add(new TransformAlpha { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0 });
number.Transforms.Add(new TransformAlpha { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0 });
flash.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0.8f });
flash.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn + 100, StartValue = 0.8f, EndValue = 0 });
flash.Transforms.Add(new TransformAlpha { StartTime = h.StartTime, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 0.8f });
flash.Transforms.Add(new TransformAlpha { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn + 100, StartValue = 0.8f, EndValue = 0 });
explode.Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 1 });
explode.Transforms.Add(new TransformAlpha { StartTime = h.StartTime, EndTime = h.StartTime + flashIn, StartValue = 0, EndValue = 1 });
Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn + fadeOut, StartValue = 1, EndValue = 0 });
Transforms.Add(new TransformAlpha { StartTime = h.StartTime + flashIn, EndTime = h.StartTime + flashIn + fadeOut, StartValue = 1, EndValue = 0 });
Transforms.Add(new TransformScale(Clock) { StartTime = h.StartTime + h.Duration, EndTime = h.StartTime + h.Duration + 400, StartValue = Scale, EndValue = Scale * 1.5f, Easing = EasingTypes.OutQuad });
Transforms.Add(new TransformScale { StartTime = h.StartTime + h.Duration, EndTime = h.StartTime + h.Duration + 400, StartValue = Scale, EndValue = Scale * 1.5f, Easing = EasingTypes.OutQuad });
break;
}
}

4
osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs
View File

@ -29,8 +29,8 @@ namespace osu.Game.Beatmaps.Objects.Taiko.Drawable
Texture = game.Textures.Get(@"Menu/logo");
Transforms.Add(new TransformPositionX(Clock) { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = 1.1f, EndValue = 0.1f });
Transforms.Add(new TransformAlpha(Clock) { StartTime = h.StartTime + h.Duration + 200, EndTime = h.StartTime + h.Duration + 400, StartValue = 1, EndValue = 0 });
Transforms.Add(new TransformPositionX { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = 1.1f, EndValue = 0.1f });
Transforms.Add(new TransformAlpha { StartTime = h.StartTime + h.Duration + 200, EndTime = h.StartTime + h.Duration + 400, StartValue = 1, EndValue = 0 });
Expire(true);
}
}

12
osu.Game/GameModes/Menu/Button.cs
View File

@ -117,7 +117,7 @@ namespace osu.Game.GameModes.Menu
icon.RotateTo(10, offset, EasingTypes.InOutSine);
icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out);
icon.Transforms.Add(new TransformRotation(Clock)
icon.Transforms.Add(new TransformRotation
{
StartValue = -10,
EndValue = 10,
@ -128,7 +128,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration * 2
});
icon.Transforms.Add(new TransformPosition(Clock)
icon.Transforms.Add(new TransformPosition()
{
StartValue = Vector2.Zero,
EndValue = new Vector2(0, -10),
@ -139,7 +139,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration
});
icon.Transforms.Add(new TransformScale(Clock)
icon.Transforms.Add(new TransformScale()
{
StartValue = new Vector2(1, 0.9f),
EndValue = Vector2.One,
@ -150,7 +150,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration
});
icon.Transforms.Add(new TransformPosition(Clock)
icon.Transforms.Add(new TransformPosition()
{
StartValue = new Vector2(0, -10),
EndValue = Vector2.Zero,
@ -161,7 +161,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration
});
icon.Transforms.Add(new TransformScale(Clock)
icon.Transforms.Add(new TransformScale()
{
StartValue = Vector2.One,
EndValue = new Vector2(1, 0.9f),
@ -172,7 +172,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration
});
icon.Transforms.Add(new TransformRotation(Clock)
icon.Transforms.Add(new TransformRotation
{
StartValue = 10,
EndValue = -10,

11
osu.Game/GameModes/Play/ComboCounter.cs
View File

@ -174,7 +174,7 @@ namespace osu.Game.GameModes.Play
protected virtual void OnCountRolling(ulong currentValue, ulong newValue)
{
transformRoll(new TransformComboRoll(Clock), currentValue, newValue);
transformRoll(new TransformComboRoll(), currentValue, newValue);
}
protected virtual void OnCountIncrement(ulong currentValue, ulong newValue) {
@ -248,11 +248,11 @@ namespace osu.Game.GameModes.Play
protected class TransformComboRoll : Transform<ulong>
{
public override ulong CurrentValue
protected override ulong CurrentValue
{
get
{
double time = Time;
double time = CurrentTime ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
@ -265,11 +265,6 @@ namespace osu.Game.GameModes.Play
base.Apply(d);
(d as ComboCounter).DisplayedCount = CurrentValue;
}
public TransformComboRoll(IClock clock)
: base(clock)
{
}
}
}
}

9
osu.Game/GameModes/Play/ComboResultCounter.cs
View File

@ -41,11 +41,11 @@ namespace osu.Game.GameModes.Play
protected class TransformComboResult : Transform<ulong>
{
public override ulong CurrentValue
protected override ulong CurrentValue
{
get
{
double time = Time;
double time = CurrentTime ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
@ -58,11 +58,6 @@ namespace osu.Game.GameModes.Play
base.Apply(d);
(d as ComboResultCounter).DisplayedCount = CurrentValue;
}
public TransformComboResult(IClock clock)
: base(clock)
{
}
}
}
}

5
osu.Game/Graphics/UserInterface/PercentageCounter.cs
View File

@ -57,11 +57,6 @@ namespace osu.Game.Graphics.UserInterface
base.Apply(d);
(d as PercentageCounter).DisplayedCount = CurrentValue;
}
public TransformAccuracy(IClock clock)
: base(clock)
{
}
}
}
}

4
osu.Game/Graphics/UserInterface/RollingCounter.cs
View File

@ -194,14 +194,12 @@ namespace osu.Game.Graphics.UserInterface
/// <seealso cref="TransformType"/>
protected virtual void TransformCount(T currentValue, T newValue)
{
object[] parameters = { Clock };
Debug.Assert(
TransformType.IsSubclassOf(typeof(Transform<T>)) || TransformType == typeof(Transform<T>),
@"transformType should be a subclass of Transform<T>."
);
TransformCount((Transform<T>)Activator.CreateInstance(TransformType, parameters), currentValue, newValue);
TransformCount((Transform<T>)Activator.CreateInstance(TransformType), currentValue, newValue);
}
/// <summary>

9
osu.Game/Graphics/UserInterface/ScoreCounter.cs
View File

@ -56,11 +56,11 @@ namespace osu.Game.Graphics.UserInterface
protected class TransformScore : Transform<ulong>
{
public override ulong CurrentValue
protected override ulong CurrentValue
{
get
{
double time = Time;
double time = CurrentTime ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
@ -73,11 +73,6 @@ namespace osu.Game.Graphics.UserInterface
base.Apply(d);
(d as ScoreCounter).DisplayedCount = CurrentValue;
}
public TransformScore(IClock clock)
: base(clock)
{
}
}
}
}