sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

CODE STYLE XD

Browse Source
This commit is contained in:
gabixdev
2017-09-17 01:28:02 +02:00
parent 846838c621
commit a8ada75633
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ namespace osu.Game.Graphics.Cursor
protected override Drawable CreateCursor() => new Cursor(); protected override Drawable CreateCursor() => new Cursor();
private Bindable<bool> cursorRotate; private Bindable<bool> cursorRotate;
private bool dragRotating;
private bool dragging; private bool dragging;
@ -29,28 +28,27 @@ namespace osu.Game.Graphics.Cursor
protected override bool OnMouseMove(InputState state) protected override bool OnMouseMove(InputState state)
{ {
if (dragRotating) { if (cursorRotate && dragging)
if (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;
if (diff < -180) if (diff < -180)
diff += 360; diff += 360;
if (diff > 180) if (diff > 180)
diff -= 360; diff -= 360;
degrees = ActiveCursor.Rotation + diff; degrees = ActiveCursor.Rotation + diff;
ActiveCursor.RotateTo (degrees, 600, Easing.OutQuint); ActiveCursor.RotateTo (degrees, 600, Easing.OutQuint);
}
} }
} }
@ -108,10 +106,9 @@ namespace osu.Game.Graphics.Cursor
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, TextureStore textures, OsuColour colour) private void load(OsuConfigManager config)
{ {
cursorRotate = config.GetBindable<bool> (OsuSetting.CursorRotation); cursorRotate = config.GetBindable<bool> (OsuSetting.CursorRotation);
cursorRotate.ValueChanged += newValue => dragRotating = newValue;
cursorRotate.TriggerChange(); cursorRotate.TriggerChange();
} }