fix: compiler warnings

Editor/Animation/MMDRelayPass.cs

@@ -63,10 +63,12 @@ namespace nadena.dev.modular_avatar.animation
 
             foreach (var layer in fx.Layers)
             {
+                if (layer.StateMachine == null) continue;
+                
                 var rootMMDModeBehaviors = layer.StateMachine.Behaviours
                     .OfType<ModularAvatarMMDLayerControl>()
                     .ToList();
-
+                
                 if (rootMMDModeBehaviors.Count == 0) continue;
                 if (rootMMDModeBehaviors.Count > 1)
                 {

Editor/MergeBlendTreePass.cs

@@ -2,6 +2,7 @@
 
 #region
 
+using System;
 using System.Collections.Generic;
 using nadena.dev.ndmf;
 using nadena.dev.ndmf.animator;
@@ -9,6 +10,7 @@ using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
+using Object = UnityEngine.Object;
 
 #endregion
 
@@ -83,8 +85,6 @@ namespace nadena.dev.modular_avatar.core.editor
                 return;
             }
 
-            string basePath = null;
-            
             var rootBlend = GetRootBlendTree();
             
             rootBlend.Children = rootBlend.Children.Add(new()
@@ -136,6 +136,10 @@ namespace nadena.dev.modular_avatar.core.editor
             var fx = _asc.ControllerContext.Controllers[VRCAvatarDescriptor.AnimLayerType.FX];
             var controller = fx.AddLayer(new LayerPriority(int.MinValue), BlendTreeLayerName);
             var stateMachine = controller.StateMachine;
+            if (fx == null)
+            {
+                throw new Exception("FX layer not found");
+            }
             
             _rootBlendTree = VirtualBlendTree.Create("Root");
             var state = stateMachine.AddState("State", _rootBlendTree);

Editor/MiscPreview/RemoveVertexColorPreview.cs

@@ -89,8 +89,8 @@ namespace nadena.dev.modular_avatar.core.editor
             public Task<IRenderFilterNode> Refresh(IEnumerable<(Renderer, Renderer)> proxyPairs, ComputeContext context,
                 RenderAspects updatedAspects)
             {
-                if (updatedAspects.HasFlag(RenderAspects.Mesh)) return Task.FromResult<IRenderFilterNode>(null);
+                if (updatedAspects.HasFlag(RenderAspects.Mesh)) return Task.FromResult<IRenderFilterNode>(null!);
-                if (_theMesh == null) return Task.FromResult<IRenderFilterNode>(null);
+                if (_theMesh == null) return Task.FromResult<IRenderFilterNode>(null!);
 
                 return Task.FromResult<IRenderFilterNode>(this);
             }

Editor/OptimizationPasses/ConstraintConverterPass.cs

@@ -52,13 +52,14 @@ namespace nadena.dev.modular_avatar.core.editor
 
             var constraintGameObjects = context.AvatarRootObject.GetComponentsInChildren<IConstraint>(true)
                 .Select(c => (c as Component)?.gameObject)
+                .Where(go => go != null)
                 .Distinct()
-                .Where(go => go.GetComponentsInParent<ModularAvatarConvertConstraints>(true)
+                .Where(go => go!.GetComponentsInParent<ModularAvatarConvertConstraints>(true)
                     .Select(c => c.gameObject)
                     .Any(converters.Contains)
                 ).ToArray();
             var targetConstraintComponents =
-                constraintGameObjects.SelectMany(go => go.GetComponents<IConstraint>()).ToArray();
+                constraintGameObjects.SelectMany(go => go!.GetComponents<IConstraint>()).ToArray();
 
             AvatarDynamicsSetup.DoConvertUnityConstraints(targetConstraintComponents, null, false);
 
@@ -72,7 +73,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
             var targetPaths = constraintGameObjects
                 .Union(existingVRCConstraints)
-                .Select(c => asc.ObjectPathRemapper.GetVirtualPathForObject(c))
+                .Select(c => asc.ObjectPathRemapper.GetVirtualPathForObject(c!))
                 .ToHashSet();
 
             // Update animation clips

Editor/ParameterPolicy.cs

@@ -156,7 +156,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
                     case ModularAvatarMergeBlendTree mergeBlendTree:
                     {
-                        WalkBlendTree(parameters, mergeBlendTree.BlendTree as BlendTree);
+                        WalkBlendTree(parameters, mergeBlendTree.Motion as BlendTree);
                         break;
                     }
 

Editor/ReactiveObjects/AnimationGeneration/AnimatedProperty.cs

@@ -1,4 +1,6 @@
-using System;
+#nullable enable
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Object = UnityEngine.Object;
@@ -34,7 +36,7 @@ namespace nadena.dev.modular_avatar.core.editor
                    TargetProp.Equals(other.TargetProp);
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;

Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectPrepass.cs

@@ -49,7 +49,7 @@ namespace nadena.dev.modular_avatar.core.editor
                 var obj = new GameObject("MA SC Defaults");
                 obj.transform.SetParent(context.AvatarRootTransform);
                 var mambt = obj.AddComponent<ModularAvatarMergeBlendTree>();
-                mambt.BlendTree = bt;
+                mambt.Motion = bt;
                 mambt.PathMode = MergeAnimatorPathMode.Absolute;
             }
         }

Runtime/MAMoveIndependently.cs

@@ -16,8 +16,6 @@ namespace nadena.dev.modular_avatar.core
     [HelpURL("https://modular-avatar.nadena.dev/docs/reference/move-independently?lang=auto")]
     class MAMoveIndependently : MonoBehaviour, IEditorOnly
     {
-        private float EPSILON = 0.0000001f;
-
         [SerializeField]
         private GameObject[] m_groupedBones;
 

Runtime/ModularAvatarMergeAnimator.cs

@@ -85,7 +85,7 @@ namespace nadena.dev.modular_avatar.core
             set => animator = value;
         }
 
-        string IVirtualizeAnimatorController.GetMotionBasePath(object ndmfBuildContext, bool clearPath = true)
+        string IVirtualizeAnimatorController.GetMotionBasePath(object ndmfBuildContext, bool clearPath)
         {
             var path = GetMotionBasePathCallback(this, ndmfBuildContext);
             if (clearPath) pathMode = MergeAnimatorPathMode.Absolute;

Runtime/ModularAvatarMergeBlendTree.cs

@@ -39,11 +39,13 @@ namespace nadena.dev.modular_avatar.core
         
         Motion IVirtualizeMotion.Motion
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             get => (Motion)BlendTree;
             set => BlendTree = value;
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
-        string IVirtualizeMotion.GetMotionBasePath(object ndmfBuildContext, bool clearPath = true)
+        string IVirtualizeMotion.GetMotionBasePath(object ndmfBuildContext, bool clearPath)
         {
             var path = GetMotionBasePathCallback(this, ndmfBuildContext);
 

UnitTests~/Animation/MergeBlendTreeTest.cs

@@ -11,6 +11,7 @@ using UnityEditor.Animations;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
 using AvatarProcessor = nadena.dev.ndmf.AvatarProcessor;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 namespace modular_avatar_tests
 {