Skip to content
This repository has been archived by the owner on Apr 8, 2023. It is now read-only.

Tiered Naming Support #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Tiered Naming Support #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f41898f
Fix create parameter switch
Adjerry91 Nov 29, 2022
47105b2
Remove symbols
Adjerry91 Feb 9, 2023
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,3 +416,4 @@ FodyWeavers.xsd
/.vsconfig
/Assets/VRCFaceTracking/Tools/Binary Parameter Tool/Editor/Test.controller
/Assets/VRCFaceTracking/Tools/Binary Parameter Tool/Editor/AllParams.asset
/Export
29 changes: 22 additions & 7 deletions Assets/VRCFaceTracking/Tools/Binary Parameter Tool/Editor/BinaryParameterFloatDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ public static AnimationClip CreateFloatDriverAnimation(string baseParamName, flo
Directory.CreateDirectory("Assets/VRCFaceTracking/Generated/Anims/");
}

string[] guid = (AssetDatabase.FindAssets(baseParamName + parameterValue + "Float"));
string[] guid = (AssetDatabase.FindAssets(NameNoSymbol(baseParamName) + parameterValue + "Float"));

if (guid.Length == 0)
{
AssetDatabase.CreateAsset(_animationClip, "Assets/VRCFaceTracking/Generated/Anims/" + baseParamName + parameterValue + "Float.anim");
AssetDatabase.CreateAsset(_animationClip, "Assets/VRCFaceTracking/Generated/Anims/" + NameNoSymbol(baseParamName) + parameterValue + "Float.anim");
AssetDatabase.SaveAssets();
}

Expand All @@ -51,11 +51,11 @@ public static AnimationClip CreateFloatDriverAnimation(string baseParamName, str
Directory.CreateDirectory("Assets/VRCFaceTracking/Generated/Anims/");
}

string[] guid = (AssetDatabase.FindAssets(animName));
string[] guid = (AssetDatabase.FindAssets(NameNoSymbol(animName)));

if (guid.Length == 0)
{
AssetDatabase.CreateAsset(_animationClip, "Assets/VRCFaceTracking/Generated/Anims/" + animName + ".anim");
AssetDatabase.CreateAsset(_animationClip, "Assets/VRCFaceTracking/Generated/Anims/" + NameNoSymbol(animName) + ".anim");
AssetDatabase.SaveAssets();
}

Expand Down Expand Up @@ -83,11 +83,11 @@ public static AnimationClip[] CreateFloatSmootherAnimation(string baseParamName,
Directory.CreateDirectory("Assets/VRCFaceTracking/Generated/Anims/");
}

string[] guid = (AssetDatabase.FindAssets(baseParamName + initThreshold + "Smoother.anim"));
string[] guid = (AssetDatabase.FindAssets(NameNoSymbol(baseParamName) + initThreshold + "Smoother.anim"));

if (guid.Length == 0)
{
AssetDatabase.CreateAsset(_animationClip1, "Assets/VRCFaceTracking/Generated/Anims/"+ baseParamName + initThreshold + "Smoother.anim");
AssetDatabase.CreateAsset(_animationClip1, "Assets/VRCFaceTracking/Generated/Anims/" + NameNoSymbol(baseParamName) + initThreshold + "Smoother.anim");
AssetDatabase.SaveAssets();
}

Expand All @@ -100,7 +100,7 @@ public static AnimationClip[] CreateFloatSmootherAnimation(string baseParamName,

if (guid.Length == 0)
{
AssetDatabase.CreateAsset(_animationClip2, "Assets/VRCFaceTracking/Generated/Anims/" + baseParamName + finalThreshold + "Smoother.anim");
AssetDatabase.CreateAsset(_animationClip2, "Assets/VRCFaceTracking/Generated/Anims/" + NameNoSymbol(baseParamName) + finalThreshold + "Smoother.anim");
AssetDatabase.SaveAssets();
}

Expand All @@ -111,5 +111,20 @@ public static AnimationClip[] CreateFloatSmootherAnimation(string baseParamName,

return new AnimationClip[] { _animationClip1, _animationClip2 };
}

public static string NameNoSymbol(string name)
{
string nameNoSym = "";

for (int j = 0; j < name.Length; j++)
{
if (name[j] != '/')
{
nameNoSym += name[j];
}

}
return nameNoSym;
}
}
}
44 changes: 30 additions & 14 deletions Assets/VRCFaceTracking/Tools/Binary Parameter Tool/Editor/BinaryParameterScript.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public void CreateBinaryLayer()

// Clear out existing ...Binary layers to make-way for an updated one
for (int i = 0; i < animatorController.layers.Length; i++)
if (animatorController.layers[i].name == baseParamName + " Binary")
if (animatorController.layers[i].name == NameNoSymbol(baseParamName) + " Binary")
{
animatorController.RemoveLayer(i);
}

// Creating a layer object since the default weight can not be assigned after creation.
AnimatorControllerLayer layer = new AnimatorControllerLayer
{
name = baseParamName + " Binary",
name = NameNoSymbol(baseParamName) + " Binary",
stateMachine = new AnimatorStateMachine
{
hideFlags = HideFlags.HideInHierarchy
Expand Down Expand Up @@ -108,15 +108,15 @@ public void CreateCombinedBinaryLayer()

// Clear out existing ...Binary layers to make-way for an updated one
for (int i = 0; i < animatorController.layers.Length; i++)
if (animatorController.layers[i].name == baseParamName + " Binary")
if (animatorController.layers[i].name == NameNoSymbol(baseParamName) + " Binary")
{
animatorController.RemoveLayer(i);
}

// Creating a layer object since the default weight can not be assigned after creation.
AnimatorControllerLayer layer = new AnimatorControllerLayer
{
name = baseParamName + " Binary",
name = NameNoSymbol(baseParamName) + " Binary",
stateMachine = new AnimatorStateMachine
{
hideFlags = HideFlags.HideInHierarchy
Expand Down Expand Up @@ -187,7 +187,7 @@ private static void CreateCombinedUniformBinaryStatesInMachine(string name, int

AnimatorState[] states = new AnimatorState[binarySteps];

stateMachine.name = name + " Binary State Machine";
stateMachine.name = NameNoSymbol(name) + " Binary State Machine";
stateMachine.anyStatePosition = new Vector3(20, 0, 0);
stateMachine.entryPosition = new Vector3
(
Expand Down Expand Up @@ -228,7 +228,7 @@ private static void CreateCombinedUniformBinaryStatesInMachine(string name, int
// Creating all the binary states and transitions
for (int i = 1; i < binarySteps; i++)
{
states[i] = stateMachine.AddState(name + i * negativeCount, new Vector3
states[i] = stateMachine.AddState(NameNoSymbol(name) + i * negativeCount, new Vector3
(
stateMachine.anyStatePosition.x - 20 - Mathf.Sin(((float)i / binarySteps) * Mathf.PI * (-1) * negativeCount) * (200 + binarySteps * 8),
stateMachine.anyStatePosition.y - 5 - Mathf.Cos(((float)i / binarySteps) * Mathf.PI) * (100 + binarySteps * 4),
Expand Down Expand Up @@ -263,7 +263,7 @@ private static void CreateCombinedUniformBinaryStatesInMachine(string name, int
blendType = BlendTreeType.Simple1D,
hideFlags = HideFlags.HideInHierarchy,
blendParameter = "BinaryBlend",
name = name + (i * negativeCount),
name = NameNoSymbol(name) + (i * negativeCount),
useAutomaticThresholds = false
};

Expand Down Expand Up @@ -308,7 +308,7 @@ private static void CreateUniformBinaryStatesInMachine(string name, int binarySi
for (int i = 0; i < binarySteps; i++)
{

stateMachine.name = name + " Binary State Machine";
stateMachine.name = NameNoSymbol(name) + " Binary State Machine";
stateMachine.anyStatePosition = new Vector3(20, 0, 0);
stateMachine.entryPosition = new Vector3
(
Expand All @@ -318,7 +318,7 @@ private static void CreateUniformBinaryStatesInMachine(string name, int binarySi
);


states[i] = stateMachine.AddState(name + i, new Vector3
states[i] = stateMachine.AddState(NameNoSymbol(name) + i, new Vector3
(
stateMachine.anyStatePosition.x - 20 - Mathf.Sin((i / (float)binarySteps) * Mathf.PI * 2f) * (200 + binarySteps * 8),
stateMachine.anyStatePosition.y - 5 - Mathf.Cos((i / (float)binarySteps) * Mathf.PI * 2f) * (100 + binarySteps * 4),
Expand Down Expand Up @@ -349,7 +349,7 @@ private static void CreateUniformBinaryStatesInMachine(string name, int binarySi
blendType = BlendTreeType.Simple1D,
hideFlags = HideFlags.HideInHierarchy,
blendParameter = "BinaryBlend",
name = name + i,
name = NameNoSymbol(name) + i,
useAutomaticThresholds = false,
};

Expand All @@ -367,6 +367,7 @@ private static void CreateUniformBinaryStatesInMachine(string name, int binarySi
}
}

// implement next update pls
private static void CreateBranchingBinaryStatesInMachine(string name, int binarySize, AnimatorStateMachine stateMachine, AnimationClip initClip, AnimationClip finalClip, bool writeDefaults, float duration, bool nextStateInterrupt, float min, float max, AnimationClip finalNegativeClip = null, float minNeg = 0, float maxNeg = 0)
{
// Skips creating the negative & positive branch
Expand All @@ -380,7 +381,7 @@ private static void CreateBranchingBinaryStatesInMachine(string name, int binary
int minSteps = (int)((min + .05) * binarySteps);
int maxSteps = (int)((max - .05) * binarySteps);

stateMachine.name = name + " Binary State Machine";
stateMachine.name = NameNoSymbol(name) + " Binary State Machine";
stateMachine.entryPosition = new Vector3(0, 20, 0);
stateMachine.anyStatePosition = new Vector3
(
Expand Down Expand Up @@ -417,7 +418,7 @@ private static void CreateBranchingBinaryStatesInMachine(string name, int binary
blendType = BlendTreeType.Simple1D,
hideFlags = HideFlags.HideInHierarchy,
blendParameter = "BinaryBlend",
name = name + i,
name = NameNoSymbol(name) + i,
useAutomaticThresholds = false,
};

Expand Down Expand Up @@ -499,15 +500,15 @@ public void CreateSmoothingLayer(float smoothness)

// Clear out existing ...Binary layers to make-way for an updated one
for (int i = 0; i < animatorController.layers.Length; i++)
if (animatorController.layers[i].name == baseParamName + " Float Smoother")
if (animatorController.layers[i].name == NameNoSymbol(baseParamName) + " Float Smoother")
{
animatorController.RemoveLayer(i);
}

// Creates an animation layer
AnimatorControllerLayer layer = new AnimatorControllerLayer
{
name = baseParamName + " Float Smoother",
name = NameNoSymbol(baseParamName) + " Float Smoother",
stateMachine = new AnimatorStateMachine
{
hideFlags = HideFlags.HideInHierarchy
Expand Down Expand Up @@ -571,5 +572,20 @@ public void CreateSmoothingLayer(float smoothness)
state.motion = rootTree;
}

public static string NameNoSymbol(string name)
{
string nameNoSym = "";

for (int j = 0; j < name.Length; j++)
{
if (name[j] != '/')
{
nameNoSym += name[j];
}

}
return nameNoSym;
}

}
}
86 changes: 68 additions & 18 deletions Assets/VRCFaceTracking/Tools/Binary Parameter Tool/Editor/BinaryParameterWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,37 @@ private void OnGUI()
"set animations, transitions, and parameters that handle the specified Binary Parameter."
)))
{
if (ParameterTools.AddVRCParameter(_avDescriptor, GenerateBinaryParams(_baseParamName, _binarySize, _isCombined)) | !_createParametersInDescriptor)
if (_createParametersInDescriptor)
{
if (ParameterTools.AddVRCParameter(_avDescriptor, GenerateBinaryParams(_baseParamName, _binarySize, _isCombined)))
{

if (_tab == 0 && !_smooth)
{
ParameterTools.CheckAndCreateParameter(_baseParamName, _animatorController, 1);

_binaryStateMachine.initClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, 0f);
_binaryStateMachine.finalClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, 1f);
}
else if (_tab == 0)
{
ParameterTools.CheckAndCreateParameter(_baseParamName, _animatorController, 1);

_binaryStateMachine.CreateSmoothingLayer(_smoothness);

_binaryStateMachine.initClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName + "Proxy", 0f);
_binaryStateMachine.finalClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName + "Proxy", 1f);
}
if (ParameterTools.AddVRCParameter(_avDescriptor, GenerateBinaryParams(_baseParamName, _binarySize, _isCombined)))
{
ParameterTools.RemoveVRCParameter(_avDescriptor, _baseParamName);
_binaryStateMachine.CreateBinaryLayer();
}
else
EditorGUILayout.HelpBox("Parameters can not fit, or Expressions Parameters do not exist.", MessageType.Warning);
}
}
else
{
if (_tab == 0 && !_smooth)
{
Expand All @@ -423,13 +453,7 @@ private void OnGUI()
_binaryStateMachine.initClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName + "Proxy", 0f);
_binaryStateMachine.finalClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName + "Proxy", 1f);
}
if (ParameterTools.AddVRCParameter(_avDescriptor, GenerateBinaryParams(_baseParamName, _binarySize, _isCombined)))
{
ParameterTools.RemoveVRCParameter(_avDescriptor, _baseParamName);
_binaryStateMachine.CreateBinaryLayer();
}
else
EditorGUILayout.HelpBox("Parameters can not fit, or Expressions Parameters do not exist.", MessageType.Warning);
_binaryStateMachine.CreateBinaryLayer();
}
}
}
Expand All @@ -442,24 +466,51 @@ private void OnGUI()
"set animations, transitions, and parameters that handle the specified Combined Binary Parameter."
)))
{
if (ParameterTools.AddVRCParameter(_avDescriptor, GenerateBinaryParams(_baseParamName, _binarySize, _isCombined)) | !_createParametersInDescriptor)
if(_createParametersInDescriptor)
{
if (_tab == 0 && !_smooth)
if (ParameterTools.AddVRCParameter(_avDescriptor, GenerateBinaryParams(_baseParamName, _binarySize, _isCombined)))
{
ParameterTools.RemoveVRCParameter(_avDescriptor, new VRCExpressionParameters.Parameter
if (_tab == 0 && !_smooth)
{
ParameterTools.RemoveVRCParameter(_avDescriptor, new VRCExpressionParameters.Parameter
{
name = _baseParamName,
valueType = VRCExpressionParameters.ValueType.Float
});
ParameterTools.CheckAndCreateParameter(_baseParamName, _animatorController, 1);

_binaryStateMachine.initClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, 0f);
_binaryStateMachine.finalClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, 1f);
_binaryStateMachine.finalNegativeClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, -1f);
}
else if (_tab == 0)
{
name = _baseParamName,
valueType = VRCExpressionParameters.ValueType.Float
});
ParameterTools.RemoveVRCParameter(_avDescriptor, _baseParamName);
ParameterTools.CheckAndCreateParameter(_baseParamName, _animatorController, 1);

_binaryStateMachine.CreateSmoothingLayer(_smoothness);
_binaryStateMachine.initClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName + "Proxy", 0f);
_binaryStateMachine.finalClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName + "Proxy", 1f);
_binaryStateMachine.finalNegativeClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName + "Proxy", -1f);
}
_binaryStateMachine.CreateCombinedBinaryLayer();
}
else
EditorGUILayout.HelpBox("Parameters can not fit, or Expressions Parameters do not exist.", MessageType.Warning);
}
else
{
if (_tab == 0 && !_smooth)
{

ParameterTools.CheckAndCreateParameter(_baseParamName, _animatorController, 1);

_binaryStateMachine.initClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, 0f);
_binaryStateMachine.finalClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, 1f);
_binaryStateMachine.finalNegativeClip = BinaryParameterFloatDriver.CreateFloatDriverAnimation(_baseParamName, -1f);
}
else if (_tab == 0)
{
ParameterTools.RemoveVRCParameter(_avDescriptor, _baseParamName);
{
ParameterTools.CheckAndCreateParameter(_baseParamName, _animatorController, 1);

_binaryStateMachine.CreateSmoothingLayer(_smoothness);
Expand All @@ -469,8 +520,7 @@ private void OnGUI()
}
_binaryStateMachine.CreateCombinedBinaryLayer();
}
else
EditorGUILayout.HelpBox("Parameters can not fit, or Expressions Parameters do not exist.", MessageType.Warning);

}
EditorGUILayout.HelpBox("Parameters (" + _avDescriptor.expressionParameters.CalcTotalCost() + "/" + VRCExpressionParameters.MAX_PARAMETER_COST + "):" + GenerateParamNames(_baseParamName, _binarySize, _isCombined), MessageType.None);

Expand Down
Loading