Add Toggle in Setting for Audio Sync

yojohanshinwataikei · Nov 10, 2023 · 1238fb9 · 1238fb9
1 parent c3ff0e2
commit 1238fb9
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 18 deletions.
diff --git a/Assets/Materials/Player/TrackBorderLeft.mat b/Assets/Materials/Player/TrackBorderLeft.mat
@@ -72,7 +72,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0
+    - _Phase: 0.26213914
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Materials/Player/TrackBorderRight.mat b/Assets/Materials/Player/TrackBorderRight.mat
@@ -72,7 +72,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0
+    - _Phase: 0.26213914
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Materials/Player/TrackMain.mat b/Assets/Materials/Player/TrackMain.mat
@@ -72,7 +72,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0
+    - _Phase: 0.26213914
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Misc/BuildTimestamp.txt b/Assets/Misc/BuildTimestamp.txt
@@ -1 +1 @@
-638313647123095071
+638331370734876546
diff --git a/Assets/Scripts/Compose/ArcadeComposeManager.cs b/Assets/Scripts/Compose/ArcadeComposeManager.cs
@@ -26,6 +26,7 @@ public class ArcadePreference
 		public int TargetFrameRate = -1;
 		public int Velocity = 30;
 		public uint UndoBufferSize = 200;
+		public bool PlaybackSync = false;
 		public bool Auto;
 		public Arcade.Gameplay.Chart.ChartSortMode ChartSortMode;
 	}
@@ -122,6 +123,7 @@ public long BuildTimestamp
 		public Toggle FullscreenToggle;
 		public Dropdown TargetFramerateDropdown;
 		public InputField UndoBufferSizeInput;
+		public Toggle PlaybackSyncToggle;
 
 		public TextAsset ChangeLog;
 		public TextAsset BuildTimestampText;
@@ -164,6 +166,12 @@ private void Start()
 				SavePreferences();
 			});
 			UndoBufferSizeInput.onEndEdit.AddListener(SetUndoBufferSize);
+			PlaybackSyncToggle.onValueChanged.AddListener((bool value) =>
+			{
+				ArcadePreference.PlaybackSync = value;
+				ArcGameplayManager.Instance.EnablePlaybackSync = value;
+				SavePreferences();
+			});
 			LoadPreferences();
 			SavePreferences();
 			Pause();
@@ -528,6 +536,8 @@ public void LoadPreferences()
 					ArcadePreference.TargetFrameRate = -1;
 				}
 				SetTargetFramerate(ArcadePreference.TargetFrameRate);
+				PlaybackSyncToggle.SetIsOnWithoutNotify(ArcadePreference.PlaybackSync);
+				ArcGameplayManager.Instance.EnablePlaybackSync = ArcadePreference.PlaybackSync;
 			}
 		}
 		public void SavePreferences()

diff --git a/Assets/Scripts/Gameplay/ArcGameplayManager.cs b/Assets/Scripts/Gameplay/ArcGameplayManager.cs
@@ -65,6 +65,8 @@ public float TimingPointDensityFactor
 			}
 		}
 
+		public bool EnablePlaybackSync = false;
+
 		private double lastDspTime = 0;
 		private double deltaDspTime = 0;
 
@@ -76,17 +78,20 @@ private void Update()
 			{
 				float playBackSpeed = ArcAudioManager.Instance.PlayBackSpeed;
 				timing += Time.deltaTime * playBackSpeed;
-				float t = ArcAudioManager.Instance.Timing;
-				if (deltaDspTime > 0f && (timing >= 0 || ArcAudioManager.Instance.Timing > 0))
-				{
-					float delta = timing - t;
-					int bufferLength;
-					int numBuffers;
-					AudioSettings.GetDSPBufferSize(out bufferLength, out numBuffers);
-					float maxDelta = 2 * (float)bufferLength / (float)AudioSettings.outputSampleRate;
-					if (Mathf.Abs(delta) > maxDelta)
+				Debug.Log(EnablePlaybackSync);
+				if(EnablePlaybackSync){
+					float t = ArcAudioManager.Instance.Timing;
+					if (deltaDspTime > 0f && (timing >= 0 || ArcAudioManager.Instance.Timing > 0))
 					{
-						timing = t;
+						float delta = timing - t;
+						int bufferLength;
+						int numBuffers;
+						AudioSettings.GetDSPBufferSize(out bufferLength, out numBuffers);
+						float maxDelta = 2 * (float)bufferLength / (float)AudioSettings.outputSampleRate;
+						if (Mathf.Abs(delta) > maxDelta)
+						{
+							timing = t;
+						}
 					}
 				}
 			}

diff --git a/Assets/_Scenes/ArcEditor.unity b/Assets/_Scenes/ArcEditor.unity
@@ -34514,6 +34514,7 @@ MonoBehaviour:
   OnChartLoad:
     m_PersistentCalls:
       m_Calls: []
+  EnablePlaybackSync: 0
 --- !u!1 &909681750
 GameObject:
   m_ObjectHideFlags: 0
@@ -81190,10 +81191,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1707394408}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 400.5, y: -72.258064}
+  m_SizeDelta: {x: 705, y: 40.258064}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &2105888210
 MonoBehaviour: