epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Render voxels before BeginFrame.

Browse Source
This commit is contained in:
Paul Chote
2019-08-31 18:38:25 +01:00
committed by teinarss
parent 5d786f411f
commit b93c7cabb3
2 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Game.cs
View File

@@ -655,12 +655,26 @@ namespace OpenRA
{
++RenderFrame;
// Prepare renderables (i.e. render voxels) before calling BeginFrame
using (new PerfSample("render_prepare"))
{
Renderer.WorldModelRenderer.BeginFrame();
// World rendering is disabled while the loading screen is displayed
if (worldRenderer != null && !worldRenderer.World.IsLoadingGameSave)
worldRenderer.PrepareRenderables();
Ui.PrepareRenderables();
Renderer.WorldModelRenderer.EndFrame();
}
// worldRenderer is null during the initial install/download screen
if (worldRenderer != null)
{
Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
// World rendering is disabled while the loading screen is displayed
// Use worldRenderer.World instead of OrderManager.World to avoid a rendering mismatch while processing orders
if (!worldRenderer.World.IsLoadingGameSave)
worldRenderer.Draw();
@@ -670,10 +684,6 @@ namespace OpenRA
using (new PerfSample("render_widgets"))
{
Renderer.WorldModelRenderer.BeginFrame();
Ui.PrepareRenderables();
Renderer.WorldModelRenderer.EndFrame();
Ui.Draw();
if (ModData != null && ModData.CursorProvider != null)