#5584: Migrating built-in shaders

codereader · Jan 25, 2022 · 8ed0bd9 · 8ed0bd9
1 parent d2a56f9
commit 8ed0bd9
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 8 deletions.
diff --git a/include/irender.h b/include/irender.h
@@ -590,7 +590,11 @@ enum class BuiltInShaderType
     CameraMergeActionOverlayChange,
     CameraMergeActionOverlayConflict,
 
-
+    // Coloured merge action highlights (ortho)
+    OrthoMergeActionOverlayAdd,
+    OrthoMergeActionOverlayRemove,
+    OrthoMergeActionOverlayChange,
+    OrthoMergeActionOverlayConflict,
 };
 
 /**

diff --git a/radiant/xyview/XYWnd.cpp b/radiant/xyview/XYWnd.cpp
@@ -226,10 +226,10 @@ void XYWnd::captureStates()
 {
     _highlightShaders.selectedShader = GlobalRenderSystem().capture(BuiltInShaderType::WireframeSelectionOverlay);
     _highlightShaders.selectedShaderGroup = GlobalRenderSystem().capture(BuiltInShaderType::WireframeSelectionOverlayOfGroups);
-    _highlightShaders.mergeActionShaderAdd = GlobalRenderSystem().capture("$XY_MERGE_ACTION_ADD");
-    _highlightShaders.mergeActionShaderChange = GlobalRenderSystem().capture("$XY_MERGE_ACTION_CHANGE");
-    _highlightShaders.mergeActionShaderRemove = GlobalRenderSystem().capture("$XY_MERGE_ACTION_REMOVE");
-    _highlightShaders.mergeActionShaderConflict = GlobalRenderSystem().capture("$XY_MERGE_ACTION_CONFLICT");
+    _highlightShaders.mergeActionShaderAdd = GlobalRenderSystem().capture(BuiltInShaderType::OrthoMergeActionOverlayAdd);
+    _highlightShaders.mergeActionShaderChange = GlobalRenderSystem().capture(BuiltInShaderType::OrthoMergeActionOverlayChange);
+    _highlightShaders.mergeActionShaderRemove = GlobalRenderSystem().capture(BuiltInShaderType::OrthoMergeActionOverlayRemove);
+    _highlightShaders.mergeActionShaderConflict = GlobalRenderSystem().capture(BuiltInShaderType::OrthoMergeActionOverlayConflict);
     _highlightShaders.nonMergeActionNodeShader = GlobalRenderSystem().capture("$XY_INACTIVE_NODE");
 }
 

diff --git a/radiantcore/rendersystem/backend/BuiltInShader.cpp b/radiantcore/rendersystem/backend/BuiltInShader.cpp
@@ -274,12 +274,47 @@ void BuiltInShader::construct()
         break;
     }
 
+    case BuiltInShaderType::OrthoMergeActionOverlayAdd:
+    {
+        // render additions over removals
+        constructOrthoMergeActionOverlay(pass, { 0, 0.5f, 0, 0.5f }, OpenGLState::SORT_OVERLAY_THIRD);
+        break;
+    }
+
+    case BuiltInShaderType::OrthoMergeActionOverlayRemove:
+    {
+        constructOrthoMergeActionOverlay(pass, { 0.6f, 0.1f, 0, 0.5f }, OpenGLState::SORT_OVERLAY_FIRST);
+        break;
+    }
+
+    case BuiltInShaderType::OrthoMergeActionOverlayChange:
+    {
+        constructOrthoMergeActionOverlay(pass, { 0, 0.4f, 0.9f, 0.5f }, OpenGLState::SORT_OVERLAY_SECOND);
+        break;
+    }
+
+    case BuiltInShaderType::OrthoMergeActionOverlayConflict:
+    {
+        constructOrthoMergeActionOverlay(pass, { 0.9f, 0.5f, 0.0f, 0.5f }, OpenGLState::SORT_OVERLAY_ONE_BEFORE_LAST);
+        break;
+    }
+
     default:
         throw std::runtime_error("Cannot construct this shader: " + getName());
     }
 }
 
-void BuiltInShader::constructCameraMergeActionOverlay(OpenGLState& pass, const Colour4& colour, 
+void BuiltInShader::constructOrthoMergeActionOverlay(OpenGLState& pass, const Colour4& colour,
+    OpenGLState::SortPosition sortPosition)
+{
+    pass.setColour(colour);
+    pass.setSortPosition(OpenGLState::SORT_OVERLAY_FIRST);
+    pass.m_linewidth = 2;
+
+    enableViewType(RenderViewType::OrthoView);
+}
+
+void BuiltInShader::constructCameraMergeActionOverlay(OpenGLState& pass, const Colour4& colour,
     OpenGLState::SortPosition sortPosition, OpenGLState::SortPosition lineSortPosition)
 {
     // This is a pass drawing a coloured overlay

diff --git a/radiantcore/rendersystem/backend/BuiltInShader.h b/radiantcore/rendersystem/backend/BuiltInShader.h
@@ -22,6 +22,8 @@ class BuiltInShader :
     void constructWireframeSelectionOverlay(OpenGLState& pass, const std::string& schemeColourKey);
     void constructCameraMergeActionOverlay(OpenGLState& pass, const Colour4& colour, 
         OpenGLState::SortPosition sortPosition, OpenGLState::SortPosition lineSortPosition);
+    void constructOrthoMergeActionOverlay(OpenGLState& pass, const Colour4& colour,
+        OpenGLState::SortPosition sortPosition);
 };
 
 }
diff --git a/radiantcore/rendersystem/backend/OpenGLShader.cpp b/radiantcore/rendersystem/backend/OpenGLShader.cpp
@@ -751,11 +751,12 @@ void OpenGLShader::constructFromMaterial(const MaterialPtr& material)
 
 void OpenGLShader::construct()
 {
+#if 0
 	// Retrieve the highlight colour from the colourschemes (once)
 	const static Colour4 highLightColour(
         GlobalColourSchemeManager().getColour("selected_brush_camera"), 0.3f
     );
-
+#endif
     // Check the first character of the name to see if this is a special built-in
     // shader
     switch (_name[0])
@@ -1066,6 +1067,7 @@ void OpenGLShader::construct()
 			}
             else
 #endif
+#if 0
             if (string::starts_with(_name, "$XY_MERGE_ACTION_"))
             {
                 Colour4 colour;
@@ -1099,7 +1101,9 @@ void OpenGLShader::construct()
 
                 enableViewType(RenderViewType::OrthoView);
             }
-            else if (_name == "$XY_INACTIVE_NODE")
+            else
+#endif
+            if (_name == "$XY_INACTIVE_NODE")
             {
                 Colour4 colour(0, 0, 0, 0.05f);
                 state.setColour(static_cast<float>(colour[0]),