Merge pull request #117 from ojh050118/planet-color-setting

Add planet color setting
ojh050118 · Mar 25, 2022 · 3a8c4cc · 3a8c4cc
2 parents 6a0bc4e + b31854a
commit 3a8c4cc
Show file tree

Hide file tree

Showing 26 changed files with 1,602 additions and 31 deletions.
diff --git a/...Tests/Visual/Object/TestSceneBasicTile.cs → ...ests/Visual/Objects/TestSceneBasicTile.cs b/...Tests/Visual/Object/TestSceneBasicTile.cs → ...ests/Visual/Objects/TestSceneBasicTile.cs
@@ -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
     {

diff --git a/...ts/Visual/Object/TestSceneCircularTile.cs → ...s/Visual/Objects/TestSceneCircularTile.cs b/...ts/Visual/Object/TestSceneCircularTile.cs → ...s/Visual/Objects/TestSceneCircularTile.cs
@@ -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
     {

diff --git a/...sts/Visual/Object/TestSceneMidspinTile.cs → ...ts/Visual/Objects/TestSceneMidspinTile.cs b/...sts/Visual/Object/TestSceneMidspinTile.cs → ...ts/Visual/Objects/TestSceneMidspinTile.cs
@@ -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
     {

diff --git a/...me.Tests/Visual/Object/TestScenePlanet.cs → ...e.Tests/Visual/Objects/TestScenePlanet.cs b/...me.Tests/Visual/Object/TestScenePlanet.cs → ...e.Tests/Visual/Objects/TestScenePlanet.cs
@@ -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
     {
@@ -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);
         }
     }
 }
diff --git a/...Tests/Visual/Object/TestSceneShortTile.cs → ...ests/Visual/Objects/TestSceneShortTile.cs b/...Tests/Visual/Object/TestSceneShortTile.cs → ...ests/Visual/Objects/TestSceneShortTile.cs
@@ -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
     {

diff --git a/Circle.Game.Tests/Visual/UserInterface/TestSceneCircleDropdown.cs b/Circle.Game.Tests/Visual/UserInterface/TestSceneCircleDropdown.cs
@@ -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
+        }
+    }
+}
diff --git a/Circle.Game.Tests/Visual/UserInterface/TestSceneSettingsDropdown.cs b/Circle.Game.Tests/Visual/UserInterface/TestSceneSettingsDropdown.cs
@@ -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",
+            });
+        }
+    }
+}
diff --git a/Circle.Game/Configuration/CircleConfigManager.cs b/Circle.Game/Configuration/CircleConfigManager.cs
@@ -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;
@@ -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()
@@ -75,6 +78,8 @@ public enum CircleSetting
         Offset,
         LoadBeatmapsOnStartup,
         BlurVisibility,
-        Parallax
+        Parallax,
+        PlanetRed,
+        PlanetBlue
     }
 }