Fix the push-free for convex polygons. Fix the objectOrderFinder to handle the case...

[cura.git] / Cura / util / polygon.py

diff --git a/Cura/util/polygon.py b/Cura/util/polygon.py
index 746fb0ed7e4d88a04412b493047ec794553f3325..8da33639bf69da041529efa23525ea80fb0d7c40 100644 (file)
--- a/Cura/util/polygon.py
+++ b/Cura/util/polygon.py
@@ -82,3 +82,42 @@ def polygonCollision(polyA, polyB):
                if aMax < bMin:
                        return False
        return True
+
+def polygonCollisionPushVector(polyA, polyB):
+       retSize = 10000000.0
+       ret = False
+       for n in xrange(0, len(polyA)):
+               p0 = polyA[n-1]
+               p1 = polyA[n]
+               normal = (p1 - p0)[::-1]
+               normal[1] = -normal[1]
+               normal /= numpy.linalg.norm(normal)
+               aMin, aMax = projectPoly(polyA, normal)
+               bMin, bMax = projectPoly(polyB, normal)
+               if aMin > bMax:
+                       return False
+               if bMin > aMax:
+                       return False
+               size = min(bMax, bMax) - max(aMin, bMin)
+               if size < retSize:
+                       ret = normal * (size + 0.1)
+                       retSize = size
+       for n in xrange(0, len(polyB)):
+               p0 = polyB[n-1]
+               p1 = polyB[n]
+               normal = (p1 - p0)[::-1]
+               normal[1] = -normal[1]
+               normal /= numpy.linalg.norm(normal)
+               aMin, aMax = projectPoly(polyA, normal)
+               bMin, bMax = projectPoly(polyB, normal)
+               if aMin > bMax:
+                       return False
+               if aMax < bMin:
+                       return False
+               size = min(bMax, bMax) - max(aMin, bMin)
+               if size < retSize:
+                       ret = normal * -(size + 0.1)
+                       retSize = size
+       #ret = ret[::-1]
+       #ret[1] = -ret[1]
+       return ret