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

Move Game.Timestep to Widget

Browse Source 
Game.Timestep wasn't used for anything other than
UI anymore anyway, moving it makes this more clear.
This commit is contained in:
reaperrr
2021-03-28 21:51:42 +02:00
committed by Paul Chote
parent 6b93f955a4
commit 40aafe586d
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Game.cs
View File

@@ -32,7 +32,6 @@ namespace OpenRA
public static class Game public static class Game
{ {
public const int NetTickScale = 3; // 120 ms net tick for 40 ms local tick public const int NetTickScale = 3; // 120 ms net tick for 40 ms local tick
public const int Timestep = 40;
public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
public static InstalledMods Mods { get; private set; } public static InstalledMods Mods { get; private set; }
@@ -572,17 +571,17 @@ namespace OpenRA
var world = orderManager.World; var world = orderManager.World;
var uiTickDelta = tick - Ui.LastTickTime; var uiTickDelta = tick - Ui.LastTickTime;
if (uiTickDelta >= Timestep) if (uiTickDelta >= Ui.Timestep)
{ {
// Explained below for the world tick calculation // Explained below for the world tick calculation
var integralTickTimestep = (uiTickDelta / Timestep) * Timestep; var integralTickTimestep = (uiTickDelta / Ui.Timestep) * Ui.Timestep;
Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep; Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Ui.Timestep;
Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, Ui.Tick); Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, Ui.Tick);
Cursor.Tick(); Cursor.Tick();
} }
var worldTimestep = world == null ? Timestep : world.IsLoadingGameSave ? 1 : world.Timestep; var worldTimestep = world == null ? Ui.Timestep : world.IsLoadingGameSave ? 1 : world.Timestep;
var worldTickDelta = tick - orderManager.LastTickTime; var worldTickDelta = tick - orderManager.LastTickTime;
if (worldTimestep != 0 && worldTickDelta >= worldTimestep) if (worldTimestep != 0 && worldTickDelta >= worldTimestep)
{ {
@@ -779,7 +778,7 @@ namespace OpenRA
{ {
// Ideal time between logic updates. Timestep = 0 means the game is paused // Ideal time between logic updates. Timestep = 0 means the game is paused
// but we still call LogicTick() because it handles pausing internally. // but we still call LogicTick() because it handles pausing internally.
var logicInterval = worldRenderer != null && worldRenderer.World.Timestep != 0 ? worldRenderer.World.Timestep : Timestep; var logicInterval = worldRenderer != null && worldRenderer.World.Timestep != 0 ? worldRenderer.World.Timestep : Ui.Timestep;
// Ideal time between screen updates // Ideal time between screen updates
var maxFramerate = Settings.Graphics.CapFramerate ? Settings.Graphics.MaxFramerate.Clamp(1, 1000) : 1000; var maxFramerate = Settings.Graphics.CapFramerate ? Settings.Graphics.MaxFramerate.Clamp(1, 1000) : 1000;

2
OpenRA.Game/Widgets/Widget.cs
View File

@@ -20,6 +20,8 @@ namespace OpenRA.Widgets
{ {
public static class Ui public static class Ui
{ {
public const int Timestep = 40;
public static Widget Root = new ContainerWidget(); public static Widget Root = new ContainerWidget();
public static long LastTickTime = Game.RunTime; public static long LastTickTime = Game.RunTime;

3
OpenRA.Mods.Common/Traits/PaletteEffects/MenuPaletteEffect.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
@@ -48,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
public void Fade(EffectType type) public void Fade(EffectType type)
{ {
startTime = Game.RunTime; startTime = Game.RunTime;
endTime = startTime + Game.Timestep * Info.FadeLength; endTime = startTime + Ui.Timestep * Info.FadeLength;
frac = 1; frac = 1;
from = to; from = to;