Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemco Burema <r.burema@ultimaker.com>2020-04-07 13:57:07 +0300
committerRemco Burema <r.burema@ultimaker.com>2020-04-07 13:57:07 +0300
commitb7e6b2888adce703c1905866ba558d95d4f9eb35 (patch)
tree344658aa29277874eacdd7f71166a620f542fdfb /plugins/SolidView
parent5494a09eefa4b65a5c763becdd518215f7216aa9 (diff)
Actually remove xray error image (because colors).
part of CURA-7262
Diffstat (limited to 'plugins/SolidView')
-rw-r--r--plugins/SolidView/SolidView.py17
1 files changed, 0 insertions, 17 deletions
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()