#5584: Migrating built-in shaders

codereader · Jan 25, 2022 · 37f1e10 · 37f1e10
1 parent 590dafb
commit 37f1e10
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 8 deletions.
diff --git a/include/irender.h b/include/irender.h
@@ -536,6 +536,12 @@ enum class RenderViewType
 
 enum class BuiltInShaderType
 {
+    // A medium-sized point
+    Point,
+
+    // A bigger version of "Point"
+    BigPoint,
+
     WireframeOverlay,
     FlatshadeOverlay,
     AasAreaBounds,

diff --git a/radiant/xyview/tools/MeasurementTool.cpp b/radiant/xyview/tools/MeasurementTool.cpp
@@ -158,7 +158,7 @@ void MeasurementTool::ensureShaders(RenderSystem& renderSystem)
 
 	if (!_pointShader)
 	{
-		_pointShader = renderSystem.capture("$POINT");
+		_pointShader = renderSystem.capture(BuiltInShaderType::Point);
 	}
 }
 

diff --git a/radiantcore/brush/BrushNode.cpp b/radiantcore/brush/BrushNode.cpp
@@ -420,7 +420,7 @@ void BrushNode::setRenderSystem(const RenderSystemPtr& renderSystem)
 
 	if (renderSystem)
 	{
-        _pointShader = renderSystem->capture("$POINT");
+        _pointShader = renderSystem->capture(BuiltInShaderType::Point);
         _renderableVertices.queueUpdate();
 	}
 	else

diff --git a/radiantcore/entity/doom3group/StaticGeometryNode.cpp b/radiantcore/entity/doom3group/StaticGeometryNode.cpp
@@ -393,7 +393,7 @@ void StaticGeometryNode::setRenderSystem(const RenderSystemPtr& renderSystem)
     if (renderSystem)
     {
         _pivotShader = renderSystem->capture("$PIVOT");
-        _pointShader = renderSystem->capture("$BIGPOINT");
+        _pointShader = renderSystem->capture(BuiltInShaderType::BigPoint);
     }
     else
     {

diff --git a/radiantcore/entity/light/LightNode.cpp b/radiantcore/entity/light/LightNode.cpp
@@ -392,7 +392,7 @@ void LightNode::setRenderSystem(const RenderSystemPtr& renderSystem)
 
     if (renderSystem)
     {
-        _vertexShader = renderSystem->capture("$BIGPOINT");
+        _vertexShader = renderSystem->capture(BuiltInShaderType::BigPoint);
         _renderableVertices.queueUpdate();
     }
     else

diff --git a/radiantcore/patch/PatchNode.cpp b/radiantcore/patch/PatchNode.cpp
@@ -386,7 +386,7 @@ void PatchNode::setRenderSystem(const RenderSystemPtr& renderSystem)
 
     if (renderSystem)
 	{
-        _ctrlPointShader = renderSystem->capture("$POINT");
+        _ctrlPointShader = renderSystem->capture(BuiltInShaderType::Point);
         _ctrlLatticeShader = renderSystem->capture("$LATTICE");
 	}
 	else

diff --git a/radiantcore/rendersystem/backend/BuiltInShader.cpp b/radiantcore/rendersystem/backend/BuiltInShader.cpp
@@ -203,11 +203,35 @@ void BuiltInShader::construct()
         break;
     }
 
+    case BuiltInShaderType::Point:
+    {
+        constructPointShader(pass, 4, OpenGLState::SORT_POINT_FIRST);
+        break;
+    }
+
+    case BuiltInShaderType::BigPoint:
+    {
+        constructPointShader(pass, 6, OpenGLState::SORT_POINT_FIRST);
+        break;
+    }
+
     default:
         throw std::runtime_error("Cannot construct this shader: " + getName());
     }
 }
 
+void BuiltInShader::constructPointShader(OpenGLState& pass, float pointSize, OpenGLState::SortPosition sort)
+{
+    pass.setRenderFlag(RENDER_POINT_COLOUR);
+    pass.setRenderFlag(RENDER_DEPTHWRITE);
+
+    pass.setSortPosition(sort);
+    pass.m_pointsize = pointSize;
+
+    enableViewType(RenderViewType::Camera);
+    enableViewType(RenderViewType::OrthoView);
+}
+
 void BuiltInShader::constructWireframeSelectionOverlay(OpenGLState& pass, const std::string& schemeColourKey)
 {
     auto colorSelBrushes = GlobalColourSchemeManager().getColour(schemeColourKey);

diff --git a/radiantcore/rendersystem/backend/BuiltInShader.h b/radiantcore/rendersystem/backend/BuiltInShader.h
@@ -18,6 +18,7 @@ class BuiltInShader :
 
 protected:
     void construct() override;
+    void constructPointShader(OpenGLState& pass, float pointSize, OpenGLState::SortPosition sort);
     void constructWireframeSelectionOverlay(OpenGLState& pass, const std::string& schemeColourKey);
 };
 

diff --git a/radiantcore/rendersystem/backend/OpenGLShader.cpp b/radiantcore/rendersystem/backend/OpenGLShader.cpp
@@ -858,6 +858,7 @@ void OpenGLShader::construct()
             OpenGLState& state = appendDefaultPass();
 			state.setName(_name);
 
+#if 0
             if (_name == "$POINT")
             {
               state.setRenderFlag(RENDER_POINT_COLOUR);
@@ -869,7 +870,9 @@ void OpenGLShader::construct()
               enableViewType(RenderViewType::Camera);
               enableViewType(RenderViewType::OrthoView);
             }
-            else if (_name == "$SELPOINT")
+            else
+#endif
+            if (_name == "$SELPOINT")
             {
               state.setRenderFlag(RENDER_POINT_COLOUR);
               state.setRenderFlag(RENDER_DEPTHWRITE);
@@ -880,6 +883,7 @@ void OpenGLShader::construct()
               enableViewType(RenderViewType::Camera);
               enableViewType(RenderViewType::OrthoView);
             }
+#if 0
             else if (_name == "$BIGPOINT")
             {
               state.setRenderFlag(RENDER_POINT_COLOUR);
@@ -891,6 +895,7 @@ void OpenGLShader::construct()
               enableViewType(RenderViewType::Camera);
               enableViewType(RenderViewType::OrthoView);
             }
+#endif
             else if (_name == "$PIVOT")
             {
               state.setRenderFlags(RENDER_DEPTHTEST | RENDER_DEPTHWRITE);

diff --git a/radiantcore/selection/manipulators/ModelScaleManipulator.cpp b/radiantcore/selection/manipulators/ModelScaleManipulator.cpp
@@ -87,7 +87,7 @@ void ModelScaleManipulator::onPreRender(const RenderSystemPtr& renderSystem, con
 
     if (!_pointShader)
     {
-        _pointShader = renderSystem->capture("$BIGPOINT");
+        _pointShader = renderSystem->capture(BuiltInShaderType::BigPoint);
     }
 
     _aabbs.clear();

diff --git a/radiantcore/selection/manipulators/RotateManipulator.cpp b/radiantcore/selection/manipulators/RotateManipulator.cpp
@@ -103,7 +103,7 @@ void RotateManipulator::onPreRender(const RenderSystemPtr& renderSystem, const V
 
     if (!_pivotPointShader)
     {
-        _pivotPointShader = renderSystem->capture("$BIGPOINT");
+        _pivotPointShader = renderSystem->capture(BuiltInShaderType::BigPoint);
     }
 
     if (!_textRenderer)