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

Fix create parameter switch #9

Open
Adjerry91 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix create parameter switch #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 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 @@ -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 Down
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
33 changes: 33 additions & 0 deletions Assets/VRCFaceTracking/Tools/Binary Parameter Tool/Editor/ParameterGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,39 @@ public static bool RemoveVRCParameter(VRCAvatarDescriptor avatarDescriptor, VRCE
return true;
}

public static bool RemoveVRCParameter(VRCAvatarDescriptor avatarDescriptor, string parameter)
{
// Make sure Parameters aren't null
if (avatarDescriptor.expressionParameters == null)
{
Debug.Log("ExpressionsParameters not found!");
return false;
}

// Instantiate and Save to Database
VRCExpressionParameters newParameters = avatarDescriptor.expressionParameters;
string assetPath = AssetDatabase.GetAssetPath(avatarDescriptor.expressionParameters);
if (assetPath != String.Empty)
{
AssetDatabase.RemoveObjectFromAsset(avatarDescriptor.expressionParameters);
AssetDatabase.CreateAsset(newParameters, assetPath);
avatarDescriptor.expressionParameters = newParameters;
}

// Check and see if parameter exists
if (newParameters.FindParameter(parameter) != null)
{
// Remove the parameters with listed keyword
List<VRCExpressionParameters.Parameter> betterParametersBecauseItsAListInstead =
newParameters.parameters.ToList();
foreach (VRCExpressionParameters.Parameter p in betterParametersBecauseItsAListInstead)
if (p.name.Contains(parameter))
betterParametersBecauseItsAListInstead.Remove(p);
newParameters.parameters = betterParametersBecauseItsAListInstead.ToArray();
}
return true;
}

public static AnimatorControllerParameter CheckAndCreateParameter(string paramName, AnimatorController animatorController, int type, double defaultVal = 0)
{
AnimatorControllerParameter param = new AnimatorControllerParameter();
Expand Down