Add apply-and-continue shortcut for clipping

Pressing Spacebar now creates a cut without exiting the Clipping Tool, which is how it behaves in Hammer

Author: trende2001

game/addons/tools/Code/Scene/Mesh/Tools/ClipTool.UI.cs

@@ -1,5 +1,4 @@
-
-namespace Editor.MeshEditor;
+namespace Editor.MeshEditor;
 
 partial class ClipTool
 {
@@ -63,6 +62,9 @@ public ClipToolWidget( ClipTool tool ) : base()
 		[Shortcut( "mesh.clip-apply", "enter", typeof( SceneViewWidget ) )]
 		void Apply() => _tool.Apply();
 
+		[Shortcut( "mesh.clip-apply-stay", "space", typeof( SceneViewWidget ) )]
+		void ApplyAndContinue() => _tool.Apply( false );
+
 		[Shortcut( "mesh.clip-cancel", "ESC", typeof( SceneViewWidget ) )]
 		void Cancel() => _tool.Cancel();
 

game/addons/tools/Code/Scene/Mesh/Tools/ClipTool.cs

@@ -1,4 +1,3 @@
-
 namespace Editor.MeshEditor;
 
 [Alias( "tools.clip-tool" )]
@@ -72,7 +71,9 @@ void CacheSelectedMeshes()
 
 			foreach ( var group in Selection.OfType<MeshFace>().GroupBy( f => f.Component ) )
 			{
-				_targets[group.Key] = (group.Key.Mesh, [.. group.Select( f => f.Handle )]);
+				var selectedFaces = new HashSet<HalfEdgeMesh.FaceHandle>( group.Select( f => f.Handle ) );
+				var targetFaces = selectedFaces.Count == group.Key.Mesh.FaceHandles.Count() ? null : selectedFaces;
+				_targets[group.Key] = (group.Key.Mesh, targetFaces);
 			}
 		}
 
@@ -275,12 +276,18 @@ void UpdatePoints( SceneTraceResult tr )
 	bool CanApply => _plane.HasValue && _targets.Count > 0;
 
 	void Apply()
+	{
+		Apply( true );
+	}
+
+	void Apply( bool closeTool = true )
 	{
 		if ( !CanApply ) return;
 
 		_applied = true;
 
 		var components = _targets.Keys.Where( x => x.IsValid() ).ToArray();
+		var selectAllFacesAfterApply = _faceSelection && _targets.Values.Any( x => x.Faces is null );
 
 		_newEdges.Clear();
 
@@ -294,7 +301,8 @@ void Apply()
 			.WithGameObjectCreations()
 			.Push() )
 		{
-			Selection.Clear();
+			if ( closeTool || _faceSelection )
+				Selection.Clear();
 
 			foreach ( var (component, data) in _targets.ToArray() )
 			{
@@ -303,34 +311,49 @@ void Apply()
 				if ( _faceSelection == false && KeepMode == ClipKeepMode.Both )
 				{
 					var newMesh = ApplyClipBoth( component, data.Faces );
-					Selection.Add( newMesh.GameObject );
+					if ( closeTool )
+						Selection.Add( newMesh.GameObject );
 				}
 				else
 				{
 					ApplyClip( component, _plane.Value, KeepMode, data.Faces );
 				}
 
-				if ( _faceSelection == false )
+				if ( closeTool && _faceSelection == false )
 				{
 					Selection.Add( component.GameObject );
 				}
 			}
 
 			if ( _faceSelection )
 			{
-				foreach ( var edge in _newEdges )
+				if ( selectAllFacesAfterApply )
 				{
-					if ( !edge.IsValid() )
-						continue;
+					foreach ( var (component, data) in _targets )
+					{
+						if ( !component.IsValid() || data.Faces is not null )
+							continue;
+
+						foreach ( var face in component.Mesh.FaceHandles )
+							Selection.Add( new MeshFace( component, face ) );
+					}
+				}
+				else
+				{
+					foreach ( var edge in _newEdges )
+					{
+						if ( !edge.IsValid() )
+							continue;
 
-					var mesh = edge.Component.Mesh;
-					mesh.GetFacesConnectedToEdge( edge.Handle, out var faceA, out var faceB );
+						var mesh = edge.Component.Mesh;
+						mesh.GetFacesConnectedToEdge( edge.Handle, out var faceA, out var faceB );
 
-					if ( faceA.IsValid )
-						Selection.Add( new MeshFace( edge.Component, faceA ) );
+						if ( faceA.IsValid )
+							Selection.Add( new MeshFace( edge.Component, faceA ) );
 
-					if ( faceB.IsValid )
-						Selection.Add( new MeshFace( edge.Component, faceB ) );
+						if ( faceB.IsValid )
+							Selection.Add( new MeshFace( edge.Component, faceB ) );
+					}
 				}
 			}
 
@@ -339,8 +362,16 @@ void Apply()
 		}
 
 		Reset();
+		_applied = false;
 
-		EditorToolManager.SetSubTool( _faceSelection ? nameof( FaceTool ) : nameof( ObjectSelection ) );
+		if ( closeTool )
+		{
+			EditorToolManager.SetSubTool( _faceSelection ? nameof( FaceTool ) : nameof( ObjectSelection ) );
+		}
+		else if ( _faceSelection )
+		{
+			CacheSelectedMeshes();
+		}
 	}
 
 	void Cancel()