Merge pull request #391 from Unity-Technologies/bugfix/1324374-rotated-parent-incorrect-rect-select

Rect Selection incorrectly selects child GameObject mesh's parts when the parent GameObject is rotated or scaled

Author: modrimkus

CHANGELOG.md

@@ -5,12 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-
 ## [Unreleased]
 
 ### Bug Fixes
 
 - [case: 1332226] Fixed issue where some Gizmos menu items would be missing in projects that have ProBuilder package installed.
+- [case: 1324374] Fixed incorrect vertex/edge/face rect selection when mesh's parent is rotated and/or scaled.
 
 ## [5.0.3] - 2021-04-01
 

Runtime/Core/InternalUtility.cs

@@ -39,7 +39,7 @@ public static T[] GetComponents<T>(this IEnumerable<Transform> transforms) where
         public static GameObject EmptyGameObjectWithTransform(Transform t)
         {
             GameObject go                   = new GameObject();
-            go.transform.position           = t.position;
+            go.transform.localPosition      = t.localPosition;
             go.transform.localRotation      = t.localRotation;
             go.transform.localScale         = t.localScale;
 
@@ -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,8 +556,8 @@ static GameObject[] GenerateFacePickingObjects(
 
                 m.colors32 = colors;
 
-                go.AddComponent<MeshFilter>().sharedMesh = m;
-                go.AddComponent<MeshRenderer>().sharedMaterial = BuiltinMaterials.facePickerMaterial;
+                GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Face Depth Test)", pb.transform, m,
+                    BuiltinMaterials.facePickerMaterial, true);
 
                 pickerObjects[i] = go;
             }
@@ -587,10 +584,11 @@ 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;
+
+                var mesh = BuildVertexMesh(pb, map, ref index);
+                GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Vertex Billboards)", pb.transform, mesh,
+                    BuiltinMaterials.vertexPickerMaterial, true);
+
                 pickerObjects[i] = go;
             }
 
@@ -602,10 +600,10 @@ 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;
+
+                    GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Depth Mask)", pb.transform, pb.mesh,
+                        BuiltinMaterials.facePickerMaterial, true);
+
                     depthObjects[i] = go;
                 }
             }
@@ -632,10 +630,11 @@ 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;
+
+                var mesh = BuildEdgeMesh(pb, map, ref index);
+                GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Edge Billboards)", pb.transform, mesh,
+                    BuiltinMaterials.edgePickerMaterial, true);
+
                 pickerObjects[i] = go;
             }
 
@@ -646,11 +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;
+                    GameObject go = InternalUtility.MeshGameObjectWithTransform(pb.name + " (Depth Mask)", pb.transform, pb.mesh,
+                        BuiltinMaterials.facePickerMaterial, true);
+
                     depthObjects[i] = go;
                 }
             }

Tests/Editor/Picking/RectSelection.cs

@@ -116,6 +116,41 @@ Dictionary<ProBuilderMesh, HashSet<Face>> TestFacePick(PickerOptions options)
         }
     }
 
+    [Test]
+    public void PickVertices_RotatedParent_DepthTestOn()
+    {
+        // Create a parent container with -90 degree rotation around Z
+        var parent = new GameObject("Parent");
+        parent.transform.position = new Vector3(0f, 0f, 0f);
+        parent.transform.rotation = Quaternion.Euler(0f, 0f, -90f);
+
+        // Create a Cube such that when parented to the container has (6f, 0f, 0f) world position
+        var cube = ShapeFactory.Instantiate<UnityEngine.ProBuilder.Shapes.Cube>();
+        cube.transform.position = new Vector3(0f, 6f, 0f);
+        cube.transform.SetParent(parent.transform, false);
+
+        // Create a camera and point it to (6f, 0f, 0) looking directly at one of the Cube's faces
+        camera = new GameObject("Camera", typeof(Camera)).GetComponent<Camera>();
+        camera.transform.position = new Vector3(6f, 0, -6f);
+        camera.transform.forward = Vector3.forward;
+
+        selectables = new ProBuilderMesh[]
+        {
+            cube
+        };
+
+        // Attempt full screen rect selection - this should select the 4 vertices of the quad that the camera's facing
+        var vertices = TestVertexPick(new PickerOptions() { depthTest = true });
+        var selection = vertices.FirstOrDefault();
+        Assert.IsNotNull(selection);
+        HashSet<int> selectedElements = selection.Value;
+        Assert.That(selectedElements.Count, Is.EqualTo(4));
+
+        UObject.DestroyImmediate(cube.gameObject);
+        UObject.DestroyImmediate(parent);
+        UObject.DestroyImmediate(camera.gameObject);
+    }
+
     [Test]
     public void PickVertices_DepthTestOn()
     {