add VRMFirstPerson reference check vrm-c#522

ousttrue · Aug 28, 2020 · e909081 · e909081
1 parent efd70d4
commit e909081
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/Assets/VRM/UniVRM/Editor/Format/VRMExporterWizard.cs b/Assets/VRM/UniVRM/Editor/Format/VRMExporterWizard.cs
@@ -705,6 +705,11 @@ void OnWizardUpdate()
             m_validations.Clear();
             m_validations.AddRange(Validate());
             m_validations.AddRange(VRMSpringBoneValidator.Validate(ExportRoot));
+            var firstPerson = ExportRoot.GetComponent<VRMFirstPerson>();
+            if (firstPerson != null)
+            {
+                m_validations.AddRange(firstPerson.Validate());
+            }
             var hasError = m_validations.Any(x => !x.CanExport);
             m_IsValid = !hasError && !MetaHasError;
 

diff --git a/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs b/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs
@@ -50,17 +50,23 @@ public Mesh SharedMesh
         [SerializeField]
         public List<RendererFirstPersonFlags> Renderers = new List<RendererFirstPersonFlags>();
 
-        static IEnumerable<Transform> Traverse(Transform parent)
+        public IEnumerable<Validation> Validate()
         {
-            yield return parent;
+            var hierarchy = GetComponentsInChildren<Transform>();
 
-            foreach (Transform child in parent)
+            for (int i = 0; i < Renderers.Count; ++i)
             {
-                foreach (var x in Traverse(child))
+                var r = Renderers[i];
+                if (r.Renderer == null)
                 {
-                    yield return x;
+                    yield return Validation.Error($"{name}.Renderers[{i}].Renderer is null");
+                }
+                if (!hierarchy.Contains(r.Renderer.transform))
+                {
+                    yield return Validation.Error($"{name}.Renderers[{i}].Renderer is out of hierarchy");
                 }
             }
+            yield break;
         }
 
         public void CopyTo(GameObject _dst, Dictionary<Transform, Transform> map)