Merge branch 'master' into uni-9224-docs-pb5

Author: Karl Henkel

CHANGELOG.md

@@ -11,9 +11,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Updated documentation for v5.0.0.
 
+### Changes
+
+- Add `GameObject/ProBuilder` menu to create primitives with default dimensions.
+
+## [5.0.0-pre.12] - 2021-03-05
+
+### Bug Fixes
+
+- [case: 1317773] Fixing undo after shape creation.
+- Fixed shape creation requiring two undos to remove new shape.
+- Fixed shape preview flickering when executing shortcut to redo.
+- Fixed new shapes instantiating with generic "Shape" name instead of the primitive name.
+
+## [5.0.0-pre.11] - 2021-02-25
+
 ### Bug Fixes
 
-- [case: 1317148] Fixing edge picking problem with some Unity versions. 
+- [case: 1317148] Fixing edge picking problem with some Unity versions.
 - [case: 1312537] Fixing script stripping on disabled objects when building.
 - [case: 1311258] Fixing material reverting when subdividing edge.
 - Added Particle System and IMGUI modules as a dependency.
@@ -26,7 +41,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added Point-to-point Cut tool.
 - Added a selection preview when using the Select Path tool.
 - Added `Selection X Ray` option to highlight occluded element selections with a muted color. Default shortcut is `Alt + Shift + X` (modifiable in Shortcut Manager).
-- MergeElements.Merge moved to public API
 - Added Analytics for Actions and Menu Shortcuts
 
 ### Bug Fixes
@@ -67,7 +81,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [case: 1285654] Fixed selected faces highlight for isometric camera mode in sceneview.
 - [case: 1286045] Fixed selection cleaning problem after scene restart.
 - [case: 1266769] Fixed tooltip window not rendering correctly on Linux.
-- [case: 1281658] Fixed warning when modifying a PBMesh with particule effect using PBMesh as shape emitter. 
+- [case: 1281658] Fixed warning when modifying a PBMesh with particule effect using PBMesh as shape emitter.
 
 ### Changes
 

Editor/EditorCore/CutTool.cs

@@ -167,7 +167,8 @@ void OnEnable()
         {
             m_IconContent = new GUIContent()
             {
-                image = IconUtility.GetIcon("Tools/PolyShape/CreatePolyShape"),
+                //image = IconUtility.GetIcon("Tools/PolyShape/CreatePolyShape"),
+                image = IconUtility.GetIcon("Toolbar/CutTool"),
                 text = "Cut Tool",
                 tooltip = "Cut Tool"
             };
@@ -197,7 +198,7 @@ void OnDisable()
         {
             Undo.undoRedoPerformed -= UndoRedoPerformed;
 
-            ExecuteCut();
+            ExecuteCut(false);
             Clear();
         }
 
@@ -218,6 +219,8 @@ void Clear()
             m_SelectedEdges = null;
 
             EditorHandleDrawing.ClearHandles();
+
+            ProBuilderEditor.Refresh();
         }
 
         /// <summary>
@@ -369,9 +372,7 @@ void OnOverlayGUI(UObject target, SceneView view)
                 if(m_Mesh == null)
                 {
                     if(GUILayout.Button(EditorGUIUtility.TrTextContent("Start")))
-                    {
                         UpdateTarget();
-                    }
 
                     if(GUILayout.Button(EditorGUIUtility.TrTextContent("Quit")))
                     {
@@ -383,8 +384,12 @@ void OnOverlayGUI(UObject target, SceneView view)
                 {
                     if(GUILayout.Button(EditorGUIUtility.TrTextContent("Complete")))
                         ExecuteCut();
+
                     if(GUILayout.Button(EditorGUIUtility.TrTextContent("Cancel")))
+                    {
                         Clear();
+                        ToolManager.RestorePreviousTool();
+                    }
                 }
             }
 
@@ -717,10 +722,13 @@ internal void UpdateMeshConnections()
         /// <summary>
         /// Compute the cut result and display a notification
         /// </summary>
-        void ExecuteCut()
+        void ExecuteCut(bool restorePrevious = true)
         {
             ActionResult result = DoCut();
             EditorUtility.ShowNotification(result.notification);
+
+            if(restorePrevious)
+                ToolManager.RestorePreviousTool();
         }
 
         /// <summary>
@@ -811,6 +819,7 @@ internal ActionResult DoCut()
             //Update mesh selection after the cut has been performed
             MeshSelection.ClearElementSelection();
             m_Mesh.SetSelectedFaces(newFaces);
+            ProBuilderEditor.Refresh();
 
             Clear();
 

Editor/EditorCore/DrawShapeTool.cs

@@ -1,5 +1,6 @@
 using System;
 using UnityEditor.EditorTools;
+using UnityEditor.SettingsManagement;
 using UnityEngine;
 using UnityEngine.ProBuilder;
 using UnityEngine.ProBuilder.Shapes;
@@ -42,12 +43,17 @@ class DrawShapeTool : EditorTool
 
         static readonly GUIContent k_ShapeTitle = new GUIContent("Create Shape");
 
+        [UserSetting]
         internal static Pref<int> s_ActiveShapeIndex = new Pref<int>("ShapeBuilder.ActiveShapeIndex", 0);
-        public static Pref<bool> s_SettingsEnabled = new Pref<bool>("ShapeComponent.SettingsEnabled", false);
+        public static Pref<bool> s_SettingsEnabled = new Pref<bool>("ShapeComponent.SettingsEnabled", false, SettingsScope.Project);
 
+        [UserSetting]
         internal static Pref<int> s_LastPivotLocation = new Pref<int>("ShapeBuilder.LastPivotLocation", (int)PivotLocation.FirstCorner);
+        [UserSetting]
         internal static Pref<Vector3> s_LastPivotPosition = new Pref<Vector3>("ShapeBuilder.LastPivotPosition", Vector3.zero);
+        [UserSetting]
         internal static Pref<Vector3> s_LastSize = new Pref<Vector3>("ShapeBuilder.LastSize", Vector3.one);
+        [UserSetting]
         internal static Pref<Quaternion> s_LastRotation = new Pref<Quaternion>("ShapeBuilder.LastRotation", Quaternion.identity);
 
         int m_ControlID;
@@ -108,7 +114,8 @@ void OnEnable()
 
             m_IconContent = new GUIContent()
             {
-                image = IconUtility.GetIcon("Tools/ShapeTool/Arch"),
+                //image = IconUtility.GetIcon("Tools/ShapeTool/Arch"),
+                image = IconUtility.GetIcon("Toolbar/Panel_Shapes"),
                 text = "Shape Settings",
                 tooltip = "Shape Settings"
             };
@@ -233,7 +240,7 @@ internal void SetBounds(Vector3 size)
 
         internal void DuplicatePreview(Vector3 position)
         {
-            if(position.Equals(Vector3.positiveInfinity))
+            if(position.Equals(Vector3.positiveInfinity) || !Event.current.isMouse)
                 return;
 
             var pivotLocation = (PivotLocation)s_LastPivotLocation.value;
@@ -269,9 +276,11 @@ internal void DuplicatePreview(Vector3 position)
             }
 
             ProBuilderShape proBuilderShape;
+
             if(m_DuplicateGO == null)
             {
-                proBuilderShape = ShapeFactory.Instantiate(activeShapeType, ( (PivotLocation)s_LastPivotLocation.value )).GetComponent<ProBuilderShape>();
+                var instantiated = ShapeFactory.Instantiate(activeShapeType, ((PivotLocation)s_LastPivotLocation.value));
+                proBuilderShape = instantiated.GetComponent<ProBuilderShape>();
                 m_DuplicateGO = proBuilderShape.gameObject;
                 m_DuplicateGO.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy;
                 ApplyPrefsSettings(proBuilderShape);
@@ -327,7 +336,10 @@ internal void RebuildShape()
                 EditorShapeUtility.CopyLastParams(shapeComponent.shape, shapeComponent.shape.GetType());
                 shapeComponent.gameObject.hideFlags = HideFlags.HideInHierarchy;
                 shapeComponent.mesh.renderer.sharedMaterial = EditorMaterialUtility.GetUserMaterial();
+                shapeComponent.rotation = Quaternion.identity;
+                shapeComponent.gameObject.name = EditorShapeUtility.GetName(shapeComponent.shape);
                 UndoUtility.RegisterCreatedObjectUndo(shapeComponent.gameObject, "Draw Shape");
+                EditorUtility.InitObject(shapeComponent.mesh);
                 m_IsShapeInit = true;
             }
 
@@ -389,7 +401,7 @@ void OnOverlayGUI(UObject overlayTarget, SceneView view)
                 if(snapDisabled)
                     EditorGUILayout.Toggle("Snapping (only Global)", false);
                 else
-                    EditorSnapSettings.gridSnapEnabled = EditorGUILayout.Toggle("Snapping", EditorSnapSettings.gridSnapEnabled);
+                    EditorSnapSettings.gridSnapEnabled = EditorGUILayout.Toggle("Grid Snapping", EditorSnapSettings.gridSnapEnabled);
             }
 #endif
 
@@ -406,13 +418,29 @@ void OnOverlayGUI(UObject overlayTarget, SceneView view)
             }
         }
 
+        void ResetPrefs()
+        {
+            var type = EditorShapeUtility.availableShapeTypes[s_ActiveShapeIndex];
+            if(currentShapeInOverlay == m_LastShapeCreated)
+                m_LastShapeCreated = null;
+
+            UndoUtility.RegisterCompleteObjectUndo(currentShapeInOverlay, "Change Shape");
+            currentShapeInOverlay.SetShape(EditorShapeUtility.CreateShape(type), currentShapeInOverlay.pivotLocation);
+            SetBounds(currentShapeInOverlay.size);
+
+            ProBuilderEditor.Refresh();
+        }
+
         void DrawShapeGUI()
         {
             if(m_BoldCenteredStyle == null)
                 m_BoldCenteredStyle = new GUIStyle("BoldLabel") { alignment = TextAnchor.MiddleCenter };
 
             EditorGUILayout.LabelField(EditorShapeUtility.shapeTypes[s_ActiveShapeIndex.value], m_BoldCenteredStyle, GUILayout.ExpandWidth(true));
 
+            if(EditorShapeUtility.s_ResetUserPrefs.value)
+                ResetPrefs();
+
             var shape = currentShapeInOverlay.shape;
 
             int groupCount = EditorShapeUtility.shapeTypesGUI.Count;