h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-16 01:42:58 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into span_fromHex

Browse Source
This commit is contained in:
Dan Balasescu 2020-02-14 12:09:34 +09:00 committed by GitHub
commit f64f934204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
View File

@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Osu.Edit
if (existing == null) if (existing == null)
return; return;
hitObject.RemoveTransform(existing);
using (hitObject.BeginAbsoluteSequence(existing.StartTime)) using (hitObject.BeginAbsoluteSequence(existing.StartTime))
hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire(); hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
break; break;

6
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
HitObject.DefaultsApplied += onDefaultsApplied; HitObject.DefaultsApplied += onDefaultsApplied;
startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy(); startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
startTimeBindable.BindValueChanged(_ => updateState(ArmedState.Idle, true)); startTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
if (HitObject is IHasComboInformation combo) if (HitObject is IHasComboInformation combo)
{ {
@ -250,8 +250,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
double transformTime = HitObject.StartTime - InitialLifetimeOffset; double transformTime = HitObject.StartTime - InitialLifetimeOffset;
base.ApplyTransformsAt(transformTime, true); base.ApplyTransformsAt(double.MinValue, true);
base.ClearTransformsAfter(transformTime, true); base.ClearTransformsAfter(double.MinValue, true);
using (BeginAbsoluteSequence(transformTime, true)) using (BeginAbsoluteSequence(transformTime, true))
{ {

15
osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Tools; using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -76,17 +75,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
#endregion #endregion
protected override bool OnMouseMove(MouseMoveEvent e)
{
if (currentPlacement != null)
{
updatePlacementPosition(e.ScreenSpaceMousePosition);
return true;
}
return base.OnMouseMove(e);
}
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
@ -95,6 +83,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
createPlacement(); createPlacement();
else if (currentPlacement?.PlacementActive == false) else if (currentPlacement?.PlacementActive == false)
removePlacement(); removePlacement();
if (currentPlacement != null)
updatePlacementPosition(inputManager.CurrentState.Mouse.Position);
} }
protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)