Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add planet color setting #117

Merged
merged 4 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using osu.Framework.Graphics.Shapes;
using osuTK.Graphics;

namespace Circle.Game.Tests.Visual.Object
namespace Circle.Game.Tests.Visual.Objects
{
public class TestSceneBasicTile : CircleTestScene
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using osu.Framework.Graphics.Shapes;
using osuTK.Graphics;

namespace Circle.Game.Tests.Visual.Object
namespace Circle.Game.Tests.Visual.Objects
{
public class TestSceneCircularTile : CircleTestScene
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using osu.Framework.Graphics.Shapes;
using osuTK.Graphics;

namespace Circle.Game.Tests.Visual.Object
namespace Circle.Game.Tests.Visual.Objects
{
public class TestSceneMidspinTile : CircleTestScene
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Circle.Game.Rulesets.Objects;
using Circle.Game.Rulesets.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osuTK.Graphics;

namespace Circle.Game.Tests.Visual.Object
namespace Circle.Game.Tests.Visual.Objects
{
public class TestScenePlanet : CircleTestScene
{
Expand All @@ -21,7 +22,13 @@ public TestScenePlanet()
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
});
AddStep("Toggle Expansion", () => planet.Expansion = planet.Expansion == 1 ? 0 : 1);
AddStep("Expansion = 1", () => planet.Expansion = 1);
AddAssert("Expansion is 1", () => planet.Expansion == 1);
AddStep("Expansion = 0", () => planet.Expansion = 0);
AddAssert("Expansion is 0", () => planet.Expansion == 0);
AddStep("Expansion to 1", () => planet.ExpandTo(1, 1000, Easing.OutQuint));
AddWaitStep("Waiting 1000ms", 5);
AddAssert("Expansion is 1", () => planet.Expansion == 1);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using osu.Framework.Graphics.Shapes;
using osuTK.Graphics;

namespace Circle.Game.Tests.Visual.Object
namespace Circle.Game.Tests.Visual.Objects
{
public class TestSceneShortTile : CircleTestScene
{
Expand Down
27 changes: 27 additions & 0 deletions Circle.Game.Tests/Visual/UserInterface/TestSceneCircleDropdown.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using Circle.Game.Graphics.UserInterface;
using osu.Framework.Graphics;

namespace Circle.Game.Tests.Visual.UserInterface
{
public class TestSceneCircleDropdown : CircleTestScene
{
public TestSceneCircleDropdown()
{
Add(new CircleEnumDropdown<TestEnum>
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Width = 400
});
}

private enum TestEnum
{
Enum1,
Enum2,
Enum3,
Enum4,
Enum5
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using Circle.Game.Screens.Setting;
using Circle.Game.Utils;
using osu.Framework.Graphics;

namespace Circle.Game.Tests.Visual.UserInterface
{
public class TestSceneSettingsDropdown : CircleTestScene
{
public TestSceneSettingsDropdown()
{
Add(new SettingsEnumDropdown<Color4Enum>
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Text = "Red planet color",
});
}
}
}
7 changes: 6 additions & 1 deletion Circle.Game/Configuration/CircleConfigManager.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using Circle.Game.Utils;
using osu.Framework.Configuration;
using osu.Framework.Configuration.Tracking;
using osu.Framework.Platform;
Expand All @@ -22,6 +23,8 @@ protected override void InitialiseDefaults()
SetDefault(CircleSetting.LoadBeatmapsOnStartup, true);
SetDefault(CircleSetting.BlurVisibility, true);
SetDefault(CircleSetting.Parallax, true);
SetDefault(CircleSetting.PlanetRed, Color4Enum.Red);
SetDefault(CircleSetting.PlanetBlue, Color4Enum.DeepSkyBlue);
}

public override TrackedSettings CreateTrackedSettings()
Expand Down Expand Up @@ -75,6 +78,8 @@ public enum CircleSetting
Offset,
LoadBeatmapsOnStartup,
BlurVisibility,
Parallax
Parallax,
PlanetRed,
PlanetBlue
}
}
Loading