diff --git a/Editor/Inspector/LogoDisplay.cs b/Editor/Inspector/LogoDisplay.cs index c583b297..43b55051 100644 --- a/Editor/Inspector/LogoDisplay.cs +++ b/Editor/Inspector/LogoDisplay.cs @@ -18,7 +18,7 @@ namespace nadena.dev.modular_avatar.core.editor { return (EditorStyles.label?.lineHeight ?? 0) * 3; } - catch (NullReferenceException e) + catch (NullReferenceException) { // This can happen in early initialization... return 0; diff --git a/Editor/Inspector/MaterialSetter/MaterialSwitchObjectEditor.cs b/Editor/Inspector/MaterialSetter/MaterialSwitchObjectEditor.cs index f789cc29..95013d55 100644 --- a/Editor/Inspector/MaterialSetter/MaterialSwitchObjectEditor.cs +++ b/Editor/Inspector/MaterialSetter/MaterialSwitchObjectEditor.cs @@ -3,7 +3,6 @@ using UnityEditor; using UnityEditor.UIElements; using UnityEngine; -using UnityEngine.UI; using UnityEngine.UIElements; #endregion @@ -148,7 +147,7 @@ namespace nadena.dev.modular_avatar.core.editor.ShapeChanger { return targetObject?.GetComponent()?.sharedMaterials; } - catch (MissingComponentException e) + catch (MissingComponentException) { return null; } diff --git a/Editor/Inspector/Menu/ToggleCreatorShortcut.cs b/Editor/Inspector/Menu/ToggleCreatorShortcut.cs index dfd18712..e549d319 100644 --- a/Editor/Inspector/Menu/ToggleCreatorShortcut.cs +++ b/Editor/Inspector/Menu/ToggleCreatorShortcut.cs @@ -30,7 +30,7 @@ namespace nadena.dev.modular_avatar.core.editor createInstaller = false; } } - catch (MissingComponentException e) + catch (MissingComponentException) { // ignore } diff --git a/Editor/Inspector/ShapeChanger/ChangedShapeEditor.cs b/Editor/Inspector/ShapeChanger/ChangedShapeEditor.cs index 8b17c58a..bb3c84cd 100644 --- a/Editor/Inspector/ShapeChanger/ChangedShapeEditor.cs +++ b/Editor/Inspector/ShapeChanger/ChangedShapeEditor.cs @@ -64,7 +64,7 @@ namespace nadena.dev.modular_avatar.core.editor.ShapeChanger .Select(x => mesh.GetBlendShapeName(x)) .ToList(); } - catch (MissingComponentException e) + catch (MissingComponentException) { shapeNames = null; } diff --git a/Editor/OptimizationPasses/GCGameObjectsPass.cs b/Editor/OptimizationPasses/GCGameObjectsPass.cs index 2dae8023..0214494a 100644 --- a/Editor/OptimizationPasses/GCGameObjectsPass.cs +++ b/Editor/OptimizationPasses/GCGameObjectsPass.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEditor; using UnityEngine; - +using Object = UnityEngine.Object; #if MA_VRCSDK3_AVATARS using VRC.SDK3.Dynamics.PhysBone.Components; #endif @@ -123,7 +123,7 @@ namespace nadena.dev.modular_avatar.core.editor } } } - catch (MissingComponentException _) + catch (MissingComponentException) { // No animator? weird. Move on. } @@ -194,7 +194,7 @@ namespace nadena.dev.modular_avatar.core.editor { if (!referencedGameObjects.Contains(go)) { - UnityEngine.Object.DestroyImmediate(go); + Object.DestroyImmediate(go); } } } diff --git a/Editor/ParamsUsage/ParamsUsageWindow.cs b/Editor/ParamsUsage/ParamsUsageWindow.cs index 4d8f58ee..a7943a77 100644 --- a/Editor/ParamsUsage/ParamsUsageWindow.cs +++ b/Editor/ParamsUsage/ParamsUsageWindow.cs @@ -109,7 +109,7 @@ namespace nadena.dev.modular_avatar.core.editor { return uxml != null && EditorStyles.label != null; } - catch (NullReferenceException _) + catch (NullReferenceException) { return false; } diff --git a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.cs b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.cs index 42f11821..b7482b27 100644 --- a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.cs +++ b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.cs @@ -157,9 +157,7 @@ namespace nadena.dev.modular_avatar.core.editor if (condition.ReferenceObject != null && !toggledObjects.Contains(condition.ReferenceObject)) condition.IsConstant = asc.AnimationDatabase.ClipsForPath(asc.PathMappings.GetObjectIdentifier(condition.ReferenceObject)).IsEmpty; - var i = 0; // Remove redundant active conditions. - int retain = 0; actionGroup.ControllingConditions.RemoveAll(c => c.IsConstant && c.InitiallyActive); } diff --git a/Editor/ReactiveObjects/RemoveBlendShapeFromMesh.cs b/Editor/ReactiveObjects/RemoveBlendShapeFromMesh.cs index 25a268df..c1105a64 100644 --- a/Editor/ReactiveObjects/RemoveBlendShapeFromMesh.cs +++ b/Editor/ReactiveObjects/RemoveBlendShapeFromMesh.cs @@ -128,7 +128,7 @@ namespace nadena.dev.modular_avatar.core.editor n_nrm[i] = o_nrm[newToOrigVertIndex[i]]; n_tan[i] = o_tan[newToOrigVertIndex[i]]; } - catch (IndexOutOfRangeException e) + catch (IndexOutOfRangeException) { throw; } @@ -250,7 +250,6 @@ namespace nadena.dev.modular_avatar.core.editor { List n2o = new List(toRetainVertices.Length); List o2n = new List(toRetainVertices.Length); - int i = 0; for (int j = 0; j < toRetainVertices.Length; j++) { diff --git a/Editor/SetupOutfit.cs b/Editor/SetupOutfit.cs index 6c263c89..922fbc74 100644 --- a/Editor/SetupOutfit.cs +++ b/Editor/SetupOutfit.cs @@ -385,8 +385,6 @@ namespace nadena.dev.modular_avatar.core.editor private static bool ValidateSetupOutfit(GameObject gameObj) { - Object obj; - if (gameObj == null) { errorHeader = S("setup_outfit.err.header.notarget"); diff --git a/UnitTests~/Animation/AvatarMask/AvatarMaskTest.cs b/UnitTests~/Animation/AvatarMask/AvatarMaskTest.cs index aec7e15a..897e323f 100644 --- a/UnitTests~/Animation/AvatarMask/AvatarMaskTest.cs +++ b/UnitTests~/Animation/AvatarMask/AvatarMaskTest.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using nadena.dev.ndmf; using NUnit.Framework; @@ -28,6 +29,11 @@ namespace modular_avatar_tests return transformMaskElements.SequenceEqual(other.transformMaskElements); } + public override int GetHashCode() + { + return HashCode.Combine(humanoidMaskElements, transformMaskElements); + } + public static ExtractedMask FromAvatarMask(AvatarMask mask) { var so = new SerializedObject(mask);