From b7e6b2888adce703c1905866ba558d95d4f9eb35 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 7 Apr 2020 12:57:07 +0200 Subject: [PATCH] Actually remove xray error image (because colors). part of CURA-7262 --- plugins/SolidView/SolidView.py | 17 ----------------- plugins/XRayView/XRayView.py | 11 ----------- resources/images/xray_error.png | Bin 906 -> 0 bytes resources/images/xray_error.svg | 20 -------------------- resources/shaders/xray_composite.shader | 6 ------ 5 files changed, 54 deletions(-) delete mode 100644 resources/images/xray_error.png delete mode 100644 resources/images/xray_error.svg diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index 7d7f231388..8c9967be03 100644 --- a/plugins/SolidView/SolidView.py +++ b/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() diff --git a/plugins/XRayView/XRayView.py b/plugins/XRayView/XRayView.py index 1b6fcca4c6..8fc47cee74 100644 --- a/plugins/XRayView/XRayView.py +++ b/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") diff --git a/resources/images/xray_error.png b/resources/images/xray_error.png deleted file mode 100644 index e54eebdd936c70c6b4ab7e00d87c1cd2dec79728..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 906 zcmV;519kj~P)g<>bWTzwS=gE=pT&drQvHm4V-C(V!d zO zzE|&flwy6IMB;L)U6DwzzK*hc8^ z<%h%Ja5!v&$oNfBqayzSADQGRwYIjly1J^AQX(Pv-B*ztwdof|zEXXCeT72d;^Lye zzh5b(AmOV`>kisa5U}#Mx3`UbXJ^L*5rCJC2hG(Sk83ExXIB3B__*UZ(P%UpjXI7q zHa2F0xCuon-=a#19_fq6HEh`0wzRbD@9(G6Y10?!bo%h{Fc=J)YCoKXj6@>m=jXZ-<&#`x%IEXl-QA{T?^XJIzjGjHpPj9(EqzIB zZf=?fss(;=CHUORA08eq7K^nm9LI^pVzF4PHUfju(NPn`?OKB8_Sp#p0=v7ruJ@Oh zmrYhzR#sdO?CtF}H8q(B>RCC#|M01mKQ}k$l?2CedU|?#dwUNK4!q9H&d!=3K7m4s z;DMDN3Wbi2j=V1W!SV5NdwaVH;ychFf5OLbVt>uA3|hBqy$^vGaALo@N&+~67v|%J g{YQ1R>js>_TW0?LV5r$!fdBvi07*qoM6N<$g1+;%CjbBd diff --git a/resources/images/xray_error.svg b/resources/images/xray_error.svg deleted file mode 100644 index 76c8e3c1bc..0000000000 --- a/resources/images/xray_error.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/resources/shaders/xray_composite.shader b/resources/shaders/xray_composite.shader index 8a2f3aa6c4..c955d4fc18 100644 --- a/resources/shaders/xray_composite.shader +++ b/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]