#5746: Start working on Vertex selection

codereader · Sep 19, 2021 · 9e76903 · 9e76903
1 parent 7b01e5b
commit 9e76903
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 20 deletions.
diff --git a/include/itexturetoolmodel.h b/include/itexturetoolmodel.h
@@ -61,7 +61,7 @@ class INode :
     using Ptr = std::shared_ptr<INode>;
 
     // Renders this node, with all coords relative to UV space origin
-    virtual void render() = 0;
+    virtual void render(SelectionMode mode) = 0;
 };
 
 // Node representing a single brush face

diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp
@@ -529,7 +529,7 @@ void TexTool::drawUVCoords()
 {
     GlobalTextureToolSceneGraph().foreachNode([&](const textool::INode::Ptr& node)
     {
-        node->render();
+        node->render(GlobalTextureToolSelectionSystem().getMode());
         return true;
     });
 #if 0

diff --git a/radiantcore/selection/textool/FaceNode.h b/radiantcore/selection/textool/FaceNode.h
@@ -3,6 +3,7 @@
 #include "ibrush.h"
 #include "NodeBase.h"
 #include "math/Matrix3.h"
+#include "SelectableVertex.h"
 
 namespace textool
 {
@@ -15,10 +16,17 @@ class FaceNode :
     IFace& _face;
     mutable AABB _bounds;
 
+    std::vector<SelectableVertex> _vertices;
+
 public:
     FaceNode(IFace& face) :
         _face(face)
-    {}
+    {
+        for (auto& vertex : _face.getWinding())
+        {
+            _vertices.emplace_back(vertex.texcoord);
+        }
+    }
 
     IFace& getFace() override
     {
@@ -87,13 +95,13 @@ class FaceNode :
         }
     }
 
-    void render() override
+    void render(SelectionMode mode) override
     {
         glEnable(GL_BLEND);
         glBlendColor(0, 0, 0, 0.3f);
         glBlendFunc(GL_CONSTANT_ALPHA_EXT, GL_ONE_MINUS_CONSTANT_ALPHA_EXT);
 
-        if (isSelected())
+        if (mode == SelectionMode::Surface && isSelected())
         {
             glColor3f(1, 0.5f, 0);
         }
@@ -112,23 +120,28 @@ class FaceNode :
         glEnd();
         glDisable(GL_BLEND);
 
-        glPointSize(5);
-        glBegin(GL_POINTS);
-
-        glColor3f(0.7f, 0.7f, 0.7f);
-
-        for (const auto& vertex : _face.getWinding())
+        if (mode == SelectionMode::Vertex)
         {
-            glVertex2d(vertex.texcoord[0], vertex.texcoord[1]);
+            glPointSize(5);
+            glBegin(GL_POINTS);
+
+            for (const auto& vertex : _vertices)
+            {
+                if (vertex.isSelected())
+                {
+                    glColor3f(1, 0.5f, 0);
+                }
+                else
+                {
+                    glColor3f(0.8f, 0.8f, 0.8f);
+                }
+
+                glVertex2d(vertex.getVertex().x(), vertex.getVertex().y());
+            }
+
+            glEnd();
         }
 
-        //glColor3f(1, 1, 1);
-
-        //Vector2 centroid = _face.getWinding();
-        //glVertex2d(centroid[0], centroid[1]);
-
-        glEnd();
-
         glDisable(GL_BLEND);
     }
 };

diff --git a/radiantcore/selection/textool/PatchNode.h b/radiantcore/selection/textool/PatchNode.h
@@ -104,7 +104,7 @@ class PatchNode :
 #endif
     }
 
-    void render() override
+    void render(SelectionMode mode) override
     {
         glEnable(GL_BLEND);
         glBlendColor(0, 0, 0, 0.3f);

diff --git a/radiantcore/selection/textool/SelectableVertex.h b/radiantcore/selection/textool/SelectableVertex.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "selection/BasicSelectable.h"
+
+namespace textool
+{
+
+class SelectableVertex :
+    public selection::BasicSelectable
+{
+private:
+    Vector2& _texcoord;
+
+public:
+    SelectableVertex(Vector2& texcoord) :
+        _texcoord(texcoord)
+    {}
+
+    const Vector2& getVertex() const
+    {
+        return _texcoord;
+    }
+};
+
+}
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -1031,6 +1031,7 @@
     <ClInclude Include="..\..\radiantcore\selection\textool\FaceNode.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\NodeBase.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\PatchNode.h" />
+    <ClInclude Include="..\..\radiantcore\selection\textool\SelectableVertex.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\TextureToolDragManipulator.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\TextureToolManipulationPivot.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\TextureToolRotateManipulator.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2238,5 +2238,8 @@
     <ClInclude Include="..\..\radiantcore\selection\textool\TextureToolDragManipulator.h">
       <Filter>src\selection\textool</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\selection\textool\SelectableVertex.h">
+      <Filter>src\selection\textool</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>