Actually remove xray error image (because colors).

part of CURA-7262
This commit is contained in:
Remco Burema 2020-04-07 12:57:07 +02:00
parent 5494a09eef
commit b7e6b2888a
No known key found for this signature in database
GPG key ID: 215C49431D43F98C
5 changed files with 0 additions and 54 deletions

View file

@ -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")