GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 01:49:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3

Browse Source
This commit is contained in:
fieldOfView 2016-09-05 18:11:15 +02:00
commit b1d2c412e8
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
cura/PlatformPhysics.py
View File

@ -29,6 +29,8 @@ class PlatformPhysics:
self._change_timer.setInterval(100) self._change_timer.setInterval(100)
self._change_timer.setSingleShot(True) self._change_timer.setSingleShot(True)
self._change_timer.timeout.connect(self._onChangeTimerFinished) self._change_timer.timeout.connect(self._onChangeTimerFinished)
self._move_factor = 1.1 # By how much should we multiply overlap to calculate a new spot?
self._max_overlap_checks = 10 # How many times should we try to find a new spot per tick?
Preferences.getInstance().addPreference("physics/automatic_push_free", True) Preferences.getInstance().addPreference("physics/automatic_push_free", True)
Preferences.getInstance().addPreference("physics/automatic_drop_down", True) Preferences.getInstance().addPreference("physics/automatic_drop_down", True)
@ -97,29 +99,42 @@ class PlatformPhysics:
continue continue
if other_node in transformed_nodes: if other_node in transformed_nodes:
continue # Other node is already moving, wait for next pass. continue # Other node is already moving, wait for next pass.
# Get the overlap distance for both convex hulls. If this returns None, there is no intersection. overlap = (0, 0) # Start loop with no overlap
head_hull = node.callDecoration("getConvexHullHead") move_vector = move_vector.set(x=overlap[0] * self._move_factor, z=overlap[1] * self._move_factor)
if head_hull: current_overlap_checks = 0
overlap = head_hull.intersectsPolygon(other_node.callDecoration("getConvexHull")) # Continue to check the overlap until we no longer find one.
if not overlap: while overlap and current_overlap_checks < self._max_overlap_checks:
other_head_hull = other_node.callDecoration("getConvexHullHead") current_overlap_checks += 1
if other_head_hull: head_hull = node.callDecoration("getConvexHullHead")
overlap = node.callDecoration("getConvexHull").intersectsPolygon(other_head_hull) if head_hull: # One at a time intersection.
else: overlap = head_hull.translate(move_vector.x, move_vector.z).intersectsPolygon(other_node.callDecoration("getConvexHull"))
own_convex_hull = node.callDecoration("getConvexHull") if not overlap:
other_convex_hull = other_node.callDecoration("getConvexHull") other_head_hull = other_node.callDecoration("getConvexHullHead")
if own_convex_hull and other_convex_hull: if other_head_hull:
overlap = own_convex_hull.intersectsPolygon(other_convex_hull) overlap = node.callDecoration("getConvexHull").translate(move_vector.x, move_vector.z).intersectsPolygon(other_head_hull)
if overlap:
# Moving ensured that overlap was still there. Try anew!
move_vector = move_vector.set(x=move_vector.x + overlap[0] * self._move_factor,
z=move_vector.z + overlap[1] * self._move_factor)
else:
# Moving ensured that overlap was still there. Try anew!
move_vector = move_vector.set(x=move_vector.x + overlap[0] * self._move_factor,
z=move_vector.z + overlap[1] * self._move_factor)
else: else:
# This can happen in some cases if the object is not yet done with being loaded. own_convex_hull = node.callDecoration("getConvexHull")
# Simply waiting for the next tick seems to resolve this correctly. other_convex_hull = other_node.callDecoration("getConvexHull")
overlap = None if own_convex_hull and other_convex_hull:
overlap = own_convex_hull.translate(move_vector.x, move_vector.z).intersectsPolygon(other_convex_hull)
if overlap: # Moving ensured that overlap was still there. Try anew!
move_vector = move_vector.set(x=move_vector.x + overlap[0] * self._move_factor,
z=move_vector.z + overlap[1] * self._move_factor)
else:
# This can happen in some cases if the object is not yet done with being loaded.
# Simply waiting for the next tick seems to resolve this correctly.
overlap = None
if overlap is None:
continue
move_vector = move_vector.set(x=overlap[0] * 1.1, z=overlap[1] * 1.1)
convex_hull = node.callDecoration("getConvexHull") convex_hull = node.callDecoration("getConvexHull")
if convex_hull: if convex_hull:
if not convex_hull.isValid(): if not convex_hull.isValid():