diff options
| author | yum <yum.food.vr@gmail.com> | 2025-02-19 15:01:32 -0800 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2025-02-19 15:01:32 -0800 |
| commit | 076e5c0c398394a438354a7f48c6ae9557b96fc5 (patch) | |
| tree | 28691181afade61bda4458292dbeec7d94b69492 /Scripts/YOTSCore.cs | |
| parent | 6574901e8104dfeff212098b6e583a2a2ff99c23 (diff) | |
More formatting
Also slightly simplify the topological sort implementation
Diffstat (limited to 'Scripts/YOTSCore.cs')
| -rw-r--r-- | Scripts/YOTSCore.cs | 1658 |
1 files changed, 826 insertions, 832 deletions
diff --git a/Scripts/YOTSCore.cs b/Scripts/YOTSCore.cs index 3cfb699..f0cb084 100644 --- a/Scripts/YOTSCore.cs +++ b/Scripts/YOTSCore.cs @@ -12,903 +12,897 @@ using VRC.SDK3.Avatars.ScriptableObjects; namespace YOTS
{
- [System.Serializable]
- public class ToggleSpec {
- // The name of the toggle. This is plumbed into the menu, the VRChat
- // parameters, and the animator parameters.
- [SerializeField]
- public string name;
-
- // The type of toggle.
- // Accepted values:
- // "toggle" - A boolean toggle. Creates a boolean sync param.
- // "radial" - A radial puppet. Creates a float sync param.
- [SerializeField]
- public string type = "toggle";
-
- // Dependencies are toggles that will be evaluated before this one. If
- // you have two toggles which animate the same thing, one must depend
- // on the other.
- [SerializeField]
- public List<string> dependencies = new List<string>();
-
- // The name of meshes to toggle.
- // For example, "Body" or "Shirt".
- [SerializeField]
- public List<string> meshToggles = new List<string>();
-
- // Blendshapes to animate.
- [SerializeField]
- public List<BlendShapeSpec> blendShapes = new List<BlendShapeSpec>();
-
- // Where to put the toggle in the menu. All toggles are placed under
- // /YOTS. So if you put "Clothes" here, it'll be placed under
- // /YOTS/Clothes.
- [SerializeField]
- public string menuPath = "/";
-
- // The default value of the toggle.
- // For example, if you want a gimmick to start toggled off, set this to
- // 0.0f.
- [SerializeField]
- public float defaultValue = 1.0f;
-
- public ToggleSpec(string name) {
- this.name = name;
- }
-
- public ToggleSpec() {}
-
- public IEnumerable<string> GetAffectedAttributes() {
- foreach (var mesh in meshToggles) {
- yield return $"MeshToggle:{mesh}";
- }
-
- foreach (var blend in blendShapes) {
- yield return $"BlendShape:{blend.path}/{blend.blendShape}";
- }
- }
+ [System.Serializable]
+ public class ToggleSpec {
+ // The name of the toggle. This is plumbed into the menu, the VRChat
+ // parameters, and the animator parameters.
+ [SerializeField]
+ public string name;
+
+ // The type of toggle.
+ // Accepted values:
+ // "toggle" - A boolean toggle. Creates a boolean sync param.
+ // "radial" - A radial puppet. Creates a float sync param.
+ [SerializeField]
+ public string type = "toggle";
+
+ // Dependencies are toggles that will be evaluated before this one. If
+ // you have two toggles which animate the same thing, one must depend
+ // on the other.
+ [SerializeField]
+ public List<string> dependencies = new List<string>();
+
+ // The name of meshes to toggle.
+ // For example, "Body" or "Shirt".
+ [SerializeField]
+ public List<string> meshToggles = new List<string>();
+
+ // Blendshapes to animate.
+ [SerializeField]
+ public List<BlendShapeSpec> blendShapes = new List<BlendShapeSpec>();
+
+ // Where to put the toggle in the menu. All toggles are placed under
+ // /YOTS. So if you put "Clothes" here, it'll be placed under
+ // /YOTS/Clothes.
+ [SerializeField]
+ public string menuPath = "/";
+
+ // The default value of the toggle.
+ // For example, if you want a gimmick to start toggled off, set this to
+ // 0.0f.
+ [SerializeField]
+ public float defaultValue = 1.0f;
+
+ public ToggleSpec(string name) {
+ this.name = name;
}
- [System.Serializable]
- public class BlendShapeSpec {
- // The path to the mesh renderer to apply the blend shape to.
- // For example, "Body" or "Shirt".
- [SerializeField]
- public string path;
-
- // The name of the blend shape to apply.
- // For example, "Chest_Hide" or "Boobs+".
- [SerializeField]
- public string blendShape;
-
- // The value of the blendshape when the toggle is off. Range from 0-100.
- [SerializeField]
- public float offValue = 0.0f;
-
- // The value of the blendshape when the toggle is on. Range from 0-100.
- [SerializeField]
- public float onValue = 100.0f;
-
- public BlendShapeSpec(string path, string blendShape, float offValue = 0, float onValue = 100) {
- this.path = path;
- this.blendShape = blendShape;
- this.offValue = offValue;
- this.onValue = onValue;
- }
-
- public BlendShapeSpec() {}
- }
+ public ToggleSpec() {}
- [System.Serializable]
- public class AnimatorConfigFile {
- [SerializeField]
- public List<ToggleSpec> toggles = new List<ToggleSpec>();
+ public IEnumerable<string> GetAffectedAttributes() {
+ foreach (var mesh in meshToggles) {
+ yield return $"MeshToggle:{mesh}";
+ }
- [SerializeField]
- public string api_version;
+ foreach (var blend in blendShapes) {
+ yield return $"BlendShape:{blend.path}/{blend.blendShape}";
+ }
}
-
- [System.Serializable]
- public class GeneratedAnimationsConfig {
- public List<GeneratedAnimationClipConfig> animations =
- new List<GeneratedAnimationClipConfig>();
+ }
+
+ [System.Serializable]
+ public class BlendShapeSpec {
+ // The path to the mesh renderer to apply the blend shape to.
+ // For example, "Body" or "Shirt".
+ [SerializeField]
+ public string path;
+
+ // The name of the blend shape to apply.
+ // For example, "Chest_Hide" or "Boobs+".
+ [SerializeField]
+ public string blendShape;
+
+ // The value of the blendshape when the toggle is off. Range from 0-100.
+ [SerializeField]
+ public float offValue = 0.0f;
+
+ // The value of the blendshape when the toggle is on. Range from 0-100.
+ [SerializeField]
+ public float onValue = 100.0f;
+
+ public BlendShapeSpec(string path, string blendShape, float offValue = 0, float onValue = 100) {
+ this.path = path;
+ this.blendShape = blendShape;
+ this.offValue = offValue;
+ this.onValue = onValue;
}
- [System.Serializable]
- public class GeneratedAnimationClipConfig {
- public string name;
- public List<GeneratedMeshToggle> meshToggles =
- new List<GeneratedMeshToggle>();
- public List<GeneratedBlendShape> blendShapes =
- new List<GeneratedBlendShape>();
+ public BlendShapeSpec() {}
+ }
+
+ [System.Serializable]
+ public class AnimatorConfigFile {
+ [SerializeField]
+ public List<ToggleSpec> toggles = new List<ToggleSpec>();
+
+ [SerializeField]
+ public string api_version;
+ }
+
+ [System.Serializable]
+ public class GeneratedAnimationsConfig {
+ public List<GeneratedAnimationClipConfig> animations =
+ new List<GeneratedAnimationClipConfig>();
+ }
+
+ [System.Serializable]
+ public class GeneratedAnimationClipConfig {
+ public string name;
+ public List<GeneratedMeshToggle> meshToggles =
+ new List<GeneratedMeshToggle>();
+ public List<GeneratedBlendShape> blendShapes =
+ new List<GeneratedBlendShape>();
+ }
+
+ [System.Serializable]
+ public class GeneratedMeshToggle {
+ public string path;
+ public float value;
+ }
+
+ [System.Serializable]
+ public class GeneratedBlendShape {
+ public string path;
+ public string blendShape;
+ public float value;
+ }
+
+ // These classes describe the generated JSON output for the animator configuration.
+ [System.Serializable]
+ public class GeneratedAnimatorConfig {
+ public List<AnimatorParameterSetting> parameters = new List<AnimatorParameterSetting>();
+ public List<AnimatorLayer> layers = new List<AnimatorLayer>();
+ public List<GeneratedAnimationClipConfig> animations =
+ new List<GeneratedAnimationClipConfig>();
+ }
+
+ [System.Serializable]
+ public class AnimatorLayer {
+ public string name;
+ public AnimatorDirectBlendTree directBlendTree =
+ new AnimatorDirectBlendTree();
+ }
+
+ [System.Serializable]
+ public class AnimatorDirectBlendTree {
+ public List<AnimatorDirectBlendTreeEntry> entries =
+ new List<AnimatorDirectBlendTreeEntry>();
+ }
+
+ [System.Serializable]
+ public class AnimatorDirectBlendTreeEntry {
+ public string name; // animation name
+ public string parameter; // parameter driving the animation
+ }
+
+ // Add these new classes at the namespace level
+ [System.Serializable]
+ public class VRCMenuConfig {
+ public string menuName = "YOTS";
+ public List<VRCMenuItemConfig> items = new List<VRCMenuItemConfig>();
+ }
+
+ [System.Serializable]
+ public class VRCMenuItemConfig {
+ public string name;
+ public string parameter;
+ public Texture2D icon;
+ }
+
+ [System.Serializable]
+ public class AnimatorParameterSetting {
+ public string name;
+ public float defaultValue;
+ }
+
+ public class YOTSCore {
+ private static Dictionary<string, AnimationClip> animationClips = new Dictionary<string, AnimationClip>();
+
+ public static AnimatorController GenerateAnimator(string configJson,
+ VRCExpressionParameters vrcParams, VRCExpressionsMenu vrcMenu) {
+ Debug.Log("=== Starting Animator Generation Process ===");
+
+ if (string.IsNullOrEmpty(configJson)) {
+ throw new ArgumentException("No config JSON provided.");
+ }
+
+ AnimatorConfigFile config;
+ config = JsonUtility.FromJson<AnimatorConfigFile>(configJson);
+ if (config == null) {
+ throw new ArgumentException("JSON config is empty or invalid");
+ }
+ if (config.toggles == null) {
+ throw new ArgumentException("No toggleSpecs found in configuration");
+ }
+ Debug.Log($"Configuration loaded. Found {config.toggles.Count} toggles.");
+
+ // Create abstract representation of the animator.
+ GeneratedAnimatorConfig genAnimatorConfig = GenerateNaiveAnimatorConfig(config.toggles);
+ genAnimatorConfig = ApplyIndependentFixToAnimatorConfig(genAnimatorConfig);
+ genAnimatorConfig = RemoveOffAnimationsFromOverrideLayers(genAnimatorConfig);
+ genAnimatorConfig = RemoveUnusedAnimations(genAnimatorConfig);
+ // Create actual assets.
+ GenerateVRChatAssets(config.toggles, vrcParams, vrcMenu);
+ CreateAnimationClips(new GeneratedAnimationsConfig { animations = genAnimatorConfig.animations });
+ AnimatorController controller = GenerateAnimatorController(genAnimatorConfig);
+
+ Debug.Log("=== Animator Generation Process Complete ===");
+ return controller;
}
- [System.Serializable]
- public class GeneratedMeshToggle {
- public string path;
- public float value;
- }
-
- [System.Serializable]
- public class GeneratedBlendShape {
- public string path;
- public string blendShape;
- public float value;
- }
+ private static void CreateAnimationClips(GeneratedAnimationsConfig animationsConfig) {
+ foreach (var clipConfig in animationsConfig.animations) {
+ AnimationClip newClip = new AnimationClip();
+ newClip.name = clipConfig.name;
+
+ // Apply mesh toggles
+ foreach (var meshToggle in clipConfig.meshToggles) {
+ AnimationCurve curve = new AnimationCurve(new Keyframe(0, meshToggle.value));
+ EditorCurveBinding binding = new EditorCurveBinding();
+ binding.path = meshToggle.path;
+ binding.type = typeof(GameObject);
+ binding.propertyName = "m_IsActive";
+ AnimationUtility.SetEditorCurve(newClip, binding, curve);
+ }
- // These classes describe the generated JSON output for the animator configuration.
- [System.Serializable]
- public class GeneratedAnimatorConfig {
- public List<AnimatorParameterSetting> parameters = new List<AnimatorParameterSetting>();
- public List<AnimatorLayer> layers = new List<AnimatorLayer>();
- public List<GeneratedAnimationClipConfig> animations =
- new List<GeneratedAnimationClipConfig>();
- }
+ // Apply blend shapes
+ foreach (var blendShape in clipConfig.blendShapes) {
+ AnimationCurve curve = AnimationCurve.Constant(0, 0, blendShape.value);
+ EditorCurveBinding binding = new EditorCurveBinding();
+ binding.path = blendShape.path;
+ binding.type = typeof(SkinnedMeshRenderer);
+ binding.propertyName = "blendShape." + blendShape.blendShape;
+ AnimationUtility.SetEditorCurve(newClip, binding, curve);
+ }
- [System.Serializable]
- public class AnimatorLayer {
- public string name;
- public AnimatorDirectBlendTree directBlendTree =
- new AnimatorDirectBlendTree();
+ // Store in memory
+ animationClips[clipConfig.name] = newClip;
+ Debug.Log("Created animation clip " + clipConfig.name);
+ }
}
- [System.Serializable]
- public class AnimatorDirectBlendTree {
- public List<AnimatorDirectBlendTreeEntry> entries =
- new List<AnimatorDirectBlendTreeEntry>();
- }
+ private static AnimatorController GenerateAnimatorController(GeneratedAnimatorConfig animatorConfig) {
+ AnimatorController controller = new AnimatorController();
+
+ // Add weight parameter used to ensure that the blendtrees always
+ // run. All layers use this. Documented on vrc.school:
+ // http://vrc.school/docs/Other/DBT-Combining#ed504c95853f4924adeffb6b125234ad
+ List<AnimatorControllerParameter> parameters_list = new List<AnimatorControllerParameter>();
+ var yots_weight = new AnimatorControllerParameter();
+ yots_weight.name = "YOTS_Weight";
+ yots_weight.type = AnimatorControllerParameterType.Float;
+ yots_weight.defaultFloat = 1.0f;
+ parameters_list.Add(yots_weight);
+ // Add all other parameters
+ foreach (var param in animatorConfig.parameters) {
+ var p = new AnimatorControllerParameter();
+ p.name = param.name;
+ p.type = AnimatorControllerParameterType.Float;
+ p.defaultFloat = param.defaultValue;
+ parameters_list.Add(p);
+ }
+ controller.parameters = parameters_list.ToArray();
+
+ // Add base layer. This is structured as a wide direct blendtree
+ // (DBT) comprised of blendtrees animating pairs of On/Off
+ // animations.
+ var baseLayerConfig = animatorConfig.layers[0];
+ var baseStateMachine = new AnimatorStateMachine();
+ baseStateMachine.name = "YOTS_BaseLayer_SM";
+
+ var rootBlendTree = new BlendTree();
+ rootBlendTree.name = "YOTS_BaseLayer_RootBlendTree";
+ rootBlendTree.blendType = BlendTreeType.Direct;
+
+ var parameterGroups = baseLayerConfig.directBlendTree.entries
+ .GroupBy(e => e.parameter)
+ .ToDictionary(g => g.Key, g => g.ToList());
+
+ // Iterate over (parameter, animationSet) pairs in the base layer.
+ foreach (var group in parameterGroups) {
+ var param = group.Key;
+ var animations = group.Value;
+
+ // Create a blendtree controlled by this toggle's parameter.
+ var paramBlendTree = new BlendTree();
+ paramBlendTree.name = $"YOTS_BlendTree_{param}";
+ paramBlendTree.blendType = BlendTreeType.Simple1D;
+ paramBlendTree.blendParameter = param;
+
+ var children = new List<ChildMotion>();
+ foreach (var animation in animations.OrderBy(e => e.name.EndsWith("_On"))) {
+ Debug.Log("Adding child motion for: " + animation.name);
+ if (!animationClips.TryGetValue(animation.name, out AnimationClip clip)) {
+ throw new InvalidOperationException($"Animation clip not found in memory: {animation.name}");
+ }
+
+ children.Add(new ChildMotion{
+ motion = clip,
+ timeScale = 1f,
+ threshold = animation.name.EndsWith("_On") ? 1f : 0f
+ });
+ }
+ paramBlendTree.children = children.ToArray();
+
+ // Add that blendtree to the parent direct blendtree (DBT)
+ // controlled by YOTS_Weight. That YOTS_Weight parameter is
+ // always set to 1, so the child blendtree always runs.
+ rootBlendTree.children = rootBlendTree.children.Append(
+ new ChildMotion{
+ motion = paramBlendTree,
+ timeScale = 1f,
+ directBlendParameter = "YOTS_Weight"
+ }).ToArray();
+ }
+
+ var baseState = baseStateMachine.AddState("YOTS_BaseLayer_State");
+ baseState.motion = rootBlendTree;
+ baseState.writeDefaultValues = true;
+ baseStateMachine.defaultState = baseState;
+
+ controller.AddLayer(new AnimatorControllerLayer{
+ name = "YOTS_BaseLayer",
+ defaultWeight = 1.0f,
+ stateMachine = baseStateMachine
+ });
+
+ // Add override layers. These are DBTs of On animations (no Off
+ // animations).
+ for (int i = 1; i < animatorConfig.layers.Count; i++) {
+ var layerConfig = animatorConfig.layers[i];
+ string layerName = $"YOTS_OverrideLayer{(i-1).ToString("00")}";
+
+ var stateMachine = new AnimatorStateMachine();
+ stateMachine.name = layerName + "_SM";
+
+ var blendTree = new BlendTree();
+ blendTree.name = layerName + "_BlendTree";
+ blendTree.blendType = BlendTreeType.Direct;
+
+ foreach (var entry in layerConfig.directBlendTree.entries) {
+ if (!animationClips.TryGetValue(entry.name, out AnimationClip clip)) {
+ throw new InvalidOperationException($"Animation clip not found in memory: {entry.name}");
+ }
+
+ blendTree.children = blendTree.children.Append(new ChildMotion{
+ motion = clip,
+ timeScale = 1f,
+ directBlendParameter = entry.parameter
+ }).ToArray();
+ }
- [System.Serializable]
- public class AnimatorDirectBlendTreeEntry {
- public string name; // animation name
- public string parameter; // parameter driving the animation
- }
+ var state = stateMachine.AddState(layerName + "_State");
+ state.motion = blendTree;
+ state.writeDefaultValues = true;
+ stateMachine.defaultState = state;
- // Add these new classes at the namespace level
- [System.Serializable]
- public class VRCMenuConfig {
- public string menuName = "YOTS";
- public List<VRCMenuItemConfig> items = new List<VRCMenuItemConfig>();
- }
+ controller.AddLayer(new AnimatorControllerLayer{
+ name = layerName,
+ defaultWeight = 1.0f,
+ stateMachine = stateMachine
+ });
- [System.Serializable]
- public class VRCMenuItemConfig {
- public string name;
- public string parameter;
- public Texture2D icon;
- }
+ Debug.Log($"Added override layer: {layerName}");
+ }
- [System.Serializable]
- public class AnimatorParameterSetting {
- public string name;
- public float defaultValue;
+ return controller;
}
- public class YOTSCore {
- private static Dictionary<string, AnimationClip> animationClips = new Dictionary<string, AnimationClip>();
-
- public static AnimatorController GenerateAnimator(
- string configJson,
- VRCExpressionParameters vrcParams,
- VRCExpressionsMenu vrcMenu
- ) {
- Debug.Log("=== Starting Animator Generation Process ===");
+ private static Dictionary<string, int> TopologicalSortToggles(List<ToggleSpec> toggleSpecs) {
+ // Get mapping from toggle name to children
+ Dictionary<string, HashSet<string>> graph = new Dictionary<string, HashSet<string>>();
+ foreach (var toggle in toggleSpecs) {
+ if (!graph.ContainsKey(toggle.name))
+ graph[toggle.name] = new HashSet<string>();
+ foreach (var dep in toggle.dependencies) {
+ if (!graph.ContainsKey(dep))
+ graph[dep] = new HashSet<string>();
+ graph[dep].Add(toggle.name);
+ }
+ }
- if (string.IsNullOrEmpty(configJson)) {
- throw new ArgumentException("No config JSON provided.");
- }
+ Dictionary<string, int> inDegree = new Dictionary<string, int>();
+ foreach (var toggle in toggleSpecs) {
+ inDegree[toggle.name] = toggle.dependencies.Count;
+ }
- AnimatorConfigFile config;
- try {
- config = JsonUtility.FromJson<AnimatorConfigFile>(configJson);
- }
- catch (System.Exception e) {
- throw new ArgumentException($"JSON parsing failed: {e.Message}");
- }
- if (config == null) {
- throw new ArgumentException("JSON config is empty or invalid");
- }
+ Dictionary<string, int> depths = new Dictionary<string, int>();
+ Queue<string> queue = new Queue<string>();
- if (config.toggles == null) {
- throw new ArgumentException("No toggleSpecs found in configuration");
- }
- Debug.Log($"Configuration loaded. Found {config.toggles.Count} toggles.");
- // Create abstract representation of the animator.
- GeneratedAnimatorConfig genAnimatorConfig = GenerateNaiveAnimatorConfig(config.toggles);
- genAnimatorConfig = ApplyIndependentFixToAnimatorConfig(genAnimatorConfig);
- genAnimatorConfig = RemoveOffAnimationsFromOverrideLayers(genAnimatorConfig);
- genAnimatorConfig = RemoveUnusedAnimations(genAnimatorConfig);
- // Create actual assets.
- GenerateVRChatAssets(config.toggles, vrcParams, vrcMenu);
- CreateAnimationClips(new GeneratedAnimationsConfig { animations = genAnimatorConfig.animations });
- AnimatorController controller = GenerateAnimatorController(genAnimatorConfig);
-
- Debug.Log("=== Animator Generation Process Complete ===");
- return controller;
+ // Identify start nodes
+ foreach (var pair in inDegree) {
+ if (pair.Value == 0) {
+ queue.Enqueue(pair.Key);
+ depths[pair.Key] = 0;
}
-
- private static void CreateAnimationClips(GeneratedAnimationsConfig animationsConfig) {
- foreach (var clipConfig in animationsConfig.animations) {
- AnimationClip newClip = new AnimationClip();
- newClip.name = clipConfig.name;
-
- // Apply mesh toggles
- foreach (var meshToggle in clipConfig.meshToggles) {
- AnimationCurve curve = new AnimationCurve(new Keyframe(0, meshToggle.value));
- EditorCurveBinding binding = new EditorCurveBinding();
- binding.path = meshToggle.path;
- binding.type = typeof(GameObject);
- binding.propertyName = "m_IsActive";
- AnimationUtility.SetEditorCurve(newClip, binding, curve);
- }
-
- // Apply blend shapes
- foreach (var blendShape in clipConfig.blendShapes) {
- AnimationCurve curve = AnimationCurve.Constant(0, 0, blendShape.value);
- EditorCurveBinding binding = new EditorCurveBinding();
- binding.path = blendShape.path;
- binding.type = typeof(SkinnedMeshRenderer);
- binding.propertyName = "blendShape." + blendShape.blendShape;
- AnimationUtility.SetEditorCurve(newClip, binding, curve);
- }
-
- // Store in memory cache
- animationClips[clipConfig.name] = newClip;
- Debug.Log("Created animation clip " + clipConfig.name);
- }
+ }
+
+ int processedNodes = 0;
+ while (queue.Count > 0) {
+ // Pop start nodes one by one.
+ string current = queue.Dequeue();
+ processedNodes++;
+ int currentDepth = depths[current];
+ // Enqueue children and set their depth to cur depth + 1.
+ foreach (var child in graph[current]) {
+ inDegree[child]--;
+ if (inDegree[child] == 0) {
+ queue.Enqueue(child);
+ depths[child] = currentDepth + 1;
+ }
}
+ }
- private static AnimatorController GenerateAnimatorController(GeneratedAnimatorConfig animatorConfig) {
- AnimatorController controller = new AnimatorController();
- // Add weight parameter used to ensure that the blendtrees always
- // run. All layers use this. Documented on vrc.school:
- // http://vrc.school/docs/Other/DBT-Combining#ed504c95853f4924adeffb6b125234ad
- List<AnimatorControllerParameter> parameters_list = new List<AnimatorControllerParameter>();
- var yots_weight = new AnimatorControllerParameter();
- yots_weight.name = "YOTS_Weight";
- yots_weight.type = AnimatorControllerParameterType.Float;
- yots_weight.defaultFloat = 1.0f;
- parameters_list.Add(yots_weight);
- // Add all other parameters
- foreach (var param in animatorConfig.parameters) {
- var p = new AnimatorControllerParameter();
- p.name = param.name;
- p.type = AnimatorControllerParameterType.Float;
- p.defaultFloat = param.defaultValue;
- parameters_list.Add(p);
- }
- controller.parameters = parameters_list.ToArray();
-
- // Add base layer. This is structured as a wide direct blendtree
- // (DBT) comprised of blendtrees animating pairs of On/Off
- // animations.
- var baseLayerConfig = animatorConfig.layers[0];
- var baseStateMachine = new AnimatorStateMachine();
- baseStateMachine.name = "YOTS_BaseLayer_SM";
-
- var rootBlendTree = new BlendTree();
- rootBlendTree.name = "YOTS_BaseLayer_RootBlendTree";
- rootBlendTree.blendType = BlendTreeType.Direct;
-
- var parameterGroups = baseLayerConfig.directBlendTree.entries
- .GroupBy(e => e.parameter)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- // Iterate over (parameter, animationSet) pairs in the base layer.
- foreach (var group in parameterGroups) {
- var param = group.Key;
- var animations = group.Value;
-
- // Create a blendtree controlled by this toggle's parameter.
- var paramBlendTree = new BlendTree();
- paramBlendTree.name = $"YOTS_BlendTree_{param}";
- paramBlendTree.blendType = BlendTreeType.Simple1D;
- paramBlendTree.blendParameter = param;
-
- var children = new List<ChildMotion>();
- foreach (var animation in animations.OrderBy(e => e.name.EndsWith("_On"))) {
- Debug.Log("Adding child motion for: " + animation.name);
- if (!animationClips.TryGetValue(animation.name, out AnimationClip clip)) {
- throw new InvalidOperationException($"Animation clip not found in memory: {animation.name}");
- }
-
- children.Add(new ChildMotion{
- motion = clip,
- timeScale = 1f,
- threshold = animation.name.EndsWith("_On") ? 1f : 0f
- });
- }
- paramBlendTree.children = children.ToArray();
-
- // Add that blendtree to the parent direct blendtree (DBT)
- // controlled by YOTS_Weight. That YOTS_Weight parameter is
- // always set to 1, so the child blendtree always runs.
- rootBlendTree.children = rootBlendTree.children.Append(
- new ChildMotion{
- motion = paramBlendTree,
- timeScale = 1f,
- directBlendParameter = "YOTS_Weight"
- }).ToArray();
- }
-
- var baseState = baseStateMachine.AddState("YOTS_BaseLayer_State");
- baseState.motion = rootBlendTree;
- baseState.writeDefaultValues = true;
- baseStateMachine.defaultState = baseState;
+ if (processedNodes != toggleSpecs.Count) {
+ var cycleNodes = toggleSpecs
+ .Where(t => !depths.ContainsKey(t.name))
+ .Select(t => t.name)
+ .ToList();
+ throw new System.Exception($"Dependency cycle detected in toggle specifications. Nodes involved: {string.Join(", ", cycleNodes)}");
+ }
- controller.AddLayer(new AnimatorControllerLayer{
- name = "YOTS_BaseLayer",
- defaultWeight = 1.0f,
- stateMachine = baseStateMachine
- });
+ return depths;
+ }
- // Add override layers. These are DBTs of On animations (no Off
- // animations).
- for (int i = 1; i < animatorConfig.layers.Count; i++) {
- var layerConfig = animatorConfig.layers[i];
- string layerName = $"YOTS_OverrideLayer{(i-1).ToString("00")}";
-
- var stateMachine = new AnimatorStateMachine();
- stateMachine.name = layerName + "_SM";
-
- var blendTree = new BlendTree();
- blendTree.name = layerName + "_BlendTree";
- blendTree.blendType = BlendTreeType.Direct;
-
- foreach (var entry in layerConfig.directBlendTree.entries) {
- if (!animationClips.TryGetValue(entry.name, out AnimationClip clip)) {
- throw new InvalidOperationException($"Animation clip not found in memory: {entry.name}");
- }
-
- blendTree.children = blendTree.children.Append(new ChildMotion{
- motion = clip,
- timeScale = 1f,
- directBlendParameter = entry.parameter
- }).ToArray();
- }
-
- var state = stateMachine.AddState(layerName + "_State");
- state.motion = blendTree;
- state.writeDefaultValues = true;
- stateMachine.defaultState = state;
-
- controller.AddLayer(new AnimatorControllerLayer{
- name = layerName,
- defaultWeight = 1.0f,
- stateMachine = stateMachine
+ private static GeneratedAnimatorConfig GenerateNaiveAnimatorConfig(List<ToggleSpec> toggleSpecs) {
+ GeneratedAnimatorConfig genAnimatorConfig = new GeneratedAnimatorConfig();
+ // Sort toggles into layers
+ Dictionary<string, int> depths = TopologicalSortToggles(toggleSpecs);
+ var togglesByDepth = toggleSpecs
+ .GroupBy(t => depths[t.name])
+ .OrderBy(g => g.Key)
+ .ToList();
+ // Add layers
+ for (int i = 0; i < togglesByDepth.Count; i++) {
+ var depthGroup = togglesByDepth[i];
+ AnimatorLayer layer = new AnimatorLayer();
+ layer.name = i == 0 ? "YOTS_BaseLayer" : $"YOTS_OverrideLayer{(i - 1).ToString("00")}";
+
+ foreach (var toggle in depthGroup) {
+ string paramName = toggle.name;
+ if (!genAnimatorConfig.parameters.Any(p => p.name == paramName))
+ genAnimatorConfig.parameters.Add(new AnimatorParameterSetting{
+ name = paramName,
+ defaultValue = toggle.defaultValue
});
- Debug.Log($"Added override layer: {layerName}");
- }
+ layer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
+ name = toggle.name + "_On",
+ parameter = paramName
+ });
- return controller;
+ layer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
+ name = toggle.name + "_Off",
+ parameter = paramName
+ });
}
- private static Dictionary<string, int> TopologicalSortToggles(List<ToggleSpec> toggleSpecs) {
- Dictionary<string, HashSet<string>> graph = new Dictionary<string, HashSet<string>>();
- foreach (var toggle in toggleSpecs) {
- if (!graph.ContainsKey(toggle.name))
- graph[toggle.name] = new HashSet<string>();
- foreach (var dep in toggle.dependencies) {
- if (!graph.ContainsKey(dep))
- graph[dep] = new HashSet<string>();
- graph[dep].Add(toggle.name);
- }
- }
-
- Dictionary<string, int> inDegree = new Dictionary<string, int>();
- foreach (var toggle in toggleSpecs) {
- inDegree[toggle.name] = toggle.dependencies.Count;
- }
-
- Dictionary<string, int> depths = new Dictionary<string, int>();
- Queue<string> queue = new Queue<string>();
+ genAnimatorConfig.layers.Add(layer);
+ }
+ // Add animations
+ GeneratedAnimationsConfig animConfig = GenerateAnimationConfig(toggleSpecs);
+ genAnimatorConfig.animations = animConfig.animations;
+ return genAnimatorConfig;
+ }
- foreach (var pair in inDegree) {
- if (pair.Value == 0) {
- queue.Enqueue(pair.Key);
- depths[pair.Key] = 0;
- }
- }
+ private static GeneratedAnimationsConfig GenerateAnimationConfig(List<ToggleSpec> toggleSpecs) {
+ GeneratedAnimationsConfig genAnimConfig = new GeneratedAnimationsConfig();
+ foreach (var toggle in toggleSpecs) {
+ GeneratedAnimationClipConfig onAnim = new GeneratedAnimationClipConfig();
+ onAnim.name = toggle.name + "_On";
+ if (toggle.meshToggles != null) {
+ foreach (var mesh in toggle.meshToggles) {
+ onAnim.meshToggles.Add(new GeneratedMeshToggle { path = mesh, value = 1.0f });
+ }
+ }
+ if (toggle.blendShapes != null) {
+ foreach (var bs in toggle.blendShapes) {
+ onAnim.blendShapes.Add(new GeneratedBlendShape{
+ path = bs.path,
+ blendShape = bs.blendShape,
+ value = bs.onValue
+ });
+ }
+ }
+ genAnimConfig.animations.Add(onAnim);
+
+ GeneratedAnimationClipConfig offAnim = new GeneratedAnimationClipConfig();
+ offAnim.name = toggle.name + "_Off";
+ if (toggle.meshToggles != null) {
+ foreach (var mesh in toggle.meshToggles) {
+ offAnim.meshToggles.Add(new GeneratedMeshToggle { path = mesh, value = 0.0f });
+ }
+ }
+ if (toggle.blendShapes != null) {
+ foreach (var bs in toggle.blendShapes) {
+ offAnim.blendShapes.Add(new GeneratedBlendShape{
+ path = bs.path,
+ blendShape = bs.blendShape,
+ value = bs.offValue
+ });
+ }
+ }
+ genAnimConfig.animations.Add(offAnim);
+ }
+ return genAnimConfig;
+ }
- int processedNodes = 0;
- while (queue.Count > 0) {
- string current = queue.Dequeue();
- processedNodes++;
- int currentDepth = depths[current];
- if (graph.ContainsKey(current)) {
- foreach (var neighbor in graph[current]) {
- inDegree[neighbor]--;
- if (inDegree[neighbor] == 0) {
- queue.Enqueue(neighbor);
- depths[neighbor] = currentDepth + 1;
- }
- }
- }
- }
+ private static GeneratedAnimatorConfig ApplyIndependentFixToAnimatorConfig(GeneratedAnimatorConfig genAnimatorConfig) {
+ float GetOffValueForMesh(string path, List<GeneratedMeshToggle> offList) {
+ var offToggle = offList?.FirstOrDefault(mt => mt.path == path);
+ return offToggle != null ? offToggle.value : 0.0f;
+ }
+
+ float GetOffValueForBlend(string path, string blendShapeName, List<GeneratedBlendShape> offList) {
+ var offBlend = offList?.FirstOrDefault(bs => bs.path == path && bs.blendShape == blendShapeName);
+ return offBlend != null ? offBlend.value : 0.0f;
+ }
+
+ Dictionary<string, (GeneratedAnimationClipConfig on, GeneratedAnimationClipConfig off)> toggleAnimations =
+ new Dictionary<string, (GeneratedAnimationClipConfig, GeneratedAnimationClipConfig)>();
+
+ foreach (var anim in genAnimatorConfig.animations) {
+ if (anim.name.EndsWith("_On")) {
+ string toggleName = anim.name.Substring(0, anim.name.LastIndexOf("_On"));
+ if (!toggleAnimations.ContainsKey(toggleName))
+ toggleAnimations[toggleName] = (null, null);
+ var pair = toggleAnimations[toggleName];
+ pair.on = anim;
+ toggleAnimations[toggleName] = pair;
+ }
+ else if (anim.name.EndsWith("_Off")) {
+ string toggleName = anim.name.Substring(0, anim.name.LastIndexOf("_Off"));
+ if (!toggleAnimations.ContainsKey(toggleName))
+ toggleAnimations[toggleName] = (null, null);
+ var pair = toggleAnimations[toggleName];
+ pair.off = anim;
+ toggleAnimations[toggleName] = pair;
+ }
+ }
+
+ Dictionary<string, int> toggleToLayerIndex = new Dictionary<string, int>();
+ for (int i = 0; i < genAnimatorConfig.layers.Count; i++) {
+ var layer = genAnimatorConfig.layers[i];
+ foreach (var entry in layer.directBlendTree.entries) {
+ string entryName = entry.name;
+ string toggleName = entryName;
+ if (toggleName.EndsWith("_On"))
+ toggleName = toggleName.Substring(0, toggleName.LastIndexOf("_On"));
+ else if (toggleName.EndsWith("_Off"))
+ toggleName = toggleName.Substring(0, toggleName.LastIndexOf("_Off"));
+ else if (toggleName.Contains("_Independent"))
+ toggleName = toggleName.Replace("_Independent", "");
+ else if (toggleName.Contains("_Dependent"))
+ toggleName = toggleName.Replace("_Dependent", "");
+
+ if (!toggleToLayerIndex.ContainsKey(toggleName))
+ toggleToLayerIndex[toggleName] = i;
+ }
+ }
+
+ Dictionary<string, HashSet<string>> attributeToToggles = new Dictionary<string, HashSet<string>>();
+ foreach (var kvp in toggleAnimations) {
+ string toggleName = kvp.Key;
+ var pair = kvp.Value;
+ if (pair.on == null) continue;
+
+ HashSet<string> attributes = new HashSet<string>();
+ if (pair.on.meshToggles != null) {
+ foreach (var mt in pair.on.meshToggles) {
+ string attr = "MeshToggle:" + mt.path;
+ attributes.Add(attr);
+ }
+ }
+ if (pair.on.blendShapes != null) {
+ foreach (var bs in pair.on.blendShapes) {
+ string attr = "BlendShape:" + bs.path + "/" + bs.blendShape;
+ attributes.Add(attr);
+ }
+ }
- if (processedNodes != toggleSpecs.Count) {
- var cycleNodes = toggleSpecs
- .Where(t => !depths.ContainsKey(t.name))
- .Select(t => t.name)
- .ToList();
+ foreach (var attr in attributes) {
+ if (!attributeToToggles.TryGetValue(attr, out var set)) {
+ set = new HashSet<string>();
+ attributeToToggles[attr] = set;
+ }
+ set.Add(toggleName);
+ }
+ }
- throw new System.Exception($"Dependency cycle detected in toggle specifications. Nodes involved: {string.Join(", ", cycleNodes)}");
- }
+ List<GeneratedAnimationClipConfig> newAnimations = new List<GeneratedAnimationClipConfig>();
- return depths;
- }
+ AnimatorLayer baseLayer = genAnimatorConfig.layers.FirstOrDefault(l => l.name == "BaseLayer");
+ if (baseLayer == null && genAnimatorConfig.layers.Count > 0)
+ baseLayer = genAnimatorConfig.layers[0];
- private static GeneratedAnimatorConfig GenerateNaiveAnimatorConfig(List<ToggleSpec> toggleSpecs) {
- GeneratedAnimatorConfig genAnimatorConfig = new GeneratedAnimatorConfig();
- // Sort toggles into layers
- Dictionary<string, int> depths = TopologicalSortToggles(toggleSpecs);
- var togglesByDepth = toggleSpecs
- .GroupBy(t => depths[t.name])
- .OrderBy(g => g.Key)
- .ToList();
- // Add layers
- for (int i = 0; i < togglesByDepth.Count; i++) {
- var depthGroup = togglesByDepth[i];
- AnimatorLayer layer = new AnimatorLayer();
- layer.name = i == 0 ? "YOTS_BaseLayer" : $"YOTS_OverrideLayer{(i - 1).ToString("00")}";
-
- foreach (var toggle in depthGroup) {
- string paramName = toggle.name;
- if (!genAnimatorConfig.parameters.Any(p => p.name == paramName))
- genAnimatorConfig.parameters.Add(new AnimatorParameterSetting{
- name = paramName,
- defaultValue = toggle.defaultValue
- });
-
- layer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
- name = toggle.name + "_On",
- parameter = paramName
- });
-
- layer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
- name = toggle.name + "_Off",
- parameter = paramName
- });
- }
-
- genAnimatorConfig.layers.Add(layer);
- }
- // Add animations
- GeneratedAnimationsConfig animConfig = GenerateAnimationConfig(toggleSpecs);
- genAnimatorConfig.animations = animConfig.animations;
- return genAnimatorConfig;
- }
+ foreach (var kvp in toggleAnimations) {
+ string toggleName = kvp.Key;
+ var pair = kvp.Value;
+ int layerIndex = toggleToLayerIndex.ContainsKey(toggleName) ? toggleToLayerIndex[toggleName] : 0;
+ bool isBase = (layerIndex == 0);
- private static GeneratedAnimationsConfig GenerateAnimationConfig(List<ToggleSpec> toggleSpecs) {
- GeneratedAnimationsConfig genAnimConfig = new GeneratedAnimationsConfig();
- foreach (var toggle in toggleSpecs) {
- GeneratedAnimationClipConfig onAnim = new GeneratedAnimationClipConfig();
- onAnim.name = toggle.name + "_On";
- if (toggle.meshToggles != null) {
- foreach (var mesh in toggle.meshToggles) {
- onAnim.meshToggles.Add(new GeneratedMeshToggle { path = mesh, value = 1.0f });
- }
- }
- if (toggle.blendShapes != null) {
- foreach (var bs in toggle.blendShapes) {
- onAnim.blendShapes.Add(new GeneratedBlendShape{
- path = bs.path,
- blendShape = bs.blendShape,
- value = bs.onValue
- });
- }
- }
- genAnimConfig.animations.Add(onAnim);
-
- GeneratedAnimationClipConfig offAnim = new GeneratedAnimationClipConfig();
- offAnim.name = toggle.name + "_Off";
- if (toggle.meshToggles != null) {
- foreach (var mesh in toggle.meshToggles) {
- offAnim.meshToggles.Add(new GeneratedMeshToggle { path = mesh, value = 0.0f });
- }
- }
- if (toggle.blendShapes != null) {
- foreach (var bs in toggle.blendShapes) {
- offAnim.blendShapes.Add(new GeneratedBlendShape{
- path = bs.path,
- blendShape = bs.blendShape,
- value = bs.offValue
- });
- }
- }
- genAnimConfig.animations.Add(offAnim);
- }
- return genAnimConfig;
+ if (isBase) {
+ newAnimations.Add(pair.on);
+ newAnimations.Add(pair.off);
}
-
- private static GeneratedAnimatorConfig ApplyIndependentFixToAnimatorConfig(GeneratedAnimatorConfig genAnimatorConfig) {
- float GetOffValueForMesh(string path, List<GeneratedMeshToggle> offList) {
- var offToggle = offList?.FirstOrDefault(mt => mt.path == path);
- return offToggle != null ? offToggle.value : 0.0f;
+ else {
+ List<GeneratedMeshToggle> independentMesh = new List<GeneratedMeshToggle>();
+ List<GeneratedMeshToggle> dependentMesh = new List<GeneratedMeshToggle>();
+
+ if (pair.on.meshToggles != null) {
+ foreach (var mt in pair.on.meshToggles) {
+ string attr = "MeshToggle:" + mt.path;
+ if (attributeToToggles[attr].Count == 1)
+ independentMesh.Add(mt);
+ else
+ dependentMesh.Add(mt);
}
-
- float GetOffValueForBlend(string path, string blendShapeName, List<GeneratedBlendShape> offList) {
- var offBlend = offList?.FirstOrDefault(bs => bs.path == path && bs.blendShape == blendShapeName);
- return offBlend != null ? offBlend.value : 0.0f;
+ }
+
+ List<GeneratedBlendShape> independentBlend = new List<GeneratedBlendShape>();
+ List<GeneratedBlendShape> dependentBlend = new List<GeneratedBlendShape>();
+
+ if (pair.on.blendShapes != null) {
+ foreach (var bs in pair.on.blendShapes) {
+ string attr = "BlendShape:" + bs.path + "/" + bs.blendShape;
+ if (attributeToToggles[attr].Count == 1)
+ independentBlend.Add(bs);
+ else
+ dependentBlend.Add(bs);
}
-
- Dictionary<string, (GeneratedAnimationClipConfig on, GeneratedAnimationClipConfig off)> toggleAnimations =
- new Dictionary<string, (GeneratedAnimationClipConfig, GeneratedAnimationClipConfig)>();
-
- foreach (var anim in genAnimatorConfig.animations) {
- if (anim.name.EndsWith("_On")) {
- string toggleName = anim.name.Substring(0, anim.name.LastIndexOf("_On"));
- if (!toggleAnimations.ContainsKey(toggleName))
- toggleAnimations[toggleName] = (null, null);
- var pair = toggleAnimations[toggleName];
- pair.on = anim;
- toggleAnimations[toggleName] = pair;
- }
- else if (anim.name.EndsWith("_Off")) {
- string toggleName = anim.name.Substring(0, anim.name.LastIndexOf("_Off"));
- if (!toggleAnimations.ContainsKey(toggleName))
- toggleAnimations[toggleName] = (null, null);
- var pair = toggleAnimations[toggleName];
- pair.off = anim;
- toggleAnimations[toggleName] = pair;
- }
+ }
+
+ bool hasIndependent = (independentMesh.Count > 0 || independentBlend.Count > 0);
+ bool hasDependent = (dependentMesh.Count > 0 || dependentBlend.Count > 0);
+
+ if (hasIndependent && hasDependent) {
+ GeneratedAnimationClipConfig dependentOn = new GeneratedAnimationClipConfig();
+ dependentOn.name = toggleName + "_Dependent_On";
+ dependentOn.meshToggles = dependentMesh;
+ dependentOn.blendShapes = dependentBlend;
+
+ GeneratedAnimationClipConfig dependentOff = new GeneratedAnimationClipConfig();
+ dependentOff.name = toggleName + "_Dependent_Off";
+ dependentOff.meshToggles = dependentMesh
+ .Select(mt => new GeneratedMeshToggle{
+ path = mt.path,
+ value = GetOffValueForMesh(mt.path, pair.off.meshToggles)
+ })
+ .ToList();
+ dependentOff.blendShapes = dependentBlend
+ .Select(bs => new GeneratedBlendShape{
+ path = bs.path,
+ blendShape = bs.blendShape,
+ value = GetOffValueForBlend(bs.path, bs.blendShape, pair.off.blendShapes)
+ })
+ .ToList();
+
+ GeneratedAnimationClipConfig independentOn = new GeneratedAnimationClipConfig();
+ independentOn.name = toggleName + "_Independent_On";
+ independentOn.meshToggles = independentMesh;
+ independentOn.blendShapes = independentBlend;
+
+ GeneratedAnimationClipConfig independentOff = new GeneratedAnimationClipConfig();
+ independentOff.name = toggleName + "_Independent_Off";
+ independentOff.meshToggles = independentMesh
+ .Select(mt => new GeneratedMeshToggle{
+ path = mt.path,
+ value = GetOffValueForMesh(mt.path, pair.off.meshToggles)
+ })
+ .ToList();
+ independentOff.blendShapes = independentBlend
+ .Select(bs => new GeneratedBlendShape{
+ path = bs.path,
+ blendShape = bs.blendShape,
+ value = GetOffValueForBlend(bs.path, bs.blendShape, pair.off.blendShapes)
+ })
+ .ToList();
+
+ newAnimations.Add(dependentOn);
+ newAnimations.Add(dependentOff);
+ newAnimations.Add(independentOn);
+ newAnimations.Add(independentOff);
+
+ AnimatorLayer overrideLayer = genAnimatorConfig.layers[layerIndex];
+ foreach (var entry in overrideLayer.directBlendTree.entries) {
+ if (entry.name.StartsWith(toggleName) &&
+ (entry.name.EndsWith("_On") || entry.name.EndsWith("_Off"))) {
+ entry.name = entry.name.EndsWith("_On") ? toggleName + "_Dependent_On" : toggleName + "_Dependent_Off";
+ }
}
- Dictionary<string, int> toggleToLayerIndex = new Dictionary<string, int>();
- for (int i = 0; i < genAnimatorConfig.layers.Count; i++) {
- var layer = genAnimatorConfig.layers[i];
- foreach (var entry in layer.directBlendTree.entries) {
- string entryName = entry.name;
- string toggleName = entryName;
- if (toggleName.EndsWith("_On"))
- toggleName = toggleName.Substring(0, toggleName.LastIndexOf("_On"));
- else if (toggleName.EndsWith("_Off"))
- toggleName = toggleName.Substring(0, toggleName.LastIndexOf("_Off"));
- else if (toggleName.Contains("_Independent"))
- toggleName = toggleName.Replace("_Independent", "");
- else if (toggleName.Contains("_Dependent"))
- toggleName = toggleName.Replace("_Dependent", "");
-
- if (!toggleToLayerIndex.ContainsKey(toggleName))
- toggleToLayerIndex[toggleName] = i;
- }
+ if (baseLayer != null) {
+ baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
+ name = toggleName + "_Independent_On",
+ parameter = toggleName
+ });
+ baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
+ name = toggleName + "_Independent_Off",
+ parameter = toggleName
+ });
}
-
- Dictionary<string, HashSet<string>> attributeToToggles = new Dictionary<string, HashSet<string>>();
- foreach (var kvp in toggleAnimations) {
- string toggleName = kvp.Key;
- var pair = kvp.Value;
- if (pair.on == null) continue;
-
- HashSet<string> attributes = new HashSet<string>();
- if (pair.on.meshToggles != null) {
- foreach (var mt in pair.on.meshToggles) {
- string attr = "MeshToggle:" + mt.path;
- attributes.Add(attr);
- }
- }
- if (pair.on.blendShapes != null) {
- foreach (var bs in pair.on.blendShapes) {
- string attr = "BlendShape:" + bs.path + "/" + bs.blendShape;
- attributes.Add(attr);
- }
- }
-
- foreach (var attr in attributes) {
- if (!attributeToToggles.TryGetValue(attr, out var set)) {
- set = new HashSet<string>();
- attributeToToggles[attr] = set;
- }
- set.Add(toggleName);
- }
+ }
+ else if (hasIndependent && !hasDependent) {
+ GeneratedAnimationClipConfig independentOn = new GeneratedAnimationClipConfig();
+ independentOn.name = toggleName + "_Independent_On";
+ independentOn.meshToggles = pair.on.meshToggles;
+ independentOn.blendShapes = pair.on.blendShapes;
+ GeneratedAnimationClipConfig independentOff = new GeneratedAnimationClipConfig();
+ independentOff.name = toggleName + "_Independent_Off";
+ independentOff.meshToggles = pair.off.meshToggles;
+ independentOff.blendShapes = pair.off.blendShapes;
+
+ newAnimations.Add(independentOn);
+ newAnimations.Add(independentOff);
+
+ AnimatorLayer overrideLayer = genAnimatorConfig.layers[layerIndex];
+ overrideLayer.directBlendTree.entries.RemoveAll(e => e.name.StartsWith(toggleName));
+ if (baseLayer != null) {
+ baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
+ name = toggleName + "_Independent_On",
+ parameter = toggleName
+ });
+ baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
+ name = toggleName + "_Independent_Off",
+ parameter = toggleName
+ });
}
-
- List<GeneratedAnimationClipConfig> newAnimations = new List<GeneratedAnimationClipConfig>();
-
- AnimatorLayer baseLayer = genAnimatorConfig.layers.FirstOrDefault(l => l.name == "BaseLayer");
- if (baseLayer == null && genAnimatorConfig.layers.Count > 0)
- baseLayer = genAnimatorConfig.layers[0];
-
- foreach (var kvp in toggleAnimations) {
- string toggleName = kvp.Key;
- var pair = kvp.Value;
- int layerIndex = toggleToLayerIndex.ContainsKey(toggleName) ? toggleToLayerIndex[toggleName] : 0;
- bool isBase = (layerIndex == 0);
-
- if (isBase) {
- newAnimations.Add(pair.on);
- newAnimations.Add(pair.off);
- }
- else {
- List<GeneratedMeshToggle> independentMesh = new List<GeneratedMeshToggle>();
- List<GeneratedMeshToggle> dependentMesh = new List<GeneratedMeshToggle>();
-
- if (pair.on.meshToggles != null) {
- foreach (var mt in pair.on.meshToggles) {
- string attr = "MeshToggle:" + mt.path;
- if (attributeToToggles[attr].Count == 1)
- independentMesh.Add(mt);
- else
- dependentMesh.Add(mt);
- }
- }
-
- List<GeneratedBlendShape> independentBlend = new List<GeneratedBlendShape>();
- List<GeneratedBlendShape> dependentBlend = new List<GeneratedBlendShape>();
-
- if (pair.on.blendShapes != null) {
- foreach (var bs in pair.on.blendShapes) {
- string attr = "BlendShape:" + bs.path + "/" + bs.blendShape;
- if (attributeToToggles[attr].Count == 1)
- independentBlend.Add(bs);
- else
- dependentBlend.Add(bs);
- }
- }
-
- bool hasIndependent = (independentMesh.Count > 0 || independentBlend.Count > 0);
- bool hasDependent = (dependentMesh.Count > 0 || dependentBlend.Count > 0);
-
- if (hasIndependent && hasDependent) {
- GeneratedAnimationClipConfig dependentOn = new GeneratedAnimationClipConfig();
- dependentOn.name = toggleName + "_Dependent_On";
- dependentOn.meshToggles = dependentMesh;
- dependentOn.blendShapes = dependentBlend;
-
- GeneratedAnimationClipConfig dependentOff = new GeneratedAnimationClipConfig();
- dependentOff.name = toggleName + "_Dependent_Off";
- dependentOff.meshToggles = dependentMesh
- .Select(mt => new GeneratedMeshToggle{
- path = mt.path,
- value = GetOffValueForMesh(mt.path, pair.off.meshToggles)
- })
- .ToList();
- dependentOff.blendShapes = dependentBlend
- .Select(bs => new GeneratedBlendShape{
- path = bs.path,
- blendShape = bs.blendShape,
- value = GetOffValueForBlend(bs.path, bs.blendShape, pair.off.blendShapes)
- })
- .ToList();
-
- GeneratedAnimationClipConfig independentOn = new GeneratedAnimationClipConfig();
- independentOn.name = toggleName + "_Independent_On";
- independentOn.meshToggles = independentMesh;
- independentOn.blendShapes = independentBlend;
-
- GeneratedAnimationClipConfig independentOff = new GeneratedAnimationClipConfig();
- independentOff.name = toggleName + "_Independent_Off";
- independentOff.meshToggles = independentMesh
- .Select(mt => new GeneratedMeshToggle{
- path = mt.path,
- value = GetOffValueForMesh(mt.path, pair.off.meshToggles)
- })
- .ToList();
- independentOff.blendShapes = independentBlend
- .Select(bs => new GeneratedBlendShape{
- path = bs.path,
- blendShape = bs.blendShape,
- value = GetOffValueForBlend(bs.path, bs.blendShape, pair.off.blendShapes)
- })
- .ToList();
-
- newAnimations.Add(dependentOn);
- newAnimations.Add(dependentOff);
- newAnimations.Add(independentOn);
- newAnimations.Add(independentOff);
-
- AnimatorLayer overrideLayer = genAnimatorConfig.layers[layerIndex];
- foreach (var entry in overrideLayer.directBlendTree.entries) {
- if (entry.name.StartsWith(toggleName) &&
- (entry.name.EndsWith("_On") || entry.name.EndsWith("_Off"))) {
- entry.name = entry.name.EndsWith("_On") ? toggleName + "_Dependent_On" : toggleName + "_Dependent_Off";
- }
- }
-
- if (baseLayer != null) {
- baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
- name = toggleName + "_Independent_On",
- parameter = toggleName
- });
- baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
- name = toggleName + "_Independent_Off",
- parameter = toggleName
- });
- }
- }
- else if (hasIndependent && !hasDependent) {
- GeneratedAnimationClipConfig independentOn = new GeneratedAnimationClipConfig();
- independentOn.name = toggleName + "_Independent_On";
- independentOn.meshToggles = pair.on.meshToggles;
- independentOn.blendShapes = pair.on.blendShapes;
- GeneratedAnimationClipConfig independentOff = new GeneratedAnimationClipConfig();
- independentOff.name = toggleName + "_Independent_Off";
- independentOff.meshToggles = pair.off.meshToggles;
- independentOff.blendShapes = pair.off.blendShapes;
-
- newAnimations.Add(independentOn);
- newAnimations.Add(independentOff);
-
- AnimatorLayer overrideLayer = genAnimatorConfig.layers[layerIndex];
- overrideLayer.directBlendTree.entries.RemoveAll(e => e.name.StartsWith(toggleName));
- if (baseLayer != null) {
- baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
- name = toggleName + "_Independent_On",
- parameter = toggleName
- });
- baseLayer.directBlendTree.entries.Add(new AnimatorDirectBlendTreeEntry{
- name = toggleName + "_Independent_Off",
- parameter = toggleName
- });
- }
- }
- else if (!hasIndependent && hasDependent) {
- GeneratedAnimationClipConfig dependentOn = new GeneratedAnimationClipConfig();
- dependentOn.name = toggleName + "_Dependent_On";
- dependentOn.meshToggles = pair.on.meshToggles;
- dependentOn.blendShapes = pair.on.blendShapes;
- GeneratedAnimationClipConfig dependentOff = new GeneratedAnimationClipConfig();
- dependentOff.name = toggleName + "_Dependent_Off";
- dependentOff.meshToggles = pair.off.meshToggles;
- dependentOff.blendShapes = pair.off.blendShapes;
-
- newAnimations.Add(dependentOn);
- newAnimations.Add(dependentOff);
-
- AnimatorLayer overrideLayer = genAnimatorConfig.layers[layerIndex];
- foreach (var entry in overrideLayer.directBlendTree.entries) {
- if (entry.name.StartsWith(toggleName) &&
- (entry.name.EndsWith("_On") || entry.name.EndsWith("_Off"))) {
- entry.name = entry.name.EndsWith("_On") ? toggleName + "_Dependent_On" : toggleName + "_Dependent_Off";
- }
- }
- }
- }
+ }
+ else if (!hasIndependent && hasDependent) {
+ GeneratedAnimationClipConfig dependentOn = new GeneratedAnimationClipConfig();
+ dependentOn.name = toggleName + "_Dependent_On";
+ dependentOn.meshToggles = pair.on.meshToggles;
+ dependentOn.blendShapes = pair.on.blendShapes;
+ GeneratedAnimationClipConfig dependentOff = new GeneratedAnimationClipConfig();
+ dependentOff.name = toggleName + "_Dependent_Off";
+ dependentOff.meshToggles = pair.off.meshToggles;
+ dependentOff.blendShapes = pair.off.blendShapes;
+
+ newAnimations.Add(dependentOn);
+ newAnimations.Add(dependentOff);
+
+ AnimatorLayer overrideLayer = genAnimatorConfig.layers[layerIndex];
+ foreach (var entry in overrideLayer.directBlendTree.entries) {
+ if (entry.name.StartsWith(toggleName) &&
+ (entry.name.EndsWith("_On") || entry.name.EndsWith("_Off"))) {
+ entry.name = entry.name.EndsWith("_On") ? toggleName + "_Dependent_On" : toggleName + "_Dependent_Off";
+ }
}
-
- genAnimatorConfig.animations = newAnimations;
- return genAnimatorConfig;
+ }
}
+ }
- private static GeneratedAnimatorConfig RemoveOffAnimationsFromOverrideLayers(GeneratedAnimatorConfig config) {
- for (int i = 1; i < config.layers.Count; i++) {
- var layer = config.layers[i];
- layer.directBlendTree.entries.RemoveAll(entry => entry.name.EndsWith("_Off"));
- }
- return config;
- }
+ genAnimatorConfig.animations = newAnimations;
+ return genAnimatorConfig;
+ }
- private static GeneratedAnimatorConfig RemoveUnusedAnimations(GeneratedAnimatorConfig config) {
- HashSet<string> referencedAnimations = new HashSet<string>();
- foreach (var layer in config.layers) {
- foreach (var entry in layer.directBlendTree.entries)
- referencedAnimations.Add(entry.name);
- }
+ private static GeneratedAnimatorConfig RemoveOffAnimationsFromOverrideLayers(GeneratedAnimatorConfig config) {
+ for (int i = 1; i < config.layers.Count; i++) {
+ var layer = config.layers[i];
+ layer.directBlendTree.entries.RemoveAll(entry => entry.name.EndsWith("_Off"));
+ }
+ return config;
+ }
- config.animations = config.animations
- .Where(anim => referencedAnimations.Contains(anim.name))
- .ToList();
+ private static GeneratedAnimatorConfig RemoveUnusedAnimations(GeneratedAnimatorConfig config) {
+ HashSet<string> referencedAnimations = new HashSet<string>();
+ foreach (var layer in config.layers) {
+ foreach (var entry in layer.directBlendTree.entries)
+ referencedAnimations.Add(entry.name);
+ }
- return config;
- }
+ config.animations = config.animations
+ .Where(anim => referencedAnimations.Contains(anim.name))
+ .ToList();
+
+ return config;
+ }
- private static VRCExpressionsMenu GetOrCreateSubmenu(
- VRCExpressionsMenu parentMenu,
- string submenuName
+ private static VRCExpressionsMenu GetOrCreateSubmenu(
+ VRCExpressionsMenu parentMenu,
+ string submenuName
) {
- if (parentMenu.controls == null)
- parentMenu.controls = new List<VRCExpressionsMenu.Control>();
-
- // Check if submenu already exists
- foreach (var control in parentMenu.controls) {
- if (control.type == VRCExpressionsMenu.Control.ControlType.SubMenu &&
- control.name == submenuName && control.subMenu != null) {
- // Clone existing submenu to avoid modifying original
- var clonedSubmenu = UnityEngine.Object.Instantiate(control.subMenu);
- control.subMenu = clonedSubmenu;
- return clonedSubmenu;
- }
- }
+ if (parentMenu.controls == null)
+ parentMenu.controls = new List<VRCExpressionsMenu.Control>();
+
+ // Check if submenu already exists
+ foreach (var control in parentMenu.controls) {
+ if (control.type == VRCExpressionsMenu.Control.ControlType.SubMenu &&
+ control.name == submenuName && control.subMenu != null) {
+ // Clone existing submenu to avoid modifying original
+ var clonedSubmenu = UnityEngine.Object.Instantiate(control.subMenu);
+ control.subMenu = clonedSubmenu;
+ return clonedSubmenu;
+ }
+ }
- // Create new submenu
- var newSubmenu = ScriptableObject.CreateInstance<VRCExpressionsMenu>();
- newSubmenu.name = submenuName;
- newSubmenu.controls = new List<VRCExpressionsMenu.Control>();
+ // Create new submenu
+ var newSubmenu = ScriptableObject.CreateInstance<VRCExpressionsMenu>();
+ newSubmenu.name = submenuName;
+ newSubmenu.controls = new List<VRCExpressionsMenu.Control>();
- var newControl = new VRCExpressionsMenu.Control{
- name = submenuName,
- type = VRCExpressionsMenu.Control.ControlType.SubMenu,
- subMenu = newSubmenu
- };
- parentMenu.controls.Add(newControl);
+ var newControl = new VRCExpressionsMenu.Control{
+ name = submenuName,
+ type = VRCExpressionsMenu.Control.ControlType.SubMenu,
+ subMenu = newSubmenu
+ };
+ parentMenu.controls.Add(newControl);
- return newSubmenu;
- }
+ return newSubmenu;
+ }
- private static void InitializeSubmenu(VRCExpressionsMenu menu) {
- if (menu == null) return;
+ private static void InitializeSubmenu(VRCExpressionsMenu menu) {
+ if (menu == null) return;
- if (menu.controls != null) {
- foreach (var control in menu.controls) {
- if (control.type == VRCExpressionsMenu.Control.ControlType.SubMenu && control.subMenu != null)
- InitializeSubmenu(control.subMenu);
- }
- menu.controls.Clear();
- }
- else {
- menu.controls = new List<VRCExpressionsMenu.Control>();
- }
+ if (menu.controls != null) {
+ foreach (var control in menu.controls) {
+ if (control.type == VRCExpressionsMenu.Control.ControlType.SubMenu && control.subMenu != null)
+ InitializeSubmenu(control.subMenu);
}
+ menu.controls.Clear();
+ }
+ else {
+ menu.controls = new List<VRCExpressionsMenu.Control>();
+ }
+ }
- private static void GenerateVRChatAssets(
- List<ToggleSpec> toggleSpecs,
- VRCExpressionParameters vrcParams,
- VRCExpressionsMenu vrcMenu
+ private static void GenerateVRChatAssets(
+ List<ToggleSpec> toggleSpecs,
+ VRCExpressionParameters vrcParams,
+ VRCExpressionsMenu vrcMenu
) {
- var uniqueToggles = toggleSpecs
- .Where(t => t.name != "YOTS_Weight")
- .GroupBy(t => t.name)
- .Select(g => g.First())
- .ToList();
-
- var paramList = new List<VRCExpressionParameters.Parameter>();
- paramList.AddRange(vrcParams.parameters.Where(p => !uniqueToggles.Any(t => t.name == p.name)));
- foreach (var toggle in uniqueToggles) {
- paramList.Add(new VRCExpressionParameters.Parameter{
- name = toggle.name,
- valueType = toggle.type == "radial" ? VRCExpressionParameters.ValueType.Float : VRCExpressionParameters.ValueType.Bool,
- defaultValue = toggle.defaultValue,
- saved = true
- });
- }
- vrcParams.parameters = paramList.ToArray();
- vrcMenu.controls.RemoveAll(c => c.name == "YOTS");
- // Create YOTS submenu
- VRCExpressionsMenu yotsSubmenu = ScriptableObject.CreateInstance<VRCExpressionsMenu>();
- yotsSubmenu.name = "YOTS";
- yotsSubmenu.controls = new List<VRCExpressionsMenu.Control>();
- // Track all created/modified menus to ensure they're saved
- HashSet<VRCExpressionsMenu> modifiedMenus = new HashSet<VRCExpressionsMenu> { vrcMenu, yotsSubmenu };
- foreach (var toggle in toggleSpecs) {
- VRCExpressionsMenu currentMenu = yotsSubmenu;
- if (!string.IsNullOrEmpty(toggle.menuPath) && toggle.menuPath != "/") {
- string trimmedPath = toggle.menuPath.Trim('/');
- var sections = trimmedPath.Split('/');
- foreach (var section in sections) {
- currentMenu = GetOrCreateSubmenu(currentMenu, section);
- modifiedMenus.Add(currentMenu);
- }
- }
- // Add toggle controls
- if (toggle.type == "radial") {
- currentMenu.controls.Add(new VRCExpressionsMenu.Control{
- name = toggle.name,
- type = VRCExpressionsMenu.Control.ControlType.RadialPuppet,
- subParameters = new VRCExpressionsMenu.Control.Parameter[]{
- new VRCExpressionsMenu.Control.Parameter { name = toggle.name }
- }
- });
- }
- else {
- currentMenu.controls.Add(new VRCExpressionsMenu.Control{
- name = toggle.name,
- type = VRCExpressionsMenu.Control.ControlType.Toggle,
- parameter = new VRCExpressionsMenu.Control.Parameter { name = toggle.name },
- value = 1f
- });
- }
- }
-
- // Add YOTS submenu to main menu
- vrcMenu.controls.Add(new VRCExpressionsMenu.Control{
- name = "YOTS",
- type = VRCExpressionsMenu.Control.ControlType.SubMenu,
- subMenu = yotsSubmenu
+ var uniqueToggles = toggleSpecs
+ .Where(t => t.name != "YOTS_Weight")
+ .GroupBy(t => t.name)
+ .Select(g => g.First())
+ .ToList();
+
+ var paramList = new List<VRCExpressionParameters.Parameter>();
+ paramList.AddRange(vrcParams.parameters.Where(p => !uniqueToggles.Any(t => t.name == p.name)));
+ foreach (var toggle in uniqueToggles) {
+ paramList.Add(new VRCExpressionParameters.Parameter{
+ name = toggle.name,
+ valueType = toggle.type == "radial" ? VRCExpressionParameters.ValueType.Float : VRCExpressionParameters.ValueType.Bool,
+ defaultValue = toggle.defaultValue,
+ saved = true
});
+ }
+ vrcParams.parameters = paramList.ToArray();
+ vrcMenu.controls.RemoveAll(c => c.name == "YOTS");
+ // Create YOTS submenu
+ VRCExpressionsMenu yotsSubmenu = ScriptableObject.CreateInstance<VRCExpressionsMenu>();
+ yotsSubmenu.name = "YOTS";
+ yotsSubmenu.controls = new List<VRCExpressionsMenu.Control>();
+ // Track all created/modified menus to ensure they're saved
+ HashSet<VRCExpressionsMenu> modifiedMenus = new HashSet<VRCExpressionsMenu> { vrcMenu, yotsSubmenu };
+ foreach (var toggle in toggleSpecs) {
+ VRCExpressionsMenu currentMenu = yotsSubmenu;
+ if (!string.IsNullOrEmpty(toggle.menuPath) && toggle.menuPath != "/") {
+ string trimmedPath = toggle.menuPath.Trim('/');
+ var sections = trimmedPath.Split('/');
+ foreach (var section in sections) {
+ currentMenu = GetOrCreateSubmenu(currentMenu, section);
+ modifiedMenus.Add(currentMenu);
+ }
+ }
+ // Add toggle controls
+ if (toggle.type == "radial") {
+ currentMenu.controls.Add(new VRCExpressionsMenu.Control{
+ name = toggle.name,
+ type = VRCExpressionsMenu.Control.ControlType.RadialPuppet,
+ subParameters = new VRCExpressionsMenu.Control.Parameter[]{
+ new VRCExpressionsMenu.Control.Parameter { name = toggle.name }
+ }
+ });
+ }
+ else {
+ currentMenu.controls.Add(new VRCExpressionsMenu.Control{
+ name = toggle.name,
+ type = VRCExpressionsMenu.Control.ControlType.Toggle,
+ parameter = new VRCExpressionsMenu.Control.Parameter { name = toggle.name },
+ value = 1f
+ });
}
+ }
+
+ // Add YOTS submenu to main menu
+ vrcMenu.controls.Add(new VRCExpressionsMenu.Control{
+ name = "YOTS",
+ type = VRCExpressionsMenu.Control.ControlType.SubMenu,
+ subMenu = yotsSubmenu
+ });
}
+ }
}
#endif // UNITY_EDITOR
|