Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Packages/befuddledlabs.opensyncdance/Runtime/OpenSyncDance.cs
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,13 @@ void ToggleBits(AacFlEditClip a)

void SoundAnimation(AacFlEditClip a, SyncedAnimation an, float startVolume)
{
if (_audioSource) {
if (_audioSource)
{
var volume = a.AnimatesAnimator(songVolumeParam);
volume.WithUnit(AacFlUnit.Seconds, key => {
if (startVolume >= 0) {
volume.WithUnit(AacFlUnit.Seconds, key =>
{
if (startVolume >= 0)
{
var endTime = 0.2f;
if (an.animationClip)
endTime = Mathf.Min(an.animationClip.length, endTime);
Expand All @@ -491,6 +494,11 @@ void SoundAnimation(AacFlEditClip a, SyncedAnimation an, float startVolume)
}
});
}
a.Animates(gameObject).WithUnit(AacFlUnit.Seconds, k =>
{
if (an.animationClip)
k.Constant(an.animationClip.length, 1);
});
}

AacFlClip CreateClip(SyncedAnimation an, float startVolume = -1) =>
Expand All @@ -511,13 +519,13 @@ AacFlClip CreateClip(SyncedAnimation an, float startVolume = -1) =>

// anim entry (with early exit)
entryMusicState.TransitionsTo(exitMusicState).When(_paramSendAnimId.IsNotEqualTo(i));
entryMusicState.TransitionsTo(loopMusicState).Automatically();
entryMusicState.TransitionsTo(loopMusicState).AfterAnimationFinishes();

// anim loop
loopMusicState.TransitionsTo(exitMusicState).When(_paramSendAnimId.IsNotEqualTo(i));

// anim exit
exitMusicState.TransitionsTo(exitState).Automatically();
exitMusicState.TransitionsTo(exitState).AfterAnimationFinishes();
}
}

Expand Down
6 changes: 3 additions & 3 deletions Packages/befuddledlabs.opensyncdance/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "befuddledlabs.opensyncdance",
"displayName": "Open Sync Dance",
"version": "0.1.5",
"version": "0.1.6",
"url": "https://github.com/BefuddledLabs/OpenSyncDance",
"author": {
"name": "BefuddledLabs"
Expand All @@ -10,7 +10,7 @@
"description": "Silly synchronized dances for all!",
"vpmDependencies": {
"com.vrchat.avatars": "^3.1.0",
"dev.hai-vr.animator-as-code.v1": "^1.1.0",
"dev.hai-vr.animator-as-code.v1.vrchat": "^1.1.0"
"dev.hai-vr.animator-as-code.v1": "^1.2.0",
"dev.hai-vr.animator-as-code.v1.vrchat": "^1.1.2"
}
}