3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Mult-nested convex hulls should now be correctly updated

Browse source
This commit is contained in:
Jaime van Kessel 2015-07-16 15:14:05 +02:00
parent 1d4dbcc990
commit 132f51883f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/ConvexHullJob.py
View file

@ -49,7 +49,9 @@ class ConvexHullJob(Job):
self._node.callDecoration("setConvexHullNode", hull_node) self._node.callDecoration("setConvexHullNode", hull_node)
self._node.callDecoration("setConvexHull", hull) self._node.callDecoration("setConvexHull", hull)
self._node.callDecoration("setConvexHullJob", None) self._node.callDecoration("setConvexHullJob", None)
#if self._node.getParent().callDecoration("isGroup"):
if self._node.getParent().callDecoration("isGroup"):
self._node.getParent().callDecoration("setConvexHull", None)
# if self._node.getParent().callDecoration("getConvexHull"): # if self._node.getParent().callDecoration("getConvexHull"):
# self._node.getParent().callDecoration("getConvexHullNode").setParent(None) # self._node.getParent().callDecoration("getConvexHullNode").setParent(None)

5
cura/ConvexHullNode.py
View file

@ -56,10 +56,11 @@ class ConvexHullNode(SceneNode):
self._material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "color.frag")) self._material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "color.frag"))
self._material.setUniformValue("u_color", Color(35, 35, 35, 128)) self._material.setUniformValue("u_color", Color(35, 35, 35, 128))
if self.getParent():
renderer.queueNode(self, material = self._material, transparent = True) renderer.queueNode(self, material = self._material, transparent = True)
return True return True
def _onNodePositionChanged(self, node): def _onNodePositionChanged(self, node):
#self.setPosition(node.getWorldPosition()) #self.setPosition(node.getWorldPosition())