MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Initialize overlay after full initialization of UI.

merge-requests/28/head
Nemirtingas 2019-08-16 18:30:55 +02:00
parent 05f3fa09b3
commit 7b53134512
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overlay_experimental/DX10_Hook.cpp
View File

@ -96,9 +96,10 @@ void DX10_Hook::prepareForOverlay(IDXGISwapChain* pSwapChain)
pDevice->CreateRenderTargetView(pBackBuffer, NULL, &mainRenderTargetView); pDevice->CreateRenderTargetView(pBackBuffer, NULL, &mainRenderTargetView);
pBackBuffer->Release(); pBackBuffer->Release();
Hook_Manager::Inst().ChangeGameWindow(desc.OutputWindow);
ImGui_ImplWin32_Init(desc.OutputWindow); ImGui_ImplWin32_Init(desc.OutputWindow);
ImGui_ImplDX10_Init(pDevice); ImGui_ImplDX10_Init(pDevice);
Hook_Manager::Inst().ChangeGameWindow(desc.OutputWindow);
initialized = true; initialized = true;
} }

3
overlay_experimental/DX11_Hook.cpp
View File

@ -109,9 +109,10 @@ void DX11_Hook::prepareForOverlay(IDXGISwapChain* pSwapChain)
pDevice->CreateRenderTargetView(pBackBuffer, NULL, &mainRenderTargetView); pDevice->CreateRenderTargetView(pBackBuffer, NULL, &mainRenderTargetView);
pBackBuffer->Release(); pBackBuffer->Release();
Hook_Manager::Inst().ChangeGameWindow(desc.OutputWindow);
ImGui_ImplWin32_Init(desc.OutputWindow); ImGui_ImplWin32_Init(desc.OutputWindow);
ImGui_ImplDX11_Init(pDevice, pContext); ImGui_ImplDX11_Init(pDevice, pContext);
Hook_Manager::Inst().ChangeGameWindow(desc.OutputWindow);
initialized = true; initialized = true;
} }

3
overlay_experimental/DX9_Hook.cpp
View File

@ -96,9 +96,10 @@ void DX9_Hook::prepareForOverlay(IDirect3DDevice9 *pDevice)
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
io.IniFilename = NULL; io.IniFilename = NULL;
Hook_Manager::Inst().ChangeGameWindow(param.hFocusWindow);
ImGui_ImplWin32_Init(param.hFocusWindow); ImGui_ImplWin32_Init(param.hFocusWindow);
ImGui_ImplDX9_Init(pDevice); ImGui_ImplDX9_Init(pDevice);
Hook_Manager::Inst().ChangeGameWindow(param.hFocusWindow);
initialized = true; initialized = true;
} }

2
overlay_experimental/OpenGL_Hook.cpp
View File

@ -73,10 +73,10 @@ void OpenGL_Hook::prepareForOverlay(HDC hDC)
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
io.IniFilename = NULL; io.IniFilename = NULL;
Hook_Manager::Inst().ChangeGameWindow(hWnd);
ImGui_ImplWin32_Init(hWnd); ImGui_ImplWin32_Init(hWnd);
ImGui_ImplOpenGL3_Init(); ImGui_ImplOpenGL3_Init();
Hook_Manager::Inst().ChangeGameWindow(hWnd);
initialized = true; initialized = true;
} }