- Added a constructor for loading other tilesets & audioset than default

- Working audio in the browser ! (I hope it works on github pages)
Mrcubix · Sep 24, 2023 · 9cf2f01 · 9cf2f01
1 parent dcd430e
commit 9cf2f01
Showing 1 changed file with 30 additions and 7 deletions.
diff --git a/ColorTiles/ViewModels/MainViewModel.cs b/ColorTiles/ViewModels/MainViewModel.cs
@@ -20,6 +20,7 @@ public class MainViewModel : ViewModelBase
 
     public GameTileSet Tileset { get; set; }
     public AudioSet? Audioset { get; set; } = null!;
+    public bool Disposed { get; private set; }
 
     public HUDViewModel HUDViewModel
     {
@@ -53,6 +54,25 @@ public MainViewModel()
         AudiosetManager = new AudioSetManager();
 
         Tileset = null!;
+        Audioset = null!;
+
+        MainMenuViewModel = new MainMenuViewModel();
+        GameOverMenuViewModel = new GameOverMenuViewModel();
+
+        HUDViewModel = null!;
+        GameBoardViewModel = null!;
+
+        Initialize();
+        PostInitialize();
+    }
+
+    public MainViewModel(GameTileSet tileset, AudioSet audioset)
+    {
+        TilesetManager = new TileSetManager();
+        AudiosetManager = new AudioSetManager();
+
+        Tileset = tileset;
+        Audioset = audioset;
 
         MainMenuViewModel = new MainMenuViewModel();
         GameOverMenuViewModel = new GameOverMenuViewModel();
@@ -66,15 +86,13 @@ public MainViewModel()
 
     protected virtual void Initialize()
     {
-        Tileset = TilesetManager.LoadDefault();
+        Tileset ??= TilesetManager.LoadDefault();
 
         // Only supported on Desktop platforms at the moment (Issue need to be fixed in OpenTK to Detect Android & IOS properly)
-        if (OperatingSystem.IsWindows() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
-        {
-            // Initialize the audio device
-            AudiosetManager.InitializeAudio();
-            Audioset = AudiosetManager.LoadDefault();
-        }
+        if (!OperatingSystem.IsBrowser())
+            AudiosetManager.InitializeOpenAL();
+
+        Audioset ??= AudiosetManager.LoadDefault();
 
         InitializeViewModels();
     }
@@ -175,6 +193,9 @@ public void OnTimeExpired(object? sender, EventArgs e)
 
     public void Dispose()
     {
+        if (Disposed)
+            return;
+
         UnsuscribeFromEvents();
 
         // Dispose Image Side
@@ -183,6 +204,8 @@ public void Dispose()
         AudiosetManager.Dispose();
 
         GameBoardViewModel.Dispose();
+
+        Disposed = true;
     }
 
     public void UnsuscribeFromEvents()