From 02da078baf768d4984d6c4ca0ae1c1463255400b Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 4 Aug 2019 01:08:55 +0200 Subject: [PATCH 1/3] Unified those messy FrameEventArgs. --- Content.Client/Chat/ChatManager.cs | 5 +++-- Content.Client/Chat/SpeechBubble.cs | 7 ++++--- Content.Client/ClientNotifyManager.cs | 7 ++++--- Content.Client/EntryPoint.cs | 12 ++++++------ Content.Client/GameTicking/ClientGameTicker.cs | 3 ++- Content.Client/Interfaces/Chat/IChatManager.cs | 3 ++- Content.Client/Interfaces/IClientGameTicker.cs | 3 ++- Content.Client/Interfaces/IClientNotifyManager.cs | 3 ++- Content.Server/EntryPoint.cs | 6 +++--- RobustToolbox | 2 +- 10 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs index 585f61862f..f99103bba5 100644 --- a/Content.Client/Chat/ChatManager.cs +++ b/Content.Client/Chat/ChatManager.cs @@ -13,6 +13,7 @@ using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.Client.Chat @@ -90,7 +91,7 @@ namespace Content.Client.Chat _speechBubbleRoot.SetPositionFirst(); } - public void FrameUpdate(RenderFrameEventArgs delta) + public void FrameUpdate(FrameEventArgs delta) { // Update queued speech bubbles. if (_queuedSpeechBubbles.Count == 0) @@ -106,7 +107,7 @@ namespace Content.Client.Chat continue; } - queueData.TimeLeft -= delta.Elapsed; + queueData.TimeLeft -= delta.DeltaSeconds; if (queueData.TimeLeft > 0) { continue; diff --git a/Content.Client/Chat/SpeechBubble.cs b/Content.Client/Chat/SpeechBubble.cs index 0815e283b7..a796c4e7e8 100644 --- a/Content.Client/Chat/SpeechBubble.cs +++ b/Content.Client/Chat/SpeechBubble.cs @@ -6,6 +6,7 @@ using Robust.Client.UserInterface.Controls; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Timers; +using Robust.Shared.Timing; namespace Content.Client.Chat { @@ -73,11 +74,11 @@ namespace Content.Client.Chat _verticalOffsetAchieved = -ContentHeight; } - protected override void FrameUpdate(RenderFrameEventArgs args) + protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - _timeLeft -= args.Elapsed; + _timeLeft -= args.DeltaSeconds; if (_timeLeft <= FadeTime) { @@ -99,7 +100,7 @@ namespace Content.Client.Chat } else { - _verticalOffsetAchieved = FloatMath.Lerp(_verticalOffsetAchieved, VerticalOffset, 10 * args.Elapsed); + _verticalOffsetAchieved = FloatMath.Lerp(_verticalOffsetAchieved, VerticalOffset, 10 * args.DeltaSeconds); } var worldPos = _senderEntity.Transform.WorldPosition; diff --git a/Content.Client/ClientNotifyManager.cs b/Content.Client/ClientNotifyManager.cs index fc4db8db17..2b2b296152 100644 --- a/Content.Client/ClientNotifyManager.cs +++ b/Content.Client/ClientNotifyManager.cs @@ -14,6 +14,7 @@ using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.Client @@ -69,7 +70,7 @@ namespace Content.Client PopupMessage(new ScreenCoordinates(_inputManager.MouseScreenPosition), message); } - public void FrameUpdate(RenderFrameEventArgs eventArgs) + public void FrameUpdate(FrameEventArgs eventArgs) { foreach (var label in _aliveLabels) { @@ -94,9 +95,9 @@ namespace Content.Client } - public void Update(RenderFrameEventArgs eventArgs) + public void Update(FrameEventArgs eventArgs) { - _timeLeft += eventArgs.Elapsed; + _timeLeft += eventArgs.DeltaSeconds; Position = InitialPos - new Vector2(0, 20 * (_timeLeft * _timeLeft + _timeLeft)); if (_timeLeft > 0.5f) { diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index bf830edbae..a75e275b99 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -22,6 +22,7 @@ using Robust.Shared.ContentPack; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Content.Client { @@ -176,17 +177,16 @@ namespace Content.Client IoCManager.Resolve().Initialize(); } - public override void Update(ModUpdateLevel level, float frameTime) + public override void Update(ModUpdateLevel level, FrameEventArgs frameEventArgs) { - base.Update(level, frameTime); + base.Update(level, frameEventArgs); switch (level) { case ModUpdateLevel.FramePreEngine: - var renderFrameEventArgs = new RenderFrameEventArgs(frameTime); - IoCManager.Resolve().FrameUpdate(renderFrameEventArgs); - IoCManager.Resolve().FrameUpdate(renderFrameEventArgs); - IoCManager.Resolve().FrameUpdate(renderFrameEventArgs); + IoCManager.Resolve().FrameUpdate(frameEventArgs); + IoCManager.Resolve().FrameUpdate(frameEventArgs); + IoCManager.Resolve().FrameUpdate(frameEventArgs); break; } } diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs index bab225f1e9..59cce13532 100644 --- a/Content.Client/GameTicking/ClientGameTicker.cs +++ b/Content.Client/GameTicking/ClientGameTicker.cs @@ -18,6 +18,7 @@ using Robust.Shared.Input; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -94,7 +95,7 @@ namespace Content.Client.GameTicking _gameHud.RootControl.Orphan(); } - public void FrameUpdate(RenderFrameEventArgs renderFrameEventArgs) + public void FrameUpdate(FrameEventArgs FrameEventArgs) { if (_lobby == null) { diff --git a/Content.Client/Interfaces/Chat/IChatManager.cs b/Content.Client/Interfaces/Chat/IChatManager.cs index 989d044136..0af1ab85ee 100644 --- a/Content.Client/Interfaces/Chat/IChatManager.cs +++ b/Content.Client/Interfaces/Chat/IChatManager.cs @@ -1,6 +1,7 @@ using Content.Client.Chat; using Robust.Client; using Robust.Shared.GameObjects; +using Robust.Shared.Timing; namespace Content.Client.Interfaces.Chat { @@ -8,7 +9,7 @@ namespace Content.Client.Interfaces.Chat { void Initialize(); - void FrameUpdate(RenderFrameEventArgs delta); + void FrameUpdate(FrameEventArgs delta); void SetChatBox(ChatBox chatBox); diff --git a/Content.Client/Interfaces/IClientGameTicker.cs b/Content.Client/Interfaces/IClientGameTicker.cs index 2b7d14e000..2d97b93a31 100644 --- a/Content.Client/Interfaces/IClientGameTicker.cs +++ b/Content.Client/Interfaces/IClientGameTicker.cs @@ -1,11 +1,12 @@ using Content.Client.UserInterface; using Robust.Client; +using Robust.Shared.Timing; namespace Content.Client.Interfaces { public interface IClientGameTicker { void Initialize(); - void FrameUpdate(RenderFrameEventArgs renderFrameEventArgs); + void FrameUpdate(FrameEventArgs FrameEventArgs); } } diff --git a/Content.Client/Interfaces/IClientNotifyManager.cs b/Content.Client/Interfaces/IClientNotifyManager.cs index ba4698041b..03d587301f 100644 --- a/Content.Client/Interfaces/IClientNotifyManager.cs +++ b/Content.Client/Interfaces/IClientNotifyManager.cs @@ -1,6 +1,7 @@ using Content.Shared.Interfaces; using Robust.Client; using Robust.Shared.Map; +using Robust.Shared.Timing; namespace Content.Client.Interfaces { @@ -9,6 +10,6 @@ namespace Content.Client.Interfaces void Initialize(); void PopupMessage(ScreenCoordinates coordinates, string message); void PopupMessage(string message); - void FrameUpdate(RenderFrameEventArgs eventArgs); + void FrameUpdate(FrameEventArgs eventArgs); } } diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index 04f1e61272..fef9a48bca 100644 --- a/Content.Server/EntryPoint.cs +++ b/Content.Server/EntryPoint.cs @@ -75,11 +75,11 @@ namespace Content.Server _gameTicker.Initialize(); } - public override void Update(ModUpdateLevel level, float frameTime) + public override void Update(ModUpdateLevel level, FrameEventArgs frameEventArgs) { - base.Update(level, frameTime); + base.Update(level, frameEventArgs); - _gameTicker.Update(new FrameEventArgs(frameTime)); + _gameTicker.Update(frameEventArgs); } } } diff --git a/RobustToolbox b/RobustToolbox index be0c520455..0a41ef3c9a 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit be0c520455e97a6b16a08dbd995d3e55bd0c57fd +Subproject commit 0a41ef3c9ad663f65afc0045bd54215cabab50ec From 687d22188aebc8badfa301c147de818d34706835 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 4 Aug 2019 11:54:58 +0200 Subject: [PATCH 2/3] Fix airlock placement. --- Resources/Prototypes/Entities/buildings/airlock_base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/buildings/airlock_base.yml b/Resources/Prototypes/Entities/buildings/airlock_base.yml index 7ee129c9d5..25e7c54df8 100644 --- a/Resources/Prototypes/Entities/buildings/airlock_base.yml +++ b/Resources/Prototypes/Entities/buildings/airlock_base.yml @@ -35,4 +35,4 @@ close_sound: /Audio/machines/airlock_close.ogg placement: - mode: SnapgridBorder + mode: SnapgridCenter From 6c76c5d917d123701d8401ea89f02df06293791e Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 4 Aug 2019 18:26:26 +0200 Subject: [PATCH 3/3] Update submodule --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 0a41ef3c9a..89726ebeec 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 0a41ef3c9ad663f65afc0045bd54215cabab50ec +Subproject commit 89726ebeece51d4f1851e314ae6156fe402572fc