#5746: Component selections are tracked

codereader · Sep 24, 2021 · 46da5bc · 46da5bc
1 parent e5f26c3
commit 46da5bc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/include/itexturetoolmodel.h b/include/itexturetoolmodel.h
@@ -194,8 +194,9 @@ class ITextureToolSelectionSystem :
     virtual void onManipulationFinished() = 0;
     virtual void onManipulationCancelled() = 0;
 
-    // Feedback method which is invoked by selectable nodes to report a selection status change
+    // Feedback methods which are invoked by selectable nodes to report a selection status change
     virtual void onNodeSelectionChanged(ISelectable& selectable) = 0;
+    virtual void onComponentSelectionChanged(ISelectable& selectable) = 0;
 };
 
 }

diff --git a/radiantcore/selection/textool/SelectableVertex.h b/radiantcore/selection/textool/SelectableVertex.h
@@ -1,19 +1,21 @@
 #pragma once
 
-#include "selection/BasicSelectable.h"
+#include "itexturetoolmodel.h"
+#include "ObservedSelectable.h"
 
 namespace textool
 {
 
 class SelectableVertex :
-    public selection::BasicSelectable
+    public selection::ObservedSelectable
 {
 private:
     Vector3& _vertex;
     Vector2& _texcoord;
 
 public:
     SelectableVertex(Vector3& vertex, Vector2& texcoord) :
+        ObservedSelectable(sigc::mem_fun(*this, &SelectableVertex::onSelectionStatusChanged)),
         _vertex(vertex),
         _texcoord(texcoord)
     {}
@@ -37,6 +39,12 @@ class SelectableVertex :
     {
         return _texcoord;
     }
+
+private:
+    void onSelectionStatusChanged(const ISelectable& selectable)
+    {
+        GlobalTextureToolSelectionSystem().onComponentSelectionChanged(*this);
+    }
 };
 
 }
diff --git a/radiantcore/selection/textool/TextureToolSelectionSystem.cpp b/radiantcore/selection/textool/TextureToolSelectionSystem.cpp
@@ -522,6 +522,11 @@ void TextureToolSelectionSystem::onNodeSelectionChanged(ISelectable& selectable)
     _sigSelectionChanged.emit();
 }
 
+void TextureToolSelectionSystem::onComponentSelectionChanged(ISelectable& selectable)
+{
+    _sigSelectionChanged.emit();
+}
+
 module::StaticModule<TextureToolSelectionSystem> _textureToolSelectionSystemModule;
 
 }
diff --git a/radiantcore/selection/textool/TextureToolSelectionSystem.h b/radiantcore/selection/textool/TextureToolSelectionSystem.h
@@ -72,6 +72,7 @@ class TextureToolSelectionSystem :
     void onManipulationCancelled() override;
 
     void onNodeSelectionChanged(ISelectable& selectable) override;
+    void onComponentSelectionChanged(ISelectable& selectable) override;
 
 private:
     void handleUnselectRequest(selection::UnselectSelectionRequest& request);