From 422a36cd93b8d66e55c132f941f49af0da2a3aa2 Mon Sep 17 00:00:00 2001 From: superp00t Date: Mon, 22 Jul 2024 16:16:41 -0400 Subject: [PATCH] fix(gx): log what api is being used when initializing device --- src/app/CMakeLists.txt | 2 +- src/app/win/Whoa.cur | Bin 0 -> 326 bytes src/app/win/Whoa.ico | Bin 0 -> 17542 bytes src/app/win/Whoa.rc | 2 ++ src/console/Device.cpp | 4 ++++ src/gx/Device.cpp | 6 +++++- src/gx/d3d/CGxDeviceD3d.cpp | 13 ++++++++++++- 7 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/app/win/Whoa.cur create mode 100644 src/app/win/Whoa.ico create mode 100644 src/app/win/Whoa.rc diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index a829594..e8b55e4 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -1,5 +1,5 @@ if(WHOA_SYSTEM_WIN) - file(GLOB PRIVATE_SOURCES "win/*.cpp") + file(GLOB PRIVATE_SOURCES "win/*.cpp" "win/Whoa.rc") add_executable(Whoa WIN32 ${PRIVATE_SOURCES}) diff --git a/src/app/win/Whoa.cur b/src/app/win/Whoa.cur new file mode 100644 index 0000000000000000000000000000000000000000..299f57567dcbc78e77732f47666730c3d018f969 GIT binary patch literal 326 zcmZQzU}9ioP*7lC;AaqEFkob05My9q&;Vkf5Q75{GXfzPKq&|ZLH_^$AHf+Q7SIg? F3ILmTgR%es literal 0 HcmV?d00001 diff --git a/src/app/win/Whoa.ico b/src/app/win/Whoa.ico new file mode 100644 index 0000000000000000000000000000000000000000..fed8f93e472b1e314fc4aa42d4f96bb42c9c48c5 GIT binary patch literal 17542 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 IXY}m<0pqAPhyVZp literal 0 HcmV?d00001 diff --git a/src/app/win/Whoa.rc b/src/app/win/Whoa.rc new file mode 100644 index 0000000..ee59167 --- /dev/null +++ b/src/app/win/Whoa.rc @@ -0,0 +1,2 @@ +BlizzardIcon.ico ICON DISCARDABLE "Whoa.ico" +BlizzardCursor.cur CURSOR "Whoa.cur" diff --git a/src/console/Device.cpp b/src/console/Device.cpp index ad3402d..2761c66 100644 --- a/src/console/Device.cpp +++ b/src/console/Device.cpp @@ -6,6 +6,7 @@ #include "event/Input.hpp" #include "gx/Device.hpp" #include +#include CVar* s_cvGxMaximize; CVar* s_cvGxResolution; @@ -297,6 +298,9 @@ void ConsoleDeviceInitialize(const char* title) { } } + // Log + printf("GxApi_%s selected\n", g_gxApiNames[api]); + // Set internally (CVar value reflects the current gxApi at launch), // this will not Set() as CVar gxApi is latched s_cvGxApi->InternalSet(g_gxApiNames[api], true, false, false, true); diff --git a/src/gx/Device.cpp b/src/gx/Device.cpp index 7eb4f13..f22dd88 100644 --- a/src/gx/Device.cpp +++ b/src/gx/Device.cpp @@ -1,15 +1,17 @@ #include "gx/Device.hpp" #include "gx/CGxDevice.hpp" #include "gx/Gx.hpp" +#include CGxDevice* g_theGxDevicePtr = nullptr; CGxDevice* GxDevCreate(EGxApi api, int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat& format) { - CGxDevice* device; + CGxDevice* device = nullptr; switch (api) { case GxApi_OpenGl: device = CGxDevice::NewOpenGl(); + break; #if defined(WHOA_SYSTEM_WIN) case GxApi_D3d9: @@ -41,6 +43,8 @@ CGxDevice* GxDevCreate(EGxApi api, int32_t (*windowProc)(void* window, uint32_t break; } + STORM_ASSERT(device != nullptr); + g_theGxDevicePtr = device; if (g_theGxDevicePtr->DeviceCreate(windowProc, format)) { diff --git a/src/gx/d3d/CGxDeviceD3d.cpp b/src/gx/d3d/CGxDeviceD3d.cpp index cfb655e..b0b8804 100644 --- a/src/gx/d3d/CGxDeviceD3d.cpp +++ b/src/gx/d3d/CGxDeviceD3d.cpp @@ -333,7 +333,18 @@ LRESULT CGxDeviceD3d::WindowProcD3d(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM } case WM_SETCURSOR: { - // TODO + if (device) { + if (device->m_d3dDevice && lParam == 1) { + SetCursor(nullptr); + BOOL show = TRUE; + // if (device->unk2904[0x13] == 0) || (device->.unk2904[0x14] == 0)) { + // show = FALSE; + // } else { + // show = TRUE; + // } + device->m_d3dDevice->ShowCursor(show); + } + } return 1; }