Merge pull request #51 from klaussilveira/feat/material-picker

Added thumbnail grid view to material browser

Author: codereader

libs/wxutil/dataview/ResourceTreeViewToolbar.cpp

@@ -122,6 +122,18 @@ void ResourceTreeViewToolbar::ClearFilter()
     {
         _treeView->SetFilterText("");
     }
+
+    _signalFilterTextChanged.emit("");
+}
+
+std::string ResourceTreeViewToolbar::GetFilterText() const
+{
+    return _filterEntry->GetValue().ToStdString();
+}
+
+sigc::signal<void(const std::string&)>& ResourceTreeViewToolbar::signal_filterTextChanged()
+{
+    return _signalFilterTextChanged;
 }
 
 void ResourceTreeViewToolbar::JumpToNextFilterMatch()
@@ -238,6 +250,8 @@ void ResourceTreeViewToolbar::_onFilterTimeoutReached(wxTimerEvent& ev)
     }
 
     _filterEntry->Refresh();
+
+    _signalFilterTextChanged.emit(filterText.ToStdString());
 }
 
 }

libs/wxutil/dataview/ResourceTreeViewToolbar.h

@@ -4,6 +4,7 @@
 #include <wx/radiobut.h>
 #include <wx/bmpbuttn.h>
 #include <wx/timer.h>
+#include <sigc++/signal.h>
 
 #include "ResourceTreeView.h"
 
@@ -32,6 +33,8 @@ class ResourceTreeViewToolbar :
 
     wxTimer _applyFilterTimer;
 
+    sigc::signal<void(const std::string&)> _signalFilterTextChanged;
+
 public:
     ResourceTreeViewToolbar(wxWindow* parent, ResourceTreeView* treeView = nullptr);
 
@@ -47,6 +50,12 @@ class ResourceTreeViewToolbar :
 
     void ClearFilter();
 
+    // Returns the current filter text
+    std::string GetFilterText() const;
+
+    // Signal emitted when the filter text changes
+    sigc::signal<void(const std::string&)>& signal_filterTextChanged();
+
 private:
     void JumpToNextFilterMatch();
     void JumpToPrevFilterMatch();

libs/wxutil/decl/DeclarationSelector.cpp

@@ -144,6 +144,16 @@ DeclarationTreeView* DeclarationSelector::GetTreeView() const
     return _treeView;
 }
 
+wxPanel* DeclarationSelector::GetLeftPanel() const
+{
+    return _leftPanel;
+}
+
+wxSizer* DeclarationSelector::GetTreeViewSizer() const
+{
+    return _treeVbox;
+}
+
 const DeclarationTreeView::Columns& DeclarationSelector::GetColumns() const
 {
     return _columns;
@@ -164,6 +174,23 @@ void DeclarationSelector::PopulateTreeView(const IResourceTreePopulator::Ptr& po
     _treeView->Populate(populator);
 }
 
+void DeclarationSelector::UpdatePreviewsWithDeclaration(const std::string& declName)
+{
+    for (auto preview : _previews)
+    {
+        preview->SetPreviewDeclName(declName);
+    }
+
+    if (!declName.empty())
+    {
+        _declFileInfo->SetDeclarationName(declName);
+    }
+    else
+    {
+        _declFileInfo->Clear();
+    }
+}
+
 const DeclarationTreeView::Columns& DeclarationSelector::CreateDefaultColumns()
 {
     static DeclarationTreeView::Columns _treeViewColumns;

libs/wxutil/decl/DeclarationSelector.h

@@ -83,6 +83,12 @@ class DeclarationSelector :
 protected:
     DeclarationTreeView* GetTreeView() const;
 
+    // Returns the left panel containing the tree view
+    wxPanel* GetLeftPanel() const;
+
+    // Returns the sizer containing the tree view (for adding widgets alongside tree view)
+    wxSizer* GetTreeViewSizer() const;
+
     // Adds a preview widget to the right of the tree view
     void AddPreviewToRightPane(ui::IDeclarationPreview* preview, int sizerProportion = 1);
     void AddPreviewToBottom(ui::IDeclarationPreview* preview, int sizerProportion = 0);
@@ -93,6 +99,9 @@ class DeclarationSelector :
 
     void PopulateTreeView(const IResourceTreePopulator::Ptr& populator);
 
+    // Manually update all preview widgets with the given declaration name
+    void UpdatePreviewsWithDeclaration(const std::string& declName);
+
     // Event method invoked when the tree view selection has been changed
     virtual void onTreeViewSelectionChanged()
     {}

radiant/CMakeLists.txt

@@ -103,6 +103,7 @@ add_executable(darkradiant
                ui/materials/MaterialChooser.cpp
                ui/materials/MaterialPopulator.cpp
                ui/materials/MaterialSelector.cpp
+               ui/materials/MaterialThumbnailBrowser.cpp
                ui/materials/MaterialTreeView.cpp
                ui/merge/MapMergePanel.cpp
                ui/animationpreview/AnimationPreview.cpp

radiant/ui/materials/MaterialSelector.cpp

@@ -8,10 +8,17 @@
 #include "texturelib.h"
 #include "gamelib.h"
 #include "string/predicate.h"
+#include "registry/registry.h"
 
 #include "../common/TexturePreviewCombo.h"
+#include "MaterialThumbnailBrowser.h"
 #include "wxutil/dataview/VFSTreePopulator.h"
 #include "wxutil/dataview/ThreadedDeclarationTreePopulator.h"
+#include "wxutil/dataview/ResourceTreeViewToolbar.h"
+#include "wxutil/Bitmap.h"
+
+#include <wx/tglbtn.h>
+#include <wx/sizer.h>
 
 namespace ui
 {
@@ -21,6 +28,7 @@ namespace ui
 namespace
 {
 	constexpr const char* const TEXTURE_ICON = "icon_texture.png";
+	constexpr const char* const RKEY_MATERIAL_SELECTOR_VIEW_MODE = "user/ui/materialSelector/viewMode";
 }
 
 /**
@@ -93,26 +101,189 @@ class ThreadedMaterialLoader final :
 
 MaterialSelector::MaterialSelector(wxWindow* parent, TextureFilter textureFilter)
 : DeclarationSelector(parent, decl::Type::Material),
-  _textureFilter(textureFilter)
+  _textureFilter(textureFilter),
+  _thumbnailBrowser(nullptr),
+  _viewToggleBtn(nullptr),
+  _showingThumbnails(false)
 {
+    createThumbnailBrowser();
+    createViewToggleButton();
+    connectFilterSignal();
+
     AddPreviewToBottom(new TexturePreviewCombo(this));
 
+    std::string savedMode = GlobalRegistry().get(RKEY_MATERIAL_SELECTOR_VIEW_MODE);
+    if (savedMode == "thumbnails")
+    {
+        _showingThumbnails = true;
+        _viewToggleBtn->SetValue(true);
+        switchView(true);
+    }
+
     Populate();
 }
 
+MaterialSelector::~MaterialSelector()
+{
+    GlobalRegistry().set(RKEY_MATERIAL_SELECTOR_VIEW_MODE,
+                         _showingThumbnails ? "thumbnails" : "tree");
+
+    _thumbnailSelectionConn.disconnect();
+    _thumbnailActivatedConn.disconnect();
+    _filterTextChangedConn.disconnect();
+}
+
+void MaterialSelector::createThumbnailBrowser()
+{
+    MaterialThumbnailBrowser::TextureFilter thumbnailFilter;
+    switch (_textureFilter)
+    {
+    case TextureFilter::Lights:
+        thumbnailFilter = MaterialThumbnailBrowser::TextureFilter::Lights;
+        break;
+    case TextureFilter::Regular:
+        thumbnailFilter = MaterialThumbnailBrowser::TextureFilter::Regular;
+        break;
+    case TextureFilter::All:
+    default:
+        thumbnailFilter = MaterialThumbnailBrowser::TextureFilter::All;
+        break;
+    }
+
+    _thumbnailBrowser = new MaterialThumbnailBrowser(GetLeftPanel(), thumbnailFilter);
+    _thumbnailBrowser->Hide();
+
+    GetTreeViewSizer()->Insert(2, _thumbnailBrowser, 1, wxEXPAND);
+
+    _thumbnailSelectionConn = _thumbnailBrowser->signal_selectionChanged().connect(
+        sigc::mem_fun(this, &MaterialSelector::onThumbnailSelectionChanged));
+    _thumbnailActivatedConn = _thumbnailBrowser->signal_itemActivated().connect(
+        sigc::mem_fun(this, &MaterialSelector::onThumbnailItemActivated));
+}
+
+void MaterialSelector::createViewToggleButton()
+{
+    auto* sizer = GetTreeViewSizer();
+    if (sizer->GetItemCount() > 0)
+    {
+        auto* toolbarItem = sizer->GetItem(static_cast<size_t>(0));
+        if (toolbarItem && toolbarItem->GetWindow())
+        {
+            auto* toolbar = dynamic_cast<wxutil::ResourceTreeViewToolbar*>(toolbarItem->GetWindow());
+            if (toolbar)
+            {
+                _viewToggleBtn = new wxBitmapToggleButton(toolbar, wxID_ANY,
+                    wxutil::GetLocalBitmap("bgimage16.png"));
+                _viewToggleBtn->SetToolTip(_("Toggle between tree view and thumbnail grid view"));
+                toolbar->GetRightSizer()->Add(_viewToggleBtn, wxSizerFlags().Border(wxLEFT, 6));
+                _viewToggleBtn->Bind(wxEVT_TOGGLEBUTTON, &MaterialSelector::onViewToggle, this);
+            }
+        }
+    }
+}
+
+void MaterialSelector::connectFilterSignal()
+{
+    auto* sizer = GetTreeViewSizer();
+    if (sizer->GetItemCount() > 0)
+    {
+        auto* toolbarItem = sizer->GetItem(static_cast<size_t>(0));
+        if (toolbarItem && toolbarItem->GetWindow())
+        {
+            auto* toolbar = dynamic_cast<wxutil::ResourceTreeViewToolbar*>(toolbarItem->GetWindow());
+            if (toolbar)
+            {
+                _filterTextChangedConn = toolbar->signal_filterTextChanged().connect(
+                    sigc::mem_fun(this, &MaterialSelector::onFilterTextChanged));
+            }
+        }
+    }
+}
+
+void MaterialSelector::onFilterTextChanged(const std::string& filterText)
+{
+    if (_thumbnailBrowser)
+    {
+        _thumbnailBrowser->setExternalFilterText(filterText);
+    }
+}
+
+void MaterialSelector::switchView(bool showThumbnails)
+{
+    if (showThumbnails)
+    {
+        _thumbnailBrowser->setSelectedShader(DeclarationSelector::GetSelectedDeclName());
+        GetTreeView()->Hide();
+        _thumbnailBrowser->Show();
+        _thumbnailBrowser->queueUpdate();
+    }
+    else
+    {
+        std::string selectedShader = _thumbnailBrowser->getSelectedShader();
+        if (!selectedShader.empty())
+        {
+            SetSelectedDeclName(selectedShader);
+        }
+        _thumbnailBrowser->Hide();
+        GetTreeView()->Show();
+    }
+
+    _showingThumbnails = showThumbnails;
+    GetLeftPanel()->Layout();
+}
+
+void MaterialSelector::onViewToggle(wxCommandEvent& ev)
+{
+    switchView(ev.IsChecked());
+}
+
+void MaterialSelector::onThumbnailSelectionChanged()
+{
+    UpdatePreviewsWithDeclaration(_thumbnailBrowser->getSelectedShader());
+    _selectionChanged();
+}
+
+void MaterialSelector::onThumbnailItemActivated()
+{
+    onTreeViewItemActivated();
+}
+
 void MaterialSelector::Populate()
 {
     PopulateTreeView(std::make_shared<ThreadedMaterialLoader>(GetColumns(), _textureFilter));
+
+    if (_thumbnailBrowser)
+    {
+        _thumbnailBrowser->queueUpdate();
+    }
+}
+
+std::string MaterialSelector::GetSelectedDeclName() const
+{
+    if (_showingThumbnails && _thumbnailBrowser)
+    {
+        return _thumbnailBrowser->getSelectedShader();
+    }
+    return DeclarationSelector::GetSelectedDeclName();
 }
 
 MaterialPtr MaterialSelector::getSelectedShader()
 {
-	return GlobalMaterialManager().getMaterial(GetSelectedDeclName());
+    return GlobalMaterialManager().getMaterial(GetSelectedDeclName());
 }
 
 void MaterialSelector::onTreeViewSelectionChanged()
 {
+    if (!_showingThumbnails && _thumbnailBrowser)
+    {
+        _thumbnailBrowser->setSelectedShader(DeclarationSelector::GetSelectedDeclName());
+    }
     _selectionChanged();
 }
 
+bool MaterialSelector::onTreeViewItemActivated()
+{
+    return false;
+}
+
 } // namespace