Refactoring. Updated change log

Author: modrimkus-unity

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Bug Fixes
 
+- [case: 1324374] Fixed incorrect vertex/edge/face rect selection when mesh's parent is rotated and/or scaled.
 - [case: 1324399] Fixing errors when building with prefabs in scene.
 - [case: 1323666] Preventing to assign an empty mesh as MeshCollider.
 - [case: 1322032] Fixing wrong ProBuilderMesh colors on domain reload when null.

Runtime/Core/InternalUtility.cs

@@ -50,6 +50,20 @@ public static GameObject EmptyGameObjectWithTransform(Transform t)
             return go;
         }
 
+        public static GameObject MeshGameObjectWithTransform(string name, Transform t, Mesh mesh, Material mat, bool inheritParent)
+        {
+            GameObject go = InternalUtility.EmptyGameObjectWithTransform(t);
+            go.name = name;
+            go.AddComponent<MeshFilter>().sharedMesh = mesh;
+            go.AddComponent<MeshRenderer>().sharedMaterial = mat;
+            go.hideFlags = HideFlags.HideAndDontSave;
+
+            if (inheritParent)
+                go.transform.SetParent(t.parent, false);
+
+            return go;
+        }
+
         public static T NextEnumValue<T>(this T current) where T : IConvertible
         {
             Assert.IsTrue(current is Enum);

Runtime/Core/SelectionPickerRenderer.cs

@@ -540,9 +540,6 @@ static GameObject[] GenerateFacePickingObjects(
             {
                 var pb = selection[i];
 
-                GameObject go = InternalUtility.EmptyGameObjectWithTransform(pb.transform);
-                go.name = pb.name + " (Face Depth Test)";
-
                 Mesh m = new Mesh();
                 m.vertices = pb.positionsInternal;
                 m.triangles = pb.facesInternal.SelectMany(x => x.indexesInternal).ToArray();
@@ -559,10 +556,8 @@ static GameObject[] GenerateFacePickingObjects(
 
                 m.colors32 = colors;
 
-                go.AddComponent<MeshFilter>().sharedMesh = m;
-                go.AddComponent<MeshRenderer>().sharedMaterial = BuiltinMaterials.facePickerMaterial;
-                go.hideFlags = HideFlags.HideAndDontSave;
-                go.transform.SetParent(pb.transform.parent, false);
+                GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Face Depth Test)", pb.transform, m,
+                    BuiltinMaterials.facePickerMaterial, true);
 
                 pickerObjects[i] = go;
             }
@@ -589,12 +584,10 @@ static void GenerateVertexPickingObjects(
             {
                 // build vertex billboards
                 var pb = selection[i];
-                GameObject go = InternalUtility.EmptyGameObjectWithTransform(pb.transform);
-                go.name = pb.name + "  (Vertex Billboards)";
-                go.AddComponent<MeshFilter>().sharedMesh = BuildVertexMesh(pb, map, ref index);
-                go.AddComponent<MeshRenderer>().sharedMaterial = BuiltinMaterials.vertexPickerMaterial;
-                go.hideFlags = HideFlags.HideAndDontSave;
-                go.transform.SetParent(pb.transform.parent, false);
+
+                var mesh = BuildVertexMesh(pb, map, ref index);
+                GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Vertex Billboards)", pb.transform, mesh,
+                    BuiltinMaterials.vertexPickerMaterial, true);
 
                 pickerObjects[i] = go;
             }
@@ -607,12 +600,9 @@ static void GenerateVertexPickingObjects(
                 for (int i = 0; i < selectionCount; i++)
                 {
                     var pb = selection[i];
-                    GameObject go = InternalUtility.EmptyGameObjectWithTransform(pb.transform);
-                    go.name = pb.name + "  (Depth Mask)";
-                    go.AddComponent<MeshFilter>().sharedMesh = pb.mesh;
-                    go.AddComponent<MeshRenderer>().sharedMaterial = BuiltinMaterials.facePickerMaterial;
-                    go.hideFlags = HideFlags.HideAndDontSave;
-                    go.transform.SetParent(pb.transform.parent, false);
+
+                    GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Depth Mask)", pb.transform, pb.mesh,
+                        BuiltinMaterials.facePickerMaterial, true);
 
                     depthObjects[i] = go;
                 }
@@ -640,12 +630,10 @@ static void GenerateEdgePickingObjects(
             {
                 // build edge billboards
                 var pb = selection[i];
-                GameObject go = InternalUtility.EmptyGameObjectWithTransform(pb.transform);
-                go.name = pb.name + "  (Edge Billboards)";
-                go.AddComponent<MeshFilter>().sharedMesh = BuildEdgeMesh(pb, map, ref index);
-                go.AddComponent<MeshRenderer>().sharedMaterial = BuiltinMaterials.edgePickerMaterial;
-                go.hideFlags = HideFlags.HideAndDontSave;
-                go.transform.SetParent(pb.transform.parent, false);
+
+                var mesh = BuildEdgeMesh(pb, map, ref index);
+                GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Edge Billboards)", pb.transform, mesh,
+                    BuiltinMaterials.edgePickerMaterial, true);
 
                 pickerObjects[i] = go;
             }
@@ -657,14 +645,11 @@ static void GenerateEdgePickingObjects(
                 for (int i = 0; i < selectionCount; i++)
                 {
                     var pb = selection[i];
+
                     // copy the select gameobject just for z-write
-                    GameObject go = InternalUtility.EmptyGameObjectWithTransform(pb.transform);
-                    go.name = pb.name + "  (Depth Mask)";
-                    go.AddComponent<MeshFilter>().sharedMesh = pb.mesh;
-                    go.AddComponent<MeshRenderer>().sharedMaterial = BuiltinMaterials.facePickerMaterial;
-                    go.hideFlags = HideFlags.HideAndDontSave;
-                    go.transform.SetParent(pb.transform.parent, false);
-                    
+                    GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Depth Mask)", pb.transform, pb.mesh,
+                        BuiltinMaterials.facePickerMaterial, true);
+
                     depthObjects[i] = go;
                 }
             }