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

Revert another masking container.

This commit is contained in:
smoogipooo 2017-04-12 15:01:17 +09:00
parent 32c3e34eb7
commit 50a598dd05
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
View File

@ -59,7 +59,6 @@ public override void Reset()
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.X,
Height = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT,
Width = 0.8f,
Clock = new FramedClock(rateAdjustClock),
Children = new[]
{

35
osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
View File

@ -111,11 +111,9 @@ public TaikoPlayfield()
Anchor = Anchor.CentreLeft,
Origin = Anchor.Centre,
},
hitObjectContainer = new ExternalMaskingRectangleContainer
hitObjectContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Masking = true,
MaskingReference = () => this
},
judgementContainer = new Container<DrawableTaikoJudgement>
{
@ -271,36 +269,5 @@ protected override void Update()
}
}
}
private class ExternalMaskingRectangleContainer : Container
{
public Func<Drawable> MaskingReference;
protected override void ApplyDrawNode(DrawNode node)
{
base.ApplyDrawNode(node);
Drawable maskingReference = MaskingReference?.Invoke();
if (MaskingReference == null)
return;
var cn = node as ContainerDrawNode;
cn.MaskingInfo = !Masking
? (MaskingInfo?)null
: new MaskingInfo
{
ScreenSpaceAABB = maskingReference.ScreenSpaceDrawQuad.AABB,
MaskingRect = maskingReference.DrawRectangle,
ToMaskingSpace = cn.MaskingInfo.Value.ToMaskingSpace,
CornerRadius = cn.MaskingInfo.Value.CornerRadius,
BorderThickness = cn.MaskingInfo.Value.BorderThickness,
BorderColour = cn.MaskingInfo.Value.BorderColour,
BlendRange = cn.MaskingInfo.Value.BlendRange,
AlphaExponent = cn.MaskingInfo.Value.AlphaExponent
};
}
}
}
}