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

Remove unneeded checks in convex hull node

Browse source 
CURA-7106
This commit is contained in:
Jaime van Kessel 2020-06-22 17:18:22 +02:00
parent 16bc2071ee
commit 570efc8310
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/Scene/ConvexHullNode.py
View file

@ -80,14 +80,11 @@ class ConvexHullNode(SceneNode):
ConvexHullNode.shader.setUniformValue("u_diffuseColor", self._color) ConvexHullNode.shader.setUniformValue("u_diffuseColor", self._color)
ConvexHullNode.shader.setUniformValue("u_opacity", 0.6) ConvexHullNode.shader.setUniformValue("u_opacity", 0.6)
if self.getParent(): renderer.queueNode(self, transparent = True, shader = ConvexHullNode.shader, backface_cull = True, sort = -8)
if self.getMeshData() and isinstance(self._node, SceneNode) and self._node.callDecoration("getBuildPlateNumber") == Application.getInstance().getMultiBuildPlateModel().activeBuildPlate: if self._convex_hull_head_mesh:
# The object itself (+ adhesion in one-at-a-time mode) # The full head. Rendered as a hint to the user: If this area overlaps another object A; this object
renderer.queueNode(self, transparent = True, shader = ConvexHullNode.shader, backface_cull = True, sort = -8) # cannot be printed after A, because the head would hit A while printing the current object
if self._convex_hull_head_mesh: renderer.queueNode(self, shader = ConvexHullNode.shader, transparent = True, mesh = self._convex_hull_head_mesh, backface_cull = True, sort = -8)
# The full head. Rendered as a hint to the user: If this area overlaps another object A; this object
# cannot be printed after A, because the head would hit A while printing the current object
renderer.queueNode(self, shader = ConvexHullNode.shader, transparent = True, mesh = self._convex_hull_head_mesh, backface_cull = True, sort = -8)
return True return True

2
plugins/SolidView/SolidView.py
View file

@ -167,7 +167,7 @@ class SolidView(View):
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)
def beginRendering(self): def beginRendering(self):
scene = self.getController().getScene() scene = self.getController().getScene()
renderer = self.getRenderer() renderer = self.getRenderer()