Compose: Fix video bg not working during render

Arcthesia · Aug 25, 2023 · accd82d · accd82d
1 parent 74fbe3d
commit accd82d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Assets/Materials/Compose/Waveform.mat b/Assets/Materials/Compose/Waveform.mat
@@ -72,7 +72,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
-    - _ToSample: 10478160
+    - _ToSample: 9948054
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:

diff --git a/Assets/Scripts/Compose/Selection/NoteCollider.cs b/Assets/Scripts/Compose/Selection/NoteCollider.cs
@@ -7,15 +7,12 @@ public class NoteCollider : MonoBehaviour
     {
         private MeshCollider meshCollider;
 
-        private MeshFilter meshFilter;
-
         public Note Note { get; private set; }
 
         public void AssignNote(Note note, int timing)
         {
             Note = note;
             meshCollider.sharedMesh = note.GetColliderMesh();
-            meshFilter.sharedMesh = meshCollider.sharedMesh;
             note.GetColliderPosition(timing, out Vector3 pos, out Vector3 scl);
             transform.localPosition = pos;
             transform.localScale = scl;
@@ -24,7 +21,6 @@ public void AssignNote(Note note, int timing)
         private void Awake()
         {
             meshCollider = GetComponent<MeshCollider>();
-            meshFilter = GetComponentInChildren<MeshFilter>();
         }
     }
 }
diff --git a/Assets/Scripts/Gameplay/Audio/AudioService.cs b/Assets/Scripts/Gameplay/Audio/AudioService.cs
@@ -134,6 +134,7 @@ public AudioClip AudioClip
         public void SetAudioTimingSilent(int timing)
         {
             audioTiming = timing;
+            videoPlayer.time = Mathf.Clamp(timing / 1000f, 0, (float)videoPlayer.length);
             UpdateSlider(timing);
         }