Merge master changes

Scripts/Brushes/CompoundBrushes/Editor/HollowBoxBrushInspector.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace Sabresaurus.SabreCSG
+{
+    [CanEditMultipleObjects]
+    [CustomEditor(typeof(HollowBoxBrush), true)]
+    public class HollowBoxBrushInspector : CompoundBrushInspector
+    {
+        SerializedProperty wallThicknessProp;
+
+        public override void DoInspectorGUI()
+        {
+            using (new NamedVerticalScope("Hollow Box"))
+            {
+                EditorGUI.BeginChangeCheck();
+                EditorGUILayout.PropertyField(wallThicknessProp);
+
+                if (EditorGUI.EndChangeCheck())
+                {
+                    ApplyAndInvalidate();
+                }
+
+                EditorGUILayout.Space();
+            }
+
+            base.DoInspectorGUI();
+        }
+
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+
+            // Setup the SerializedProperties.
+            wallThicknessProp = serializedObject.FindProperty("wallThickness");
+        }
+
+        private void ApplyAndInvalidate()
+        {
+            serializedObject.ApplyModifiedProperties();
+            System.Array.ForEach(BrushTargets, item => item.Invalidate(true));
+        }
+    }
+}

Scripts/Brushes/CompoundBrushes/Editor/ShapeEditorWindow.cs

@@ -510,6 +510,11 @@ private void OnGUI()
                     OnSegmentInsert();
                     Event.current.Use();
                 }
+                if (Event.current.keyCode == KeyCode.E)
+                {
+                    OnSegmentExtrude();
+                    Event.current.Use();
+                }
                 if (Event.current.keyCode == KeyCode.Delete)
                 {
                     OnDelete();
@@ -787,6 +792,10 @@ private void OnGUI()
             {
                 OnSegmentInsert();
             }
+            if (GUILayout.Button(new GUIContent(SabreCSGResources.ShapeEditorSegmentExtrudeTexture, "Extrude Segment(s) (E)"), createBrushStyle))
+            {
+                OnSegmentExtrude();
+            }
             if (GUILayout.Button(new GUIContent(SabreCSGResources.ShapeEditorDeleteTexture, "Delete Segment(s) or Shape(s) (DEL)"), createBrushStyle))
             {
                 OnDelete();
@@ -1140,6 +1149,31 @@ private void OnSegmentInsert()
             }
         }
 
+        /// <summary>
+        /// Called when the extrude segment button is pressed. Will extrude all selected segments.
+        /// </summary>
+        private void OnSegmentExtrude()
+        {
+            foreach (Segment segment in selectedSegments.ToArray()) // use .ToArray() to iterate a clone.
+            {
+                bool inverted = project.flipHorizontally ^ project.flipVertically;
+                Segment next = GetNextSegment(segment);
+                // calculate extrude direction.
+                Vector2Int pos1 = (inverted ? segment.position - next.position : next.position - segment.position);
+                Vector2 dir = new Vector2(pos1.y, -pos1.x).normalized * 2.0f;
+                // insert new segments at an extruded distance.
+                Shape parent = GetShapeOfSegment(segment);
+                Segment select;
+                parent.segments.Insert(parent.segments.IndexOf(next), select = new Segment(segment.position.x + Mathf.RoundToInt(dir.x), segment.position.y + Mathf.RoundToInt(dir.y)));
+                parent.segments.Insert(parent.segments.IndexOf(next), new Segment(next.position.x + Mathf.RoundToInt(dir.x), next.position.y + Mathf.RoundToInt(dir.y)));
+                // recalculate the pivot position of the shape.
+                parent.CalculatePivotPosition();
+                // update the selection so we have the extruded segment selected, this improves the workflow experience.
+                selectedObjects.Remove(segment);
+                selectedObjects.Add(select);
+            }
+        }
+
         /// <summary>
         /// Called when the delete button is pressed. Will delete all selected segments and shapes.
         /// </summary>