update CCK to 3.10, fixing unity 2021 crash :)

This commit is contained in:
Crispy 2024-08-03 22:24:42 +02:00
parent 48a978fa2a
commit d11e0fb3a9
492 changed files with 2165204 additions and 437687 deletions

View file

@ -55,7 +55,7 @@ namespace ABI.CCK.Scripts.Editor
private void OnGUI()
{
var avatar = (CVRAvatar) EditorGUILayout.ObjectField("Avatar", Avatar, typeof(CVRAvatar));
var avatar = EditorGUILayout.ObjectField("Avatar", Avatar, typeof(CVRAvatar), true) as CVRAvatar;
if (avatar != Avatar) FaceTracking = null;
Avatar = avatar;
@ -79,7 +79,7 @@ namespace ABI.CCK.Scripts.Editor
FaceTracking = Avatar.gameObject.AddComponent<CVRFaceTracking>();
FaceTracking.FaceMesh = Avatar.bodyMesh;
FaceTracking.GetBlendShapeNames();
FaceTracking.FindVisemes();
FaceTracking.AutoSelectFaceTrackingShapes();
}
return;
@ -344,8 +344,8 @@ namespace ABI.CCK.Scripts.Editor
var maxX = 0f;
var minY = 0f;
var maxY = 0f;
var minZ = 0f;
var maxZ = 0f;
//var minZ = 0f;
//var maxZ = 0f;
var leftWeight = 0f;
var rightWeight = 0f;
@ -553,7 +553,7 @@ namespace ABI.CCK.Scripts.Editor
FaceTracking.FaceMesh.sharedMesh = m;
FaceTracking.GetBlendShapeNames();
FaceTracking.FindVisemes();
FaceTracking.AutoSelectFaceTrackingShapes();
}
private Vector3 GetPointRelativeToAvatarVoicePosition(Matrix4x4 matrix, Vector3 VertexPosition)