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

Extract common methods into ManiaPlacementBlueprint

Browse Source
This commit is contained in:
smoogipoo 2018-11-12 18:32:44 +09:00
parent 3a1fee59fb
commit 1d40a042f6
2 changed files with 66 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs Normal file
View File

@ -0,0 +1,61 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.UI.Scrolling;
using OpenTK;
namespace osu.Game.Rulesets.Mania.Edit.Blueprints
{
public class ManiaPlacementBlueprint<T> : PlacementBlueprint
where T : ManiaHitObject
{
protected new T HitObject => (T)base.HitObject;
[Resolved]
private ManiaHitObjectComposer composer { get; set; }
[Resolved]
private IScrollingInfo scrollingInfo { get; set; }
public ManiaPlacementBlueprint(T hitObject)
: base(hitObject)
{
RelativeSizeAxes = Axes.None;
}
protected double TimeAt(Vector2 screenSpacePosition)
{
var column = ColumnAt(screenSpacePosition);
if (column == null)
return 0;
return scrollingInfo.Algorithm.TimeAt(column.HitObjectContainer.ToLocalSpace(applyPositionOffset(screenSpacePosition)).Y,
EditorClock.CurrentTime,
scrollingInfo.TimeRange.Value,
column.HitObjectContainer.DrawHeight);
}
protected Column ColumnAt(Vector2 screenSpacePosition)
=> composer.ColumnAt(applyPositionOffset(screenSpacePosition));
private Vector2 applyPositionOffset(Vector2 position)
{
switch (scrollingInfo.Direction.Value)
{
case ScrollingDirection.Up:
position.Y -= DrawHeight / 2;
break;
case ScrollingDirection.Down:
position.Y += DrawHeight / 2;
break;
}
return position;
}
}
}

39
osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
View File

@ -1,31 +1,19 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Input.Events;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.UI.Scrolling;
using osu.Game.Rulesets.Mania.UI;
namespace osu.Game.Rulesets.Mania.Edit.Blueprints
{
public class NotePlacementBlueprint : PlacementBlueprint
public class NotePlacementBlueprint : ManiaPlacementBlueprint<Note>
{
protected new Note HitObject => (Note)base.HitObject;
[Resolved]
private ManiaHitObjectComposer composer { get; set; }
[Resolved]
private IScrollingInfo scrollingInfo { get; set; }
public NotePlacementBlueprint()
: base(new Note())
{
RelativeSizeAxes = Axes.None;
Origin = Anchor.Centre;
AutoSizeAxes = Axes.Y;
@ -42,28 +30,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
protected override bool OnClick(ClickEvent e)
{
var offsetPosition = e.ScreenSpaceMousePosition;
switch (scrollingInfo.Direction.Value)
{
case ScrollingDirection.Up:
offsetPosition.Y -= DrawHeight / 2;
break;
case ScrollingDirection.Down:
offsetPosition.Y += DrawHeight / 2;
break;
}
var column = composer.ColumnAt(offsetPosition);
if (column == null)
Column column;
if ((column = ColumnAt(e.ScreenSpaceMousePosition)) == null)
return base.OnClick(e);
var hitObjectContainer = column.HitObjectContainer;
HitObject.StartTime = scrollingInfo.Algorithm.TimeAt(hitObjectContainer.ToLocalSpace(offsetPosition).Y,
EditorClock.CurrentTime,
scrollingInfo.TimeRange.Value,
hitObjectContainer.DrawHeight);
HitObject.StartTime = TimeAt(e.ScreenSpaceMousePosition);
HitObject.Column = column.Index;
EndPlacement();