sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert af4c3727d77a16e2534df9bbf452336b5c544342

Browse Source
This commit is contained in:
Opelkuh
2021-09-19 14:00:56 +02:00
parent af4c3727d7
commit 761da45f6a
4 changed files with 178 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorParticles.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Textures;
using osu.Framework.Input;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
@ -20,17 +21,12 @@ using osuTK.Graphics;
namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{
public class LegacyCursorParticles : CompositeDrawable, IKeyBindingHandler<OsuAction>, IRequireHighFrequencyMousePosition
public class LegacyCursorParticles : CompositeDrawable, IKeyBindingHandler<OsuAction>
{
private const int particle_lifetime_min = 300;
private const int particle_lifetime_max = 1000;
private const float particle_gravity = 240;
public bool Active => breakSpewer?.Active.Value == true || kiaiSpewer?.Active.Value == true;
private Vector2 cursorVelocity;
private ParticleSpewer breakSpewer;
private ParticleSpewer kiaiSpewer;
private LegacyCursorParticleSpewer breakSpewer;
private LegacyCursorParticleSpewer kiaiSpewer;
[Resolved(canBeNull: true)]
private Player player { get; set; }
@ -50,25 +46,21 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
texture.ScaleAdjust *= 1.6f;
}
RelativeSizeAxes = Axes.Both;
Anchor = Anchor.Centre;
InternalChildren = new[]
{
breakSpewer = new ParticleSpewer(texture, 20, particle_lifetime_max)
breakSpewer = new LegacyCursorParticleSpewer(texture, 20)
{
RelativeSizeAxes = Axes.Both,
Size = Vector2.One,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Colour = starBreakAdditive,
ParticleGravity = particle_gravity,
CreateParticle = createBreakParticle,
Direction = SpewDirection.None,
},
kiaiSpewer = new ParticleSpewer(texture, 60, particle_lifetime_max)
kiaiSpewer = new LegacyCursorParticleSpewer(texture, 60)
{
RelativeSizeAxes = Axes.Both,
Size = Vector2.One,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Colour = starBreakAdditive,
ParticleGravity = particle_gravity,
CreateParticle = createParticle,
Direction = SpewDirection.None,
},
};
@ -94,39 +86,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
kiaiSpewer.Active.Value = kiaiHitObject != null;
}
private Vector2? cursorScreenPosition;
private const double max_velocity_frame_length = 15;
private double velocityFrameLength;
private Vector2 totalPosDifference;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
protected override bool OnMouseMove(MouseMoveEvent e)
{
if (cursorScreenPosition == null)
{
cursorScreenPosition = e.ScreenSpaceMousePosition;
return base.OnMouseMove(e);
}
// calculate cursor velocity.
totalPosDifference += e.ScreenSpaceMousePosition - cursorScreenPosition.Value;
cursorScreenPosition = e.ScreenSpaceMousePosition;
velocityFrameLength += Math.Abs(Clock.ElapsedFrameTime);
if (velocityFrameLength > max_velocity_frame_length)
{
cursorVelocity = totalPosDifference / (float)velocityFrameLength;
totalPosDifference = Vector2.Zero;
velocityFrameLength = 0;
}
return base.OnMouseMove(e);
}
public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
{
handleInput(e.Action, true);
@ -153,53 +112,125 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
rightPressed = pressed;
break;
}
}
private ParticleSpewer.FallingParticle? createParticle()
{
if (!cursorScreenPosition.HasValue) return null;
return new ParticleSpewer.FallingParticle
{
StartPosition = ToLocalSpace(cursorScreenPosition.Value),
Duration = RNG.NextSingle(particle_lifetime_min, particle_lifetime_max),
StartAngle = (float)(RNG.NextDouble() * 4 - 2),
EndAngle = RNG.NextSingle(-2f, 2f),
EndScale = RNG.NextSingle(2f),
Velocity = cursorVelocity * 40,
};
}
private ParticleSpewer.FallingParticle? createBreakParticle()
{
var baseParticle = createParticle();
if (!baseParticle.HasValue) return null;
var p = baseParticle.Value;
if (leftPressed && rightPressed)
{
p.Velocity += new Vector2(
RNG.NextSingle(-460f, 460f),
RNG.NextSingle(-160f, 160f)
);
}
breakSpewer.Direction = SpewDirection.Omni;
else if (leftPressed)
{
p.Velocity += new Vector2(
RNG.NextSingle(-460f, 0),
RNG.NextSingle(-40f, 40f)
);
}
breakSpewer.Direction = SpewDirection.Left;
else if (rightPressed)
breakSpewer.Direction = SpewDirection.Right;
else
breakSpewer.Direction = SpewDirection.None;
}
private class LegacyCursorParticleSpewer : ParticleSpewer, IRequireHighFrequencyMousePosition
{
private const int particle_duration_min = 300;
private const int particle_duration_max = 1000;
public SpewDirection Direction { get; set; }
protected override bool CanSpawnParticles => base.CanSpawnParticles && cursorScreenPosition.HasValue;
protected override float ParticleGravity => 240;
public LegacyCursorParticleSpewer(Texture texture, int perSecond)
: base(texture, perSecond, particle_duration_max)
{
p.Velocity += new Vector2(
RNG.NextSingle(0, 460f),
RNG.NextSingle(-40f, 40f)
);
Active.BindValueChanged(_ => resetVelocityCalculation());
}
return p;
private Vector2? cursorScreenPosition;
private Vector2 cursorVelocity;
private const double max_velocity_frame_length = 15;
private double velocityFrameLength;
private Vector2 totalPosDifference;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
protected override bool OnMouseMove(MouseMoveEvent e)
{
if (cursorScreenPosition == null)
{
cursorScreenPosition = e.ScreenSpaceMousePosition;
return base.OnMouseMove(e);
}
// calculate cursor velocity.
totalPosDifference += e.ScreenSpaceMousePosition - cursorScreenPosition.Value;
cursorScreenPosition = e.ScreenSpaceMousePosition;
velocityFrameLength += Math.Abs(Clock.ElapsedFrameTime);
if (velocityFrameLength > max_velocity_frame_length)
{
cursorVelocity = totalPosDifference / (float)velocityFrameLength;
totalPosDifference = Vector2.Zero;
velocityFrameLength = 0;
}
return base.OnMouseMove(e);
}
private void resetVelocityCalculation()
{
cursorScreenPosition = null;
totalPosDifference = Vector2.Zero;
velocityFrameLength = 0;
}
protected override FallingParticle CreateParticle() =>
new FallingParticle
{
StartPosition = ToLocalSpace(cursorScreenPosition ?? Vector2.Zero),
Duration = RNG.NextSingle(particle_duration_min, particle_duration_max),
StartAngle = (float)(RNG.NextDouble() * 4 - 2),
EndAngle = RNG.NextSingle(-2f, 2f),
EndScale = RNG.NextSingle(2f),
Velocity = getVelocity(),
};
private Vector2 getVelocity()
{
Vector2 velocity = Vector2.Zero;
switch (Direction)
{
case SpewDirection.Left:
velocity = new Vector2(
RNG.NextSingle(-460f, 0),
RNG.NextSingle(-40f, 40f)
);
break;
case SpewDirection.Right:
velocity = new Vector2(
RNG.NextSingle(0, 460f),
RNG.NextSingle(-40f, 40f)
);
break;
case SpewDirection.Omni:
velocity = new Vector2(
RNG.NextSingle(-460f, 460f),
RNG.NextSingle(-160f, 160f)
);
break;
}
velocity += cursorVelocity * 40;
return velocity;
}
}
private enum SpewDirection
{
None,
Left,
Right,
Omni,
}
}
}