3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

allow immediate change of preference for showing xray errors in solid view

Browse source
This commit is contained in:
Tim Kuipers 2020-02-27 08:46:52 +01:00
parent 4b1a426873
commit 0e633a0dfa
1 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

72
plugins/SolidView/SolidView.py
View file

@ -139,38 +139,49 @@ class SolidView(View):
self._checkSetup() self._checkSetup()
if not self._xray_error_image: if not CuraApplication.getInstance().getPreferences().getValue(self._show_xray_warning_preference):
self._xray_error_image = OpenGL.getInstance().createTexture() self._xray_error_image = None
texture_file = "xray_error.png" self._xray_shader = None
try: self._xray_composite_shader = None
self._xray_error_image.load(Resources.getPath(Resources.Images, texture_file)) if self._composite_pass and 'xray' in self._composite_pass.getLayerBindings():
except FileNotFoundError: self._composite_pass.setLayerBindings(self._old_layer_bindings)
Logger.log("w", "Unable to find xray error texture image [%s]", texture_file) self._composite_pass.setCompositeShader(self._old_composite_shader)
self._old_layer_bindings = None
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:
self._xray_error_image.load(Resources.getPath(Resources.Images, texture_file))
except FileNotFoundError:
Logger.log("w", "Unable to find xray error texture image [%s]", texture_file)
if not self._xray_shader: if not self._xray_shader:
self._xray_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray.shader")) self._xray_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray.shader"))
if not self._xray_composite_shader: if not self._xray_composite_shader:
self._xray_composite_shader = OpenGL.getInstance().createShaderProgram(os.path.join(PluginRegistry.getInstance().getPluginPath("SolidView"), "xray_composite.shader")) self._xray_composite_shader = OpenGL.getInstance().createShaderProgram(os.path.join(PluginRegistry.getInstance().getPluginPath("SolidView"), "xray_composite.shader"))
theme = Application.getInstance().getTheme() theme = Application.getInstance().getTheme()
self._xray_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb())) 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_outline_color", Color(*theme.getColor("model_selection_outline").getRgb()))
self._xray_composite_shader.setTexture(3, self._xray_error_image) self._xray_composite_shader.setTexture(3, self._xray_error_image)
if not self.getRenderer().getRenderPass("xray"): if not self._composite_pass or not 'xray' in self._composite_pass.getLayerBindings():
# Currently the RenderPass constructor requires a size > 0 # Currently the RenderPass constructor requires a size > 0
# This should be fixed in RenderPass's constructor. # This should be fixed in RenderPass's constructor.
self._xray_pass = XRayPass.XRayPass(1, 1) self._xray_pass = XRayPass.XRayPass(1, 1)
self.getRenderer().addRenderPass(self._xray_pass) self.getRenderer().addRenderPass(self._xray_pass)
if not self._composite_pass: if not self._composite_pass:
self._composite_pass = self.getRenderer().getRenderPass("composite") self._composite_pass = self.getRenderer().getRenderPass("composite")
self._old_layer_bindings = self._composite_pass.getLayerBindings() self._old_layer_bindings = self._composite_pass.getLayerBindings()
self._composite_pass.setLayerBindings(["default", "selection", "xray"]) self._composite_pass.setLayerBindings(["default", "selection", "xray"])
self._old_composite_shader = self._composite_pass.getCompositeShader() self._old_composite_shader = self._composite_pass.getCompositeShader()
self._composite_pass.setCompositeShader(self._xray_composite_shader) self._composite_pass.setCompositeShader(self._xray_composite_shader)
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack: if global_container_stack:
@ -290,7 +301,8 @@ class SolidView(View):
if event.type == Event.ViewDeactivateEvent: if event.type == Event.ViewDeactivateEvent:
self.getRenderer().removeRenderPass(self._xray_pass) if self._composite_pass and 'xray' in self._composite_pass.getLayerBindings():
self._composite_pass.setLayerBindings(self._old_layer_bindings) self.getRenderer().removeRenderPass(self._xray_pass)
self._composite_pass.setCompositeShader(self._old_composite_shader) self._composite_pass.setLayerBindings(self._old_layer_bindings)
self._xray_warning_message.hide() self._composite_pass.setCompositeShader(self._old_composite_shader)
self._xray_warning_message.hide()