CrispyPin/cvr-props
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update CCK to 3.10, fixing unity 2021 crash :)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

23
Assets/ABI.CCK/Scripts/Editor/CCK_CVRFaceTrackingEditor.cs
View file

@ -1,12 +1,13 @@
using System.Collections.Generic;
using System.Linq;
using ABI.CCK.Components;
using ABI.CCK.Scripts.Editor;
using UnityEditor;
using UnityEngine;
namespace ABI.CCK.Scripts.Editor
{
[CustomEditor(typeof(ABI.CCK.Components.CVRFaceTracking))]
[CustomEditor(typeof(CVRFaceTracking))]
public class CCK_CVRFaceTrackingEditor : UnityEditor.Editor
{
private CVRFaceTracking _faceTracking;
@ -16,28 +17,22 @@ namespace ABI.CCK.Scripts.Editor
if (_faceTracking == null) _faceTracking = (CVRFaceTracking) target;
_faceTracking.GetBlendShapeNames();
_faceTracking.UseFacialTracking = EditorGUILayout.Toggle("Enable Facial Tracking", _faceTracking.UseFacialTracking);
_faceTracking.BlendShapeStrength = EditorGUILayout.Slider("Blend Shape Weight", _faceTracking.BlendShapeStrength, 50f, 500f);
_faceTracking.FaceMesh = (SkinnedMeshRenderer)EditorGUILayout.ObjectField("Face Mesh", _faceTracking.FaceMesh, typeof(SkinnedMeshRenderer), true);
for (int i = 0; i < CVRFaceTracking.FaceBlendShapeNames.Length; i++)
{
int current = 0;
for (int j = 0; j < _faceTracking.BlendShapeNames.Count; ++j)
if (_faceTracking.FaceBlendShapes[i] == _faceTracking.BlendShapeNames[j])
current = j;
int viseme = EditorGUILayout.Popup(CVRFaceTracking.FaceBlendShapeNames[i], current, _faceTracking.BlendShapeNames.ToArray());
_faceTracking.FaceBlendShapes[i] = _faceTracking.BlendShapeNames[viseme];
_faceTracking.FaceBlendShapes[i] = EditorGUIExtensions.CustomPopup(
GUILayoutUtility.GetRect(new GUIContent(CVRFaceTracking.FaceBlendShapeNames[i]), EditorStyles.popup),
CVRFaceTracking.FaceBlendShapeNames[i],
_faceTracking.FaceBlendShapes[i],
_faceTracking.BlendShapeNames.ToArray(),
CVRFaceTracking.FaceBlendShapeNames[i]);
}
if (GUILayout.Button("Auto select Blendshapes"))
{
_faceTracking.FindVisemes();
}
_faceTracking.AutoSelectFaceTrackingShapes();
EditorGUILayout.BeginVertical("HelpBox");
EditorGUILayout.LabelField("Face Tracking ");