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

A few improvements to the overlay merge request.

Browse source 
NO_OVERLAY define becomes EMU_OVERLAY which enables the overlay instead of disabling it.

disable_overlay.txt moved to steam_settings.
This commit is contained in:
Mr_Goldberg 2020-01-19 12:55:14 -05:00
parent ffdaf72597
commit db2a803cf7
No known key found for this signature in database
GPG key ID: 8597D87419DEF278
42 changed files with 857 additions and 1107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
overlay_experimental/windows/DX10_Hook.cpp
View file

@ -3,7 +3,7 @@
#include "../Renderer_Detector.h"
#include "../../dll/dll.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <imgui.h>
#include <impls/windows/imgui_impl_dx10.h>
@ -169,4 +169,4 @@ void DX10_Hook::loadFunctions(IDXGISwapChain *pSwapChain)
#undef LOAD_FUNC
}
#endif//NO_OVERLAY
#endif//EMU_OVERLAY

4
overlay_experimental/windows/DX10_Hook.h
View file

@ -2,7 +2,7 @@
#define __INCLUDED_DX10_HOOK_H__
#include "../Base_Hook.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <d3d10.h>
#include "DirectX_VTables.h"
@ -46,6 +46,6 @@ public:
void loadFunctions(IDXGISwapChain *pSwapChain);
};
#endif//NO_OVERLAY
#endif//EMU_OVERLAY
#endif//__INCLUDED_DX10_HOOK_H__

4
overlay_experimental/windows/DX11_Hook.cpp
View file

@ -3,7 +3,7 @@
#include "../Renderer_Detector.h"
#include "../../dll/dll.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <imgui.h>
#include <impls/windows/imgui_impl_dx11.h>
@ -183,4 +183,4 @@ void DX11_Hook::loadFunctions(IDXGISwapChain *pSwapChain)
#undef LOAD_FUNC
}
#endif//NO_OVERLAY
#endif//EMU_OVERLAY

4
overlay_experimental/windows/DX11_Hook.h
View file

@ -2,7 +2,7 @@
#define __INCLUDED_DX11_HOOK_H__
#include "../Base_Hook.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <d3d11.h>
#include "DirectX_VTables.h"
@ -46,6 +46,6 @@ public:
void loadFunctions(IDXGISwapChain *pSwapChain);
};
#endif//NO_OVERLAY
#endif//EMU_OVERLAY
#endif//__INCLUDED_DX11_HOOK_H__

4
overlay_experimental/windows/DX12_Hook.cpp
View file

@ -3,7 +3,7 @@
#include "../Renderer_Detector.h"
#include "../../dll/dll.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <imgui.h>
#include <impls/windows/imgui_impl_dx12.h>
@ -316,4 +316,4 @@ void DX12_Hook::loadFunctions(ID3D12CommandQueue* pCommandQueue, IDXGISwapChain
#undef LOAD_FUNC
}
#endif//NO_OVERLAY
#endif//EMU_OVERLAY

4
overlay_experimental/windows/DX12_Hook.h
View file

@ -2,7 +2,7 @@
#define __INCLUDED_DX12_HOOK_H__
#include "../Base_Hook.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <d3d12.h>
#include <dxgi1_4.h>
@ -56,5 +56,5 @@ public:
void loadFunctions(ID3D12CommandQueue* pCommandQueue, IDXGISwapChain* pSwapChain);
};
#endif//NO_OVERLAY
#endif//EMU_OVERLAY
#endif//__INCLUDED_DX12_HOOK_H__

4
overlay_experimental/windows/DX9_Hook.cpp
View file

@ -3,7 +3,7 @@
#include "../Renderer_Detector.h"
#include "../../dll/dll.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <imgui.h>
#include <impls/windows/imgui_impl_dx9.h>
@ -169,4 +169,4 @@ void DX9_Hook::loadFunctions(IDirect3DDevice9* pDevice, bool ex)
#undef LOAD_FUNC
}
#endif//NO_OVERLAY
#endif//EMU_OVERLAY

4
overlay_experimental/windows/DX9_Hook.h
View file

@ -2,7 +2,7 @@
#define __INCLUDED_DX9_HOOK_H__
#include "../Base_Hook.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <d3d9.h>
#include "DirectX_VTables.h"
@ -47,6 +47,6 @@ public:
void loadFunctions(IDirect3DDevice9 *pDevice, bool ex);
};
#endif//NO_OVERLAY
#endif//EMU_OVERLAY
#endif//__INCLUDED_DX9_HOOK_H__

4
overlay_experimental/windows/OpenGL_Hook.cpp
View file

@ -3,7 +3,7 @@
#include "../Renderer_Detector.h"
#include "../../dll/dll.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <imgui.h>
#include <impls/imgui_impl_opengl3.h>
@ -144,4 +144,4 @@ void OpenGL_Hook::loadFunctions(wglSwapBuffers_t pfnwglSwapBuffers)
wglSwapBuffers = pfnwglSwapBuffers;
}
#endif//NO_OVERLAY
#endif//EMU_OVERLAY

4
overlay_experimental/windows/OpenGL_Hook.h
View file

@ -2,7 +2,7 @@
#define __INCLUDED_OPENGL_HOOK_H__
#include "../Base_Hook.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
class OpenGL_Hook : public Base_Hook
{
@ -38,5 +38,5 @@ public:
void loadFunctions(wglSwapBuffers_t pfnwglSwapBuffers);
};
#endif//NO_OVERLAY
#endif//EMU_OVERLAY
#endif//__INCLUDED_OPENGL_HOOK_H__

4
overlay_experimental/windows/Windows_Hook.cpp
View file

@ -2,7 +2,7 @@
#include "../Renderer_Detector.h"
#include "../../dll/dll.h"
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
#include <imgui.h>
#include <impls/windows/imgui_impl_win32.h>
@ -206,4 +206,4 @@ const char* Windows_Hook::get_lib_name() const
return DLL_NAME;
}
#endif//NO_OVERLAY
#endif//EMU_OVERLAY

4
overlay_experimental/windows/Windows_Hook.h
View file

@ -4,7 +4,7 @@
#include "../Base_Hook.h"
#ifdef __WINDOWS__
#ifndef NO_OVERLAY
#ifdef EMU_OVERLAY
class Windows_Hook : public Base_Hook
{
@ -45,6 +45,6 @@ public:
virtual const char* get_lib_name() const;
};
#endif//NO_OVERLAY
#endif//EMU_OVERLAY
#endif//__WINDOWS__
#endif//__INCLUDED_WINDOWS_HOOK_H__