Skip to content

Commit 1cd0997

Browse files
committed
Move packet generation code to bridge
1 parent e3c3035 commit 1cd0997

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+42
-1338
lines changed

RLBotCS.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.1.32328.378
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RLBotCS", "RLBotCS\RLBotCS.csproj", "{E99EA002-2A1B-4672-BBEA-2AF9D67A0FE3}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RLBotModels", "RLBotModels\RLBotModels.csproj", "{F46726A1-EC2F-4E72-BDB4-47D1A929937B}"
9-
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RLBotCSTests", "RLBotCSTests\RLBotCSTests.csproj", "{1DB880C1-2AA1-4E1B-97AA-642656565457}"
119
EndProject
1210
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7243CDCC-3DAF-4982-9C05-A7F1E4A5E5E3}"
@@ -24,10 +22,6 @@ Global
2422
{E99EA002-2A1B-4672-BBEA-2AF9D67A0FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
2523
{E99EA002-2A1B-4672-BBEA-2AF9D67A0FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
2624
{E99EA002-2A1B-4672-BBEA-2AF9D67A0FE3}.Release|Any CPU.Build.0 = Release|Any CPU
27-
{F46726A1-EC2F-4E72-BDB4-47D1A929937B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28-
{F46726A1-EC2F-4E72-BDB4-47D1A929937B}.Debug|Any CPU.Build.0 = Debug|Any CPU
29-
{F46726A1-EC2F-4E72-BDB4-47D1A929937B}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{F46726A1-EC2F-4E72-BDB4-47D1A929937B}.Release|Any CPU.Build.0 = Release|Any CPU
3125
{1DB880C1-2AA1-4E1B-97AA-642656565457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3226
{1DB880C1-2AA1-4E1B-97AA-642656565457}.Debug|Any CPU.Build.0 = Debug|Any CPU
3327
{1DB880C1-2AA1-4E1B-97AA-642656565457}.Release|Any CPU.ActiveCfg = Release|Any CPU

RLBotCS/Conversion/FlatToModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using RLBotModels.Command;
2-
using RLBotModels.Control;
3-
using RLBotModels.Phys;
1+
using RLBotSecret.Models.Command;
2+
using RLBotSecret.Models.Control;
3+
using RLBotSecret.Models.Phys;
44

55
namespace RLBotSecret.Conversion
66
{

RLBotCS/GameControl/MatchStarter.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
using rlbot.flat;
22
using RLBotCS.Conversion;
3-
using RLBotCS.GameState;
4-
using RLBotCS.Server;
5-
using RLBotModels.Message;
63
using RLBotSecret.Controller;
74
using RLBotSecret.Conversion;
5+
using RLBotSecret.GameState;
6+
using RLBotSecret.Models.Message;
87
using RLBotSecret.TCP;
9-
using GameStateType = RLBotModels.Message.GameStateType;
8+
using RLBotSecret.Types;
9+
using GameStateType = RLBotSecret.Models.Message.GameStateType;
1010

1111
namespace RLBotCS.GameControl
1212
{
1313
internal class MatchStarter
1414
{
15-
private RLBotPacket.GameTickPacket gameTickPacket;
15+
private RLBotSecret.Packet.GameTickPacket gameTickPacket;
1616
private PlayerMapping playerMapping;
1717
private MatchCommandSender matchCommandSender;
1818
private (MatchSettingsT, TypedPayload)? lastMatchMessage;
@@ -25,7 +25,7 @@ internal class MatchStarter
2525
private bool isRenderingEnabled = true;
2626
private int gamePort;
2727

28-
public MatchStarter(TcpMessenger tcpMessenger, GameState.GameState gameState, int gamePort)
28+
public MatchStarter(TcpMessenger tcpMessenger, GameState gameState, int gamePort)
2929
{
3030
gameTickPacket = gameState.gameTickPacket;
3131
playerMapping = gameState.playerMapping;
@@ -389,7 +389,7 @@ private void SpawnBots(MatchSettingsT matchSettings)
389389
playerConfig.Loadout.LoadoutPaint = new LoadoutPaintT();
390390
}
391391

392-
RLBotModels.Command.Loadout loadout = FlatToModel.ToLoadout(
392+
var loadout = FlatToModel.ToLoadout(
393393
playerConfig.Loadout,
394394
playerConfig.Team
395395
);

RLBotCS/GameState/GameState.cs

Lines changed: 0 additions & 206 deletions
This file was deleted.

RLBotCS/GameState/MatchSettings.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)