sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update framework

Browse Source
This commit is contained in:
Dean Herbert
2019-08-21 13:29:50 +09:00
parent 9ea4921e2b
commit 48716f8f2b
47 changed files with 63 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -61,6 +61,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2019.816.0" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2019.821.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
View File

@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
AccentColour = Color4.Red, AccentColour = Color4.Red,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0.5f, Alpha = 0.5f,
Scale = new Vector2(1.333f) Scale = new Vector2(1.333f)
}); });

2
osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
Colour = Color4.White.Opacity(0.9f); Colour = Color4.White.Opacity(0.9f);
} }

2
osu.Game.Rulesets.Catch/UI/CatcherArea.cs
View File

@ -201,7 +201,7 @@ namespace osu.Game.Rulesets.Catch.UI
additive.Scale = Scale; additive.Scale = Scale;
additive.Colour = HyperDashing ? Color4.Red : Color4.White; additive.Colour = HyperDashing ? Color4.Red : Color4.White;
additive.RelativePositionAxes = RelativePositionAxes; additive.RelativePositionAxes = RelativePositionAxes;
additive.Blending = BlendingMode.Additive; additive.Blending = BlendingParameters.Additive;
AdditiveTarget.Add(additive); AdditiveTarget.Add(additive);

4
osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
View File

@ -26,14 +26,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
public BodyPiece() public BodyPiece()
{ {
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
Children = new[] Children = new[]
{ {
Background = new Box { RelativeSizeAxes = Axes.Both }, Background = new Box { RelativeSizeAxes = Axes.Both },
Foreground = new BufferedContainer Foreground = new BufferedContainer
{ {
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
CacheDrawnFrameBuffer = true, CacheDrawnFrameBuffer = true,
Children = new Drawable[] Children = new Drawable[]

4
osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/LaneGlowPiece.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
Name = "Top", Name = "Top",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Height = 0.5f, Height = 0.5f,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Colour = ColourInfo.GradientVertical(Color4.Transparent, Color4.White.Opacity(alpha)) Colour = ColourInfo.GradientVertical(Color4.Transparent, Color4.White.Opacity(alpha))
}, },
new Box new Box
@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Height = 0.5f, Height = 0.5f,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Colour = ColourInfo.GradientVertical(Color4.White.Opacity(alpha), Color4.Transparent) Colour = ColourInfo.GradientVertical(Color4.White.Opacity(alpha), Color4.Transparent)
} }
}; };

2
osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
Name = "Background Gradient Overlay", Name = "Background Gradient Overlay",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Height = 0.5f, Height = 0.5f,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0 Alpha = 0
} }
}; };

2
osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
Child = new Box Child = new Box
{ {
Size = new Vector2(width), Size = new Vector2(width),
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Alpha = 0.5f, Alpha = 0.5f,

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2); Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
Origin = Anchor.Centre; Origin = Anchor.Centre;
InternalChild = scaleContainer = new SkinnableDrawable("Play/osu/reversearrow", _ => new SpriteIcon InternalChild = scaleContainer = new SkinnableDrawable("Play/osu/reversearrow", _ => new SpriteIcon

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
new TrianglesPiece new TrianglesPiece
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0.5f, Alpha = 0.5f,
} }
}; };

4
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
View File

@ -17,12 +17,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
Alpha = 0; Alpha = 0;
Child = new SkinnableDrawable("Play/osu/hitcircle-explode", _ => new TrianglesPiece Child = new SkinnableDrawable("Play/osu/hitcircle-explode", _ => new TrianglesPiece
{ {
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0.2f, Alpha = 0.2f,
}, s => s.GetTexture("Play/osu/hitcircle") == null); }, s => s.GetTexture("Play/osu/hitcircle") == null);

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/FlashPiece.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
Alpha = 0; Alpha = 0;
Child = new SkinnableDrawable("Play/osu/hitcircle-flash", name => new CircularContainer Child = new SkinnableDrawable("Play/osu/hitcircle-flash", name => new CircularContainer

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/GlowPiece.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = textures.Get(name), Texture = textures.Get(name),
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0.5f Alpha = 0.5f
}, s => s.GetTexture("Play/osu/hitcircle") == null); }, s => s.GetTexture("Play/osu/hitcircle") == null);
} }

4
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
this.drawableSlider = drawableSlider; this.drawableSlider = drawableSlider;
this.slider = slider; this.slider = slider;
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2); Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
Masking = true, Masking = true,
BorderThickness = 5, BorderThickness = 5,
BorderColour = Color4.Orange, BorderColour = Color4.Orange,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Child = new Box Child = new Box
{ {
Colour = Color4.Orange, Colour = Color4.Orange,

4
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
Origin = Anchor.Centre, Origin = Anchor.Centre,
Alpha = 0, Alpha = 0,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Masking = true, Masking = true,
Children = new[] Children = new[]
{ {
@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true, Masking = true,
BorderThickness = target_ring_thick_border, BorderThickness = target_ring_thick_border,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box

2
osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
View File

@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.White, Colour = Color4.White,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0, Alpha = 0,
AlwaysPresent = true AlwaysPresent = true
} }

4
osu.Game.Rulesets.Taiko/UI/InputDrum.cs
View File

@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Taiko.UI
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
}, },
centre = new Sprite centre = new Sprite
{ {
@ -124,7 +124,7 @@ namespace osu.Game.Rulesets.Taiko.UI
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = new Vector2(0.7f), Size = new Vector2(0.7f),
Alpha = 0, Alpha = 0,
Blending = BlendingMode.Additive Blending = BlendingParameters.Additive
} }
}; };
} }

6
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.UI
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
}, },
HitTarget = new HitTarget HitTarget = new HitTarget
{ {
@ -127,14 +127,14 @@ namespace osu.Game.Rulesets.Taiko.UI
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
Margin = new MarginPadding { Left = HIT_TARGET_OFFSET }, Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
Blending = BlendingMode.Additive Blending = BlendingParameters.Additive
}, },
judgementContainer = new JudgementContainer<DrawableTaikoJudgement> judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
{ {
Name = "Judgements", Name = "Judgements",
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Margin = new MarginPadding { Left = HIT_TARGET_OFFSET }, Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
Blending = BlendingMode.Additive Blending = BlendingParameters.Additive
}, },
} }
}, },

2
osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs
View File

@ -249,7 +249,7 @@ namespace osu.Game.Tests.Visual.UserInterface
Size = new Vector2(50); Size = new Vector2(50);
Masking = true; Masking = true;
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
Alpha = 0.5f; Alpha = 0.5f;
Child = new Box { RelativeSizeAxes = Axes.Both }; Child = new Box { RelativeSizeAxes = Axes.Both };

2
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -125,7 +125,7 @@ namespace osu.Game.Tournament.Components
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.Gray, Colour = Color4.Gray,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0, Alpha = 0,
}, },
}); });

9
osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
View File

@ -86,11 +86,6 @@ namespace osu.Game.Beatmaps.Drawables
private readonly FillFlowContainer difficultyFlow; private readonly FillFlowContainer difficultyFlow;
public string TooltipText
{
set { }
}
public DifficultyIconTooltip() public DifficultyIconTooltip()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
@ -168,10 +163,6 @@ namespace osu.Game.Beatmaps.Drawables
return true; return true;
} }
public void Refresh()
{
}
public void Move(Vector2 pos) => Position = pos; public void Move(Vector2 pos) => Position = pos;
protected override void PopIn() => this.FadeIn(200, Easing.OutQuint); protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);

2
osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
View File

@ -246,7 +246,7 @@ namespace osu.Game.Beatmaps.Formats
switch (type) switch (type)
{ {
case "A": case "A":
timelineGroup?.BlendingMode.Add(easing, startTime, endTime, BlendingMode.Additive, startTime == endTime ? BlendingMode.Additive : BlendingMode.Inherit); timelineGroup?.BlendingParameters.Add(easing, startTime, endTime, BlendingParameters.Additive, startTime == endTime ? BlendingParameters.Additive : BlendingParameters.Inherit);
break; break;
case "H": case "H":

2
osu.Game/Graphics/Containers/OsuScrollContainer.cs
View File

@ -98,7 +98,7 @@ namespace osu.Game.Graphics.Containers
public OsuScrollbar(Direction scrollDir) public OsuScrollbar(Direction scrollDir)
: base(scrollDir) : base(scrollDir)
{ {
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
CornerRadius = 5; CornerRadius = 5;

2
osu.Game/Graphics/Cursor/MenuCursor.cs
View File

@ -150,7 +150,7 @@ namespace osu.Game.Graphics.Cursor
}, },
AdditiveLayer = new Sprite AdditiveLayer = new Sprite
{ {
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Colour = colour.Pink, Colour = colour.Pink,
Alpha = 0, Alpha = 0,
Texture = textures.Get(@"Cursor/menu-cursor-additive"), Texture = textures.Get(@"Cursor/menu-cursor-additive"),

2
osu.Game/Graphics/Sprites/GlowingSpriteText.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Graphics.Sprites
BlurSigma = new Vector2(4), BlurSigma = new Vector2(4),
CacheDrawnFrameBuffer = true, CacheDrawnFrameBuffer = true,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Size = new Vector2(3f), Size = new Vector2(3f),
Children = new[] Children = new[]
{ {

2
osu.Game/Graphics/UserInterface/DialogButton.cs
View File

@ -254,7 +254,7 @@ namespace osu.Game.Graphics.UserInterface
colourContainer.Add(flash); colourContainer.Add(flash);
flash.Colour = ButtonColour; flash.Colour = ButtonColour;
flash.Blending = BlendingMode.Additive; flash.Blending = BlendingParameters.Additive;
flash.Alpha = 0.3f; flash.Alpha = 0.3f;
flash.FadeOutFromOne(click_duration); flash.FadeOutFromOne(click_duration);
flash.Expire(); flash.Expire();

2
osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = HoverColour, Colour = HoverColour,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0, Alpha = 0,
}, },
} }

2
osu.Game/Graphics/UserInterface/OsuButton.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface
hover = new Box hover = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Colour = Color4.White.Opacity(0.1f), Colour = Color4.White.Opacity(0.1f),
Alpha = 0, Alpha = 0,
Depth = -1 Depth = -1

9
osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
View File

@ -296,15 +296,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
this.MoveTo(pos, 200, Easing.OutQuint); this.MoveTo(pos, 200, Easing.OutQuint);
} }
public void Refresh()
{
}
public string TooltipText
{
set => throw new InvalidOperationException();
}
protected override void PopIn() => this.FadeIn(200, Easing.OutQuint); protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
protected override void PopOut() => this.FadeOut(200, Easing.OutQuint); protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);

2
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.Gray(80).Opacity(180), Colour = OsuColour.Gray(80).Opacity(180),
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0, Alpha = 0,
}, },
Flow = new FillFlowContainer Flow = new FillFlowContainer

2
osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.Gray(150).Opacity(180), Colour = OsuColour.Gray(150).Opacity(180),
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Depth = 2, Depth = 2,
Alpha = 0, Alpha = 0,
}); });

2
osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
Scale = new Vector2(0.5f), Scale = new Vector2(0.5f),
X = 10, X = 10,
Masking = true, Masking = true,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Child = new Box { RelativeSizeAxes = Axes.Both } Child = new Box { RelativeSizeAxes = Axes.Both }
}; };
} }

2
osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
View File

@ -360,7 +360,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.2f), Color4.White), Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.2f), Color4.White),
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
}, },
new EquilateralTriangle new EquilateralTriangle
{ {

2
osu.Game/Screens/Menu/Button.cs
View File

@ -92,7 +92,7 @@ namespace osu.Game.Screens.Menu
{ {
EdgeSmoothness = new Vector2(1.5f, 0), EdgeSmoothness = new Vector2(1.5f, 0),
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Colour = Color4.White, Colour = Color4.White,
Alpha = 0, Alpha = 0,
}, },

6
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -296,7 +296,7 @@ namespace osu.Game.Screens.Menu
{ {
Colour = Color4.White; Colour = Color4.White;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -399,11 +399,11 @@ namespace osu.Game.Screens.Menu
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = Color4.Black, Colour = Color4.Black,
Size = new Vector2(size - 5), Size = new Vector2(size - 5),
Blending = BlendingMode.None, Blending = BlendingParameters.None,
}); });
} }
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
CacheDrawnFrameBuffer = true; CacheDrawnFrameBuffer = true;
} }
} }

2
osu.Game/Screens/Menu/LogoVisualisation.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Screens.Menu
public LogoVisualisation() public LogoVisualisation()
{ {
texture = Texture.WhitePixel; texture = Texture.WhitePixel;
Blending = BlendingMode.Additive; Blending = BlendingParameters.Additive;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

4
osu.Game/Screens/Menu/MenuSideFlashes.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Screens.Menu
// align off-screen to make sure our edges don't become visible during parallax. // align off-screen to make sure our edges don't become visible during parallax.
X = -box_width, X = -box_width,
Alpha = 0, Alpha = 0,
Blending = BlendingMode.Additive Blending = BlendingParameters.Additive
}, },
rightBox = new Box rightBox = new Box
{ {
@ -81,7 +81,7 @@ namespace osu.Game.Screens.Menu
Height = 1.5f, Height = 1.5f,
X = box_width, X = box_width,
Alpha = 0, Alpha = 0,
Blending = BlendingMode.Additive Blending = BlendingParameters.Additive
} }
}; };

4
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Screens.Menu
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Alpha = 0 Alpha = 0
} }
} }
@ -185,7 +185,7 @@ namespace osu.Game.Screens.Menu
flashLayer = new Box flashLayer = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Colour = Color4.White, Colour = Color4.White,
Alpha = 0, Alpha = 0,
}, },

2
osu.Game/Screens/Multi/Match/Components/HeaderButton.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Screens.Multi.Match.Components
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0.15f, Alpha = 0.15f,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
}, },
}); });
} }

2
osu.Game/Screens/ScreenWhiteBox.cs
View File

@ -95,7 +95,7 @@ namespace osu.Game.Screens
Colour = getColourFor(GetType()), Colour = getColourFor(GetType()),
Alpha = 0.2f, Alpha = 0.2f,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
}, },
textContainer = new FillFlowContainer textContainer = new FillFlowContainer
{ {

2
osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Screens.Select.Carousel
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
}, },
} }
}; };

2
osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
View File

@ -121,7 +121,7 @@ namespace osu.Game.Screens.Select.Options
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
EdgeSmoothness = new Vector2(1.5f, 0), EdgeSmoothness = new Vector2(1.5f, 0),
Blending = BlendingMode.Additive, Blending = BlendingParameters.Additive,
Colour = Color4.White, Colour = Color4.White,
Alpha = 0, Alpha = 0,
}, },

4
osu.Game/Storyboards/CommandTimelineGroup.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Storyboards
public CommandTimeline<float> Rotation = new CommandTimeline<float>(); public CommandTimeline<float> Rotation = new CommandTimeline<float>();
public CommandTimeline<Color4> Colour = new CommandTimeline<Color4>(); public CommandTimeline<Color4> Colour = new CommandTimeline<Color4>();
public CommandTimeline<float> Alpha = new CommandTimeline<float>(); public CommandTimeline<float> Alpha = new CommandTimeline<float>();
public CommandTimeline<BlendingMode> BlendingMode = new CommandTimeline<BlendingMode>(); public CommandTimeline<BlendingParameters> BlendingParameters = new CommandTimeline<BlendingParameters>();
public CommandTimeline<bool> FlipH = new CommandTimeline<bool>(); public CommandTimeline<bool> FlipH = new CommandTimeline<bool>();
public CommandTimeline<bool> FlipV = new CommandTimeline<bool>(); public CommandTimeline<bool> FlipV = new CommandTimeline<bool>();
@ -35,7 +35,7 @@ namespace osu.Game.Storyboards
yield return Rotation; yield return Rotation;
yield return Colour; yield return Colour;
yield return Alpha; yield return Alpha;
yield return BlendingMode; yield return BlendingParameters;
yield return FlipH; yield return FlipH;
yield return FlipV; yield return FlipV;
} }

10
osu.Game/Storyboards/Drawables/DrawablesExtensions.cs
View File

@ -12,19 +12,19 @@ namespace osu.Game.Storyboards.Drawables
/// Adjusts <see cref="Drawable.Blending"/> after a delay. /// Adjusts <see cref="Drawable.Blending"/> after a delay.
/// </summary> /// </summary>
/// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns> /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
public static TransformSequence<T> TransformBlendingMode<T>(this T drawable, BlendingMode newValue, double delay = 0) public static TransformSequence<T> TransformBlendingMode<T>(this T drawable, BlendingParameters newValue, double delay = 0)
where T : Drawable where T : Drawable
=> drawable.TransformTo(drawable.PopulateTransform(new TransformBlendingMode(), newValue, delay)); => drawable.TransformTo(drawable.PopulateTransform(new TransformBlendingParameters(), newValue, delay));
} }
public class TransformBlendingMode : Transform<BlendingMode, Drawable> public class TransformBlendingParameters : Transform<BlendingParameters, Drawable>
{ {
private BlendingMode valueAt(double time) private BlendingParameters valueAt(double time)
=> time < EndTime ? StartValue : EndValue; => time < EndTime ? StartValue : EndValue;
public override string TargetMember => nameof(Drawable.Blending); public override string TargetMember => nameof(Drawable.Blending);
protected override void Apply(Drawable d, double time) => d.Blending = valueAt(time); protected override void Apply(Drawable d, double time) => d.Blending = valueAt(time);
protected override void ReadIntoStartValue(Drawable d) => StartValue = d.Blending.Mode; protected override void ReadIntoStartValue(Drawable d) => StartValue = d.Blending;
} }
} }

2
osu.Game/Storyboards/StoryboardSprite.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Storyboards
applyCommands(drawable, getCommands(g => g.Rotation, triggeredGroups), (d, value) => d.Rotation = value, (d, value, duration, easing) => d.RotateTo(value, duration, easing)); applyCommands(drawable, getCommands(g => g.Rotation, triggeredGroups), (d, value) => d.Rotation = value, (d, value, duration, easing) => d.RotateTo(value, duration, easing));
applyCommands(drawable, getCommands(g => g.Colour, triggeredGroups), (d, value) => d.Colour = value, (d, value, duration, easing) => d.FadeColour(value, duration, easing)); applyCommands(drawable, getCommands(g => g.Colour, triggeredGroups), (d, value) => d.Colour = value, (d, value, duration, easing) => d.FadeColour(value, duration, easing));
applyCommands(drawable, getCommands(g => g.Alpha, triggeredGroups), (d, value) => d.Alpha = value, (d, value, duration, easing) => d.FadeTo(value, duration, easing)); applyCommands(drawable, getCommands(g => g.Alpha, triggeredGroups), (d, value) => d.Alpha = value, (d, value, duration, easing) => d.FadeTo(value, duration, easing));
applyCommands(drawable, getCommands(g => g.BlendingMode, triggeredGroups), (d, value) => d.Blending = value, (d, value, duration, easing) => d.TransformBlendingMode(value, duration), false); applyCommands(drawable, getCommands(g => g.BlendingParameters, triggeredGroups), (d, value) => d.Blending = value, (d, value, duration, easing) => d.TransformBlendingMode(value, duration), false);
if (drawable is IFlippable flippable) if (drawable is IFlippable flippable)
{ {

2
osu.Game/osu.Game.csproj
View File

@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.816.0" /> <PackageReference Include="ppy.osu.Framework" Version="2019.821.0" />
<PackageReference Include="SharpCompress" Version="0.23.0" /> <PackageReference Include="SharpCompress" Version="0.23.0" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" /> <PackageReference Include="SharpRaven" Version="2.4.0" />

4
osu.iOS.props
View File

@ -118,8 +118,8 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.816.0" /> <PackageReference Include="ppy.osu.Framework" Version="2019.821.0" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.816.0" /> <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.821.0" />
<PackageReference Include="SharpCompress" Version="0.22.0" /> <PackageReference Include="SharpCompress" Version="0.22.0" />
<PackageReference Include="NUnit" Version="3.11.0" /> <PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" /> <PackageReference Include="SharpRaven" Version="2.4.0" />