foreachを使っていたところをLinqに置き換えた

gatosyocora · Oct 11, 2020 · 0bbe0b5 · 0bbe0b5
1 parent 701444f
commit 0bbe0b5
Showing 1 changed file with 9 additions and 28 deletions.
diff --git a/Assets/VRCAvatarEditor/Editor/DataClass/VRCAvatarBase.cs b/Assets/VRCAvatarEditor/Editor/DataClass/VRCAvatarBase.cs
@@ -113,35 +113,16 @@ private float CalculateAvatarHeight(Vector3 footPosition,
                                             IEnumerable<SkinnedMeshRenderer> skinnedMeshRenderers, 
                                             IEnumerable<MeshRenderer> meshRenderers)
         {
-            var maxHeight = float.MinValue;
-            foreach (var skinnedMeshRenderer in skinnedMeshRenderers)
-            {
-                var meshMaxHeight = CalculateMaxPositionInMesh(
-                                            skinnedMeshRenderer.transform, 
-                                            skinnedMeshRenderer.sharedMesh);
-
-                if (maxHeight < meshMaxHeight)
-                {
-                    maxHeight = meshMaxHeight;
-                }
-            }
-            foreach (var meshRenderer in meshRenderers)
-            {
-                var meshMaxHeight = CalculateMaxPositionInMesh(
-                                            meshRenderer.transform,
-                                            meshRenderer.GetComponent<MeshFilter>().sharedMesh);
+            // アバターのすべてのメッシュの頂点位置のy座標が最も高いところを取る
+            var avatarMaxHeight = skinnedMeshRenderers
+                                    .Select(r => new { Transform = r.transform, Mesh = r.sharedMesh })
+                                    .Concat(meshRenderers.Select(r => new { Transform = r.transform, Mesh = r.GetComponent<MeshFilter>().sharedMesh }))
+                                    .SelectMany(r => r.Mesh.vertices.Select(v => r.Transform.TransformPoint(v).y))
+                                    .DefaultIfEmpty()
+                                    .Max();
 
-                if (maxHeight < meshMaxHeight)
-                {
-                    maxHeight = meshMaxHeight;
-                }
-            }
-            return maxHeight - footPosition.y;
-        }
-
-        private float CalculateMaxPositionInMesh(Transform meshTransform, Mesh mesh)
-        {
-            return mesh.vertices.Select(v => meshTransform.TransformPoint(v).y).DefaultIfEmpty().Max();
+            if (avatarMaxHeight <= 0) return 0;
+            return avatarMaxHeight - footPosition.y;
         }
     }
 }