zhmiscellany 5.7.2__py3-none-any.whl → 5.7.4__py3-none-any.whl

zhmiscellany/_misc_supportfuncs.py

@@ -130,8 +130,8 @@ def move_mouse(x: int, y: int, relative=False):
         normalized_y = int(y * (65535 / SCREEN_HEIGHT))
     else:
         if calibrated:
-            normalized_x = math.ceil(x * calibration_multiplier_x)
-            normalized_y = math.ceil(y * calibration_multiplier_y)
+            normalized_x = x * calibration_multiplier_x
+            normalized_y = y * calibration_multiplier_y
         else:
             normalized_x = x
             normalized_y = y

zhmiscellany/macro.py

@@ -43,35 +43,60 @@ def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_c
     keys_down = []
 
     if animation_time:
+        def ease_in_out_sine(t: float) -> float:
+            return 0.5 * (1 - math.cos(math.pi * t))
+
+        def generate_movement_offsets(total_dx: int, total_dy: int, n_steps: int, ease: bool = True) -> list[tuple[int, int]]:
+            if n_steps <= 0:
+                return []
+
+            offsets = []
+
+            current_actual_x = 0
+            current_actual_y = 0
+
+            for i in range(n_steps):
+                t = (i + 1) / n_steps
+
+                if ease:
+                    fraction_of_total_movement = ease_in_out_sine(t)
+                else:
+                    fraction_of_total_movement = t
+
+                target_x = round(total_dx * fraction_of_total_movement)
+                target_y = round(total_dy * fraction_of_total_movement)
+
+                dx = int(target_x - current_actual_x)
+                dy = int(target_y - current_actual_y)
+
+                offsets.append((dx, dy))
+
+                current_actual_x += dx
+                current_actual_y += dy
+
+            return offsets
+
         mxy = get_mouse_xy()
         start = mxy
-        if not relative:
-            end = (x, y)
-        else:
-            end = tuple(a + b for a, b in zip(start, (x,y)))
+        end = (x, y)
         num_points = animation_fps*animation_time  # 60 fps animation
-        num_points += 2  # don't need start and end points
+        if not relative:
+            num_points += 2  # don't need start and end points
         num_points = math.ceil(num_points)
         if animation_easing:
-            animation_points = zhmiscellany.math.generate_eased_points(start, end, num_points)
+            if not relative:
+                animation_points = zhmiscellany.math.generate_eased_points(start, end, num_points)
+            else:
+                animation_points = generate_movement_offsets(end[0], end[1], num_points)
         else:
-            animation_points = zhmiscellany.math.generate_linear_points(start, end, num_points)
-
-        if relative:
-            temp = []
-            for i, point in enumerate(animation_points):
-                if i == 0:
-                    temp.append(tuple(a - b for a, b in zip(animation_points[i], start)))
-                    continue
-
-                relative_point = tuple(a - b for a, b in zip(animation_points[i], animation_points[i-1]))
-
-                temp.append(relative_point)
-            animation_points = temp
+            if not relative:
+                animation_points = zhmiscellany.math.generate_linear_points(start, end, num_points)
+            else:
+                animation_points = generate_movement_offsets(end[0], end[1], num_points, ease=False)
 
         # remove start and end
-        animation_points.pop(0)
         if not relative:
+            animation_points.pop(0)
             animation_points.pop()
         for point in animation_points:
             click_pixel((round(point[0]), round(point[1])), act_start=False, act_end=False, click_end_duration=1/animation_fps, relative=relative)

{zhmiscellany-5.7.2.dist-info → zhmiscellany-5.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zhmiscellany
-Version: 5.7.2
+Version: 5.7.4
 Summary: A collection of useful/interesting python libraries made by zh.
 Home-page: https://discord.gg/ThBBAuueVJ
 Author: zh

{zhmiscellany-5.7.2.dist-info → zhmiscellany-5.7.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 zhmiscellany/__init__.py,sha256=Oh3gAJRWq2aUEgkolmQyiZOQ3iey5OC4NA2XaTHuVv4,1139
 zhmiscellany/_discord_supportfuncs.py,sha256=RotSpurqFtL5q6v_ST1e2Y_1qJMaHp1CDsF5i-gR4ec,6524
 zhmiscellany/_fileio_supportfuncs.py,sha256=OIboEBVahqbpG1wbtrhAjoFV-oPylFVmOENOByawaX0,365
-zhmiscellany/_misc_supportfuncs.py,sha256=UvD7aFofx-0XlLKS01j81K2afHGtt8usb9-UdNCQCa4,6730
+zhmiscellany/_misc_supportfuncs.py,sha256=DLu1QIt7PUulqgeMwi7RVh1Nu4xcsQs2wz8WxHogGNk,6708
 zhmiscellany/_processing_supportfuncs.py,sha256=aZKWIfJW_lVaQs_EyGGBhmoMc6btA38X2hY6A3kTxN8,10341
 zhmiscellany/_py_resources.py,sha256=HqJs5aRLymLZ2J5Io8g6bY58pGWhN9b8vCktC2DW4KQ,229009
 zhmiscellany/_resource_files_lookup.py,sha256=hsgPW0dngokgqWrAVAv5rUo-eobzJPjvWHt4xrOG5l0,856
@@ -12,7 +12,7 @@ zhmiscellany/fileio.py,sha256=KmRnWWZJWBc5Or3_mKcRY2ehE_Fuk870iS-imtyERyg,18169
 zhmiscellany/gui.py,sha256=VgT5j5UIr-wWyL2P1qCHSNL7RrvZWDlm0TX00JGWmKo,7404
 zhmiscellany/image.py,sha256=qUjxiYpc2VVZp2vwr1vN36O2PVQ7YlMKzhegQ1u4c0M,8198
 zhmiscellany/list.py,sha256=S8Z85bLJEP9lk2JkGpzUcG6kpRB7a-NWDIHMPiF5bKo,1473
-zhmiscellany/macro.py,sha256=7oMnrIUfFNOxRKafv3mY5IKHVziZdsRT_cSmLmBjRPY,15517
+zhmiscellany/macro.py,sha256=a1m4G8OFUM1EKsjzPpcZIPH3ldTq5_UiTHJ9KGl_y7o,16354
 zhmiscellany/math.py,sha256=btOQTe_GvqP0A7Zz84tmN_c8j1NGe_mKnhmAt40lhLU,2482
 zhmiscellany/misc.py,sha256=BsTbRWlXI5LZBG7Bl2MgLzHESyCMJnr_KNZAf2wY_H4,29689
 zhmiscellany/netio.py,sha256=GTamo5cJn4P6u8V_kgZ9kL8qeMUE7OQAmYkmj9Sp_GA,2236
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=PxO4aykFzC60xbTQuc66KzZYIxiW0KPebXZbncD2HcU,3795
 zhmiscellany/processing.py,sha256=srwlV8FZ--svF5e6rZZxhIs_6ZjOAwq2OcQEf6T2Le8,10410
 zhmiscellany/rust.py,sha256=znN6DYNoa_p-braTuDZKvUnXX8reWLFu_dG4fv2vLR0,442
 zhmiscellany/string.py,sha256=xyqE6V5YF2nieZDcg5ZrXTIrH2D9oDRbZ5vQGz8rPys,4787
-zhmiscellany-5.7.2.dist-info/METADATA,sha256=yXU8bT4A34FXS8P5wqm1XDmIKgQ1IJLvnCPYLOXcFUg,42153
-zhmiscellany-5.7.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zhmiscellany-5.7.2.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-5.7.2.dist-info/RECORD,,
+zhmiscellany-5.7.4.dist-info/METADATA,sha256=L8JT8SrpptwnuFnJxjiM5IG_w_C1DhDzntxVdQFjHcQ,42153
+zhmiscellany-5.7.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+zhmiscellany-5.7.4.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-5.7.4.dist-info/RECORD,,