fix: fixed the audio delay introduced by vrchat

Co-authored-by: DeltaNeverUsed <[email protected]>

Author: Naraenda

Docs/osd_ui_preview.png

@@ -663,7 +663,6 @@ private void GenerateReceiveLayer()
             readyState.TrackingTracks(AacAv3.Av3TrackingElement.LeftFingers);
             readyState.TrackingTracks(AacAv3.Av3TrackingElement.RightFingers);
 
-            danceState.PlayableEnables(VRC_PlayableLayerControl.BlendableLayer.Action);
             readyState.PlayableDisables(VRC_PlayableLayerControl.BlendableLayer.Action);
 
             // Transition to dance blend tree whenever an animation is triggered
@@ -672,10 +671,13 @@ private void GenerateReceiveLayer()
             danceState.TransitionsTo(readyState);
 
             var paramRecvBitsWrapped = new AacFlBoolGroupDecisionParameter(_paramRecvBits, _numberOfBits);
-            foreach (var (entryState, parent, param) in Utils.CreateBinarySearchTree(new AacFlStateMachineWrapped(danceState), paramRecvBitsWrapped))
+            foreach (var (waitState, parent, param) in Utils.CreateBinarySearchTree(new AacFlStateMachineWrapped(danceState), paramRecvBitsWrapped))
             {
+                var waitDoneState = parent.NewState("waitState");
+                var entryState = parent.NewState("entryState");
                 var loopState = parent.NewState("loopState");
                 var exitState = parent.NewState("exitState");
+
                 entryState.TransitionsTo(exitState).When(param.ExitCondition);
                 entryState.TransitionsTo(loopState).Automatically();
                 loopState.TransitionsTo(exitState).When(param.ExitCondition);
@@ -688,6 +690,13 @@ private void GenerateReceiveLayer()
 
                 var item = _animations[param.id - 1];
 
+                // HACK: For some reason VRChat's play audio state behaviour has a delay.
+                // We delay the action animation to match with the delayed audio.
+                waitState.TransitionsTo(waitDoneState).WithTransitionDurationSeconds(0.25f).When(_recvLayer.BoolParameter("false").IsFalse());
+                waitDoneState.TransitionsTo(entryState).Automatically();
+
+                entryState.PlayableEnables(VRC_PlayableLayerControl.BlendableLayer.Action);
+                
                 entryState.TrackingAnimates(AacAv3.Av3TrackingElement.Head);
                 entryState.TrackingAnimates(AacAv3.Av3TrackingElement.LeftHand);
                 entryState.TrackingAnimates(AacAv3.Av3TrackingElement.RightHand);

Packages/befuddledlabs.opensyncdance/Runtime/OpenSyncDance.cs

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a599b965f37af693aae15364294b219aac2ecce46dc8d23f7d29f490ea645e9d
-size 17802827
+oid sha256:b54dd7c376efb19c1e4d285f82fe7786490e377711ad818a0bc9ebb2341629a3
+size 17803101

Packages/befuddledlabs.opensyncdance/Samples/Animations/DeltaNeverUsed - Stock Dancin'.anim

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af5ac192539b7efbb5879a51809cdd03a7a4dea6a40e790ab70b0085a510acdb
-size 1320311
+oid sha256:65949f925343ef873d2ea0a286d835a6a38608d3fc30587997b291cff856caf3
+size 1460138

Packages/befuddledlabs.opensyncdance/Samples/OSD_ActionAnimator.controller

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b50b54a4d5733242ffcc6f6c89fddc8f156f0abca42cfebae9a746d2b4fcee0d
-size 9367407
+oid sha256:dabb9ca090560b983408961c77361768637947f31ea924f6119ab2bf98f5d8b5
+size 12269576

Packages/befuddledlabs.opensyncdance/Samples/OSD_FXAnimator.controller

@@ -12,6 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: -340790334, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3}
   m_Name: OSD_Menu_0
   m_EditorClassIdentifier: 
+  Parameters: {fileID: 0}
   controls:
   - name: Page 1
     icon: {fileID: 0}

Packages/befuddledlabs.opensyncdance/Samples/VRChat/OSD_Menu_0.asset

@@ -12,6 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: -340790334, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3}
   m_Name: OSD_Menu_1
   m_EditorClassIdentifier: 
+  Parameters: {fileID: 0}
   controls:
   - name: Page 2
     icon: {fileID: 0}

Packages/befuddledlabs.opensyncdance/Samples/VRChat/OSD_Menu_1.asset

@@ -12,6 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: -340790334, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3}
   m_Name: OSD_Menu_2
   m_EditorClassIdentifier: 
+  Parameters: {fileID: 0}
   controls:
   - name: Geddan
     icon: {fileID: 0}

Packages/befuddledlabs.opensyncdance/Samples/VRChat/OSD_Menu_2.asset

@@ -1,7 +1,7 @@
 {
   "name": "befuddledlabs.opensyncdance",
   "displayName": "Open Sync Dance",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "url": "https://github.com/BefuddledLabs/OpenSyncDance",
   "author": {
     "name": "BefuddledLabs"

Packages/befuddledlabs.opensyncdance/package.json

@@ -8,7 +8,7 @@ Open Sync Dance is a utility and Unity prefab to have player-synchronized dances
 ## Dependencies
 
 - [Haï's Animator As Code](https://github.com/hai-vr/av3-animator-as-code)
-- [Haï's Animator As Code - VRChat](https://github.com/hai-vr/animator-as-code-vrchat), version `1.1.0-beta` or higher
+- [Haï's Animator As Code - VRChat](https://github.com/hai-vr/animator-as-code-vrchat), version `1.1.0` or higher
 - [VRCFury (optional)](https://vrcfury.com/)
 
 ## How to use
@@ -17,8 +17,9 @@ Open Sync Dance is a utility and Unity prefab to have player-synchronized dances
 2. Add the Open Sync Dance package to VCC via the listing at [`befuddledlabs.github.io/OpenSyncDance`](https://befuddledlabs.github.io/OpenSyncDance/).
 3. Drag and drop the `OpenSyncDance` prefab from `Packages/Open Sync Dance/Samples` onto a VRChat avatar.
 4. On the prefab, download the missing audio clips. This will download from the supplied URLs and cut them to length. You can configure other things here too, like selecting animations and swapping songs.
-5. If you have VRCFury, the avatar will be ready to upload. If not, please merge the animators, parameters and menu 0 with your current avatar.
-6. Upload & dance! 💃💃
+5. **Click the Generate button!**
+6. If you have VRCFury, the avatar will be ready to upload. If not, please merge the animators, parameters and menu 0 with your current avatar.
+7. Upload & dance! 💃💃
 
 ## Included Dances
 
@@ -51,7 +52,7 @@ To make modifications to this package:
 - [*DeltaNeverUsed*](https://github.com/DeltaNeverUsed) 💻
 - [*Nara*](https://github.com/Naraenda) 💻
 - [*Airishayn*](https://x.com/Airishayn1/) 🎨
-  - For making the banner for the package listing
+  - For making the banner for the package listing.
 - [*THEDAO77*](https://thedao77.booth.pm/) 💃
   - For allowing us to redistribute animation files.
 - [*Krysiek*](https://github.com/Krysiek) 💃