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

Revert "fix: resolve parameter type conflicts for menu items in params usage window"

Browse Source 
This reverts commit 4c6b41de4c92da5828219657b2927c90685e275a.
This commit is contained in:
nekobako 2024-09-19 21:19:33 +09:00
parent 4c6b41de4c
commit 8da1cf3e67
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Editor/ParamsUsage/ParamsUsageWindow.cs
View File

@ -182,22 +182,7 @@ namespace nadena.dev.modular_avatar.core.editor
outerbox.RemoveFromClassList("no-data"); outerbox.RemoveFromClassList("no-data");
} }
ParameterInfo.ConflictHandler onConflict = (type, p1, p2) => var orderedPlugins = ParameterInfo.ForUI.GetParametersForObject(target)
{
if (p1.Source is not ModularAvatarMenuItem ||
p2.Source is not ModularAvatarMenuItem)
{
return;
}
if (p1.ParameterType == AnimatorControllerParameterType.Bool ||
p2.ParameterType == AnimatorControllerParameterType.Float)
{
p1.ParameterType = p2.ParameterType;
}
};
var orderedPlugins = ParameterInfo.ForUI.GetParametersForObject(target, onConflict)
.GroupBy(p => p.Plugin) .GroupBy(p => p.Plugin)
.Select(group => (group.Key, group.Sum(p => p.BitUsage))) .Select(group => (group.Key, group.Sum(p => p.BitUsage)))
.Where((kv, index) => kv.Item2 > 0) .Where((kv, index) => kv.Item2 > 0)
@ -211,7 +196,7 @@ namespace nadena.dev.modular_avatar.core.editor
int totalUsage = byPlugin.Sum(kv => kv.Item2); int totalUsage = byPlugin.Sum(kv => kv.Item2);
int avatarTotalUsage = int avatarTotalUsage =
ParameterInfo.ForUI.GetParametersForObject(avatarRoot, onConflict).Sum(p => p.BitUsage); ParameterInfo.ForUI.GetParametersForObject(avatarRoot).Sum(p => p.BitUsage);
int freeSpace = VRCExpressionParameters.MAX_PARAMETER_COST - avatarTotalUsage; int freeSpace = VRCExpressionParameters.MAX_PARAMETER_COST - avatarTotalUsage;