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

Move responsibility placement blueprint's StartTime set to within

Browse Source
This commit is contained in:
Dean Herbert 2020-05-21 14:38:40 +09:00
parent bac78707de
commit a9a1c00cf1
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
View File

@ -50,6 +50,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
public override void UpdatePosition(SnapResult result) public override void UpdatePosition(SnapResult result)
{ {
base.UpdatePosition(result);
if (!PlacementActive) if (!PlacementActive)
Column = (result as ManiaSnapResult)?.Column; Column = (result as ManiaSnapResult)?.Column;
} }

6
osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
View File

@ -39,6 +39,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
public override void UpdatePosition(SnapResult result) => HitObject.Position = ToLocalSpace(result.ScreenSpacePosition); public override void UpdatePosition(SnapResult result)
{
base.UpdatePosition(result);
HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
}
} }
} }

2
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
View File

@ -69,6 +69,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
public override void UpdatePosition(SnapResult result) public override void UpdatePosition(SnapResult result)
{ {
base.UpdatePosition(result);
switch (state) switch (state)
{ {
case PlacementState.Initial: case PlacementState.Initial:

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

@ -59,9 +59,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
return true; return true;
} }
public override void UpdatePosition(SnapResult result)
{
}
} }
} }

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

@ -244,8 +244,6 @@ namespace osu.Game.Rulesets.Edit
public void BeginPlacement(HitObject hitObject) public void BeginPlacement(HitObject hitObject)
{ {
EditorBeatmap.PlacementObject.Value = hitObject; EditorBeatmap.PlacementObject.Value = hitObject;
hitObject.StartTime = SnapScreenSpacePositionToValidTime(inputManager.CurrentState.Mouse.Position).Time ?? EditorClock.CurrentTime;
} }
public void EndPlacement(HitObject hitObject, bool commit) public void EndPlacement(HitObject hitObject, bool commit)

10
osu.Game/Rulesets/Edit/PlacementBlueprint.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Timing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Compose; using osu.Game.Screens.Edit.Compose;
using osuTK; using osuTK;
@ -83,11 +84,18 @@ namespace osu.Game.Rulesets.Edit
PlacementActive = false; PlacementActive = false;
} }
[Resolved(canBeNull: true)]
private IFrameBasedClock editorClock { get; set; }
/// <summary> /// <summary>
/// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position. /// Updates the position of this <see cref="PlacementBlueprint"/> to a new screen-space position.
/// </summary> /// </summary>
/// <param name="snapResult">The snap result information.</param> /// <param name="snapResult">The snap result information.</param>
public abstract void UpdatePosition(SnapResult snapResult); public virtual void UpdatePosition(SnapResult snapResult)
{
if (!PlacementActive)
HitObject.StartTime = snapResult.Time ?? editorClock?.CurrentTime ?? Time.Current;
}
/// <summary> /// <summary>
/// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty)"/>, /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty)"/>,