menu fixes

trauty · May 23, 2022 · aee1cb3 · aee1cb3
1 parent c3fefcc
commit aee1cb3
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 182 deletions.
diff --git a/Assets/SO.meta b/Assets/SO.meta
diff --git a/Assets/SO/GameStatsSO.cs b/Assets/SO/GameStatsSO.cs
@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu]
+public class GameStatsSO : ScriptableObject
+{
+    public float sensX;
+    public float sensY;
+}
diff --git a/Assets/SO/GameStatsSO.cs.meta b/Assets/SO/GameStatsSO.cs.meta
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
@@ -1098,11 +1098,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   offStateMat: {fileID: 2100000, guid: e87cb04671b8a77479095c394b4409bd, type: 2}
   onStateMat: {fileID: 2100000, guid: 98c91092757be184390dc5335bd69044, type: 2}
-  slider: {fileID: 0}
+  pipelineAsset: {fileID: 11400000, guid: dd917faa5220cda49a8ac9f15a4a6c8c, type: 2}
   isVSyncDisabled: 1
   isFullscreen: 0
   audioMixer: {fileID: 24100000, guid: 5e423f6fea15bc546b45fd8d4c9dd05e, type: 2}
   dropdown: {fileID: 562128473}
+  dropdownMSAA: {fileID: 854824120}
 --- !u!1 &402972147
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scripts/SettingsMenu.cs b/Assets/Scripts/SettingsMenu.cs
@@ -4,20 +4,22 @@
 using TMPro;
 using UnityEngine;
 using UnityEngine.Audio;
+using UnityEngine.Rendering.Universal;
 using UnityEngine.UI;
 
-public class SettingsMenu : MonoBehaviour
+public class SettingsMenu : MonoBehaviour, ISaveable
 {
     [SerializeField] private Material offStateMat;
     [SerializeField] private Material onStateMat;
 
-    [SerializeField] private Slider slider;
+    [SerializeField] private UniversalRenderPipelineAsset pipelineAsset;
 
     [SerializeField] private bool isVSyncDisabled = true;
     [SerializeField] private bool isFullscreen = true;
 
     [SerializeField] private AudioMixer audioMixer;
     [SerializeField] private TMP_Dropdown dropdown;
+    [SerializeField] private TMP_Dropdown dropdownMSAA;
     Resolution[] resolutions;
 
     private void Start()
@@ -42,6 +44,8 @@ private void Start()
         dropdown.AddOptions(options);
         dropdown.value = currentResolutionIndex;
         dropdown.RefreshShownValue();
+        dropdownMSAA.value = pipelineAsset.msaaSampleCount;
+        dropdownMSAA.RefreshShownValue();
     }
 
     public void ChangeVSyncState(Image image)
@@ -92,25 +96,37 @@ public void SetAntiAliasing(int index)
         switch (index)
         {
             case 0:
-                QualitySettings.antiAliasing = 0;
+                pipelineAsset.msaaSampleCount = 0;
                 break;
             case 1:
-                QualitySettings.antiAliasing = 2;
+                pipelineAsset.msaaSampleCount = 2;
                 break;
             case 2:
-                QualitySettings.antiAliasing = 4;
+                pipelineAsset.msaaSampleCount = 4;
                 break;
             case 3:
-                QualitySettings.antiAliasing = 8;
+                pipelineAsset.msaaSampleCount = 8;
                 break;
         }
-        print(QualitySettings.antiAliasing);
     }
 
-    public void SaveState()
+    public object SaveState()
     {
         audioMixer.GetFloat("masterVolume", out float buffer);
-        PlayerPrefs.SetFloat("masterVolume", buffer);
-        print("SaveState");
+        return new SaveData()
+        {
+            masterVolume = buffer
+        };
+    }
+
+    public void LoadState(object state)
+    {
+        SaveData saveData = (SaveData)state;
+        audioMixer.SetFloat("masterVolume", saveData.masterVolume);
+    }
+
+    private struct SaveData
+    {
+        public float masterVolume;
     }
 }
diff --git a/Assets/URP/Level1.lighting b/Assets/URP/Level1.lighting
diff --git a/Assets/URP/Level1.lighting.meta b/Assets/URP/Level1.lighting.meta
diff --git a/Assets/URP/URP_Asset.asset b/Assets/URP/URP_Asset.asset
@@ -27,6 +27,9 @@ MonoBehaviour:
   m_SupportsHDR: 1
   m_MSAA: 1
   m_RenderScale: 1
+  m_UpscalingFilter: 0
+  m_FsrOverrideSharpness: 0
+  m_FsrSharpness: 0.92
   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
   m_MainLightShadowmapResolution: 2048

diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -18,19 +18,19 @@ EditorUserSettings:
       value: 510855505d515e5d0f5a5b26457a5c44124f4a79287e7f317e2c4a66b7b6323b
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5408030400025e5a08580f7445275a4442164c2c7e787f337a2f1e61e6b06661
+      value: 5502020755070a5d5f0f0e20137207444e4f4d287d7e733579284e36b2e2603d
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5502020755070a5d5f0f0e20137207444e4f4d287d7e733579284e36b2e2603d
+      value: 0606010000070f59080b587a48270e444e4f48722f2c20367d7d186bb2e46139
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 0606010000070f59080b587a48270e444e4f48722f2c20367d7d186bb2e46139
+      value: 5500515751020d020e5e0d7b47745b4443151d287c7174362e2a4f37b1b53560
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5500515751020d020e5e0d7b47745b4443151d287c7174362e2a4f37b1b53560
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 5408030400025e5a08580f7445275a4442164c2c7e787f337a2f1e61e6b06661
       flags: 0
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c72111f19563f22213229