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

Fix xray composite shader for opengl 2.1

Browse source 
textureSize() is not available in opengl 2.1, so we calculate the xray error image scale outside the shader (which is also a theoretical performance improvement because now the scale does not get computed over and over for each pixel)
This commit is contained in:
fieldOfView 2020-03-27 23:24:20 +01:00
parent 986284052d
commit 0794766644
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/XRayView/XRayView.py
View file

@ -1,4 +1,4 @@
# Copyright (c) 2015 Ultimaker B.V.
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import os.path
@ -91,16 +91,17 @@ class XRayView(CuraView):
if not self._xray_error_image:
self._xray_error_image = OpenGL.getInstance().createTexture()
img = QImage(1, 1, QImage.Format_RGB888)
dummy_image = QImage(1, 1, QImage.Format_RGB888)
theme = Application.getInstance().getTheme()
img.setPixelColor(0, 0, theme.getColor("xray_error"))
self._xray_error_image.setImage(img)
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: