removed Media Volume, working on camera tracking

dooly123 · dooly123 · commit dbc1aae71b90 · 2026-06-05T10:09:17.000+10:00
diff --git a/Basis/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Basis/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 37c75a6cf72db324eb01200602299fc8
   m_currentHash:
     serializedVersion: 2
-    Hash: 5fb38613a650df59b01d34675473340b
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0
diff --git a/Basis/Packages/com.basis.framework/BasisUI/BasisSettingsDefaults.cs b/Basis/Packages/com.basis.framework/BasisUI/BasisSettingsDefaults.cs
@@ -9,7 +9,6 @@ public static class BasisSettingsDefaults
         public static BasisSettingsBinding<float> MainVolume = new("main volume", new BasisPlatformDefault<float>(75));
 
         public static BasisSettingsBinding<float> MenuVolume = new("menuvolume", new BasisPlatformDefault<float>(75));
-        public static BasisSettingsBinding<float> MediaVolume = new("mediavolume", new BasisPlatformDefault<float>(75));
         public static BasisSettingsBinding<float> WorldVolume = new("worldvolume", new BasisPlatformDefault<float>(75));
 
         public static BasisSettingsBinding<float> VoiceVolume = new("voicevolume", new BasisPlatformDefault<float>(75));
@@ -1197,7 +1196,6 @@ public static void LoadAll()
             VoiceVolume.LoadBindingValue();
             AvatarVolume.LoadBindingValue();
             PropVolume.LoadBindingValue();
-            MediaVolume.LoadBindingValue();
 
             MicrophoneVolume.LoadBindingValue();
             MicrophoneRange.LoadBindingValue();
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ar.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ar.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "مستوى صوت اللعبة الإجمالي." },
     { "key": "settings.audio.menuVolume", "value": "مستوى صوت القائمة" },
     { "key": "settings.audio.worldVolume", "value": "مستوى صوت العالم" },
-    { "key": "settings.audio.mediaVolume", "value": "مستوى صوت الوسائط" },
     { "key": "settings.audio.voiceVolume", "value": "مستوى الصوت" },
     { "key": "settings.audio.avatarVolume", "value": "مستوى صوت الأفاتار" },
     { "key": "settings.audio.propVolume", "value": "مستوى صوت المجسمات" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/bn.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/bn.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "সামগ্রিক গেম ভলিউম।" },
     { "key": "settings.audio.menuVolume", "value": "মেনু ভলিউম" },
     { "key": "settings.audio.worldVolume", "value": "বিশ্ব ভলিউম" },
-    { "key": "settings.audio.mediaVolume", "value": "মিডিয়া ভলিউম" },
     { "key": "settings.audio.voiceVolume", "value": "ভয়েস ভলিউম" },
     { "key": "settings.audio.avatarVolume", "value": "অবতার ভলিউম" },
     { "key": "settings.audio.propVolume", "value": "প্রপ ভলিউম" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/de.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/de.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Gesamte Spiellautstärke." },
     { "key": "settings.audio.menuVolume", "value": "Menü-Lautstärke" },
     { "key": "settings.audio.worldVolume", "value": "Welt-Lautstärke" },
-    { "key": "settings.audio.mediaVolume", "value": "Medien-Lautstärke" },
     { "key": "settings.audio.voiceVolume", "value": "Sprachlautstärke" },
     { "key": "settings.audio.avatarVolume", "value": "Avatar-Lautstärke" },
     { "key": "settings.audio.propVolume", "value": "Prop-Lautstärke" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/en.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/en.json
@@ -1890,10 +1890,6 @@
       "key": "settings.audio.worldVolume",
       "value": "World Volume"
     },
-    {
-      "key": "settings.audio.mediaVolume",
-      "value": "Media Volume"
-    },
     {
       "key": "settings.audio.voiceVolume",
       "value": "Voice Volume"
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/es-MX.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/es-MX.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Volumen general del juego." },
     { "key": "settings.audio.menuVolume", "value": "Volumen del menú" },
     { "key": "settings.audio.worldVolume", "value": "Volumen del mundo" },
-    { "key": "settings.audio.mediaVolume", "value": "Volumen multimedia" },
     { "key": "settings.audio.voiceVolume", "value": "Volumen de voz" },
     { "key": "settings.audio.avatarVolume", "value": "Volumen del avatar" },
     { "key": "settings.audio.propVolume", "value": "Volumen de objetos" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/es.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/es.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Volumen general del juego." },
     { "key": "settings.audio.menuVolume", "value": "Volumen del menú" },
     { "key": "settings.audio.worldVolume", "value": "Volumen del mundo" },
-    { "key": "settings.audio.mediaVolume", "value": "Volumen multimedia" },
     { "key": "settings.audio.voiceVolume", "value": "Volumen de voz" },
     { "key": "settings.audio.avatarVolume", "value": "Volumen del avatar" },
     { "key": "settings.audio.propVolume", "value": "Volumen de objetos" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/fr.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/fr.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Volume global du jeu." },
     { "key": "settings.audio.menuVolume", "value": "Volume du menu" },
     { "key": "settings.audio.worldVolume", "value": "Volume du monde" },
-    { "key": "settings.audio.mediaVolume", "value": "Volume des médias" },
     { "key": "settings.audio.voiceVolume", "value": "Volume de la voix" },
     { "key": "settings.audio.avatarVolume", "value": "Volume de l'avatar" },
     { "key": "settings.audio.propVolume", "value": "Volume des accessoires" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/hi.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/hi.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "समग्र गेम वॉल्यूम।" },
     { "key": "settings.audio.menuVolume", "value": "मेनू वॉल्यूम" },
     { "key": "settings.audio.worldVolume", "value": "वर्ल्ड वॉल्यूम" },
-    { "key": "settings.audio.mediaVolume", "value": "मीडिया वॉल्यूम" },
     { "key": "settings.audio.voiceVolume", "value": "आवाज़ वॉल्यूम" },
     { "key": "settings.audio.avatarVolume", "value": "अवतार वॉल्यूम" },
     { "key": "settings.audio.propVolume", "value": "प्रॉप वॉल्यूम" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/it.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/it.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Volume generale del gioco." },
     { "key": "settings.audio.menuVolume", "value": "Volume menu" },
     { "key": "settings.audio.worldVolume", "value": "Volume mondo" },
-    { "key": "settings.audio.mediaVolume", "value": "Volume media" },
     { "key": "settings.audio.voiceVolume", "value": "Volume voce" },
     { "key": "settings.audio.avatarVolume", "value": "Volume avatar" },
     { "key": "settings.audio.propVolume", "value": "Volume oggetti" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ja.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ja.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "ゲーム全体の音量。" },
     { "key": "settings.audio.menuVolume", "value": "メニュー音量" },
     { "key": "settings.audio.worldVolume", "value": "ワールド音量" },
-    { "key": "settings.audio.mediaVolume", "value": "メディア音量" },
     { "key": "settings.audio.voiceVolume", "value": "ボイス音量" },
     { "key": "settings.audio.avatarVolume", "value": "アバター音量" },
     { "key": "settings.audio.propVolume", "value": "プロップ音量" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/nl.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/nl.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Algemeen spelvolume." },
     { "key": "settings.audio.menuVolume", "value": "Menuvolume" },
     { "key": "settings.audio.worldVolume", "value": "Wereldvolume" },
-    { "key": "settings.audio.mediaVolume", "value": "Mediavolume" },
     { "key": "settings.audio.voiceVolume", "value": "Stemvolume" },
     { "key": "settings.audio.avatarVolume", "value": "Avatarvolume" },
     { "key": "settings.audio.propVolume", "value": "Propvolume" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/pt.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/pt.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Volume geral do jogo." },
     { "key": "settings.audio.menuVolume", "value": "Volume do Menu" },
     { "key": "settings.audio.worldVolume", "value": "Volume do Mundo" },
-    { "key": "settings.audio.mediaVolume", "value": "Volume de Mídia" },
     { "key": "settings.audio.voiceVolume", "value": "Volume de Voz" },
     { "key": "settings.audio.avatarVolume", "value": "Volume de Avatar" },
     { "key": "settings.audio.propVolume", "value": "Volume de Adereços" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ru.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ru.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "Общая громкость игры." },
     { "key": "settings.audio.menuVolume", "value": "Громкость меню" },
     { "key": "settings.audio.worldVolume", "value": "Громкость мира" },
-    { "key": "settings.audio.mediaVolume", "value": "Громкость медиа" },
     { "key": "settings.audio.voiceVolume", "value": "Громкость голоса" },
     { "key": "settings.audio.avatarVolume", "value": "Громкость аватара" },
     { "key": "settings.audio.propVolume", "value": "Громкость реквизита" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ur.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/ur.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "مجموعی گیم والیوم۔" },
     { "key": "settings.audio.menuVolume", "value": "مینیو والیوم" },
     { "key": "settings.audio.worldVolume", "value": "دنیا کا والیوم" },
-    { "key": "settings.audio.mediaVolume", "value": "میڈیا والیوم" },
     { "key": "settings.audio.voiceVolume", "value": "آواز کا والیوم" },
     { "key": "settings.audio.avatarVolume", "value": "اواتار والیوم" },
     { "key": "settings.audio.propVolume", "value": "پروپ والیوم" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh-CN.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh-CN.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "整体游戏音量。" },
     { "key": "settings.audio.menuVolume", "value": "菜单音量" },
     { "key": "settings.audio.worldVolume", "value": "世界音量" },
-    { "key": "settings.audio.mediaVolume", "value": "媒体音量" },
     { "key": "settings.audio.voiceVolume", "value": "语音音量" },
     { "key": "settings.audio.avatarVolume", "value": "虚拟形象音量" },
     { "key": "settings.audio.propVolume", "value": "道具音量" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh-Hans.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh-Hans.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "整体游戏音量。" },
     { "key": "settings.audio.menuVolume", "value": "菜单音量" },
     { "key": "settings.audio.worldVolume", "value": "世界音量" },
-    { "key": "settings.audio.mediaVolume", "value": "媒体音量" },
     { "key": "settings.audio.voiceVolume", "value": "语音音量" },
     { "key": "settings.audio.avatarVolume", "value": "虚拟形象音量" },
     { "key": "settings.audio.propVolume", "value": "道具音量" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh-Hant.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh-Hant.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "整个游戏的总音量。" },
     { "key": "settings.audio.menuVolume", "value": "菜单音量" },
     { "key": "settings.audio.worldVolume", "value": "世界音量" },
-    { "key": "settings.audio.mediaVolume", "value": "媒体音量" },
     { "key": "settings.audio.voiceVolume", "value": "语音音量" },
     { "key": "settings.audio.avatarVolume", "value": "虚拟形象音量" },
     { "key": "settings.audio.propVolume", "value": "道具音量" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh.json b/Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/zh.json
@@ -412,7 +412,6 @@
     { "key": "settings.audio.masterVolume.description", "value": "整个游戏的总音量。" },
     { "key": "settings.audio.menuVolume", "value": "菜单音量" },
     { "key": "settings.audio.worldVolume", "value": "世界音量" },
-    { "key": "settings.audio.mediaVolume", "value": "媒体音量" },
     { "key": "settings.audio.voiceVolume", "value": "语音音量" },
     { "key": "settings.audio.avatarVolume", "value": "虚拟形象音量" },
     { "key": "settings.audio.propVolume", "value": "道具音量" },
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/SettingsProvider.cs b/Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/SettingsProvider.cs
@@ -656,12 +656,6 @@ public static PanelTabPage AudioTab(PanelTabGroup tabGroup)
                 BasisSettingsDefaults.WorldVolume);
             sliderWorldVolume.SliderComponent.onValueChanged.AddListener(SMModuleAudio.ApplyWorldVolume);
 
-            PanelSlider sliderVideoVolume = PanelSlider.CreateEntryAndBind(
-                mixerGroup,
-                PanelSlider.SliderSettings.Percentage(BasisLocalization.Get("settings.audio.mediaVolume")),
-                BasisSettingsDefaults.MediaVolume);
-            sliderVideoVolume.SliderComponent.onValueChanged.AddListener(SMModuleAudio.ApplyMediaVolume);
-
             PanelSlider sliderVoiceVolume = PanelSlider.CreateEntryAndBind(
                 mixerGroup,
                 PanelSlider.SliderSettings.Percentage(BasisLocalization.Get("settings.audio.voiceVolume")),
@@ -695,7 +689,6 @@ private static void ResetAudioDefaults()
             BasisSettingsDefaults.MainVolume.ResetToDefault();
             BasisSettingsDefaults.MenuVolume.ResetToDefault();
             BasisSettingsDefaults.WorldVolume.ResetToDefault();
-            BasisSettingsDefaults.MediaVolume.ResetToDefault();
             BasisSettingsDefaults.VoiceVolume.ResetToDefault();
             BasisSettingsDefaults.AvatarVolume.ResetToDefault();
             BasisSettingsDefaults.PropVolume.ResetToDefault();
diff --git a/Basis/Packages/com.basis.framework/Settings/SMModuleAudio.cs b/Basis/Packages/com.basis.framework/Settings/SMModuleAudio.cs
@@ -14,7 +14,6 @@ public class SMModuleAudio : BasisSettingsBase
     public static Action<float> MenusVolume;
     public static Action<float> WorldVolume;
     public static Action<float> VoiceVolume;
-    public static Action<float> VideoVolume;
 
     public static Action<float> AvatarVolume;
     public static Action<float> PropVolume;
@@ -23,7 +22,6 @@ public class SMModuleAudio : BasisSettingsBase
     public static float ActiveMenusVolume;
     public static float ActiveWorldVolume;
     public static float ActiveVoiceVolume;
-    public static float ActiveVideoVolume;
 
     public static float ActiveAvatarVolume;
     public static float ActivePropVolume;
@@ -33,7 +31,6 @@ public class SMModuleAudio : BasisSettingsBase
     private static string K_MENU_VOLUME => BasisSettingsDefaults.MenuVolume.BindingKey;
     private static string K_WORLD_VOLUME => BasisSettingsDefaults.WorldVolume.BindingKey;
     private static string K_VOICE_VOLUME => BasisSettingsDefaults.VoiceVolume.BindingKey;
-    private static string K_MEDIA_VOLUME => BasisSettingsDefaults.MediaVolume.BindingKey;
     private static string K_AVATAR_VOLUME => BasisSettingsDefaults.AvatarVolume.BindingKey;
     private static string K_PROP_VOLUME => BasisSettingsDefaults.PropVolume.BindingKey;
 
@@ -72,9 +69,6 @@ public override void ValidSettingsChange(string matchedSettingName, string optio
             case var s when s == K_PROP_VOLUME:
                 if (SliderReadOption(optionValue, out float newProp)) ApplyPropVolume(newProp);
                 break;
-            case var s when s == K_MEDIA_VOLUME:
-                if (SliderReadOption(optionValue, out float newVideo)) ApplyMediaVolume(newVideo);
-                break;
         }
     }
 
@@ -120,12 +114,6 @@ public static void ApplyPropVolume(float sliderPercent)
         PropVolume?.Invoke(ActivePropVolume);
     }
 
-    public static void ApplyMediaVolume(float sliderPercent)
-    {
-        ActiveVideoVolume = Mathf.Clamp01(sliderPercent / 100f);
-        VideoVolume?.Invoke(ActiveVideoVolume);
-    }
-
     public override void ChangedSettings()
     {
         // Optional: re-apply Active* if your system needs a "push current state" pass.
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Application/BasisMediaPipeManagement.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Application/BasisMediaPipeManagement.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/BasisMediaPipeConfig.cs b/Basis/Packages/com.basis.mediapipe/Runtime/BasisMediaPipeConfig.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeArmConverter.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeArmConverter.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeArmConverter.cs.meta b/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeArmConverter.cs.meta
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeBodyConverter.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeBodyConverter.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeHandConverter.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeHandConverter.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeHeadConverter.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Converters/MediaPipeHeadConverter.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Homuler/HomulerMediaPipeBackend.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Homuler/HomulerMediaPipeBackend.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Inference/BasisMediaPipeResult.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Inference/BasisMediaPipeResult.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Settings/BasisMediaPipeSettings.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Settings/BasisMediaPipeSettings.cs
diff --git a/Basis/Packages/com.basis.mediapipe/Runtime/Settings/SettingsProviderMediaPipe.cs b/Basis/Packages/com.basis.mediapipe/Runtime/Settings/SettingsProviderMediaPipe.cs
