Revert some changes.

This commit is contained in:
GabsPuNs
2026-06-20 17:02:11 -04:00
parent 9b3e7b7e2b
commit 894eec412f
5 changed files with 24 additions and 26 deletions

View File

@@ -915,6 +915,8 @@ static bool ResizeD3D(int newW, int newH)
ui.updateRenderTargets(g_pRenderTargetView, g_pDepthStencilView);
ui.updateScreenSize(bbW, bbH);
RmlManager::Get().OnResize(bbW, bbH);
// Track actual backbuffer dimensions for the rest of the engine
g_iScreenWidth = bbW;
g_iScreenHeight = bbH;
@@ -969,6 +971,7 @@ postReset:
g_iScreenWidth = recW;
g_iScreenHeight = recH;
ui.updateScreenSize(recW, recH);
RmlManager::Get().OnResize(recW, recH);
}
app.DebugPrintf("[RESIZE] FAILED but recovered views at %dx%d\n", g_iScreenWidth, g_iScreenHeight);
@@ -1069,8 +1072,11 @@ static Minecraft* InitialiseMinecraftRuntime()
RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
app.loadStringTable();
ui.init(g_pd3dDevice, g_pImmediateContext, g_pRenderTargetView, g_pDepthStencilView, g_iScreenWidth, g_iScreenHeight);
RmlManager::Get().Init(g_iScreenWidth, g_iScreenHeight);
InputManager.Initialise(1, 3, MINECRAFT_ACTION_MAX, ACTION_MAX_MENU);
g_KBMInput.Init();
DefineActions();
@@ -1504,9 +1510,10 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
}
#endif
ui.tick();
RmlManager::Get().Update();
ui.render();
RmlManager::Get().Render();
g_DiscordPresence.Tick();
pMinecraft->gameRenderer->ApplyGammaPostProcess();

View File

@@ -61,10 +61,6 @@ void ConsoleUIController::init(ID3D11Device *dev, ID3D11DeviceContext *ctx, ID3D
// Shared init
postInit();
// Initialise RmlUi (menus)
if (!RmlManager::Get().Init())
app.DebugPrintf("ConsoleUIController::init - RmlManager::Init failed\n");
#endif
}
@@ -88,9 +84,6 @@ void ConsoleUIController::render()
renderScenes();
// Render RmlUi menus on top of the Iggy scenes
RmlManager::Get().Render();
/* Finally we're ready to display the frame. We call GDraw to
let it know we're done rendering, so it can do any finalization
it needs to do. */