AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-24 21:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unify logic to determine parameter type and rename confusing variable

Browse Source
This commit is contained in:
nekobako 2024-09-15 18:17:50 +09:00
parent e57d73b41a
commit 6338e42438
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Editor/ReactiveObjects/ParameterAssignerPass.cs
View File

@ -136,10 +136,10 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
var type = mami.ExpressionParametersValueType; var newValueType = mami.ExpressionParametersValueType;
if (valueType == VRCExpressionParameters.ValueType.Bool || type == VRCExpressionParameters.ValueType.Float) if (valueType == VRCExpressionParameters.ValueType.Bool || newValueType == VRCExpressionParameters.ValueType.Float)
{ {
valueType = type; valueType = newValueType;
} }
isSaved |= mami.isSaved; isSaved |= mami.isSaved;

26
Runtime/ModularAvatarMenuItem.cs
View File

@ -174,27 +174,13 @@ namespace nadena.dev.modular_avatar.core
} }
internal AnimatorControllerParameterType AnimatorControllerParameterType internal AnimatorControllerParameterType AnimatorControllerParameterType
=> ExpressionParametersValueType switch
{ {
get VRCExpressionParameters.ValueType.Bool => AnimatorControllerParameterType.Bool,
{ VRCExpressionParameters.ValueType.Int => AnimatorControllerParameterType.Int,
// 0, 1 VRCExpressionParameters.ValueType.Float => AnimatorControllerParameterType.Float,
var type = AnimatorControllerParameterType.Bool; _ => 0,
};
// 2, 3, ..., (255)
if (Control.value > 1)
{
type = AnimatorControllerParameterType.Int;
}
// (-1.0), ..., -0.1, 0.1, ..., 0.9
if (Control.value < 0 || Mathf.Abs(Control.value - Mathf.Round(Control.value)) > 0.01f)
{
type = AnimatorControllerParameterType.Float;
}
return type;
}
}
} }
} }