#5731: Adjust the FaceNode/PatchNode rendering routines.

codereader · Sep 27, 2021 · 7157b92 · 7157b92
1 parent c9846f7
commit 7157b92
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 27 deletions.
diff --git a/include/itexturetoolcolours.h b/include/itexturetoolcolours.h
@@ -18,6 +18,11 @@ enum class SchemeElement
     GridText,
     MinorGrid,
     MajorGrid,
+    SurfaceInSurfaceMode,
+    SurfaceInComponentMode,
+    Vertex,
+    SelectedSurface,
+    SelectedVertex,
 };
 
 class IColourSchemeManager :

diff --git a/radiantcore/selection/textool/ColourSchemeManager.cpp b/radiantcore/selection/textool/ColourSchemeManager.cpp
@@ -37,7 +37,24 @@ class ColourSchemeManager final :
         {
             { SchemeElement::GridText, { 0, 0, 0, 0.8f } },
             { SchemeElement::MajorGrid, { 0, 0, 0, 0.8f } },
-            { SchemeElement::MinorGrid, { 0.2f, 0.2f, 0.2f, 1.0f} },
+            { SchemeElement::MinorGrid, { 0.2f, 0.2f, 0.2f, 0.4f} },
+            { SchemeElement::SurfaceInSurfaceMode, { 0.1f, 0.1f, 0.1f, 1.0f} },
+            { SchemeElement::SurfaceInComponentMode, { 0.3f, 0.3f, 0.3f, 1.0f} },
+            { SchemeElement::SelectedSurface, { 1.0f, 0.2f, 0, 1.0f} },
+            { SchemeElement::SelectedVertex, { 1.0f, 0.2f, 0, 1.0f} },
+            { SchemeElement::Vertex, { 0.1f, 0.1f, 0.1f, 1.0f} },
+        };
+
+        _schemes[ColourScheme::Light] = SchemeMap
+        {
+            { SchemeElement::GridText, { 1, 1, 1, 0.8f } },
+            { SchemeElement::MajorGrid, { 0.9f, 0.9f, 0.9f, 0.8f } },
+            { SchemeElement::MinorGrid, { 0.5f, 0.5f, 0.5f, 0.4f} },
+            { SchemeElement::SurfaceInSurfaceMode, { 0.8f, 0.8f, 0.8f, 1.0f} },
+            { SchemeElement::SurfaceInComponentMode, { 0.6f, 0.6f, 0.6f, 1.0f} },
+            { SchemeElement::SelectedSurface, { 1.0f, 0.5f, 0, 1.0f} },
+            { SchemeElement::SelectedVertex, { 1.0f, 0.5f, 0, 1.0f} },
+            { SchemeElement::Vertex, { 0.8f, 0.8f, 0.8f, 1.0f} },
         };
     }
 

diff --git a/radiantcore/selection/textool/FaceNode.cpp b/radiantcore/selection/textool/FaceNode.cpp
@@ -1,6 +1,7 @@
 #include "FaceNode.h"
 
 #include "ibrush.h"
+#include "itexturetoolcolours.h"
 #include "math/Matrix3.h"
 
 namespace textool
@@ -127,18 +128,8 @@ void FaceNode::render(SelectionMode mode)
     glBlendColor(0, 0, 0, 0.3f);
     glBlendFunc(GL_CONSTANT_ALPHA_EXT, GL_ONE_MINUS_CONSTANT_ALPHA_EXT);
 
-    if (mode == SelectionMode::Surface && isSelected())
-    {
-        glColor3f(1, 0.5f, 0);
-    }
-    else if (mode == SelectionMode::Vertex)
-    {
-        glColor3f(0.6f, 0.6f, 0.6f);
-    }
-    else
-    {
-        glColor3f(0.8f, 0.8f, 0.8f);
-    }
+    auto surfaceColour = getSurfaceColour(mode);
+    glColor4fv(surfaceColour);
 
     glBegin(GL_TRIANGLE_FAN);
 

diff --git a/radiantcore/selection/textool/Node.cpp b/radiantcore/selection/textool/Node.cpp
@@ -1,5 +1,6 @@
 #include "Node.h"
 
+#include "itexturetoolcolours.h"
 #include <sigc++/functors/mem_fun.h>
 
 namespace textool
@@ -98,22 +99,41 @@ void Node::expandComponentSelectionToRelated()
     }
 }
 
+Colour4 Node::getSurfaceColour(SelectionMode mode)
+{
+    if (mode == SelectionMode::Surface && isSelected())
+    {
+        return GlobalTextureToolColourSchemeManager().getColour(SchemeElement::SelectedSurface);
+    }
+    else if (mode == SelectionMode::Vertex)
+    {
+        return GlobalTextureToolColourSchemeManager().getColour(SchemeElement::SurfaceInComponentMode);
+    }
+    else
+    {
+        return GlobalTextureToolColourSchemeManager().getColour(SchemeElement::SurfaceInSurfaceMode);
+    }
+}
+
 void Node::renderComponents()
 {
     glPointSize(5);
     glEnable(GL_DEPTH_TEST);
     glDepthFunc(GL_LEQUAL);
     glBegin(GL_POINTS);
 
+    auto deselectedColour = GlobalTextureToolColourSchemeManager().getColour(SchemeElement::Vertex);
+    auto selectedColour = GlobalTextureToolColourSchemeManager().getColour(SchemeElement::SelectedVertex);
+
     for (const auto& vertex : _vertices)
     {
         if (vertex.isSelected())
         {
-            glColor3f(1, 0.5f, 0);
+            glColor4fv(selectedColour);
         }
         else
         {
-            glColor3f(0.8f, 0.8f, 0.8f);
+            glColor4fv(deselectedColour);
         }
 
         // Move the selected vertices a bit up in the Z area

diff --git a/radiantcore/selection/textool/Node.h b/radiantcore/selection/textool/Node.h
@@ -34,6 +34,7 @@ class Node :
 
 protected:
     virtual void renderComponents();
+    virtual Colour4 getSurfaceColour(SelectionMode mode);
 
 private:
     void onSelectionStatusChanged(const ISelectable& selectable);

diff --git a/radiantcore/selection/textool/PatchNode.cpp b/radiantcore/selection/textool/PatchNode.cpp
@@ -112,18 +112,8 @@ void PatchNode::render(SelectionMode mode)
     glBlendColor(0, 0, 0, 0.3f);
     glBlendFunc(GL_CONSTANT_ALPHA_EXT, GL_ONE_MINUS_CONSTANT_ALPHA_EXT);
 
-    if (mode == SelectionMode::Surface && isSelected())
-    {
-        glColor3f(1, 0.5f, 0);
-    }
-    else if (mode == SelectionMode::Vertex)
-    {
-        glColor3f(0.6f, 0.6f, 0.6f);
-    }
-    else
-    {
-        glColor3f(0.8f, 0.8f, 0.8f);
-    }
+    auto surfaceColour = getSurfaceColour(mode);
+    glColor4fv(surfaceColour);
 
     // Get the tesselation and the first
     auto tess = _patch.getTesselatedPatchMesh();