feat: Renamed and added more GUI class functionality

Author: OrsellGit

src/modules/gui.cpp

@@ -10,41 +10,91 @@
 
 #include "utils.hpp"
 
-HWND WindowsGUI::GetWindowHandle()
+bool GeneralGUI::InitializeGUISystems()
 {
-    if (!WindowsGUI::hWnd)
-        WindowsGUI::hWnd = FindWindow("Valve001", nullptr);
+    Log(INFO, true, "Grabbing game window handle...");
+    if (!GeneralGUI::GetWindowHandle())
+    {
+        //assert(0 && "Failed to get window handle!");
+        Log(WARNING, false, "Failed to get window handle!");
+        return false;
+    }
+    
+    // Log(INFO, true, "Starting ImGUI...");
+    // if (!ImGui::Init())
+    // {
+    //     //assert(false && "Failed to initialize ImGui!");
+    //     Log(INFO, false, "Failed to initialize ImGui!");
+    //     return false;
+    // }
+
+    return true;
+}
+
+/**
+ * @brief Get the handle to the game Window.
+ * @return Windows Window handle.
+ */
+HWND GeneralGUI::GetWindowHandle()
+{
+    if (!GeneralGUI::hWnd)
+    {
+        GeneralGUI::hWnd = FindWindow("Valve001", nullptr);
+    }
     // if (!WindowsGUI::hWnd)
     //     WindowsGUI::hWnd = FindWindowA(nullptr, "Portal 2 - Direct3D 9");
     // if (!WindowsGUI::hWnd)
-    //     WindowsGUI::hWnd = FindWindowA(nullptr, "Portal 2 - Direct3D 9");
+    //     WindowsGUI::hWnd = FindWindowA(nullptr, "PORTAL 2 - Vulkan");
     // if (!WindowsGUI::hWnd)
     //     WindowsGUI::hWnd = FindWindowA(nullptr, "PORTAL 2");
-    return WindowsGUI::hWnd;
+    return GeneralGUI::hWnd;
 }
 
+/**
+ * @brief ImGui initialization function.
+ * @return Returns true if ImGui initialized successfully.
+ */
 bool ImGui::Init()
 {
-    // Get the DirectX9 device
-    auto scanResult = Memory::Scan(APIDX9, "A1 ? ? ? ? 6A 00", 1);
-    if (!scanResult)
-        scanResult = Memory::Scan(APIVULKAN, "A1 ? ? ? ? 56 84 DB", 1);
-    ImGui::g_pDXDevice = Memory::Deref<IDirect3DDevice9*>(scanResult);
+    // Get the DirectX9 Device.
+    // Valve used DXVK for Vulkan, so the API it uses layers over DirectX's stuff so the device handle can be used for both cases.
+
+    uintptr_t deviceAddressPtr = NULL;
+    if (Memory::GetModuleHandleByName(MODULE_SHADERAPIDX9))
+        deviceAddressPtr = Memory::Scan(MODULE_SHADERAPIDX9, "A1 ? ? ? ? 6A 00", 1);
+    else
+        deviceAddressPtr = Memory::Scan(MODULE_APIVULKAN, "A1 ? ? ? ? 56 84 DB", 1);
+        
+    if (!deviceAddressPtr)
+    {
+        assert(0 && "Failed to get address pointer to the DirectX9 device!");
+        Log(WARNING, false, "Failed to get address pointer to the DirectX9 device!");
+        return false;
+    }
+
+    // Get the device itself from the pointer pointer of the device address.
+    ImGui::g_pDXDevice = Memory::Deref<IDirect3DDevice9*>(deviceAddressPtr);
     if (!ImGui::g_pDXDevice)
     {
         assert(0 && "Failed to get DirectX9 device!");
+        Log(WARNING, false, "Failed to get DirectX9 device!");
         return false;
     }
 
-    ImGui::present = Memory::VMT<void*>(g_pDXDevice, 17);
-    Log(INFO, false, "Present %p", present);
+    // Get the "Present" class function used for rendering to it can be hooked.
+    ImGui::Present = Memory::VMT<void*>(g_pDXDevice, 17);
+    Log(INFO, false, "Present %p", Present);
+
+    // TODO: Add ImGui initialization calls here.
 
     return true;
 }
 
 void ImGui::Shutdown()
 {
+    // TODO: Add ImGui shutdown calls here.
 }
 
-HWND WindowsGUI::hWnd = nullptr;
-IDirect3DDevice9* ImGui::g_pDXDevice = nullptr;
+HWND GeneralGUI::hWnd = nullptr;
+IDirect3DDevice9* ImGui::g_pDXDevice = nullptr;
+void* ImGui::Present = nullptr;

src/modules/gui.hpp

@@ -17,13 +17,18 @@
 #endif
 
 /**
- * @brief Windows GUI functions and variables.
+ * @brief General GUI functions and variables.
  */
-class WindowsGUI
+class GeneralGUI
 {
 public: // MARK: WindowsGUI Public Members
 #pragma region Public Members
+
+
+    static bool InitializeGUISystems();
+    
     static HWND GetWindowHandle();
+    
 #pragma endregion
 
 private: // MARK: WindowsGUI Private Members
@@ -67,8 +72,9 @@ class ImGui
 #else
     // TODO: Implement SDL and Vulkan devices
 #endif
-
-    static void* present;
+    
+    static void* Present;
+    
 
 #pragma endregion
 };

src/p2sm.cpp

@@ -66,23 +66,24 @@ bool CP2SMPlusPlusPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateI
 	);
 
 	Log(INFO, false, "Loading plugin...");
-
-	Log(INFO, true, "Grabbing game window handle...");
-	if (!WindowsGUI::GetWindowHandle())
-		Log(WARNING, false, "Failed to find game window!");
-
-	Log(INFO, true, "Connecting tier libraries...");
+	
+	Log(INFO, true, "Connecting tier libraries and registering plugin ConVars and ConCommands...");
+	ConVar_Register(0);
 	MathLib_Init(2.2f, 2.2f, 0.0f, 2.0f);
 	ConnectTier1Libraries(&interfaceFactory, 1);
 	ConnectTier2Libraries(&interfaceFactory, 1);
 
-	Log(INFO, true, "Registering plugin ConVars and ConCommands...");
-	ConVar_Register(0);
-
+	Log(INFO, true, "Initializing plugin GUI systems...");
+	if (!GeneralGUI::InitializeGUISystems())
+	{
+		assert(0 && "Failed to initialize plugin GUI systems!");
+		Log(WARNING, false, "Failed to initialize plugin GUI systems!");
+	}
+	
 	// Make sure that all the interfaces needed are loaded and usable.
 	Log(INFO, true, "Loading interfaces...");
 	Log(INFO, true, "Loading engineServer...");
-	engineServer = static_cast<IVEngineServer*>(interfaceFactory(INTERFACEVERSION_VENGINESERVER, 0));
+	engineServer = static_cast<IVEngineServer*>(interfaceFactory(INTERFACEVERSION_VENGINESERVER, nullptr));
 	if (!engineServer)
 	{
 		assert(false && "Unable to load engineServer!");
@@ -92,7 +93,7 @@ bool CP2SMPlusPlusPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateI
 	}
 
 	Log(INFO, true, "Loading engineClient...");
-	engineClient = static_cast<IVEngineClient*>(interfaceFactory(VENGINE_CLIENT_INTERFACE_VERSION, 0));
+	engineClient = static_cast<IVEngineClient*>(interfaceFactory(VENGINE_CLIENT_INTERFACE_VERSION, nullptr));
 	if (!engineClient)
 	{
 		assert(false && "Unable to load engineClient!");
@@ -102,7 +103,7 @@ bool CP2SMPlusPlusPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateI
 	}
 
 	Log(INFO, true, "Loading g_pPlayerInfoManager...");
-	g_pPlayerInfoManager = static_cast<IPlayerInfoManager*>(gameServerFactory(INTERFACEVERSION_PLAYERINFOMANAGER, 0));
+	g_pPlayerInfoManager = static_cast<IPlayerInfoManager*>(gameServerFactory(INTERFACEVERSION_PLAYERINFOMANAGER, nullptr));
 	if (!g_pPlayerInfoManager)
 	{
 		assert(false && "Unable to load g_pPlayerInfoManager!");
@@ -188,19 +189,6 @@ bool CP2SMPlusPlusPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateI
 			&CUGCFileRequestManager__Update_hook, reinterpret_cast<void**>(&CUGCFileRequestManager__Update_orig)
 		);
 
-		// MH_CreateHook(
-		// 	Memory::Scanner::Scan(CLIENT, "55 8B EC 51 56 6A 20 8B F1"),
-		// 	&CUGCFileRequestManager__Update_hook, reinterpret_cast<void**>(&CUGCFileRequestManager__Update_orig)
-		// );
-		
-		//
-		// Stop workshop map downloads by not returning false on the download request.
-		// Log(INFO, true, "Hooking CWorkshopManager::CreateFileDownloadRequest...");
-		// MH_CreateHook( //55 8B EC 8B 45 ?? 83 EC 14 53 57
-		// 	Memory::Scanner::Scan(CLIENT, "55 8B EC 8B 45 ?? 83 EC 14 53 57"),
-		// 	&CUGCFileRequestManager__CreateFileDownloadRequest_hook, reinterpret_cast<void**>(&CUGCFileRequestManager__CreateFileDownloadRequest_orig)
-		// );
-
 		// Log(INFO, true, "Hooking CEnvProjectedTexture::EnforceSingleProjectionRules...");
 		// MH_CreateHook(
 		// 	Memory::Scan<void*>(CLIENT, "55 8B EC 8B 45 ? 8B 55 ? 50 8B 45 ? 52 8B 55 ? 50 8B 45 ? 52 8B 55 ? 50 8B 45"),
@@ -241,13 +229,6 @@ bool CP2SMPlusPlusPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateI
 	if (ConVar* ifuCVar = g_pCVar->FindVar("in_forceuser"))
 		ifuCVar->RemoveFlags(FCVAR_CHEAT);
 
-	Log(INFO, true, "Starting ImGUI...");
-	if (!ImGui::Init())
-	{
-		assert(false && "Failed to initialize ImGui!");
-		Log(INFO, false, "Failed to initialize ImGui!");
-	}
-	
 	Log(INFO, false, "Loaded plugin! Yay! :D");
 	m_bPluginLoaded = true;
 
@@ -264,7 +245,7 @@ void CP2SMPlusPlusPlugin::Unload(void)
 	{
 		m_bNoUnload = false;
 		Log(WARNING, true, "Failed to load plugin!");
-		MessageBox(WindowsGUI::GetWindowHandle(), "P2SM++ ran into a error when starting!\nPlease check the console for more info!", "P2SM++ Startup Error", MB_OK | MB_ICONERROR);
+		MessageBox(GeneralGUI::GetWindowHandle(), "P2SM++ ran into a error when starting!\nPlease check the console for more info!", "P2SM++ Startup Error", MB_OK | MB_ICONERROR);
 		return;
 	}