refactor mouse_position()

Ciremun · Jul 28, 2024 · 2d6f7e4 · 2d6f7e4
1 parent 044c7fd
commit 2d6f7e4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 26 deletions.
diff --git a/freedom/features/aimbot.cpp b/freedom/features/aimbot.cpp
@@ -2,18 +2,6 @@
 
 float elapsed_lerp = 0;
 
-static inline Vector2<float> mouse_position()
-{
-    Vector2<float> mouse_pos(.0f, .0f);
-    uintptr_t osu_manager = *(uintptr_t*)(osu_manager_ptr);
-    if (!osu_manager) return mouse_pos;
-    uintptr_t osu_ruleset_ptr = *(uintptr_t*)(osu_manager + OSU_MANAGER_RULESET_PTR_OFFSET);
-    if (!osu_ruleset_ptr) return mouse_pos;
-    mouse_pos.x = *(float*)(osu_ruleset_ptr + OSU_RULESET_MOUSE_X_OFFSET);
-    mouse_pos.y = *(float*)(osu_ruleset_ptr + OSU_RULESET_MOUSE_Y_OFFSET);
-    return mouse_pos;
-}
-
 static inline float lerp(float a, float b, float t)
 {
     return a + t * (b - a);

diff --git a/freedom/features/relax.cpp b/freedom/features/relax.cpp
@@ -46,17 +46,6 @@ void calc_od_timing()
     }
 }
 
-Vector2<float> mouse_position()
-{
-    Vector2<float> mouse_pos;
-    uintptr_t osu_manager = *(uintptr_t *)(osu_manager_ptr);
-    uintptr_t osu_ruleset_ptr = *(uintptr_t *)(osu_manager + OSU_MANAGER_RULESET_PTR_OFFSET);
-    mouse_pos.x = *(float *)(osu_ruleset_ptr + OSU_RULESET_MOUSE_X_OFFSET);
-    mouse_pos.y = *(float *)(osu_ruleset_ptr + OSU_RULESET_MOUSE_Y_OFFSET);
-
-    return mouse_pos;
-}
-
 void update_relax(Circle &circle, const int32_t audio_time)
 {
     static double keydown_time = 0.0;
@@ -68,9 +57,9 @@ void update_relax(Circle &circle, const int32_t audio_time)
 
         auto current_time = audio_time + od_check_ms;
         auto valid_timing = current_time >= circle.start_time;
-        auto mouse_pos = mouse_position();
-        Vector2 screen_pos = playfield_to_screen(circle.position);
-        auto scalar_dist = sqrt((mouse_pos.x - screen_pos.x) * (mouse_pos.x - screen_pos.x) + (mouse_pos.y - screen_pos.y) * (mouse_pos.y - screen_pos.y));
+        // auto mouse_pos = mouse_position();
+        // Vector2 screen_pos = playfield_to_screen(circle.position);
+        // auto scalar_dist = sqrt((mouse_pos.x - screen_pos.x) * (mouse_pos.x - screen_pos.x) + (mouse_pos.y - screen_pos.y) * (mouse_pos.y - screen_pos.y));
         // auto valid_position = scalar_dist <= current_beatmap.scaled_hit_object_radius;
 
         if (valid_timing)

diff --git a/freedom/input.cpp b/freedom/input.cpp
@@ -46,6 +46,18 @@ void send_keyboard_input(char wVk, DWORD dwFlags)
     SendInput(1, inputs, sizeof(INPUT));
 }
 
+Vector2<float> mouse_position()
+{
+    Vector2<float> mouse_pos(.0f, .0f);
+    uintptr_t osu_manager = *(uintptr_t*)(osu_manager_ptr);
+    if (!osu_manager) return mouse_pos;
+    uintptr_t osu_ruleset_ptr = *(uintptr_t*)(osu_manager + OSU_MANAGER_RULESET_PTR_OFFSET);
+    if (!osu_ruleset_ptr) return mouse_pos;
+    mouse_pos.x = *(float*)(osu_ruleset_ptr + OSU_RULESET_MOUSE_X_OFFSET);
+    mouse_pos.y = *(float*)(osu_ruleset_ptr + OSU_RULESET_MOUSE_Y_OFFSET);
+    return mouse_pos;
+}
+
 void move_mouse_to(int x, int y)
 {
     x += client_offset.x;

diff --git a/include/features/aimbot.h b/include/features/aimbot.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "vector.h"
+#include "input.h"
 
 #include "ui/config.h"
 

diff --git a/include/features/relax.h b/include/features/relax.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "input.h"
+
 #include "ui/config.h"
 
 extern float od_window;

diff --git a/include/input.h b/include/input.h
@@ -5,6 +5,7 @@
 #include "window.h"
 #include "freedom.h"
 #include "scan.h"
+#include "vector.h"
 
 extern uintptr_t binding_manager_code_start;
 extern uintptr_t binding_manager_ptr;
@@ -14,4 +15,5 @@ extern char right_click[2];
 
 void init_input();
 void send_keyboard_input(char wVk, DWORD dwFlags);
+Vector2<float> mouse_position();
 void move_mouse_to(int x, int y);