Actually remove xray error image (because colors).

part of CURA-7262

plugins/SolidView/SolidView.py

@@ -52,8 +52,6 @@ class SolidView(View):
         self._xray_pass = None
         self._xray_composite_shader = None
         self._composite_pass = None
-        self._xray_error_image = None
-        self._xray_error_image_size = QSize(1,1)
 
         self._extruders_model = None
         self._theme = None
@@ -134,7 +132,6 @@ class SolidView(View):
             self._support_mesh_shader.setUniformValue("u_width", 5.0)
 
         if not Application.getInstance().getPreferences().getValue(self._show_xray_warning_preference):
-            self._xray_error_image = None
             self._xray_shader = None
             self._xray_composite_shader = None
             if self._composite_pass and 'xray' in self._composite_pass.getLayerBindings():
@@ -144,16 +141,6 @@ class SolidView(View):
                 self._old_composite_shader = None
                 self._xray_warning_message.hide()
         else:
-            if not self._xray_error_image:
-                self._xray_error_image = OpenGL.getInstance().createTexture()
-                texture_file = "xray_error.png"
-                try:
-                    texture_image = QImage(Resources.getPath(Resources.Images, texture_file)).mirrored()
-                    self._xray_error_image.setImage(texture_image)
-                    self._xray_error_image_size = texture_image.size()
-                except FileNotFoundError:
-                    Logger.log("w", "Unable to find xray error texture image [%s]", texture_file)
-
             if not self._xray_shader:
                 self._xray_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray.shader"))
 
@@ -162,7 +149,6 @@ class SolidView(View):
                 theme = Application.getInstance().getTheme()
                 self._xray_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb()))
                 self._xray_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb()))
-                self._xray_composite_shader.setTexture(3, self._xray_error_image)
 
             renderer = self.getRenderer()
             if not self._composite_pass or not 'xray' in self._composite_pass.getLayerBindings():
@@ -180,9 +166,6 @@ class SolidView(View):
                 self._old_composite_shader = self._composite_pass.getCompositeShader()
                 self._composite_pass.setCompositeShader(self._xray_composite_shader)
 
-            error_image_scale = [renderer.getViewportWidth() / self._xray_error_image_size.width(), renderer.getViewportHeight() / self._xray_error_image_size.height()]
-            self._xray_composite_shader.setUniformValue("u_xray_error_scale", error_image_scale)
-
     def beginRendering(self):
         scene = self.getController().getScene()
         renderer = self.getRenderer()

plugins/XRayView/XRayView.py

@@ -34,7 +34,6 @@ class XRayView(CuraView):
         self._composite_pass = None
         self._old_composite_shader = None
         self._old_layer_bindings = None
-        self._xray_error_image = None
 
     def beginRendering(self):
         scene = self.getController().getScene()
@@ -89,20 +88,10 @@ class XRayView(CuraView):
 
             self.getRenderer().addRenderPass(self._xray_pass)
 
-            if not self._xray_error_image:
-                self._xray_error_image = OpenGL.getInstance().createTexture()
-                dummy_image = QImage(1, 1, QImage.Format_RGB888)
-                theme = Application.getInstance().getTheme()
-                dummy_image.setPixelColor(0, 0, theme.getColor("xray_error"))
-                self._xray_error_image.setImage(dummy_image)
-
             if not self._xray_composite_shader:
                 self._xray_composite_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray_composite.shader"))
                 self._xray_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb()))
                 self._xray_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb()))
-                self._xray_composite_shader.setUniformValue("u_xray_error_strength", 0.8)
-                self._xray_composite_shader.setUniformValue("u_xray_error_scale", [1, 1]) # irrelevant, because we don't use an actual texture
-                self._xray_composite_shader.setTexture(3, self._xray_error_image)
 
             if not self._composite_pass:
                 self._composite_pass = self.getRenderer().getRenderPass("composite")

resources/images/xray_error.svg

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32">
-    <defs>
-        <g id="cross" stroke="white">
-            <line x1="-6" y1="-6" x2="6" y2="6" />
-            <line x1="6" y1="-6" x2="-6" y2="6" />
-        </g>
-    </defs>
-
-    <rect fill="red" width="32" height="32" /> <!-- Red background. -->
-    <g stroke-width="3" stroke-linejoin="round" stroke-linecap="round">
-        <g stroke="black" fill="white">
-            <polygon points="16,6.5 29.856,30.5 2.144,30.5" /> <!-- Triangle. -->
-            <line x1="16" y1="14.5" x2="16" y2="22.5" /> <!-- Line of the ! -->
-        </g>
-        <use xlink:href="#cross" x="0" y="7.5" /> <!-- Two crosses, forming one cross split over the viewport. -->
-        <use xlink:href="#cross" x="32" y="7.5" />
-    </g>
-    <circle r="1.5" cx="16" cy="26.5" /> <!-- Dot under the ! -->
-</svg>

resources/shaders/xray_composite.shader

@@ -23,9 +23,7 @@ fragment =
     uniform sampler2D u_layer0; //Default pass.
     uniform sampler2D u_layer1; //Selection pass.
     uniform sampler2D u_layer2; //X-ray pass.
-    uniform sampler2D u_xray_error; //X-ray error image.
 
-    uniform vec2 u_xray_error_scale;
     uniform vec2 u_offset[9];
 
     uniform float u_outline_strength;
@@ -117,9 +115,7 @@ fragment41core =
     uniform sampler2D u_layer0; //Default pass.
     uniform sampler2D u_layer1; //Selection pass.
     uniform sampler2D u_layer2; //X-ray pass.
-    uniform sampler2D u_xray_error; //X-ray error image.
 
-    uniform vec2 u_xray_error_scale;
     uniform vec2 u_offset[9];
 
     uniform float u_outline_strength;
@@ -197,11 +193,9 @@ fragment41core =
 u_layer0 = 0
 u_layer1 = 1
 u_layer2 = 2
-u_xray_error = 3
 u_background_color = [0.965, 0.965, 0.965, 1.0]
 u_outline_strength = 1.0
 u_outline_color = [0.05, 0.66, 0.89, 1.0]
-u_xray_error_strength = 0.4
 
 [bindings]