Remove memory visualiser.

stevehjohn · Nov 22, 2023 · c5cb409 · c5cb409
1 parent b9b2c8f
commit c5cb409
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 113 deletions.
diff --git a/src/Zen.Desktop.Host/Features/MemoryVisualiser.cs b/src/Zen.Desktop.Host/Features/MemoryVisualiser.cs
diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -47,14 +47,12 @@ public class Host : Game
 
     private CountersVisualiser _countersVisualiser;
 
-    private MemoryVisualiser _memoryVisualiser;
-
     public Host()
     {
         var width = Constants.ScreenWidthPixels * _scaleFactor;
         var height = Constants.ScreenHeightPixels * _scaleFactor;
 
-        if (AppSettings.Instance.Visualisation == Visualisation.Waveforms || AppSettings.Instance.Visualisation == Visualisation.Memory)
+        if (AppSettings.Instance.Visualisation == Visualisation.Waveforms)
         {
             width += Constants.VisualisationPanelWidth * _scaleFactor;
         }
@@ -148,11 +146,6 @@ protected override void LoadContent()
             _motherboard.AyAudio.BeeperSignalHook = _waveVisualiser.ReceiveSignal;
         }
 
-        if (AppSettings.Instance.Visualisation == Visualisation.Memory)
-        {
-            _memoryVisualiser = new MemoryVisualiser(_graphicsDeviceManager, _scaleFactor, _motherboard.Ram);
-        }
-
         _vRamAdapter = new VideoRenderer(_motherboard.VideoAdapter.ScreenFrame, _graphicsDeviceManager);
     }
 
@@ -260,8 +253,6 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.AyAudio.AySignalHook = null;
                 _motherboard.AyAudio.BeeperSignalHook = null;
 
-                _memoryVisualiser = null;
-
                 ChangeScale(_scaleFactor);
 
                 break;
@@ -278,16 +269,6 @@ private void MenuFinished(MenuResult result, object arguments)
 
                 break;
 
-            case MenuResult.VisualisationMemory:
-                AppSettings.Instance.Visualisation = Visualisation.Memory;
-                AppSettings.Instance.Save();
-
-                _memoryVisualiser = new MemoryVisualiser(_graphicsDeviceManager, _scaleFactor, _motherboard.Ram);
-
-                ChangeScale(_scaleFactor);
-
-                break;
-
             case MenuResult.CountersOn:
                 AppSettings.Instance.ViewCounters = true;
                 AppSettings.Instance.Save();
@@ -324,7 +305,7 @@ private void ChangeScale(int scale)
         var width = Constants.ScreenWidthPixels * _scaleFactor;
         var height = Constants.ScreenHeightPixels * _scaleFactor;
 
-        if (AppSettings.Instance.Visualisation == Visualisation.Waveforms || AppSettings.Instance.Visualisation == Visualisation.Memory)
+        if (AppSettings.Instance.Visualisation == Visualisation.Waveforms)
         {
             width += Constants.VisualisationPanelWidth * _scaleFactor;
         }
@@ -339,11 +320,6 @@ private void ChangeScale(int scale)
 
         _graphicsDeviceManager.ApplyChanges();
 
-        if (_memoryVisualiser != null)
-        {
-            _memoryVisualiser.ScaleFactor = scale;
-        }
-
         AppSettings.Instance.ScaleFactor = _scaleFactor;
         AppSettings.Instance.Save();
     }
@@ -461,16 +437,6 @@ protected override void Draw(GameTime gameTime)
                               new Rectangle(0, 0, Constants.ScreenWidthPixels, Constants.CountersPanelHeight), Color.White);
         }
 
-        if (_memoryVisualiser != null)
-        {
-            _memoryVisualiser.Render();
-
-            _spriteBatch.Draw(_memoryVisualiser.View,
-                              new Rectangle(Constants.ScreenWidthPixels * _scaleFactor, 0, Constants.VisualisationPanelWidth * _scaleFactor, Constants.ScreenHeightPixels * _scaleFactor), 
-                              new Rectangle(0, 0, Constants.VisualisationPanelWidth, Constants.ScreenHeightPixels), Color.White);
-
-        }
-
         _spriteBatch.End();
 
         base.Draw(gameTime);

diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs
@@ -16,7 +16,6 @@ public enum MenuResult
     SoundOff,
     VisualisationOff,
     VisualisationWaveform,
-    VisualisationMemory,
     CountersOn,
     CountersOff
 }
diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/VisualisationMenu.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/VisualisationMenu.cs
@@ -31,9 +31,6 @@ public override (MenuResult Result, MenuBase NewMenu, object Arguments) ItemSele
             case 2:
                 return (MenuResult.VisualisationWaveform, null, null);
 
-            case 3:
-                return (MenuResult.VisualisationMemory, null, null);
-
             default:
                 return (MenuResult.NewMenu, new MainMenu(), null);
         }

diff --git a/src/Zen.Desktop.Host/Infrastructure/Settings/Visualisation.cs b/src/Zen.Desktop.Host/Infrastructure/Settings/Visualisation.cs
@@ -3,6 +3,5 @@
 public enum Visualisation
 {
     Off,
-    Waveforms,
-    Memory
+    Waveforms
 }