Merge pull request #376 from Unity-Technologies/bugfixes-5x-release

Bugfixes 5x release

Author: Karl Henkel

CHANGELOG.md

@@ -5,6 +5,20 @@ 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).
 
+## [5.0.2] - 2021-03-11
+
+### Bug Fixes
+
+- Fixed `Draw Shape` tool showing incorrect UVs when setting shape bounding box.
+- Fixed `Draw Shape` tool not clearing selection when changing the active shape type.
+- Fixed `Cut Tool` error when pressing `Backspace` with no vertices placed.
+- Fixed `Cut Tool` error when finishing a cut segment with less than 3 vertices.
+- Fixed `Draw Shape` tool truncating shape property fields in the Scene View Overlay.
+
+### Changes
+
+- Moved contents of warning box in `Draw Shape` tool to tooltips.
+
 ## [5.0.1] - 2021-03-09
 
 ### Bug Fixes

Debug/Editor/Guides.cs

@@ -0,0 +1,107 @@
+using UnityEditor;
+using UnityEditor.SettingsManagement;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace ProBuilder.Debug.Editor
+{
+    static class GuidesSettingsProvider
+    {
+        const string k_PreferencesPath = "Preferences/Scene Guides";
+        static Settings s_Settings;
+        public static Settings settings => s_Settings ?? (s_Settings = new Settings("com.unity.scene-guides"));
+
+        [SettingsProvider]
+        static SettingsProvider CreateSettingsProvider()
+        {
+            var provider = new UserSettingsProvider(k_PreferencesPath,
+                settings,
+                new[] { typeof(GuidesSettingsProvider).Assembly });
+
+            settings.afterSettingsSaved += HandleUtility.Repaint;
+
+            return provider;
+        }
+    }
+
+    class Pref<T> : UserSetting<T>
+    {
+        public Pref(string key, T value, SettingsScope scope = SettingsScope.Project)
+            : base(GuidesSettingsProvider.settings, key, value, scope) { }
+    }
+
+    static class Guides
+    {
+        [UserSetting("World Space", "Origin Axes", "Shows 3 axis guides from the scene view origin.")]
+        static Pref<bool> s_SceneOrigin = new Pref<bool>("Guides.s_SceneOrigin", false);
+
+        [UserSetting("Selection", "Transform Pivot", "Draw a gizmo at the origin of each selected transform.")]
+        static Pref<bool> s_SelectionPivot = new Pref<bool>("Guides.s_SelectionPivot", false);
+
+        static Vector3  zero = Vector3.zero,
+                        up = new Vector3(0f, 1f, 0f),
+                        right = new Vector3(1f, 0f, 0f),
+                        forward = new Vector3(0f, 0f, 1f);
+
+        [InitializeOnLoadMethod]
+        static void Init()
+        {
+            SceneView.duringSceneGui += view =>
+            {
+                var evt = Event.current;
+
+                if (evt.type != EventType.Repaint)
+                    return;
+
+                if (s_SceneOrigin)
+                {
+                    var dist = view.camera.farClipPlane / 10f;
+
+                    DrawLine(zero, right * dist, Handles.xAxisColor);
+                    DrawLine(zero, right * -dist, Handles.xAxisColor * .7f);
+
+                    DrawLine(zero, up * dist, Handles.yAxisColor);
+                    DrawLine(zero, up * -dist, Handles.yAxisColor * .7f);
+
+                    DrawLine(zero, forward * dist, Handles.zAxisColor);
+                    DrawLine(zero, forward * -dist, Handles.zAxisColor * .7f);
+                }
+
+                if (s_SelectionPivot)
+                {
+                    foreach (var transform in Selection.transforms)
+                        DrawPivot(transform);
+                }
+            };
+        }
+
+        static void DrawPivot(Transform transform)
+        {
+            using (new Handles.DrawingScope(transform.localToWorldMatrix))
+            {
+                DrawLine(zero, right * .2f, Handles.xAxisColor, 1f, 3f);
+                DrawLine(zero, up * .2f, Handles.yAxisColor, 1f, 3f);
+                DrawLine(zero, forward * .2f, Handles.zAxisColor, 1f, 3f);
+            }
+        }
+
+        static void DrawLine(Vector3 from, Vector3 to, Color color, float occludedTint = .7f, float thickness = 0f)
+        {
+            Handles.color = color;
+            Handles.zTest = CompareFunction.LessEqual;
+#if UNITY_2021_1_OR_NEWER
+            Handles.DrawLine(from, to, thickness);
+#else
+            Handles.DrawLine(from, to);
+#endif
+
+            Handles.color = color * occludedTint;
+            Handles.zTest = CompareFunction.Greater;
+#if UNITY_2021_1_OR_NEWER
+            Handles.DrawLine(from, to, thickness);
+#else
+            Handles.DrawLine(from, to);
+#endif
+        }
+    }
+}

Debug/Editor/Guides.cs.meta

@@ -1,11 +1,12 @@
 {
     "name": "Unity.ProBuilder.Debug.Editor",
+    "rootNamespace": "",
     "references": [
         "Unity.ProBuilder",
         "Unity.ProBuilder.Editor",
-        "Unity.ProBuilder.AssetIdRemapUtility"
+        "Unity.ProBuilder.AssetIdRemapUtility",
+        "Unity.Settings.Editor"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -14,5 +15,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": false,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Debug/Editor/Unity.ProBuilder.Debug.Editor.asmdef

@@ -133,9 +133,8 @@ public bool isALoop
             {
                 if (m_CutPath.Count < 3)
                     return false;
-                else
-                    return Math.Approx3(m_CutPath[0].position,
-                        m_CutPath[m_CutPath.Count - 1].position);
+
+                return Math.Approx3(m_CutPath[0].position, m_CutPath[m_CutPath.Count - 1].position);
             }
         }
 
@@ -409,9 +408,13 @@ void HandleKeyEvent(Event evt)
             {
                 case KeyCode.Backspace:
                 {
-                    UndoUtility.RecordObject(m_Mesh, "Delete Selected Points");
-                    m_CutPath.RemoveAt(m_CutPath.Count-1);
-                    m_Dirty = true;
+                    if (m_CutPath.Count > 0)
+                    {
+                        UndoUtility.RecordObject(m_Mesh, "Delete Selected Points");
+                        m_CutPath.RemoveAt(m_CutPath.Count - 1);
+                        m_Dirty = true;
+                    }
+
                     evt.Use();
                     break;
                 }
@@ -513,9 +516,7 @@ void DoPointPlacement()
                      && evtType == EventType.MouseDown
                      && HandleUtility.nearestControl == m_ControlId)
             {
-                int polyCount = m_CutPath.Count;
-                if (!m_CurrentPosition.Equals(Vector3.positiveInfinity)
-                    && (polyCount == 0 || m_SelectedIndex != polyCount - 1))
+                if(CanAppendCurrentPointToPath())
                 {
                     AddCurrentPositionToPath();
                     evt.Use();
@@ -532,6 +533,26 @@ void DoPointPlacement()
             }
         }
 
+        bool CanAppendCurrentPointToPath()
+        {
+            int polyCount = m_CutPath.Count;
+
+            if (!Math.IsNumber(m_CurrentPosition))
+                return false;
+
+            if (!(polyCount == 0 || m_SelectedIndex != polyCount - 1))
+                return false;
+
+            // duplicate points are not permitted, except the special case where placing a final point on the starting
+            // point finishes the cut operation.
+            for(int i = 1; i < polyCount; i++)
+                if (Math.Approx3(m_CutPath[i].position, m_CurrentPosition))
+                    return false;
+
+            // when the existing vertex count is less than 3, don't allow the special duplicate first vertex position
+            return polyCount < 2 || !(polyCount < 3 && Math.Approx3(m_CutPath[0].position, m_CurrentPosition));
+        }
+
         internal void AddCurrentPositionToPath(bool optimize = true)
         {
             UndoUtility.RecordObject(this, "Add Vertex On Path");

Editor/EditorCore/CutTool.cs

@@ -4,6 +4,7 @@
 using UnityEngine;
 using UnityEngine.ProBuilder;
 using UnityEngine.ProBuilder.Shapes;
+using Math = UnityEngine.ProBuilder.Math;
 using UObject = UnityEngine.Object;
 #if UNITY_2020_2_OR_NEWER
 using ToolManager = UnityEditor.EditorTools.ToolManager;
@@ -238,22 +239,32 @@ internal void SetBounds(Vector3 size)
             m_BB_HeightCorner = m_BB_Origin + size;
         }
 
-        internal void DuplicatePreview(Vector3 position)
+        internal void DoDuplicateShapePreviewHandle(Vector3 position)
         {
-            if(position.Equals(Vector3.positiveInfinity) || !Event.current.isMouse)
+            var evt = Event.current;
+
+            if(evt.type != EventType.Repaint)
+                return;
+
+            bool previewShortcutActive = evt.shift && !(evt.control || evt.command);
+
+            if (HandleUtility.nearestControl != m_ControlID || !previewShortcutActive)
+            {
+                DestroyImmediate(m_DuplicateGO);
                 return;
+            }
 
             var pivotLocation = (PivotLocation)s_LastPivotLocation.value;
             var size = currentShapeInOverlay.size;
 
             m_Bounds.size = size;
-
             Vector3 cornerPosition;
-            switch(pivotLocation)
+
+            switch (pivotLocation)
             {
                 case PivotLocation.FirstCorner:
                     cornerPosition = GetPoint(position);
-                    m_PlaneRotation = Quaternion.LookRotation(m_PlaneForward,m_Plane.normal);
+                    m_PlaneRotation = Quaternion.LookRotation(m_PlaneForward, m_Plane.normal);
                     m_Bounds.center = cornerPosition + m_PlaneRotation * size / 2f;
 
                     m_BB_Origin = cornerPosition;
@@ -266,32 +277,37 @@ internal void DuplicatePreview(Vector3 position)
                     position = GetPoint(position);
                     cornerPosition = position - size / 2f;
                     cornerPosition.y = position.y;
-                    m_Bounds.center = cornerPosition + new Vector3(size.x/2f,0, size.z/2f) + (size.y / 2f) * m_Plane.normal;
-                    m_PlaneRotation = Quaternion.LookRotation(m_PlaneForward,m_Plane.normal);
+                    m_Bounds.center = cornerPosition + new Vector3(size.x / 2f, 0, size.z / 2f) + (size.y / 2f) * m_Plane.normal;
+                    m_PlaneRotation = Quaternion.LookRotation(m_PlaneForward, m_Plane.normal);
 
                     m_BB_Origin = m_Bounds.center - m_PlaneRotation * (size / 2f);
                     m_BB_HeightCorner = m_Bounds.center + m_PlaneRotation * (size / 2f);
                     m_BB_OppositeCorner = m_BB_HeightCorner - m_PlaneRotation * new Vector3(0, size.y, 0);
                     break;
             }
 
-            ProBuilderShape proBuilderShape;
-
-            if(m_DuplicateGO == null)
+            if (m_DuplicateGO == null)
             {
                 var instantiated = ShapeFactory.Instantiate(activeShapeType, ((PivotLocation)s_LastPivotLocation.value));
-                proBuilderShape = instantiated.GetComponent<ProBuilderShape>();
-                m_DuplicateGO = proBuilderShape.gameObject;
+                var shape = instantiated.GetComponent<ProBuilderShape>();
+                m_DuplicateGO = shape.gameObject;
                 m_DuplicateGO.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy;
-                ApplyPrefsSettings(proBuilderShape);
-                proBuilderShape.GetComponent<MeshRenderer>().sharedMaterial = m_ShapePreviewMaterial;
+                ApplyPrefsSettings(shape);
+                shape.GetComponent<MeshRenderer>().sharedMaterial = m_ShapePreviewMaterial;
+
+                EditorShapeUtility.CopyLastParams(shape.shape, shape.shape.GetType());
+                shape.Rebuild(m_Bounds, m_PlaneRotation, m_BB_Origin);
+                ProBuilderEditor.Refresh(false);
             }
-            else
-                proBuilderShape = m_DuplicateGO.GetComponent<ProBuilderShape>();
 
-            EditorShapeUtility.CopyLastParams(proBuilderShape.shape, proBuilderShape.shape.GetType());
-            proBuilderShape.Rebuild(m_Bounds, m_PlaneRotation);
-            ProBuilderEditor.Refresh(false);
+            var pivot = GetPoint(position);
+            if (pivotLocation == PivotLocation.Center)
+                pivot += m_Plane.normal * size.y * .5f;
+
+            m_DuplicateGO.transform.position = pivot;
+            m_DuplicateGO.transform.rotation = Quaternion.LookRotation(m_PlaneForward, m_Plane.normal);
+
+            DrawBoundingBox(false);
         }
 
         void RecalculateBounds()
@@ -343,7 +359,7 @@ internal void RebuildShape()
                 m_IsShapeInit = true;
             }
 
-            m_ProBuilderShape.Rebuild(m_Bounds, m_PlaneRotation);
+            m_ProBuilderShape.Rebuild(m_Bounds, m_PlaneRotation, m_BB_Origin);
             ProBuilderEditor.Refresh(false);
 
             SceneView.RepaintAll();
@@ -390,8 +406,6 @@ internal void DrawBoundingBox(bool drawCorners = true)
 
         void OnOverlayGUI(UObject overlayTarget, SceneView view)
         {
-            EditorGUILayout.HelpBox(L10n.Tr("Click and drag to place and scale the shape, or SHIFT+click once to duplicate last size settings."), MessageType.Info);
-
             DrawShapeGUI();
 
 #if !UNITY_2021_1_OR_NEWER
@@ -463,6 +477,7 @@ void DrawShapeGUI()
                             m_LastShapeCreated = null;
 
                         UndoUtility.RegisterCompleteObjectUndo(currentShapeInOverlay, "Change Shape");
+                        Selection.activeObject = null;
                         currentShapeInOverlay.SetShape(EditorShapeUtility.CreateShape(type), currentShapeInOverlay.pivotLocation);
                         SetBounds(currentShapeInOverlay.size);
 

Editor/EditorCore/DrawShapeTool.cs

@@ -12,8 +12,8 @@ static class EditorShapeUtility
     {
         [UserSetting]
         public static Pref<bool> s_ResetUserPrefs = new Pref<bool>("ShapeComponent.ResetSettings", true);
-
         static Dictionary<string, Shape> s_Prefs = new Dictionary<string, Shape>();
+        static readonly string k_Tooltip = L10n.Tr("Click and drag to place and scale the shape, or SHIFT+click once to duplicate last size settings.");
 
         static Dictionary<string, Shape> prefs
         {
@@ -76,7 +76,7 @@ public static List<GUIContent[]> shapeTypesGUI
                 if(s_ShapeTypesGUILists == null)
                 {
                     s_ShapeTypesGUILists = new List<GUIContent[]>();
-                    string[] shapeTypeNames = availableShapeTypes.Select(x => ((ShapeAttribute)System.Attribute.GetCustomAttribute(x, typeof(ShapeAttribute))).name).ToArray();
+                    string[] shapeTypeNames = availableShapeTypes.Select(x => ((ShapeAttribute) Attribute.GetCustomAttribute(x, typeof(ShapeAttribute))).name).ToArray();
                     GUIContent[] shapeTypesGUI = null;
 
                     int i;
@@ -91,9 +91,9 @@ public static List<GUIContent[]> shapeTypesGUI
                         var name = shapeTypeNames[i];
                         var texture = IconUtility.GetIcon("Tools/ShapeTool/" + name);
                         if(texture != null)
-                            shapeTypesGUI[i % s_MaxContentPerGroup] = new GUIContent(texture, name);
+                            shapeTypesGUI[i % s_MaxContentPerGroup] = new GUIContent(texture, k_Tooltip);
                         else
-                            shapeTypesGUI[i % s_MaxContentPerGroup] = new GUIContent(name, name);
+                            shapeTypesGUI[i % s_MaxContentPerGroup] = new GUIContent(name, k_Tooltip);
                     }
 
                     if(shapeTypesGUI != null) s_ShapeTypesGUILists.Add(shapeTypesGUI);

Editor/EditorCore/EditorShapeUtility.cs

@@ -42,7 +42,7 @@ public static class EditorUtility
         static Pref<bool> s_MeshColliderIsConvex = new Pref<bool>("mesh.meshColliderIsConvex", false);
 
         [UserSetting("Mesh Settings", "Pivot Location", "Determines the placement of new shape's pivot.")]
-        static Pref<PivotLocation> s_NewShapesPivotAtCenter = new Pref<PivotLocation>("mesh.newShapePivotLocation", PivotLocation.Center);
+        static Pref<PivotLocation> s_NewShapesPivotAtCenter = new Pref<PivotLocation>("mesh.newShapePivotLocation", PivotLocation.FirstCorner);
 
         [UserSetting("Mesh Settings", "Snap New Shape To Grid", "When enabled, new shapes will snap to the closest point on grid.")]
         static Pref<bool> s_SnapNewShapesToGrid = new Pref<bool>("mesh.newShapesSnapToGrid", true);

Editor/EditorCore/EditorUtility.cs

@@ -31,6 +31,7 @@ static void ExperimentalFeaturesSettings(string searchContext)
 
             EditorGUI.BeginChangeCheck();
 
+            EditorGUILayout.HelpBox("Enabling Experimental Features will cause Unity to recompile scripts.", MessageType.Warning);
             enabled = SettingsGUILayout.SearchableToggle("Experimental Features Enabled", enabled, searchContext);
 
             if (EditorGUI.EndChangeCheck())