Use the new ImageSpaceStage from RTM

Author: pr0bability

NewVegasReloaded/Main.cpp

@@ -51,9 +51,14 @@ extern "C" {
 			if (hRTM) {
 				Logger::Log("Real Time Menus found, initializing functions");
 				TheGameMenuManager->IsLiveMenu = (GameMenuManager::MenuPauseState(__cdecl*)(uint32_t, bool, bool))GetProcAddress(hRTM, "IsLiveMenu");
-			}
+				TheGameMenuManager->GetImageSpaceStage = (GameMenuManager::ImageSpaceStage(__cdecl*)())GetProcAddress(hRTM, "GetImageSpaceStage");
 
-			
+				if (!TheGameMenuManager->IsLiveMenu || !TheGameMenuManager->GetImageSpaceStage) {
+					MessageBox(NULL, L"Failed to load Real Time Menus functions.\nNew Vegas Reloaded cannot be used without them, please make sure to update RTM.", L"New Vegas Reloaded", MB_OK | MB_ICONERROR);
+					ExitProcess(0);
+				}
+
+			}
 
 			typedef void(__cdecl pfn_RegisterEOFEffect)(uint32_t auiIndex, ImageSpaceEffect* apEffect);
 			HMODULE hShaderLoader = GetModuleHandle(L"Fallout Shader Loader.dll");

src/NewVegas/Hooks/Render.cpp

@@ -127,9 +127,6 @@ float __fastcall GetWaterHeightLODHook(TESWorldSpace* This, UInt32 edx) {
 
 }
 
-bool bSkippedRender_RenderedMenu = false;
-bool bDoneRender_LockPickMenu = false;
-
 void(__cdecl* ProcessImageSpaceShaders)(NiDX9Renderer*, BSRenderedTexture*, BSRenderedTexture*) = (void(__cdecl*)(NiDX9Renderer*, BSRenderedTexture*, BSRenderedTexture*))Hooks::ProcessImageSpaceShaders;
 void __cdecl ProcessImageSpaceShadersHook(NiDX9Renderer* Renderer, BSRenderedTexture* SourceTarget, BSRenderedTexture* DestinationTarget) {
 	bool bLiveRenderedMenu = false; // FORenderedMenu, FOPipBoyManager
@@ -146,31 +143,15 @@ void __cdecl ProcessImageSpaceShadersHook(NiDX9Renderer* Renderer, BSRenderedTex
 	TheShaderManager->RenderAfterTonemapping = !DestinationTarget;
 
 	if (bLive3DMenu) {
-		if (bDoneRender_LockPickMenu) {
-			bDoneRender_LockPickMenu = false;
+		if (bLive3DMenu && TheGameMenuManager->GetImageSpaceStage && TheGameMenuManager->GetImageSpaceStage() != GameMenuManager::IS_BG) {
 			ProcessImageSpaceShaders(Renderer, SourceTarget, DestinationTarget);
 			return;
 		}
-		else {
-			bDoneRender_LockPickMenu = true;
-		}
-	}
-	else {
-		bDoneRender_LockPickMenu = false;
 	}
 
-	if (bLiveRenderedMenu) {
-		if (!bSkippedRender_RenderedMenu) {
-			bSkippedRender_RenderedMenu = true;
-			ProcessImageSpaceShaders(Renderer, SourceTarget, DestinationTarget);
-			return;
-		}
-		else {
-			bSkippedRender_RenderedMenu = false;
-		}
-	}
-	else {
-		bSkippedRender_RenderedMenu = false;
+	if (bLiveRenderedMenu && TheGameMenuManager->GetImageSpaceStage && TheGameMenuManager->GetImageSpaceStage() == GameMenuManager::IS_BG) {
+		ProcessImageSpaceShaders(Renderer, SourceTarget, DestinationTarget);
+		return;
 	}
 
 	IDirect3DDevice9* Device = TheRenderManager->device;

src/core/GameMenuManager.cpp

@@ -131,6 +131,7 @@ void GameMenuManager::Initialize() {
 	TheGameMenuManager->Keys[211] = "Delete";
 
 	TheGameMenuManager->IsLiveMenu = nullptr;
+	TheGameMenuManager->GetImageSpaceStage = nullptr;
 }
 
 void GameMenuManager::UpdateSettings() {

src/core/GameMenuManager.h

@@ -51,7 +51,14 @@ class GameMenuManager { // Never disposed
 		MENU_MIXED	= 2, // Does not pause the game, runs only MenuMode
 	};
 
+	enum ImageSpaceStage : uint32_t {
+		IS_NONE = 0, // No IS effects are currently being rendered
+		IS_BG = 1, // IS effects for the background are being rendered
+		IS_FG = 2, // IS effects for the foreground are being rendered
+	};
+
 	MenuPauseState(__cdecl* IsLiveMenu)(uint32_t aeMenu, bool abCheckInstances, bool abGameModeCheck);
+	ImageSpaceStage(__cdecl* GetImageSpaceStage)();
 
 	int HeaderYPos;
 	int MenuHeight;