Merge branch 'master' into hammer-scene-prefabs

Author: DrakeFruit

engine/Sandbox.Engine/Editor/Gizmos/Gizmo.cs

@@ -88,7 +88,7 @@ public static void Select( bool allowUnselect = true, bool allowMultiSelect = tr
 				return;
 			}
 
-			if ( Active.Selection.Contains( Object ) )
+			if ( Object is not null && Active.Selection.Contains( Object ) )
 			{
 				Active.Selection.Remove( Object );
 				return;

engine/Sandbox.System/Utility/SelectionSystem.cs

@@ -8,7 +8,7 @@ namespace Sandbox;
 public class SelectionSystem : IEnumerable<object>
 {
 	// Value is always false and unused - we only need the ordered key collection
-	private OrderedDictionary<object, bool> _list { get; } = new();
+	private readonly OrderedDictionary<object, bool> _list = new();
 
 	// Random hash code that changes when the collection is modified
 	int _hashCode = Random.Shared.Int( 0, 4096 );
@@ -120,6 +120,7 @@ public virtual bool Remove( object obj )
 	/// <returns>True if the object is selected</returns>
 	public virtual bool Contains( object obj )
 	{
+		if ( obj is null ) return false;
 		return _list.ContainsKey( obj );
 	}
 

engine/Sandbox.Tools/EditorShortcuts.cs

@@ -28,7 +28,6 @@ internal static void RegisterShortcuts()
 	{
 		Entries.Clear();
 
-
 		var methods = EditorTypeLibrary.GetMethodsWithAttribute<ShortcutAttribute>( false );
 
 		foreach ( var method in methods )
@@ -46,7 +45,6 @@ internal static void RegisterShortcuts()
 				method.Attribute.Type = ShortcutType.Window;
 			}
 
-
 			var entry = new Entry( method.Method, method.Attribute, group );
 			Entries.Add( entry );
 		}

engine/Sandbox.Tools/MeshEditor/PrimitiveBuilder.cs

@@ -91,5 +91,6 @@ public Face AddFace( params Vector3[] positions )
 	/// <summary>
 	/// The material to use for this whole primitive.
 	/// </summary>
+	[Hide]
 	public Material Material { get; set; } = Material.Load( "materials/dev/reflectivity_30.vmat" );
 }

engine/Sandbox.Tools/Qt/Graphic/Paint.cs

@@ -595,6 +595,17 @@ internal static IDisposable Start( QPainter e, StateFlag flags = StateFlag.None,
 
 		public static Rect DrawIcon( Rect rect, string iconName, float pixelHeight, TextFlag alignment = TextFlag.Center )
 		{
+			if ( string.IsNullOrEmpty( iconName ) )
+				return rect;
+
+			if ( iconName.Contains( '.' ) )
+			{
+				var innerRect = rect.Align( new Vector2( pixelHeight, pixelHeight ), alignment );
+
+				Draw( innerRect, iconName, Pen.a );
+				return innerRect;
+			}
+
 			// save and restore the font
 			var of = fontInfo;
 
@@ -615,12 +626,12 @@ public static void Draw( Rect r, Pixmap pixmap, float alpha = 1.0f )
 			Current.drawPixmap( r, pixmap.ptr, src, alpha );
 		}
 
-		public static void Draw( Rect r, string image )
+		public static void Draw( Rect r, string image, float alpha = 1.0f )
 		{
 			// find the image, and resize it to this size to make it nice
 			var pixmap = LoadImage( image, (int)(r.Size.x * _dpiScale), (int)(r.Size.y * _dpiScale) );
 
-			Draw( r, pixmap );
+			Draw( r, pixmap, alpha );
 		}
 
 		public static IDisposable ToPixmap( Pixmap pixmap )

engine/Sandbox.Tools/Widgets/IconLabel.cs

@@ -0,0 +1,52 @@
+using System;
+
+namespace Editor;
+
+/// <summary>
+/// A material icon label
+/// </summary>
+public class IconLabel : Widget
+{
+	public string Icon { get; set; }
+	public float IconSize { get; set; } = 12.0f;
+	public Color Background { get; set; }
+	public Color Foreground { get; set; }
+
+	public Action<bool> OnToggled { get; set; }
+
+	public IconLabel( string icon, Widget parent = null ) : base( parent )
+	{
+		Icon = icon;
+
+		Background = Color.Transparent;
+		Foreground = Theme.Text;
+
+		FixedHeight = Theme.RowHeight;
+		FixedWidth = Theme.RowHeight;
+	}
+
+	protected override Vector2 SizeHint()
+	{
+		return MinimumWidth;
+	}
+
+	protected override void OnPaint()
+	{
+		Paint.ClearBrush();
+		Paint.ClearPen();
+
+		var bg = Background;
+		var fg = Foreground;
+
+		Paint.SetBrush( bg );
+		Paint.DrawRect( LocalRect, 2.0f );
+
+		Paint.ClearBrush();
+		Paint.ClearPen();
+
+		Paint.Pen = fg;
+		if ( !Enabled ) Paint.Pen = fg.WithAlphaMultiplied( 0.25f );
+
+		Paint.DrawIcon( LocalRect, Icon, IconSize, TextFlag.Center );
+	}
+}

game/addons/tools/Code/MeshEditor/Primitives/Block.cs

@@ -4,12 +4,24 @@ namespace Editor.MeshEditor;
 [Title( "Block" ), Icon( "rectangle" )]
 public class BlockPrimitive : PrimitiveBuilder
 {
-	public bool Top { get; set; } = true;
-	public bool Bottom { get; set; } = true;
-	public bool Left { get; set; } = true;
-	public bool Right { get; set; } = true;
-	public bool Front { get; set; } = true;
-	public bool Back { get; set; } = true;
+	[Flags]
+	public enum Side
+	{
+		[Hide]
+		None = 0,
+
+		Top = 1 << 0,
+		Bottom = 1 << 1,
+		Left = 1 << 2,
+		Right = 1 << 3,
+		Front = 1 << 4,
+		Back = 1 << 5,
+
+		[Hide]
+		All = Top | Bottom | Left | Right | Front | Back
+	}
+
+	public Side Sides { get; set; } = Side.All;
 	public bool Hollow { get; set; } = false;
 
 	[Hide] private BBox _box;
@@ -32,9 +44,10 @@ public override void Build( PolygonMesh mesh )
 			maxs = _box.Maxs;
 		}
 
-		if ( Top )
+		bool Has( Side s ) => (Sides & s) != 0;
+
+		if ( Has( Side.Top ) )
 		{
-			// x planes - top first
 			mesh.AddFace(
 				new Vector3( mins.x, mins.y, maxs.z ),
 				new Vector3( maxs.x, mins.y, maxs.z ),
@@ -43,9 +56,8 @@ public override void Build( PolygonMesh mesh )
 			);
 		}
 
-		if ( Bottom )
+		if ( Has( Side.Bottom ) )
 		{
-			// x planes - bottom
 			mesh.AddFace(
 				new Vector3( mins.x, maxs.y, mins.z ),
 				new Vector3( maxs.x, maxs.y, mins.z ),
@@ -54,9 +66,8 @@ public override void Build( PolygonMesh mesh )
 			);
 		}
 
-		if ( Left )
+		if ( Has( Side.Left ) )
 		{
-			// y planes - left
 			mesh.AddFace(
 				new Vector3( mins.x, maxs.y, mins.z ),
 				new Vector3( mins.x, mins.y, mins.z ),
@@ -65,9 +76,8 @@ public override void Build( PolygonMesh mesh )
 			);
 		}
 
-		if ( Right )
+		if ( Has( Side.Right ) )
 		{
-			// y planes - right
 			mesh.AddFace(
 				new Vector3( maxs.x, maxs.y, maxs.z ),
 				new Vector3( maxs.x, mins.y, maxs.z ),
@@ -76,9 +86,8 @@ public override void Build( PolygonMesh mesh )
 			);
 		}
 
-		if ( Front )
+		if ( Has( Side.Front ) )
 		{
-			// x planes - farthest
 			mesh.AddFace(
 				new Vector3( maxs.x, maxs.y, mins.z ),
 				new Vector3( mins.x, maxs.y, mins.z ),
@@ -87,9 +96,8 @@ public override void Build( PolygonMesh mesh )
 			);
 		}
 
-		if ( Back )
+		if ( Has( Side.Back ) )
 		{
-			// x planes - nearest
 			mesh.AddFace(
 				new Vector3( maxs.x, mins.y, maxs.z ),
 				new Vector3( mins.x, mins.y, maxs.z ),