From 32369e39e3f37e321b1625c73fbef6dda1fd642a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 24 Oct 2024 09:48:36 +0200 Subject: [PATCH] Fix z-fighting between build-plate-grid and printer-model. Since both of them where a different render type (solid versus transparent) the sorting didn't work. Make them both transparent. (Though no changes where made there, see also UM/Scene/Platform -- which is not to be confused with UM/Platform.) should fix CURA-12188 --- cura/BuildVolume.py | 4 ++-- resources/shaders/grid.shader | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 742d1872cb..02cc943823 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -262,9 +262,9 @@ class BuildVolume(SceneNode): renderer.queueNode(self, mode = RenderBatch.RenderMode.Lines) renderer.queueNode(self, mesh = self._origin_mesh, backface_cull = True) - renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True) + renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True, transparent = True, sort = -10) if self._disallowed_area_mesh: - renderer.queueNode(self, mesh = self._disallowed_area_mesh, shader = self._shader, transparent = True, backface_cull = True, sort = -9) + renderer.queueNode(self, mesh = self._disallowed_area_mesh, shader = self._shader, transparent = True, backface_cull = True, sort = -5) if self._error_mesh: renderer.queueNode(self, mesh=self._error_mesh, shader=self._shader, transparent=True, diff --git a/resources/shaders/grid.shader b/resources/shaders/grid.shader index 0ec6cc0f98..968c17d99a 100644 --- a/resources/shaders/grid.shader +++ b/resources/shaders/grid.shader @@ -45,6 +45,7 @@ fragment = float majorLine = min(majorGrid.x, majorGrid.y); gl_FragColor = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); + gl_FragColor.a = 0.8; } vertex41core = @@ -88,6 +89,7 @@ fragment41core = float majorLine = min(majorGrid.x, majorGrid.y); frag_color = mix(minorGridColor, u_gridColor0, 1.0 - min(majorLine, 1.0)); + frag_color.a = 0.8; } [defaults]