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

Reformat again...

Browse Source
This commit is contained in:
gabixdev 2017-09-17 01:44:49 +02:00
parent a33dfbba25
commit 3c00a7cc51
1 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
osu.Game/Graphics/Cursor/MenuCursor.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Graphics.Cursor
{ {
public class MenuCursor : CursorContainer public class MenuCursor : CursorContainer
{ {
protected override Drawable CreateCursor () => new Cursor(); protected override Drawable CreateCursor() => new Cursor();
private Bindable<bool> cursorRotate; private Bindable<bool> cursorRotate;
@ -26,18 +26,20 @@ namespace osu.Game.Graphics.Cursor
private bool startRotation; private bool startRotation;
protected override bool OnMouseMove (InputState state) protected override bool OnMouseMove(InputState state)
{ {
if (cursorRotate && dragging) { if (cursorRotate && dragging)
Debug.Assert (state.Mouse.PositionMouseDown != null); {
Debug.Assert(state.Mouse.PositionMouseDown != null);
// don't start rotating until we're moved a minimum distance away from the mouse down location, // don't start rotating until we're moved a minimum distance away from the mouse down location,
// else it can have an annoying effect. // else it can have an annoying effect.
startRotation |= Vector2Extensions.Distance (state.Mouse.Position, state.Mouse.PositionMouseDown.Value) > 30; startRotation |= Vector2Extensions.Distance(state.Mouse.Position, state.Mouse.PositionMouseDown.Value) > 30;
if (startRotation) { if (startRotation)
{
Vector2 offset = state.Mouse.Position - state.Mouse.PositionMouseDown.Value; Vector2 offset = state.Mouse.Position - state.Mouse.PositionMouseDown.Value;
float degrees = (float)MathHelper.RadiansToDegrees (Math.Atan2 (-offset.X, offset.Y)) + 24.3f; float degrees = (float)MathHelper.RadiansToDegrees(Math.Atan2(-offset.X, offset.Y)) + 24.3f;
// Always rotate in the direction of least distance // Always rotate in the direction of least distance
float diff = (degrees - ActiveCursor.Rotation) % 360; float diff = (degrees - ActiveCursor.Rotation) % 360;
@ -47,66 +49,67 @@ namespace osu.Game.Graphics.Cursor
diff -= 360; diff -= 360;
degrees = ActiveCursor.Rotation + diff; degrees = ActiveCursor.Rotation + diff;
ActiveCursor.RotateTo (degrees, 600, Easing.OutQuint); ActiveCursor.RotateTo(degrees, 600, Easing.OutQuint);
} }
} }
return base.OnMouseMove (state); return base.OnMouseMove(state);
} }
protected override bool OnDragStart (InputState state) protected override bool OnDragStart(InputState state)
{ {
dragging = true; dragging = true;
return base.OnDragStart (state); return base.OnDragStart(state);
} }
protected override bool OnMouseDown (InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{ {
ActiveCursor.Scale = new Vector2 (1); ActiveCursor.Scale = new Vector2(1);
ActiveCursor.ScaleTo (0.90f, 800, Easing.OutQuint); ActiveCursor.ScaleTo(0.90f, 800, Easing.OutQuint);
((Cursor)ActiveCursor).AdditiveLayer.Alpha = 0; ((Cursor)ActiveCursor).AdditiveLayer.Alpha = 0;
((Cursor)ActiveCursor).AdditiveLayer.FadeInFromZero (800, Easing.OutQuint); ((Cursor)ActiveCursor).AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
return base.OnMouseDown (state, args); return base.OnMouseDown(state, args);
} }
protected override bool OnMouseUp (InputState state, MouseUpEventArgs args) protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{ {
if (!state.Mouse.HasMainButtonPressed) { if (!state.Mouse.HasMainButtonPressed)
{
dragging = false; dragging = false;
startRotation = false; startRotation = false;
((Cursor)ActiveCursor).AdditiveLayer.FadeOut (500, Easing.OutQuint); ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, Easing.OutQuint);
ActiveCursor.RotateTo (0, 600 * (1 + Math.Abs (ActiveCursor.Rotation / 720)), Easing.OutElasticHalf); ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), Easing.OutElasticHalf);
ActiveCursor.ScaleTo (1, 500, Easing.OutElastic); ActiveCursor.ScaleTo(1, 500, Easing.OutElastic);
} }
return base.OnMouseUp (state, args); return base.OnMouseUp(state, args);
} }
protected override bool OnClick (InputState state) protected override bool OnClick(InputState state)
{ {
((Cursor)ActiveCursor).AdditiveLayer.FadeOutFromOne (500, Easing.OutQuint); ((Cursor)ActiveCursor).AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
return base.OnClick (state); return base.OnClick(state);
} }
protected override void PopIn () protected override void PopIn()
{ {
ActiveCursor.FadeTo (1, 250, Easing.OutQuint); ActiveCursor.FadeTo(1, 250, Easing.OutQuint);
ActiveCursor.ScaleTo (1, 400, Easing.OutQuint); ActiveCursor.ScaleTo(1, 400, Easing.OutQuint);
} }
protected override void PopOut () protected override void PopOut()
{ {
ActiveCursor.FadeTo (0, 900, Easing.OutQuint); ActiveCursor.FadeTo(0, 900, Easing.OutQuint);
ActiveCursor.ScaleTo (0, 500, Easing.In); ActiveCursor.ScaleTo(0, 500, Easing.In);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load (OsuConfigManager config) private void load(OsuConfigManager config)
{ {
cursorRotate = config.GetBindable<bool> (OsuSetting.CursorRotation); cursorRotate = config.GetBindable<bool>(OsuSetting.CursorRotation);
} }
public class Cursor : Container public class Cursor : Container
@ -118,7 +121,7 @@ namespace osu.Game.Graphics.Cursor
public Sprite AdditiveLayer; public Sprite AdditiveLayer;
public Cursor () public Cursor()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
} }
@ -126,25 +129,30 @@ namespace osu.Game.Graphics.Cursor
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, TextureStore textures, OsuColour colour) private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
{ {
Children = new Drawable[] { Children = new Drawable[]
cursorContainer = new Container { {
cursorContainer = new Container
{
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] { Children = new Drawable[]
new Sprite { {
Texture = textures.Get (@"Cursor/menu-cursor"), new Sprite
{
Texture = textures.Get(@"Cursor/menu-cursor"),
}, },
AdditiveLayer = new Sprite { AdditiveLayer = new Sprite
{
Blending = BlendingMode.Additive, Blending = BlendingMode.Additive,
Colour = colour.Pink, Colour = colour.Pink,
Alpha = 0, Alpha = 0,
Texture = textures.Get (@"Cursor/menu-cursor-additive"), Texture = textures.Get(@"Cursor/menu-cursor-additive"),
}, },
} }
} }
}; };
cursorScale = config.GetBindable<double> (OsuSetting.MenuCursorSize); cursorScale = config.GetBindable<double>(OsuSetting.MenuCursorSize);
cursorScale.ValueChanged += newScale => cursorContainer.Scale = new Vector2 ((float)newScale * base_scale); cursorScale.ValueChanged += newScale => cursorContainer.Scale = new Vector2((float)newScale * base_scale);
cursorScale.TriggerChange(); cursorScale.TriggerChange();
} }
} }