Skip to content

Commit ddbe4fe

Browse files
committed
building a driver that stores common between all lip syncs
1 parent a0be195 commit ddbe4fe

File tree

6 files changed

+536
-147
lines changed

6 files changed

+536
-147
lines changed

Basis/Packages/com.basis.bundlemanagement/AddressableFallback/AddressableResourceProcess.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ public static void ReleaseGameobject(GameObject Reference)
4242
if (Reference != null)
4343
{
4444
Addressables.ReleaseInstance(Reference);
45-
GameObject.Destroy(Reference);
45+
if (Reference != null)
46+
{
47+
GameObject.Destroy(Reference);
48+
}
4649
}
4750
}
4851
}

Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ private void OnDestroy()
193193
BasisPlayerFactory.DeInitalize();
194194
StopAllDevices();
195195
UnsubscribeEvents();
196+
BasisUlipSyncDriver.DisposeShared();
196197
}
197198

198199
#endregion
@@ -208,7 +209,7 @@ public async Task Initialize()
208209
BasisPlayerFactory.Initalize();
209210
BasisXRManagement.Initalize();
210211
BasisCommandLineArgs.Initialize(BakedInCommandLineArgs, out ForcedDefault);
211-
BasisUlipSync.profile = BasisDeviceManagement.Instance.LipSyncProfile;
212+
BasisUlipSyncDriver.Initialize(BasisDeviceManagement.Instance.LipSyncProfile);
212213
await BasisPlayerFactory.CreateLocalPlayer(new InstantiationParameters(transform, true));
213214
StartAllStartIfPermanentlyExists();
214215
await SwitchSetModeToDefault();

Basis/Packages/com.basis.framework/Drivers/Common/BasisAudioAndVisemeDriver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public bool TryInitialize(BasisPlayer BasisPlayer)
105105
phonemeBlendShapeTable.Clear();
106106
uLipSync.skinnedMeshRenderer = Avatar.FaceVisemeMesh;
107107
uLipSync.sharedMesh = Avatar.FaceVisemeMesh.sharedMesh;
108-
uLipSync.Count = uLipSync.sharedMesh.blendShapeCount;
108+
uLipSync.blendShapeCount = uLipSync.sharedMesh.blendShapeCount;
109109
// Build viseme availability and phoneme mapping table
110110
BlendShapeCount = Avatar.FaceVisemeMovement.Length;
111111
HasViseme = new bool[BlendShapeCount];

0 commit comments

Comments
 (0)