Merge branch 'develop'

Pulsarc/Pulsarc.cs

@@ -2,6 +2,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using Pulsarc.UI;
+using Pulsarc.UI.Screens;
 using Pulsarc.UI.Screens.Gameplay;
 using Pulsarc.UI.Screens.MainMenu;
 using Pulsarc.UI.Screens.SongSelect;
@@ -107,6 +108,8 @@ internal class PulsarcGame : Game
         // Map Converting Flag
         private bool converting = false;
 
+        private PulsarcScreen lastScreen = null;
+
         public PulsarcGame()
         {
             // Set up stored Data access
@@ -219,8 +222,12 @@ protected override void UnloadContent()
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
         protected override void Update(GameTime gameTime)
         {
+            Thread.Yield();
+
             PulsarcTime.Update();
 
+            CheckDiscord();
+
             cursor.SetPos(MouseManager.CurrentState.Position);
 
             // Temporary measure for converting intralism or osu!mania beatmaps
@@ -255,6 +262,17 @@ protected override void Update(GameTime gameTime)
             base.Update(gameTime);
         }
 
+        private void CheckDiscord()
+        {
+            if (ScreenManager.Screens.Peek() != lastScreen)
+            {
+                PulsarcScreen currentScreen = (PulsarcScreen)ScreenManager.Screens.Peek();
+                lastScreen = currentScreen;
+
+                currentScreen.UpdateDiscord();
+            }
+        }
+
         /// <summary>
         /// This is called when the game should draw itself.
         /// </summary>

Pulsarc/UI/Screens/Gameplay/GameplayEngine.cs

@@ -110,13 +110,6 @@ public class GameplayEngine : PulsarcScreen
         // Time distance (in ms) from which hitobjects are neither updated not drawn
         public int IgnoreTime { get; private set; } = 500;
 
-        public override string DiscordDetails => $"Playing Singleplayer";
-
-        public override string DiscordState => CurrentBeatmap.Title;
-
-        //public override int DiscordTimer => CurrentBeatmap.Arcs[CurrentBeatmap.Arcs.Count -1].Time;
-        public override bool DiscordTimer => true;
-
         /// <summary>
         /// The engine that handles the gameplay of Pulsarc.
         /// </summary>
@@ -313,6 +306,7 @@ private void StartGameplay()
         {
             AudioManager.StartGamePlayer();
 
+
             GameplayEngine.Active = true;
             Pulsarc.DisplayCursor = false;
         }
@@ -323,8 +317,6 @@ private void StartGameplay()
         /// <param name="gameTime">The current GameTime</param>
         public override void Update(GameTime gameTime)
         {
-            base.Update(gameTime);
-
             // If not active, don't update.
             if (!Active)
                 return;
@@ -656,12 +648,18 @@ public void EndGameplay(bool save = false)
             ResultScreen next = new ResultScreen(Judgements, errors, scoreDisplay, maxCombo, Rate, 0, CurrentBeatmap, Background, !AutoPlay && save);
             Pulsarc.DisplayCursor = true;
             Reset();
+
             // Switch to results screen
             ScreenManager.RemoveScreen(true);
             ScreenManager.AddScreen(next);
 
             // TODO: restart GC when out of gameplay
             GC.Collect();
         }
+
+        public override void UpdateDiscord()
+        {
+            PulsarcDiscord.SetStatus("Playing Singleplayer", CurrentBeatmap.Title);
+        }
     }
 }

Pulsarc/UI/Screens/InProgressScreen.cs

@@ -13,9 +13,12 @@ public InProgressScreen()
         {
             View = new InProgressScreenView(this);
         }
+
         public override void Init()
         {
             ScreenManager.RemoveScreen();
         }
+
+        public override void UpdateDiscord() { }
     }
 }

Pulsarc/UI/Screens/MainMenu/Menu.cs

@@ -1,15 +1,30 @@
-using Wobble.Screens;
+using Microsoft.Xna.Framework;
+using Pulsarc.Utils;
+using Wobble.Screens;
 
 namespace Pulsarc.UI.Screens.MainMenu
 {
     class Menu : PulsarcScreen
     {
         public override ScreenView View { get; protected set; }
 
+        private const string DISCORD_DETAILS = "In the menus";
+
         public Menu()
         {
             View = new MenuView(this);
-            DiscordDetails = "In the menus";
+            PulsarcDiscord.SetStatus("", DISCORD_DETAILS);
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+            View?.Update(gameTime);
+        }
+
+        public override void UpdateDiscord()
+        {
+            if (PulsarcDiscord.Presence.Details != DISCORD_DETAILS)
+                PulsarcDiscord.SetStatus("", DISCORD_DETAILS);
         }
     }
 }

Pulsarc/UI/Screens/PulsarcScreen.cs

@@ -11,21 +11,11 @@ public abstract class PulsarcScreen : Screen
     {
         public bool Initialized { get; protected set; } = false;
 
-        public virtual string DiscordDetails { get; protected set; } = "";
-        public virtual string DiscordState { get; protected set; } = "";
-        public virtual bool DiscordTimer => false;
-
         public virtual void Init()
         {
             Initialized = true;
         }
 
-        public override void Update(GameTime gameTime)
-        {
-            base.Update(gameTime);
-
-            if (PulsarcDiscord.Presence.Details != DiscordDetails || PulsarcDiscord.Presence.State != DiscordState)
-                PulsarcDiscord.SetStatus(DiscordDetails, DiscordState, DiscordTimer);
-        }
+        public abstract void UpdateDiscord();
     }
 }

Pulsarc/UI/Screens/Quit/QuitScreen.cs

@@ -20,5 +20,7 @@ public override void Init()
             Pulsarc.Exit();
             Environment.Exit(0);
         }
+
+        public override void UpdateDiscord() { }
     }
 }

Pulsarc/UI/Screens/Result/ResultScreen.cs

@@ -1,4 +1,5 @@
-using Pulsarc.Beatmaps;
+using Microsoft.Xna.Framework;
+using Pulsarc.Beatmaps;
 using Pulsarc.UI.Common;
 using Pulsarc.UI.Screens.Gameplay;
 using Pulsarc.Utils;
@@ -34,6 +35,8 @@ class ResultScreen : PulsarcScreen
         // Whether or not a full combo was achieved.
         public bool FullCombo { get; private set; }
 
+        private ScoreData scoreData;
+
         /// <summary>
         /// The screen that summarizes the last play.
         /// </summary>
@@ -71,17 +74,24 @@ public ResultScreen(List<JudgementValue> judgements, List<KeyValuePair<double, i
             FullCombo = JudgesCount["miss"] == 0;
 
             // Determine the grade achieved.
-            ScoreData scoreData = new ScoreData(Beatmap.GetHash(), Config.GetString("Profile","Username"), rate, mods, DisplayScore, (float)accuracyTotal, Combo, "D", JudgesCount["max"], JudgesCount["perfect"], JudgesCount["great"], JudgesCount["good"], JudgesCount["bad"], JudgesCount["miss"]);
+            scoreData = new ScoreData(Beatmap.GetHash(), Config.GetString("Profile","Username"), rate, mods, DisplayScore, (float)accuracyTotal, Combo, "D", JudgesCount["max"], JudgesCount["perfect"], JudgesCount["great"], JudgesCount["good"], JudgesCount["bad"], JudgesCount["miss"]);
             scoreData.grade = Scoring.GetGrade(scoreData);
 
             // Save the score locally
             if (newScore)
                 DataManager.ScoreDB.AddScore(scoreData);
 
-            DiscordDetails = $"Finished {beatmap.Title}";
-            DiscordState = $"Grade: {scoreData.grade} | Score: {scoreData.score} | Acc = {Math.Round(accuracyTotal * 100, 2)}%";
-
             View = new ResultScreenView(this, accuracyTotal, scoreData.grade, Beatmap, mapBackground);
         }
+
+        public override void UpdateDiscord()
+        {
+            string details = $"Finished {Beatmap.Title}";
+            string state = $"Grade: {scoreData.grade} | Score: {scoreData.score} | Acc = {Math.Round(scoreData.accuracy * 100, 2)}%";
+
+            Console.WriteLine(details + "\n" + state);
+
+            PulsarcDiscord.SetStatus(details, state);
+        }
     }
 }

Pulsarc/UI/Screens/Settings/SettingsScreen.cs

@@ -15,15 +15,11 @@ public override void Init()
         {
             base.Init();
 
-            DiscordDetails = "In the menus";
-
             View = new SettingsScreenView(this);
         }
 
         public override void Update(GameTime gameTime)
         {
-            base.Update(gameTime);
-
             handleMouseInput();
 
             View?.Update(gameTime);
@@ -50,5 +46,7 @@ private void handleMouseInput()
 
             changeFocus(ms);
         }
+
+        public override void UpdateDiscord() { }
     }
 }

Pulsarc/UI/Screens/Settings/UI/Setting.cs

@@ -85,7 +85,10 @@ public virtual void Save(string category, string key)
                     Config.SetDouble(category, key,(double) GetSaveValue());
                     break;
                 case "bool":
-                    Config.SetBool(category, key,(bool) GetSaveValue());
+                    Config.SetBool(category, key, (bool)GetSaveValue());
+                    break;
+                case "string":
+                    Config.SetString(category, key, (string)GetSaveValue());
                     break;
                 default:
                     Console.WriteLine("Cannot save type " + Type.ToString() + " in category "+category+" for setting "+key);

Pulsarc/UI/Screens/SongSelect/SongSelection.cs

@@ -1,6 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 using Pulsarc.Beatmaps;
+using Pulsarc.UI.Screens.Gameplay;
 using Pulsarc.UI.Screens.SongSelect.UI;
 using Pulsarc.Utils;
 using Pulsarc.Utils.Input;
@@ -34,8 +35,6 @@ public override void Init()
         {
             base.Init();
 
-            DiscordDetails = "Browsing Maps";
-
             RefreshBeatmaps();
         }
 
@@ -113,14 +112,17 @@ public List<Beatmap> SortBeatmaps(List<Beatmap> beatmaps, string sort, bool asce
 
         public override void Update(GameTime gameTime)
         {
-            base.Update(gameTime);
-
             HandleKeyboardPresses();
             HandleMouseInput();
 
             View?.Update(gameTime);
         }
 
+        public override void UpdateDiscord()
+        {
+            PulsarcDiscord.SetStatus("", "Browsing Maps");
+        }
+
         private void HandleKeyboardPresses()
         {
             while (InputManager.KeyboardPresses.Count > 0)

Pulsarc/Utils/AssetsManager.cs

@@ -31,8 +31,11 @@ public static void Initialize(ContentManager content)
 
         public static Texture2D Load(string path)
         {
-            if (StoredTexture.ContainsKey(path) && StoredTexture[path].Value + textureExpireTimeMs > PulsarcTime.CurrentElapsedTime)
-                return StoredTexture[path].Key;
+            if (StoredTexture.ContainsKey(path))
+                if (StoredTexture[path].Value + textureExpireTimeMs > PulsarcTime.CurrentElapsedTime)
+                    return StoredTexture[path].Key;
+                else
+                    StoredTexture.Remove(path);
 
             Texture2D newTexture = null;
 

Pulsarc/Utils/InputManager.cs

@@ -40,6 +40,7 @@ static public void InputUpdater()
 
             while (running)
             {
+                Thread.Yield();
                 if (threadLimiterWatch.ElapsedMilliseconds >= 1)
                 {
                     threadLimiterWatch.Restart();