h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:03:22 +08:00
Code Issues Releases Wiki Activity

CI fixes

Browse Source
This commit is contained in:
smoogipoo 2017-11-30 18:48:00 +09:00
parent 33adf569a4
commit efa39f38ca
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
View File

@ -2,12 +2,13 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Osu.Objects;
namespace osu.Game.Rulesets.Osu.Edit
{
public class OsuHitObjectComposer : Rulesets.Edit.HitObjectComposer
public class OsuHitObjectComposer : HitObjectComposer
{
public OsuHitObjectComposer(Ruleset ruleset)
: base(ruleset)

1
osu.Game.Tests/Visual/TestCaseEditorComposeRadioButtons.cs
View File

@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Screens.Edit.Screens.Compose.RadioButtons;
namespace osu.Game.Tests.Visual

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

@ -6,17 +6,14 @@ using System.Collections.Generic;
using System.Linq;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Framework.Timing;
using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Edit.Screens.Compose.RadioButtons;
using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Game.Rulesets.Edit
{
@ -24,7 +21,7 @@ namespace osu.Game.Rulesets.Edit
{
private readonly Ruleset ruleset;
public HitObjectComposer(Ruleset ruleset)
protected HitObjectComposer(Ruleset ruleset)
{
this.ruleset = ruleset;

11
osu.Game/Screens/Edit/Screens/Compose/Compose.cs
View File

@ -1,14 +1,12 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Screens.Edit.Screens.Compose.Timeline;
@ -85,7 +83,14 @@ namespace osu.Game.Screens.Edit.Screens.Compose
composerContainer.Clear();
var ruleset = newBeatmap.BeatmapInfo.Ruleset?.CreateInstance();
var composer = ruleset?.CreateHitObjectComposer();
if (ruleset == null)
{
Logger.Log("Beatmap doesn't have a ruleset assigned.");
// ExitRequested?.Invoke();
return;
}
var composer = ruleset.CreateHitObjectComposer();
if (composer == null)
{
Logger.Log($"Ruleset {ruleset.Description} doesn't support hitobject composition.");

20
osu.Game/Screens/Edit/Screens/Compose/RadioButtons/DrawableRadioButton.cs
View File

@ -19,10 +19,10 @@ namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons
{
public class DrawableRadioButton : TriangleButton
{
private static readonly Color4 DefaultBackgroundColour = OsuColour.FromHex("333");
private static readonly Color4 DefaultBubbleColour = DefaultBackgroundColour.Darken(0.5f);
private static readonly Color4 SelectedBackgroundColour = OsuColour.FromHex("1188aa");
private static readonly Color4 SelectedBubbleColour = SelectedBackgroundColour.Lighten(0.5f);
private static readonly Color4 default_background_colour = OsuColour.FromHex("333");
private static readonly Color4 default_bubble_colour = default_background_colour.Darken(0.5f);
private static readonly Color4 selected_background_colour = OsuColour.FromHex("1188aa");
private static readonly Color4 selected_bubble_colour = selected_background_colour.Lighten(0.5f);
/// <summary>
/// Invoked when this <see cref="DrawableRadioButton"/> has been selected.
@ -43,7 +43,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons
private void load()
{
Triangles.Alpha = 0;
BackgroundColour = DefaultBackgroundColour;
BackgroundColour = default_background_colour;
Content.EdgeEffect = new EdgeEffectParameters
{
@ -62,7 +62,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons
Scale = new Vector2(0.5f),
X = 10,
Masking = true,
Colour = DefaultBubbleColour,
Colour = default_bubble_colour,
Blending = BlendingMode.Additive,
Child = new Box { RelativeSizeAxes = Axes.Both }
});
@ -76,8 +76,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons
return;
isSelected = false;
BackgroundColour = DefaultBackgroundColour;
bubble.Colour = DefaultBubbleColour;
BackgroundColour = default_background_colour;
bubble.Colour = default_bubble_colour;
}
public void Select()
@ -87,8 +87,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons
isSelected = true;
Selected?.Invoke(this);
BackgroundColour = SelectedBackgroundColour;
bubble.Colour = SelectedBubbleColour;
BackgroundColour = selected_background_colour;
bubble.Colour = selected_bubble_colour;
}
protected override bool OnClick(InputState state)

1
osu.Game/Screens/Edit/Screens/Compose/RadioButtons/RadioButtonCollection.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System.Linq;
using OpenTK;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;