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

Unified those messy FrameEventArgs.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-08-04 01:08:55 +02:00
parent a246d7e48d
commit 02da078baf
10 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Chat/ChatManager.cs
View File

@@ -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;

7
Content.Client/Chat/SpeechBubble.cs
View File

@@ -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;

7
Content.Client/ClientNotifyManager.cs
View File

@@ -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)
{

12
Content.Client/EntryPoint.cs
View File

@@ -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<IChatManager>().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<IClientNotifyManager>().FrameUpdate(renderFrameEventArgs);
IoCManager.Resolve<IClientGameTicker>().FrameUpdate(renderFrameEventArgs);
IoCManager.Resolve<IChatManager>().FrameUpdate(renderFrameEventArgs);
IoCManager.Resolve<IClientNotifyManager>().FrameUpdate(frameEventArgs);
IoCManager.Resolve<IClientGameTicker>().FrameUpdate(frameEventArgs);
IoCManager.Resolve<IChatManager>().FrameUpdate(frameEventArgs);
break;
}
}

3
Content.Client/GameTicking/ClientGameTicker.cs
View File

@@ -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)
{

3
Content.Client/Interfaces/Chat/IChatManager.cs
View File

@@ -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);

3
Content.Client/Interfaces/IClientGameTicker.cs
View File

@@ -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);
}
}

3
Content.Client/Interfaces/IClientNotifyManager.cs
View File

@@ -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);
}
}

6
Content.Server/EntryPoint.cs
View File

@@ -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);
}
}
}

2
RobustToolbox

Submodule RobustToolbox updated: be0c520455...0a41ef3c9a