izzy/libultraship
0
0
Fork 0
mirror of https://github.com/izzy2lost/libultraship.git synced 2026-06-19 01:16:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes for mouse delta (#846)

Browse Source 
* Update gfx_dxgi.cpp

* Update gfx_dxgi.cpp

* Update gfx_dxgi.h

* Update gfx_dxgi.cpp

* Update gfx_dxgi.cpp

* Update gfx_dxgi.cpp

* Update gfx_dxgi.cpp

* Update gfx_dxgi.h

* tidy

* reposition

* minor focus inconsistency

* some fixes

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
lightmanLP
2025-03-23 08:07:00 -04:00
committed by GitHub
co-authored by MegaMech
parent 379007d866
commit 4dca3ee20d
2 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphic/Fast3D/gfx_dxgi.cpp
+36 -11
View File
@@ -99,9 +99,12 @@ static struct {
float mouse_wheel[2];
LARGE_INTEGER previous_present_time;
bool is_mouse_captured;
bool is_mouse_hovered;
bool in_focus;
bool has_mouse_position;
RAWINPUTDEVICE raw_input_device[1];
POINT raw_mouse_delta_buf;
POINT prev_mouse_cursor_pos;
void (*on_fullscreen_changed)(bool is_now_fullscreen);
bool (*on_key_down)(int scancode);
@@ -343,6 +346,17 @@ static void apply_mouse_capture_clip() {
ClipCursor(&rect);
}
static void update_mouse_prev_pos() {
if (!dxgi.has_mouse_position && dxgi.is_mouse_hovered && !dxgi.is_mouse_captured) {
dxgi.has_mouse_position = true;
int32_t x, y;
gfx_dxgi_get_mouse_pos(&x, &y);
dxgi.prev_mouse_cursor_pos.x = x;
dxgi.prev_mouse_cursor_pos.y = y;
}
}
static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_param, LPARAM l_param) {
char fileName[256];
Ship::WindowEvent event_impl;
@@ -447,6 +461,16 @@ static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_par
}
break;
}
case WM_MOUSEMOVE:
if (!dxgi.is_mouse_hovered) {
dxgi.is_mouse_hovered = true;
update_mouse_prev_pos();
}
break;
case WM_MOUSELEAVE:
dxgi.is_mouse_hovered = false;
dxgi.has_mouse_position = false;
break;
case WM_DROPFILES:
DragQueryFileA((HDROP)w_param, 0, fileName, 256);
Ship::Context::GetInstance()->GetConsoleVariables()->SetString(CVAR_DROPPED_FILE, fileName);
@@ -601,22 +625,21 @@ static void gfx_dxgi_get_mouse_pos(int32_t* x, int32_t* y) {
}
static void gfx_dxgi_get_mouse_delta(int32_t* x, int32_t* y) {
if (!dxgi.in_focus) {
*x = 0;
*y = 0;
} else if (dxgi.is_mouse_captured) {
if (dxgi.is_mouse_captured) {
*x = dxgi.raw_mouse_delta_buf.x;
*y = dxgi.raw_mouse_delta_buf.y;
dxgi.raw_mouse_delta_buf.x = 0;
dxgi.raw_mouse_delta_buf.y = 0;
} else {
static int32_t prev_x = 0, prev_y = 0;
} else if (dxgi.has_mouse_position) {
int32_t current_x, current_y;
gfx_dxgi_get_mouse_pos(&current_x, &current_y);
*x = current_x - prev_x;
*y = current_y - prev_y;
prev_x = current_x;
prev_y = current_y;
*x = current_x - dxgi.prev_mouse_cursor_pos.x;
*y = current_y - dxgi.prev_mouse_cursor_pos.y;
dxgi.prev_mouse_cursor_pos.x = current_x;
dxgi.prev_mouse_cursor_pos.y = current_y;
} else {
*x = 0;
*y = 0;
}
}
@@ -632,16 +655,18 @@ static bool gfx_dxgi_get_mouse_state(uint32_t btn) {
}
static void gfx_dxgi_set_mouse_capture(bool capture) {
dxgi.is_mouse_captured = capture;
if (capture) {
apply_mouse_capture_clip();
gfx_dxgi_set_cursor_visibility(false);
SetCapture(dxgi.h_wnd);
dxgi.has_mouse_position = false;
} else {
ClipCursor(nullptr);
gfx_dxgi_set_cursor_visibility(true);
ReleaseCapture();
update_mouse_prev_pos();
}
dxgi.is_mouse_captured = capture;
}
static bool gfx_dxgi_is_mouse_captured() {
src/graphic/Fast3D/gfx_dxgi.h
+1
View File
@@ -13,6 +13,7 @@ void gfx_dxgi_create_factory_and_device(bool debug, int d3d_version,
bool (*create_device_fn)(IDXGIAdapter1* adapter, bool test_only));
void gfx_dxgi_create_swap_chain(IUnknown* device, std::function<void()>&& before_destroy_fn);
HWND gfx_dxgi_get_h_wnd();
void gfx_dxgi_get_mouse_pos(int32_t* x, int32_t* y);
IDXGISwapChain1* gfx_dxgi_get_swap_chain();
void ThrowIfFailed(HRESULT res);
void ThrowIfFailed(HRESULT res, HWND h_wnd, const char* message);