3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixes to grouping.

Browse source 
Fixes Ultimaker/Cura#377
This commit is contained in:
Jaime van Kessel 2015-09-14 13:25:03 +02:00
parent 91a5439f88
commit 4d6528e90d
2 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/PlatformPhysics.py
View file

@ -98,9 +98,10 @@ class PlatformPhysics:
continue
# Ignore colissions within a group
if other_node.getParent().callDecoration("isGroup") is not None:
if node.getParent().callDecoration("isGroup") is other_node.getParent().callDecoration("isGroup"):
continue
if other_node.getParent().callDecoration("isGroup") is not None or node.getParent().callDecoration("isGroup") is not None:
continue
#if node.getParent().callDecoration("isGroup") is other_node.getParent().callDecoration("isGroup"):
# continue
# Ignore nodes that do not have the right properties set.
if not other_node.callDecoration("getConvexHull") or not other_node.getBoundingBox():
@ -126,9 +127,9 @@ class PlatformPhysics:
if overlap is None:
continue
move_vector.setX(overlap[0] * 1.1)
move_vector.setZ(overlap[1] * 1.1)
print(overlap)
move_vector.setX(overlap[0] * 1.01)
move_vector.setZ(overlap[1] * 1.01)
convex_hull = node.callDecoration("getConvexHull")
if convex_hull:
if not convex_hull.isValid():