project/code/TMV/UI/TextureBrowser.cs

@@ -1,22 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
 using Godot;
 
 namespace KeepersCompound.TMV.UI;
 
 public partial class TextureBrowser : Node
 {
-	enum SortMode
-	{
-		Name,
-		Family,
-		Index,
-		Count,
-	}
-
 	private Tree _folderTree;
 	private LineEdit _searchBar;
 	private MenuButton _sortMenu;
@@ -25,12 +12,6 @@ public partial class TextureBrowser : Node
 	private HFlowContainer _textureList;
 	private TextureRect _previewTexture;
 	private LineEdit _texturePath;
-	private OptionButton _filterOptions;
-	private LineEdit _fileType;
-	private LineEdit _resolutionBox;
-	private LineEdit _fileSizeBox;
-
-	private string _searchFilterPrefix = "";
 
 	public override void _Ready()
 	{
@@ -46,15 +27,6 @@ public partial class TextureBrowser : Node
 		_textureList = GetNode<HFlowContainer>("%TextureList");
 		_previewTexture = GetNode<TextureRect>("%PreviewTexture");
 		_texturePath = GetNode<LineEdit>("%PathBox");
-		_filterOptions = GetNode<OptionButton>("%FilterOptions");
-		_fileType = GetNode<LineEdit>("%FileTypeBox");
-		_resolutionBox = GetNode<LineEdit>("%ResolutionBox");
-		_fileSizeBox = GetNode<LineEdit>("%FileSizeBox");
-
-		_searchBar.TextChanged += ApplySearchFilter;
-		_sortMenu.GetPopup().IdPressed += ApplySortMode;
-		_folderTree.ItemSelected += SetActiveFolder;
-		_filterOptions.ItemSelected += SetPreviewTextureFilter;
 
 		BuildFolderTree();
 		BuildTextureList(); // TODO: This should be triggered on folder change
@@ -63,28 +35,13 @@ public partial class TextureBrowser : Node
 	private void BuildFolderTree()
 	{
 		_folderTree.Clear();
+		_folderTree.SetColumnTitle(0, "Name");
+		_folderTree.SetColumnTitle(1, "Count");
 
-		var context = Context.Instance;
+		// TODO: We need some way to get family names
-		var textureNames = context.PathManager.GetResourceNames(LGS.ResourceType.Texture, context.CampaignName);
+		// Maybe PathManager and CampaignResource should be expanded so that we
-
+		// can get the resource itself and query things
-		var treeItems = new Dictionary<string, TreeItem>();
+		var pathManager = Context.Instance.PathManager;
-		treeItems.Add("", _folderTree.CreateItem());
-		foreach (var name in textureNames)
-		{
-			var tokens = name.Split('/');
-			var fams = new string[tokens.Length + 1];
-			fams[0] = "";
-			for (var i = 1; i < tokens.Length; i++)
-			{
-				fams[i] = tokens[..i].Join("/");
-				if (!treeItems.ContainsKey(fams[i]))
-				{
-					var item = _folderTree.CreateItem(treeItems[fams[i - 1]]);
-					item.SetText(0, tokens[i - 1]);
-					treeItems.Add(fams[i], item);
-				}
-			}
-		}
 	}
 
 	private void BuildTextureList()
@@ -109,10 +66,7 @@ public partial class TextureBrowser : Node
 			textureRect.StretchMode = TextureRect.StretchModeEnum.KeepAspectCentered;
 			textureRect.SetAnchorsPreset(Control.LayoutPreset.FullRect);
 
-			// We use meta here rather than just Name because Name replaces / with _ so
-			// we can't reliably construct it (the path can have natural _)
 			var slot = new Panel();
-			slot.SetMeta("TexPath", name);
 			slot.CustomMinimumSize = new Vector2(128, 128);
 			slot.AddChild(textureRect);
 			slot.GuiInput += (input) =>
@@ -121,7 +75,7 @@ public partial class TextureBrowser : Node
 					mouseEvent.Pressed &&
 					mouseEvent.ButtonIndex == MouseButton.Left)
 				{
-					SetPreviewTexture(name, texture, path);
+					SetPreviewTexture(name, texture);
 				}
 			};
 
@@ -129,70 +83,9 @@ public partial class TextureBrowser : Node
 		}
 	}
 
-	private void SetPreviewTexture(string name, Texture2D texture, string path)
+	private void SetPreviewTexture(string name, Texture2D texture)
 	{
 		_previewTexture.Texture = texture;
 		_texturePath.Text = name;
-		_fileType.Text = Path.GetExtension(path).ToUpper();
-
-		var resolution = texture.GetSize();
-		_resolutionBox.Text = $"{resolution.X}x{resolution.Y}";
-
-		var fileInfo = new FileInfo(path);
-		_fileSizeBox.Text = $"{(fileInfo.Length / 1000.0f).ToString("0.0")} kb";
-	}
-
-	private void ApplySearchFilter(string filter)
-	{
-		var regex = $"^{_searchFilterPrefix}.*{Regex.Escape(filter).Replace("\\*", ".*")}.*$";
-		foreach (var node in _textureList.GetChildren())
-		{
-			var panel = (Panel)node;
-			var name = panel.GetMeta("TexPath").ToString();
-			panel.Visible = Regex.IsMatch(name, regex);
-		}
-	}
-
-	private void ApplySortMode(long id)
-	{
-		var popup = _sortMenu.GetPopup();
-		for (var i = 0; i < popup.ItemCount; i++)
-		{
-			popup.SetItemChecked(i, popup.GetItemId(i) == id);
-		}
-
-		// TODO: Actualy sort
-	}
-
-	private void SetActiveFolder()
-	{
-		var selected = _folderTree.GetSelected();
-		var selectedFolder = selected.GetText(0) + "/";
-		var parent = selected.GetParent();
-		while (parent != null)
-		{
-			var text = parent.GetText(0);
-			if (text != "")
-			{
-				selectedFolder = text + "/" + selectedFolder;
-			}
-			parent = parent.GetParent();
-		}
-
-		// This prefix is used in a regex, so we escape it here. The additional
-		// replace is because C# Regex doesn't escape /
-		_searchFilterPrefix = Regex.Escape(selectedFolder).Replace("/", "\\/");
-		ApplySearchFilter(_searchBar.Text);
-	}
-
-	private void SetPreviewTextureFilter(long idx)
-	{
-		var filterMode = idx switch
-		{
-			0 => CanvasItem.TextureFilterEnum.LinearWithMipmaps,
-			1 => CanvasItem.TextureFilterEnum.NearestWithMipmaps,
-			_ => throw new InvalidOperationException(),
-		};
-		_previewTexture.TextureFilter = filterMode;
 	}
 }

project/scenes/asset_browser/asset_browser.tscn

@@ -47,7 +47,8 @@ size_flags_vertical = 3
 unique_name_in_owner = true
 custom_minimum_size = Vector2(256, 0)
 layout_mode = 2
-hide_root = true
+columns = 2
+column_titles_visible = true
 
 [node name="HSplitContainer" type="HSplitContainer" parent="TabContainer/Textures/VBoxContainer/HSplitContainer"]
 layout_mode = 2
@@ -75,15 +76,14 @@ tooltip_text = "Sort Mode"
 icon = ExtResource("3_0k1fm")
 icon_alignment = 1
 item_count = 4
-popup/item_0/text = "Name"
+popup/item_0/text = "Family"
 popup/item_0/checkable = 2
-popup/item_0/checked = true
+popup/item_0/id = 1
-popup/item_1/text = "Family"
+popup/item_1/text = "Name"
 popup/item_1/checkable = 2
-popup/item_1/id = 1
+popup/item_1/id = 2
 popup/item_2/text = "Index"
 popup/item_2/checkable = 2
-popup/item_2/id = 2
 popup/item_2/disabled = true
 popup/item_3/text = "Count"
 popup/item_3/checkable = 2
@@ -110,7 +110,6 @@ popup/item_0/id = 1
 popup/item_1/text = "Show Custom"
 popup/item_1/checkable = 1
 popup/item_1/checked = true
-popup/item_1/id = 1
 popup/item_2/text = "Show Family Name"
 popup/item_2/checkable = 1
 popup/item_2/id = 2
@@ -218,7 +217,6 @@ layout_mode = 2
 text = "Texture Filter"
 
 [node name="FilterOptions" type="OptionButton" parent="TabContainer/Textures/VBoxContainer/HSplitContainer/HSplitContainer/Preview/VBoxContainer/PanelContainer/MarginContainer/Details"]
-unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 selected = 0
@@ -277,7 +275,6 @@ layout_mode = 2
 text = "File Type"
 
 [node name="FileTypeBox" type="LineEdit" parent="TabContainer/Textures/VBoxContainer/HSplitContainer/HSplitContainer/Preview/VBoxContainer/PanelContainer/MarginContainer/Details"]
-unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 editable = false
@@ -287,7 +284,6 @@ layout_mode = 2
 text = "Resolution"
 
 [node name="ResolutionBox" type="LineEdit" parent="TabContainer/Textures/VBoxContainer/HSplitContainer/HSplitContainer/Preview/VBoxContainer/PanelContainer/MarginContainer/Details"]
-unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 editable = false
@@ -297,7 +293,6 @@ layout_mode = 2
 text = "File Size"
 
 [node name="FileSizeBox" type="LineEdit" parent="TabContainer/Textures/VBoxContainer/HSplitContainer/HSplitContainer/Preview/VBoxContainer/PanelContainer/MarginContainer/Details"]
-unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 editable = false