mirror/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2025-12-05 11:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Moved window hooks to its own class

Browse source 
Every class has a job. Overlay is to show an overlay not to hook windows functions.
Hook_Manager's job is to manage hooks and should not contain a reference to the overlay. (It should not contains any reference to directX or OpenGL either but I'll see that later... Maybe)
This makes the overlay code much cleaner and "could" be used in Linux as well.
This commit is contained in:
Nemirtingas 2019-08-18 16:22:07 +02:00
parent f096a2d8a2
commit 5b0306dccc
11 changed files with 281 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

22
overlay_experimental/DX9_Hook.cpp
View file

@ -1,11 +1,11 @@
#include "DX9_Hook.h"
#include "Windows_Hook.h"
#include "Hook_Manager.h"
#include "../dll/dll.h"
#ifndef NO_OVERLAY
#include "Hook_Manager.h"
#include <imgui.h>
#include <impls/imgui_impl_win32.h>
#include <impls/imgui_impl_dx9.h>
#include "steam_overlay.h"
@ -46,6 +46,9 @@ bool DX9_Hook::start_hook()
//std::make_pair<void**, void*>(&(PVOID&)EndScene, &DX9_Hook::MyEndScene)
);
EndHook();
if (Windows_Hook::Inst().start_hook())
get_steam_client()->steam_overlay->HookReady();
}
else
{
@ -65,7 +68,7 @@ void DX9_Hook::resetRenderState()
{
initialized = false;
ImGui_ImplDX9_Shutdown();
ImGui_ImplWin32_Shutdown();
Windows_Hook::Inst().resetRenderState();
ImGui::DestroyContext();
}
}
@ -83,7 +86,7 @@ void DX9_Hook::prepareForOverlay(IDirect3DDevice9 *pDevice)
pDevice->GetCreationParameters(&param);
// Workaround to detect if we changed window.
if (param.hFocusWindow != Hook_Manager::Inst().GetOverlay()->GetGameHwnd())
if (param.hFocusWindow != Windows_Hook::Inst().GetGameHwnd())
resetRenderState();
if (!initialized)
@ -92,19 +95,16 @@ void DX9_Hook::prepareForOverlay(IDirect3DDevice9 *pDevice)
ImGuiIO& io = ImGui::GetIO();
io.IniFilename = NULL;
ImGui_ImplWin32_Init(param.hFocusWindow);
ImGui_ImplDX9_Init(pDevice);
Hook_Manager::Inst().ChangeGameWindow(param.hFocusWindow);
initialized = true;
}
ImGui_ImplDX9_NewFrame();
ImGui_ImplWin32_NewFrame();
Windows_Hook::Inst().prepareForOverlay(param.hFocusWindow);
ImGui::NewFrame();
Hook_Manager::Inst().CallOverlayProc(PresentParameters.BackBufferWidth, PresentParameters.BackBufferHeight);
get_steam_client()->steam_overlay->OverlayProc(PresentParameters.BackBufferWidth, PresentParameters.BackBufferHeight);
ImGui::EndFrame();
@ -195,7 +195,7 @@ DX9_Hook::~DX9_Hook()
//ImGui_ImplDX9_Shutdown(); This makes some games hang when Releasing the D3D9 device (pDevice->Release())
// maybe because D3D is already shut down when we try to free the device?
ImGui_ImplDX9_InvalidateDeviceObjects();
ImGui_ImplWin32_Shutdown();
Windows_Hook::Inst().resetRenderState();
ImGui::DestroyContext();
}