RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7755 from peppy/fix-spinner-placement 

Fix spinner placement blueprint in multiple ways
This commit is contained in:
Dean Herbert 2020-02-08 01:49:48 +09:00 committed by GitHub
parent 4ad20ccd8b 51edd88277
commit 51ae741fc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Graphics;
using osu.Framework.Input.Events;
using osu.Game.Rulesets.Edit;
@ -8,6 +9,7 @@
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.UI;
using osuTK;
using osuTK.Input;
namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
{
@ -29,22 +31,31 @@ protected override void Update()
{
base.Update();
if (isPlacingEnd)
HitObject.EndTime = Math.Max(HitObject.StartTime, EditorClock.CurrentTime);
piece.UpdateFrom(HitObject);
}
protected override bool OnClick(ClickEvent e)
protected override bool OnMouseDown(MouseDownEvent e)
{
if (isPlacingEnd)
{
if (e.Button != MouseButton.Right)
return false;
HitObject.EndTime = EditorClock.CurrentTime;
EndPlacement();
}
else
{
isPlacingEnd = true;
piece.FadeTo(1f, 150, Easing.OutQuint);
if (e.Button != MouseButton.Left)
return false;
BeginPlacement();
piece.FadeTo(1f, 150, Easing.OutQuint);
isPlacingEnd = true;
}
return true;

6
osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
View File

@ -36,6 +36,9 @@ protected override DrawableRuleset<OsuHitObject> CreateDrawableRuleset(Ruleset r
protected override DistanceSnapGrid CreateDistanceSnapGrid(IEnumerable<HitObject> selectedHitObjects)
{
if (BlueprintContainer.CurrentTool is SpinnerCompositionTool)
return null;
var objects = selectedHitObjects.ToList();
if (objects.Count == 0)
@ -89,6 +92,9 @@ private OsuDistanceSnapGrid createGrid(Func<HitObject, bool> sourceSelector, int
targetIndex++;
}
if (sourceObject is Spinner)
return null;
return new OsuDistanceSnapGrid((OsuHitObject)sourceObject, (OsuHitObject)targetObject);
}
}

9
osu.Game.Rulesets.Osu/Objects/Spinner.cs
View File

@ -13,8 +13,13 @@ namespace osu.Game.Rulesets.Osu.Objects
{
public class Spinner : OsuHitObject, IHasEndTime
{
public double EndTime { get; set; }
public double Duration => EndTime - StartTime;
public double EndTime
{
get => StartTime + Duration;
set => Duration = value - StartTime;
}
public double Duration { get; set; }
/// <summary>
/// Number of spins required to finish the spinner without miss.

11
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -49,8 +49,9 @@ public abstract class HitObjectComposer<TObject> : HitObjectComposer, IPlacement
[Resolved]
private IBeatSnapProvider beatSnapProvider { get; set; }
protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
private ComposeBlueprintContainer blueprintContainer;
private Container distanceSnapGridContainer;
private DistanceSnapGrid distanceSnapGrid;
private readonly List<Container> layerContainers = new List<Container>();
@ -94,7 +95,7 @@ private void load(IFrameBasedClock framedClock)
new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
});
var layerAboveRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(blueprintContainer = CreateBlueprintContainer());
var layerAboveRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(BlueprintContainer = CreateBlueprintContainer());
layerContainers.Add(layerBelowRuleset);
layerContainers.Add(layerAboveRuleset);
@ -142,7 +143,7 @@ private void load(IFrameBasedClock framedClock)
setSelectTool();
blueprintContainer.SelectionChanged += selectionChanged;
BlueprintContainer.SelectionChanged += selectionChanged;
}
protected override bool OnKeyDown(KeyDownEvent e)
@ -174,7 +175,7 @@ protected override void Update()
{
base.Update();
if (EditorClock.CurrentTime != lastGridUpdateTime && !(blueprintContainer.CurrentTool is SelectTool))
if (EditorClock.CurrentTime != lastGridUpdateTime && !(BlueprintContainer.CurrentTool is SelectTool))
showGridFor(Enumerable.Empty<HitObject>());
}
@ -210,7 +211,7 @@ private void selectionChanged(IEnumerable<HitObject> selectedHitObjects)
private void toolSelected(HitObjectCompositionTool tool)
{
blueprintContainer.CurrentTool = tool;
BlueprintContainer.CurrentTool = tool;
if (tool is SelectTool)
distanceSnapGridContainer.Hide();