add(LabMusic): Dropdown now includes all the possible musicThemeInsta…

…nces.
GothicVRProject · Mar 6, 2024 · d79267e · d79267e
1 parent 31f759c
commit d79267e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/Assets/GothicVR-Lab/Scenes/Lab.unity b/Assets/GothicVR-Lab/Scenes/Lab.unity
@@ -4120,11 +4120,11 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 464842610}
+  - component: {fileID: 464842615}
   - component: {fileID: 464842609}
   - component: {fileID: 464842612}
   - component: {fileID: 464842613}
   - component: {fileID: 464842614}
-  - component: {fileID: 464842615}
   - component: {fileID: 464842616}
   - component: {fileID: 464842617}
   m_Layer: 0

diff --git a/Assets/GothicVR-Lab/Scripts/Handler/LabMusicHandler.cs b/Assets/GothicVR-Lab/Scripts/Handler/LabMusicHandler.cs
@@ -1,9 +1,13 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using GVR.Caches;
 using GVR.Debugging;
+using GVR.Globals;
 using GVR.Manager;
 using TMPro;
 using UnityEngine;
+using ZenKit.Daedalus;
 
 namespace GVR.Lab.Handler
 {
@@ -12,17 +16,22 @@ public class LabMusicHandler : MonoBehaviour, ILabHandler
         public TMP_Dropdown fileSelector;
         public TMP_Dropdown themeSelector;
 
-        private Dictionary<string, List<string>> musicMapping = new()
-        {
-            { "ow_day_std.sgt", new(){ "DEF_DAY_STD" } },
-            { "ban_day_std.sgt", new(){ "STA_DAY_STD" } },
-            { "oc_day_std.sgt", new(){ "" } },
-        };
+        private List<MusicThemeInstance> _musicInstances;
 
         public void Bootstrap()
         {
-            fileSelector.options = musicMapping.Select(dict => new TMP_Dropdown.OptionData(dict.Key)).ToList();
-            themeSelector.options = musicMapping.First().Value.Select(i => new TMP_Dropdown.OptionData(i)).ToList();
+            var prototype = GameData.MusicVm.GetSymbolByName("C_MUSICTHEME_DEF");
+
+            _musicInstances = GameData.MusicVm.Symbols
+                .Where(s => s.Parent == prototype.Index)
+                .Select(s => AssetCache.TryGetMusic(s.Name))
+                .GroupBy(instance => instance.File, StringComparer.InvariantCultureIgnoreCase)
+                .Select(group => group.First())
+                .OrderBy(instance => instance.File)
+                .ToList();
+
+            fileSelector.options = _musicInstances.Select(i => new TMP_Dropdown.OptionData(i.File)).ToList();
+            // themeSelector.options = musicMapping.First().Value.Select(i => new TMP_Dropdown.OptionData(i)).ToList();
         }
 
         public void MusicPlayClick()
@@ -31,10 +40,9 @@ public void MusicPlayClick()
             FeatureFlags.I.enableMusic = true;
             FeatureFlags.I.showMusicLogs = true;
 
-            var fileSelect = fileSelector.options[fileSelector.value].text;
-            var themeSelect = fileSelector.options[fileSelector.value].text;
+            var item = _musicInstances[fileSelector.value];
 
-            MusicManager.I.SetMusic(fileSelect, themeSelect);
+            MusicManager.I.SetMusic(item);
         }
     }
 }
diff --git a/Assets/GothicVR/Scripts/Manager/MusicManager.cs b/Assets/GothicVR/Scripts/Manager/MusicManager.cs
@@ -191,40 +191,38 @@ public void SetMusic(string zone, Tags tags)
             if ((tags & Tags.Thr) != 0)
                 musicTag = "THR";
 
-            var musicName = $"{result}_{(isDay ? "DAY" : "NGT")}_{musicTag}";
+            var musicThemeInstanceName = $"{result}_{(isDay ? "DAY" : "NGT")}_{musicTag}";
 
-            var theme = AssetCache.TryGetMusic(musicName);
+            var theme = AssetCache.TryGetMusic(musicThemeInstanceName);
 
             reloadTheme = pendingTheme.File != theme.File;
             pendingTheme = theme;
             pendingTags = tags;
             hasPending = true;
 
             if (FeatureFlags.I.showMusicLogs)
-                Debug.Log($"Playing music: theme >{musicName}< from file >{theme.File}<");
+                Debug.Log($"Playing music: MusicThemeInstance >{musicThemeInstanceName}< from file >{theme.File}<");
         }
 
-        public void SetMusic(string segment, string themeName)
+        public void SetMusic(MusicThemeInstance theme)
         {
-            var theme = AssetCache.TryGetMusic(themeName);
-
             reloadTheme = true;
             pendingTheme = theme;
             hasPending = true;
 
             if (FeatureFlags.I.showMusicLogs)
-                Debug.Log($"Playing music: theme >{themeName}< from file >{theme.File}<");
+                Debug.Log($"[Music] Playing music from file >{theme.File}<.");
         }
 
-        public void SetMusic(string musicName)
+        public void SetMusic(string musicThemeInstanceName)
         {
-            var theme = AssetCache.TryGetMusic(musicName);
+            var theme = AssetCache.TryGetMusic(musicThemeInstanceName);
             reloadTheme = true;
             pendingTheme = theme;
             hasPending = true;
 
             if (FeatureFlags.I.showMusicLogs)
-                Debug.Log($"[Music] Playing music: theme >{musicName}< from file >{theme.File}<");
+                Debug.Log($"[Music] Playing music: MusicThemeInstance >{musicThemeInstanceName}< from file >{theme.File}<");
         }
 
         private void StopMusic()