From 8da1cf3e67de68b366b60dcf84481e1715c3eabd Mon Sep 17 00:00:00 2001 From: nekobako Date: Thu, 19 Sep 2024 21:19:33 +0900 Subject: [PATCH] Revert "fix: resolve parameter type conflicts for menu items in params usage window" This reverts commit 4c6b41de4c92da5828219657b2927c90685e275a. --- Editor/ParamsUsage/ParamsUsageWindow.cs | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/Editor/ParamsUsage/ParamsUsageWindow.cs b/Editor/ParamsUsage/ParamsUsageWindow.cs index 40ae45ff..4d8f58ee 100644 --- a/Editor/ParamsUsage/ParamsUsageWindow.cs +++ b/Editor/ParamsUsage/ParamsUsageWindow.cs @@ -182,22 +182,7 @@ namespace nadena.dev.modular_avatar.core.editor outerbox.RemoveFromClassList("no-data"); } - ParameterInfo.ConflictHandler onConflict = (type, p1, p2) => - { - 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) + var orderedPlugins = ParameterInfo.ForUI.GetParametersForObject(target) .GroupBy(p => p.Plugin) .Select(group => (group.Key, group.Sum(p => p.BitUsage))) .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 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;