tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust some frametiming stuff (#6496)

Browse Source
This commit is contained in:
metalgearsloth
2022-03-01 01:11:25 +11:00
committed by GitHub
parent eeef210ae4
commit ffed5eec81
6 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
View File

@@ -176,8 +176,12 @@ namespace Content.Client.Atmos.EntitySystems
var frameCount = FrameCounter[i]; var frameCount = FrameCounter[i];
Timer[i] += frameTime; Timer[i] += frameTime;
if (!(Timer[i] >= delays[frameCount])) continue; var time = delays[frameCount];
Timer[i] = 0f;
if (Timer[i] < time)
continue;
Timer[i] -= time;
FrameCounter[i] = (frameCount + 1) % Frames[i].Length; FrameCounter[i] = (frameCount + 1) % Frames[i].Length;
} }
@@ -188,8 +192,10 @@ namespace Content.Client.Atmos.EntitySystems
var frameCount = FireFrameCounter[i]; var frameCount = FireFrameCounter[i];
FireTimer[i] += frameTime; FireTimer[i] += frameTime;
if (!(FireTimer[i] >= delays[frameCount])) continue; var time = delays[frameCount];
FireTimer[i] = 0f;
if (FireTimer[i] < time) continue;
FireTimer[i] -= time;
FireFrameCounter[i] = (frameCount + 1) % FireFrames[i].Length; FireFrameCounter[i] = (frameCount + 1) % FireFrames[i].Length;
} }
} }

2
Content.Client/DragDrop/DragDropSystem.cs
View File

@@ -243,7 +243,7 @@ namespace Content.Client.DragDrop
if (_targetRecheckTime > TargetRecheckInterval) if (_targetRecheckTime > TargetRecheckInterval)
{ {
HighlightTargets(); HighlightTargets();
_targetRecheckTime = 0; _targetRecheckTime -= TargetRecheckInterval;
} }
return true; return true;

2
Content.Server/Administration/Logs/AdminLogSystem.cs
View File

@@ -182,7 +182,7 @@ public sealed partial class AdminLogSystem : SharedAdminLogSystem
private async Task SaveLogs() private async Task SaveLogs()
{ {
_accumulatedFrameTime = 0; _accumulatedFrameTime = 0f;
// TODO ADMIN LOGS array pool // TODO ADMIN LOGS array pool
var copy = new List<QueuedLog>(_logQueue.Count + _preRoundLogQueue.Count); var copy = new List<QueuedLog>(_logQueue.Count + _preRoundLogQueue.Count);

13
Content.Server/Animals/Systems/UdderSystem.cs
View File

@@ -37,8 +37,9 @@ namespace Content.Server.Animals.Systems
{ {
udder.AccumulatedFrameTime += frameTime; udder.AccumulatedFrameTime += frameTime;
if (udder.AccumulatedFrameTime < udder.UpdateRate) while (udder.AccumulatedFrameTime > udder.UpdateRate)
continue; {
udder.AccumulatedFrameTime -= udder.UpdateRate;
// Actually there is food digestion so no problem with instant reagent generation "OnFeed" // Actually there is food digestion so no problem with instant reagent generation "OnFeed"
if (EntityManager.TryGetComponent<HungerComponent?>(udder.Owner, out var hunger)) if (EntityManager.TryGetComponent<HungerComponent?>(udder.Owner, out var hunger))
@@ -50,12 +51,14 @@ namespace Content.Server.Animals.Systems
continue; continue;
} }
if (!_solutionContainerSystem.TryGetSolution(udder.Owner, udder.TargetSolutionName, out var solution)) if (!_solutionContainerSystem.TryGetSolution(udder.Owner, udder.TargetSolutionName,
out var solution))
continue; continue;
//TODO: toxins from bloodstream !? //TODO: toxins from bloodstream !?
_solutionContainerSystem.TryAddReagent(udder.Owner, solution, udder.ReagentId, udder.QuantityPerUpdate, out var accepted); _solutionContainerSystem.TryAddReagent(udder.Owner, solution, udder.ReagentId,
udder.AccumulatedFrameTime = 0; udder.QuantityPerUpdate, out var accepted);
}
} }
} }

2
Content.Server/Botany/Systems/BotanySystem.Plant.cs
View File

@@ -72,7 +72,7 @@ namespace Content.Server.Botany.Systems
if (_timer < 3f) if (_timer < 3f)
return; return;
_timer = 0f; _timer -= 3f;
foreach (var plantHolder in EntityManager.EntityQuery<PlantHolderComponent>()) foreach (var plantHolder in EntityManager.EntityQuery<PlantHolderComponent>())
{ {

3
Content.Server/Nutrition/EntitySystems/HungerSystem.cs
View File

@@ -19,7 +19,8 @@ namespace Content.Server.Nutrition.EntitySystems
{ {
comp.OnUpdate(_accumulatedFrameTime); comp.OnUpdate(_accumulatedFrameTime);
} }
_accumulatedFrameTime = 0;
_accumulatedFrameTime -= 1;
} }
} }
} }