added capped framerate set

Author: dooly123

Basis/Assets/AddressableAssetsData/link.xml

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_SupportsHDR: 1
   m_HDRColorBufferPrecision: 1
   m_MSAA: 2
-  m_RenderScale: 0.7622722
+  m_RenderScale: 1.002028
   m_UpscalingFilter: 0
   m_FsrOverrideSharpness: 0
   m_FsrSharpness: 0.92

Basis/Assets/AddressableAssetsData/link.xml.meta

@@ -426,6 +426,16 @@ public static class BasisSettingsDefaults
         public static BasisSettingsBinding<bool> FBIKRightShoulderEuroRot =>
             new("FBIKRightShoulderEuroRot", new BasisPlatformDefault<bool>(false));
 
+        // Optional: a real persistent setting for the master toggle.
+        public static BasisSettingsBinding<string> VSyncCapFps =>
+            new("vsynccappedset", new BasisPlatformDefault<string>
+            {
+                windows = "120",
+                android = "60",
+                linux = "120",
+                other = "120"
+            });
+
         // Optional: a real persistent setting for the master toggle.
         public static readonly BasisSettingsBinding<bool> FBIKEuroAll =
             new BasisSettingsBinding<bool>("EuroAll");

Basis/Assets/Basis/Settings/Quality Settiings/Modified - Desktop.asset

@@ -413,15 +413,22 @@ public static PanelTabPage GraphicsTab(PanelTabGroup tabGroup)
             // VSync
             PanelDropdown dropdownVSync = PanelDropdown.CreateNewEntry(qualityGroup.ContentParent);
             dropdownVSync.Descriptor.SetTitle("Vertical Sync");
-            dropdownVSync.AssignEntries(new List<string>
-            {
-                "On",
-                "Capped",
-                "Off",
-                "Half",
-            });
+            dropdownVSync.Descriptor.SetDescription("VR uses headset refreshrate");
+            dropdownVSync.AssignEntries(new List<string> { "On", "Capped", "Off", "Half" });
             dropdownVSync.AssignBinding(BasisSettingsDefaults.VSync);
 
+            PanelTextField fpsCapField = PanelTextField.CreateNewEntry(qualityGroup.ContentParent);
+            fpsCapField.Descriptor.SetTitle("Frame Rate Cap (FPS)");
+            fpsCapField.Descriptor.SetDescription("Used only when Vertical Sync is set to Capped.");
+            fpsCapField.AssignBinding(BasisSettingsDefaults.VSyncCapFps);
+            // Force numeric entry
+            TMP_InputField fpsInput = fpsCapField._inputField;
+            if (fpsInput != null)
+            {
+                fpsInput.contentType = TMP_InputField.ContentType.IntegerNumber;
+                fpsInput.lineType = TMP_InputField.LineType.SingleLine;
+            }
+
             // RENDERING GROUP
             PanelElementDescriptor renderingGroup =
                 PanelElementDescriptor.CreateNew(PanelElementDescriptor.ElementStyles.Group, container);

Basis/Packages/com.basis.framework/BasisUI/BasisSettingsDefaults.cs

@@ -6,8 +6,8 @@ namespace Basis.BasisUI
     public class PanelTextField : PanelDataComponent<string>
     {
 
-        [SerializeField] protected TMP_InputField _inputField;
-        [SerializeField] protected TextMeshProUGUI _placeholderLabel;
+        [SerializeField] public TMP_InputField _inputField;
+        [SerializeField] public TextMeshProUGUI _placeholderLabel;
         [SerializeField] protected string _placeholderText;
         [SerializeField] protected string _defaultValue;
         [SerializeField] protected TMP_InputField.ContentType _contentType = TMP_InputField.ContentType.Alphanumeric;

Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/SettingsProvider.cs

@@ -1,44 +1,103 @@
 using Basis.Scripts.Device_Management;
 using UnityEngine;
+
 public class BasisVerticalSyncModule : BasisSettingsBase
 {
+    public static int CappedFrameRateSelected = 120;
+
+    private enum VSyncMode { On, Capped, Half, Off }
+    private static VSyncMode _requestedMode = VSyncMode.On;
+
     public override void ValidSettingsChange(string matchedSettingName, string optionValue)
     {
-        Application.targetFrameRate = -1;
-        QualitySettings.maxQueuedFrames = -1;
 #if UNITY_SERVER
-            QualitySettings.vSyncCount = 0;
-            Application.targetFrameRate = 25;
+        // Server ignores client settings entirely
+        return;
 #endif
-        if (BasisDeviceManagement.StaticCurrentMode == BasisConstants.Desktop)
+
+        // Non-desktop devices force vsync off
+        if (BasisDeviceManagement.StaticCurrentMode != BasisConstants.Desktop)
+        {
+            _requestedMode = VSyncMode.Off;
+            return;
+        }
+
+        // Cap value setting
+        if (matchedSettingName == "vsynccappedset")
         {
-            BasisDebug.Log($"Vertical Sync Changed to {optionValue}", BasisDebug.LogTag.Local);
-            switch (optionValue.ToLower())
+            if (int.TryParse(
+                    optionValue,
+                    System.Globalization.NumberStyles.Integer,
+                    System.Globalization.CultureInfo.InvariantCulture,
+                    out CappedFrameRateSelected))
             {
-                case "on":
-                    QualitySettings.vSyncCount = 1;
-                    Application.targetFrameRate = -1;
-                    break;
-                case "capped":
-                    QualitySettings.vSyncCount = 0;
-                    Application.targetFrameRate = (int)Screen.currentResolution.refreshRateRatio.value;
-                    break;
-                case "half":
-                    QualitySettings.vSyncCount = 2;
-                    Application.targetFrameRate = -1;
-                    break;
-                case "off":
-                    QualitySettings.vSyncCount = 0;
-                    Application.targetFrameRate = -1;
-                    break;
+                BasisDebug.Log(
+                    $"Target Framerate set to {CappedFrameRateSelected}",
+                    BasisDebug.LogTag.Local);
             }
+            return;
         }
-        else
+
+        switch (optionValue.ToLower())
         {
-            QualitySettings.vSyncCount = 0;
+            case "on":
+                _requestedMode = VSyncMode.On;
+                break;
+            case "capped":
+                _requestedMode = VSyncMode.Capped;
+                break;
+            case "half":
+                _requestedMode = VSyncMode.Half;
+                break;
+            case "off":
+                _requestedMode = VSyncMode.Off;
+                break;
         }
     }
+
     public override void ChangedSettings()
     {
+#if UNITY_SERVER
+        QualitySettings.vSyncCount = 0;
+        Application.targetFrameRate = 25;
+        return;
+#endif
+
+        if (BasisDeviceManagement.StaticCurrentMode != BasisConstants.Desktop)
+        {
+            QualitySettings.vSyncCount = 0;
+            Application.targetFrameRate = -1;
+            return;
+        }
+
+        ApplyMode(_requestedMode);
+    }
+
+    private static void ApplyMode(VSyncMode mode)
+    {
+        QualitySettings.maxQueuedFrames = -1;
+
+        switch (mode)
+        {
+            case VSyncMode.On:
+                QualitySettings.vSyncCount = 1;
+                Application.targetFrameRate = -1;
+                break;
+
+            case VSyncMode.Capped:
+                QualitySettings.vSyncCount = 0;
+                Application.targetFrameRate = CappedFrameRateSelected;
+                break;
+
+            case VSyncMode.Half:
+                QualitySettings.vSyncCount = 2;
+                Application.targetFrameRate = -1;
+                break;
+
+            case VSyncMode.Off:
+                QualitySettings.vSyncCount = 0;
+                Application.targetFrameRate = -1;
+                break;
+        }
     }
 }