actually, *really*, fix beat event synchronization

sh0ckR6 · Jul 8, 2024 · 3976a42 · 3976a42
1 parent 1b21150
commit 3976a42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Assets/Script/Gameplay/GameManager.Loading.cs b/Assets/Script/Gameplay/GameManager.Loading.cs
@@ -187,7 +187,8 @@ private async void Start()
 
             // TODO: Move the offset here to SFX configuration
             // The clap SFX has 20 ms of lead-up before the actual impact happens
-            BeatEventHandler.Subscribe(StarPowerClap, -0.02);
+            // Must be offset by audio calibration to account for playback delay
+            BeatEventHandler.Subscribe(StarPowerClap, -0.02 + _songRunner.AudioCalibration);
 
             // Log constant values
             YargLogger.LogFormatDebug("Audio calibration: {0}, video calibration: {1}, song offset: {2}",

diff --git a/Assets/Script/Gameplay/GameManager.cs b/Assets/Script/Gameplay/GameManager.cs
@@ -220,7 +220,7 @@ private void Update()
 
             // Update handlers
             _songRunner.Update();
-            BeatEventHandler.Update(_songRunner.RealSongTime);
+            BeatEventHandler.Update(_songRunner.SongTime);
 
             // Update players
             int totalScore = 0;