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

Fix for hit testing in ortho mode

Browse source
This commit is contained in:
Patryk Skowroński 2024-10-07 16:50:01 +02:00
parent c563c0a2ca
commit aa755b0b32
1 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cura/NavlibClient.py
View file

@ -1,5 +1,5 @@
import pynavlib.pynavlib_interface as pynav import pynavlib.pynavlib_interface as pynav
from UM.Math.Matrix import Matrix from UM.Math.Matrix import Matrix, Vector
from cura.PickingPass import PickingPass from cura.PickingPass import PickingPass
class NavlibClient(pynav.NavlibNavigationModel): class NavlibClient(pynav.NavlibNavigationModel):
@ -41,7 +41,7 @@ class NavlibClient(pynav.NavlibNavigationModel):
from cura.Utils.Threading import call_on_qt_thread from cura.Utils.Threading import call_on_qt_thread
wrapped_pick = call_on_qt_thread(self.pick) wrapped_pick = call_on_qt_thread(self.pick)
self._pointer_pick, id = wrapped_pick(x_n, y_n) self._pointer_pick, _ = wrapped_pick(x_n, y_n)
return pynav.NavlibVector(0., 0., 0.) return pynav.NavlibVector(0., 0., 0.)
else: else:
@ -131,6 +131,8 @@ class NavlibClient(pynav.NavlibNavigationModel):
if boundingBox is not None: if boundingBox is not None:
pt_min = pynav.NavlibVector(boundingBox.minimum.x, boundingBox.minimum.y, boundingBox.minimum.z) pt_min = pynav.NavlibVector(boundingBox.minimum.x, boundingBox.minimum.y, boundingBox.minimum.z)
pt_max = pynav.NavlibVector(boundingBox.maximum.x, boundingBox.maximum.y, boundingBox.maximum.z) pt_max = pynav.NavlibVector(boundingBox.maximum.x, boundingBox.maximum.y, boundingBox.maximum.z)
self._scene_center = boundingBox.center
self._scene_radius = (boundingBox.maximum - self._scene_center).length()
return pynav.NavlibBox(pt_min, pt_max) return pynav.NavlibBox(pt_min, pt_max)
def get_pivot_position(self)->pynav.NavlibVector: def get_pivot_position(self)->pynav.NavlibVector:
@ -178,6 +180,27 @@ class NavlibClient(pynav.NavlibNavigationModel):
return False return False
def set_camera_matrix(self, matrix : pynav.NavlibMatrix): def set_camera_matrix(self, matrix : pynav.NavlibMatrix):
if not self.get_is_view_perspective():
affine = matrix._matrix
direction = Vector(-affine[0][2], -affine[1][2], -affine[2][2])
distance = self._scene_center - Vector(affine[0][3], affine[1][3], affine[2][3])
cos_value = direction.dot(distance.normalized())
offset = 0.
if (distance.length() < self._scene_radius) and (cos_value > 0.):
offset = self._scene_radius
elif (distance.length() < self._scene_radius) and (cos_value < 0.):
offset = 2. * self._scene_radius
elif (distance.length() > self._scene_radius) and (cos_value < 0.):
offset = 2. * distance.length()
matrix._matrix[0][3] = matrix._matrix[0][3] - offset * direction.x
matrix._matrix[1][3] = matrix._matrix[1][3] - offset * direction.y
matrix._matrix[2][3] = matrix._matrix[2][3] - offset * direction.z
transformation = Matrix(data = matrix._matrix) transformation = Matrix(data = matrix._matrix)
self._scene.getActiveCamera().setTransformation(transformation) self._scene.getActiveCamera().setTransformation(transformation)