Merge pull request #69 from klaussilveira/feat/groups

Added group management panel and recursive ungroup command

Author: codereader

include/ui/iusercontrol.h

@@ -83,6 +83,7 @@ struct UserControl
     constexpr static const char* AasVisualisationPanel = "AasVisualisationPanel";
     constexpr static const char* OrthoBackgroundPanel = "OrthoBackgroundPanel";
     constexpr static const char* DecalShooter = "DecalShooter";
+    constexpr static const char* SelectionGroupPanel = "SelectionGroupPanel";
 };
 
 }

libs/scene/Group.h

@@ -179,4 +179,39 @@ inline void ungroupSelected()
 	SceneChangeNotify();
 }
 
+/**
+ * Dissolve all group memberships of the currently selected nodes,
+ * removing every nested group level at once.
+ * Will throw cmd::ExecutionNotPossible if it cannot execute.
+ */
+inline void ungroupSelectedRecursively()
+{
+	checkUngroupSelectedAvailable();
+
+	UndoableCommand cmd("UngroupSelectedRecursively");
+
+	std::set<std::size_t> ids;
+
+	GlobalSelectionSystem().foreachSelected([&](const scene::INodePtr& node)
+	{
+		std::shared_ptr<IGroupSelectable> selectable = std::dynamic_pointer_cast<IGroupSelectable>(node);
+
+		if (!selectable) return;
+
+		for (std::size_t id : selectable->getGroupIds())
+		{
+			ids.insert(id);
+		}
+	});
+
+	auto& selGroupMgr = detail::getMapSelectionGroupManager();
+
+	std::for_each(ids.begin(), ids.end(), [&](std::size_t id)
+	{
+		selGroupMgr.deleteSelectionGroup(id);
+	});
+
+	SceneChangeNotify();
+}
+
 }

radiant/CMakeLists.txt

@@ -162,6 +162,7 @@ add_executable(darkradiant
                ui/terrain/TerrainGeneratorDialog.cpp
                ui/script/ScriptMenu.cpp
                ui/script/ScriptWindow.cpp
+               ui/selectiongroup/SelectionGroupPanel.cpp
                ui/selectionset/SelectionSetToolmenu.cpp
                ui/skin/SkinEditor.cpp
                ui/skin/SkinEditorTreeView.cpp

radiant/ui/UserInterfaceModule.cpp

@@ -84,6 +84,7 @@
 #include "lightinspector/LightInspectorControl.h"
 #include "decalshooter/DecalShooterControl.h"
 #include "overlay/OrthoBackgroundControl.h"
+#include "selectiongroup/SelectionGroupControl.h"
 #include "patch/PatchInspectorControl.h"
 #include "surfaceinspector/SurfaceInspectorControl.h"
 #include "textool/TextureToolControl.h"
@@ -207,6 +208,12 @@ void UserInterfaceModule::initialiseModule(const IApplicationContext& ctx)
 		[]() { return cmd::ExecutionNotPossible::ToBool(selection::checkUngroupSelectedAvailable); }),
 		IOrthoContextMenu::SECTION_SELECTION_GROUPS);
 
+	GlobalOrthoContextMenu().addItem(std::make_shared<wxutil::MenuItem>(
+		new wxutil::IconTextMenuItem(_("Ungroup Selection Recursively"), "ungroup_selection.png"),
+		[]() { selection::ungroupSelectedRecursively(); },
+		[]() { return cmd::ExecutionNotPossible::ToBool(selection::checkUngroupSelectedAvailable); }),
+		IOrthoContextMenu::SECTION_SELECTION_GROUPS);
+
 	_longOperationHandler.reset(new LongRunningOperationHandler);
 	_mapFileProgressHandler.reset(new MapFileProgressHandler);
 	_autoSaveRequestHandler.reset(new AutoSaveRequestHandler);
@@ -271,6 +278,7 @@ void UserInterfaceModule::initialiseModule(const IApplicationContext& ctx)
     registerControl(std::make_shared<FindShaderControl>());
     registerControl(std::make_shared<OrthoBackgroundControl>());
     registerControl(std::make_shared<DecalShooterControl>());
+    registerControl(std::make_shared<SelectionGroupControl>());
 
     GlobalMainFrame().signal_MainFrameConstructed().connect([&]()
     {
@@ -312,6 +320,9 @@ void UserInterfaceModule::initialiseModule(const IApplicationContext& ctx)
         GlobalMainFrame().addControl(
             UserControl::DecalShooter, ControlSettings::floating(300, 200)
         );
+        GlobalMainFrame().addControl(
+            UserControl::SelectionGroupPanel, ControlSettings::floating(300, 400)
+        );
 
         _viewMenu = std::make_unique<ViewMenu>();
     });

radiant/ui/selectiongroup/SelectionGroupControl.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "i18n.h"
+#include "ui/iusercontrol.h"
+#include "SelectionGroupPanel.h"
+
+namespace ui
+{
+
+class SelectionGroupControl :
+    public IUserControlCreator
+{
+public:
+    std::string getControlName() override
+    {
+        return UserControl::SelectionGroupPanel;
+    }
+
+    std::string getDisplayName() override
+    {
+        return _("Selection Groups");
+    }
+
+    std::string getIcon() override
+    {
+        return "group_selection.png";
+    }
+
+    wxWindow* createWidget(wxWindow* parent) override
+    {
+        return new SelectionGroupPanel(parent);
+    }
+};
+
+}