Set gravity for ball prediction (#105)

VirxEC · web-flow · commit 74c7efea0171 · 2025-04-26T08:18:28.000+02:00
* Set gravity for ball prediction

* Run formatter

* Update ball pred test

* Actually set gravity

* Update build.yml to run tests

* Fix test

* Directly set WorldGravityZ
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,6 +19,9 @@ jobs:
       with:
         submodules: 'recursive'
 
+    - name: Test
+      run: dotnet test
+
     - name: Build 
       run: dotnet publish -r win-x64
 
@@ -37,6 +40,9 @@ jobs:
       with:
         submodules: 'recursive'
 
+    - name: Test
+      run: dotnet test
+
     - name: Build 
       run: dotnet publish -r linux-x64
 
diff --git a/RLBotCS/Main.cs b/RLBotCS/Main.cs
@@ -8,7 +8,7 @@
 
 if (args.Length > 0 && args[0] == "--version")
 {
-    Console.WriteLine("RLBotServer v5.beta.6.3");
+    Console.WriteLine("RLBotServer v5.beta.6.4");
     Environment.Exit(0);
 }
 
diff --git a/RLBotCS/ManagerTools/BallPredictor.cs b/RLBotCS/ManagerTools/BallPredictor.cs
@@ -56,6 +56,9 @@ public static partial class BallPredictor
     [LibraryImport("rl_ball_sym", EntryPoint = "set_heatseeker_target")]
     private static partial void SetHeatseekerTarget(byte blueGoal);
 
+    [LibraryImport("rl_ball_sym", EntryPoint = "set_gravity")]
+    private static partial void SetGravity(float gravityZ);
+
     [LibraryImport("rl_ball_sym", EntryPoint = "step")]
     private static unsafe partial BallSlice* Step(BallSlice ball, ushort ticks);
 
@@ -122,7 +125,8 @@ public static PredictionMode UpdateMode(MatchConfigurationT matchConfig)
     public static BallPredictionT Generate(
         float currentTime,
         BallInfoT currentBall,
-        (TouchT, uint)? lastTouch
+        (TouchT, uint)? lastTouch,
+        float gravityZ
     )
     {
         BallSlice ball = new()
@@ -165,6 +169,8 @@ public static BallPredictionT Generate(
             }
         }
 
+        SetGravity(gravityZ);
+
         unsafe
         {
             var ballSlices = Step(ball, numSlices);
diff --git a/RLBotCS/ManagerTools/ConfigValidator.cs b/RLBotCS/ManagerTools/ConfigValidator.cs
@@ -43,7 +43,7 @@ public static bool Validate(MatchConfigurationT config)
                 config.LauncherArg = "";
             }
         }
-        
+
         config.Mutators ??= new();
         config.PlayerConfigurations ??= new();
         config.ScriptConfigurations ??= new();
@@ -139,7 +139,7 @@ List<PlayerConfigurationT> players
                     // Fallback if above fails or user didn't include paints
                     player.Loadout ??= new();
                     player.Loadout.LoadoutPaint ??= new();
-                    
+
                     player.RunCommand = "";
                     player.RootDir = "";
 
@@ -161,7 +161,10 @@ List<PlayerConfigurationT> players
                     break;
             }
 
-            player.SpawnId = player.Variety.Type == PlayerClass.Human ? 0 : $"{player.AgentId}/{player.Team}/{i}".GetHashCode();
+            player.SpawnId =
+                player.Variety.Type == PlayerClass.Human
+                    ? 0
+                    : $"{player.AgentId}/{player.Team}/{i}".GetHashCode();
         }
 
         if (humanCount > 1)
diff --git a/RLBotCS/ManagerTools/MatchStarter.cs b/RLBotCS/ManagerTools/MatchStarter.cs
@@ -305,7 +305,7 @@ private void LoadMatch(MatchConfigurationT matchConfig, PlayerSpawner spawner)
                     {
                         spawner.DespawnPlayers(toDespawnIds);
                     }
-                    
+
                     // We can flush C&S despawn commands immediately
                     spawner.Flush();
                 }
@@ -451,7 +451,7 @@ private bool SpawnCars(
         {
             spawner.Flush();
         }
-        
+
         return true;
     }
 
diff --git a/RLBotCS/ManagerTools/PlayerSpawner.cs b/RLBotCS/ManagerTools/PlayerSpawner.cs
@@ -54,14 +54,17 @@ public void SpawnHuman(PlayerConfigurationT config, uint desiredIndex)
             .FirstOrDefault(kp => config.SpawnId == kp.SpawnId);
         if (alreadySpawnedPlayer != null)
         {
-            _gameState.PlayerMapping.QueueIndexChange(alreadySpawnedPlayer.PlayerIndex, desiredIndex);
+            _gameState.PlayerMapping.QueueIndexChange(
+                alreadySpawnedPlayer.PlayerIndex,
+                desiredIndex
+            );
             return;
         }
 
         _gameState.PlayerMapping.AddPendingSpawn(
             new SpawnTracker
             {
-                CommandId = 0, // Human spawning must use command id 0 for reasons in bridge 
+                CommandId = 0, // Human spawning must use command id 0 for reasons in bridge
                 SpawnId = config.SpawnId,
                 DesiredPlayerIndex = desiredIndex,
                 IsBot = false,
diff --git a/RLBotCS/Server/BridgeContext.cs b/RLBotCS/Server/BridgeContext.cs
@@ -44,6 +44,7 @@ MatchStarter matchStarter
     public PerfMonitor PerfMonitor { get; } = new();
 
     public PlayerSpawner GetPlayerSpawner() => new(ref GameState, SpawnCommandQueue);
+
     public void UpdateTimeMutators()
     {
         var mutators = MatchConfig!.Mutators;
diff --git a/RLBotCS/Server/BridgeHandler.cs b/RLBotCS/Server/BridgeHandler.cs
@@ -137,7 +137,11 @@ private async Task HandleServer()
                         _context.PerfMonitor.ClearAll();
                 }
 
-                if (_context.MatchStarter.HasSpawnedMap && _context.GameState.MatchPhase == MatchPhase.Paused && _context.SpawnCommandQueue.Count > 0)
+                if (
+                    _context.MatchStarter.HasSpawnedMap
+                    && _context.GameState.MatchPhase == MatchPhase.Paused
+                    && _context.SpawnCommandQueue.Count > 0
+                )
                 {
                     _context.Logger.LogDebug("Sending queued spawning commands");
                     _context.SpawnCommandQueue.Flush();
diff --git a/RLBotCS/Server/BridgeMessage/SetGameState.cs b/RLBotCS/Server/BridgeMessage/SetGameState.cs
@@ -13,9 +13,12 @@ public void HandleMessage(BridgeContext context)
         if (GameState.MatchInfo is { } matchInfo)
         {
             if (matchInfo.WorldGravityZ is { } gravity)
+            {
                 context.MatchCommandQueue.AddConsoleCommand(
                     FlatToCommand.MakeGravityCommand(gravity.Val)
                 );
+                context.GameState.WorldGravityZ = gravity.Val;
+            }
 
             if (matchInfo.GameSpeed is { } speed)
                 context.MatchCommandQueue.AddConsoleCommand(
@@ -58,10 +61,7 @@ public void HandleMessage(BridgeContext context)
 
             if (car.BoostAmount is { } boostAmount)
             {
-                context.MatchCommandQueue.AddSetBoostCommand(
-                    (ushort)id,
-                    (int)boostAmount.Val
-                );
+                context.MatchCommandQueue.AddSetBoostCommand((ushort)id, (int)boostAmount.Val);
             }
         }
 
diff --git a/RLBotCS/Server/FlatBuffersServer.cs b/RLBotCS/Server/FlatBuffersServer.cs
@@ -32,7 +32,7 @@ private void AddSession(TcpClient client)
         Thread sessionThread = new(() =>
         {
             _context.Logger.LogDebug("Client {} connected", clientId);
-            
+
             FlatBuffersSession session = new(
                 client,
                 clientId,
diff --git a/RLBotCS/Server/FlatBuffersSession.cs b/RLBotCS/Server/FlatBuffersSession.cs
@@ -74,7 +74,7 @@ class FlatBuffersSession
 
     private readonly FlatBufferBuilder _messageBuilder = new(1 << 10);
 
-    public string ClientName => 
+    public string ClientName =>
         _agentId != ""
             ? $"client {_clientId} (index {string.Join("+", _playerIdPairs.Select(p => p.Index))}, team {_team}, aid {_agentId})"
             : $"client {_clientId} (w/o aid)";
@@ -394,7 +394,7 @@ private async Task HandleInternalMessages()
                             _messageBuilder
                         )
                     );
-                    
+
                     Logger.LogDebug("Reserved agents for {}", ClientName);
 
                     break;
diff --git a/RLBotCS/Server/ServerMessage/DistributeGamePacket.cs b/RLBotCS/Server/ServerMessage/DistributeGamePacket.cs
@@ -25,7 +25,8 @@ private static void DistributeBallPrediction(ServerContext context, GamePacketT
         BallPredictionT prediction = BallPredictor.Generate(
             packet.MatchInfo.SecondsElapsed,
             firstBall,
-            lastTouch
+            lastTouch,
+            packet.MatchInfo.WorldGravityZ
         );
 
         foreach (var (writer, _) in context.Sessions.Values)
diff --git a/RLBotCS/lib/rl_ball_sym/librl_ball_sym.a b/RLBotCS/lib/rl_ball_sym/librl_ball_sym.a
diff --git a/RLBotCS/lib/rl_ball_sym/librl_ball_sym.so b/RLBotCS/lib/rl_ball_sym/librl_ball_sym.so
diff --git a/RLBotCS/lib/rl_ball_sym/rl_ball_sym.dll b/RLBotCS/lib/rl_ball_sym/rl_ball_sym.dll
diff --git a/RLBotCS/lib/rl_ball_sym/rl_ball_sym.lib b/RLBotCS/lib/rl_ball_sym/rl_ball_sym.lib
diff --git a/RLBotCSTests/BallPrediction.cs b/RLBotCSTests/BallPrediction.cs
@@ -31,7 +31,7 @@ public void TestBallPred()
         packet.Balls[12345] = new();
         var gTP = packet.ToFlatBuffers();
 
-        BallPredictor.Generate(1, gTP.Balls[0], null);
+        BallPredictor.Generate(1, gTP.Balls[0], null, -650f);
 
         packet.Balls[12345].Physics = new Physics(
             new Vector3(0, 0, 1.1f * 91.25f),
@@ -41,7 +41,7 @@ public void TestBallPred()
         );
         var gTP2 = packet.ToFlatBuffers();
 
-        var ballPred = BallPredictor.Generate(1, gTP2.Balls[0], null);
+        var ballPred = BallPredictor.Generate(1, gTP2.Balls[0], null, -650f);
 
         int numSlices = 6 * 120;
         Assert.AreEqual(numSlices, ballPred.Slices.Count);
@@ -65,7 +65,7 @@ public void TestBallPred()
             var gTP3 = packet.ToFlatBuffers();
 
             stopWatch.Start();
-            BallPredictor.Generate(1, gTP3.Balls[0], null);
+            BallPredictor.Generate(1, gTP3.Balls[0], null, -650f);
             stopWatch.Stop();
         }
 
diff --git a/RLBotCSTests/PlayerMappingTest.cs b/RLBotCSTests/PlayerMappingTest.cs
@@ -51,7 +51,7 @@ public void TestSpawnProcess()
         Assert.AreEqual(0u, _playerMapping.PlayerIndexFromActorId(111));
         Assert.IsNotNull(index);
         Assert.AreEqual(0u, index);
-        Assert.IsNull(metadata2.SpawnId);
+        Assert.AreEqual(0, metadata2.SpawnId);
         Assert.AreEqual(desiredIndex, _playerMapping.PlayerIndexFromActorId(actorId));
         Assert.IsTrue(!metadata2.IsBot);
         Assert.IsTrue(!metadata2.IsCustomBot);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`if (args.Length > 0 && args[0] == "--version")`
`10`	`10`	`{`
`11`		`- Console.WriteLine("RLBotServer v5.beta.6.3");`
	`11`	`+ Console.WriteLine("RLBotServer v5.beta.6.4");`
`12`	`12`	`Environment.Exit(0);`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ public static partial class BallPredictor`
`56`	`56`	`[LibraryImport("rl_ball_sym", EntryPoint = "set_heatseeker_target")]`
`57`	`57`	`private static partial void SetHeatseekerTarget(byte blueGoal);`
`58`	`58`
	`59`	`+ [LibraryImport("rl_ball_sym", EntryPoint = "set_gravity")]`
	`60`	`+ private static partial void SetGravity(float gravityZ);`
	`61`	`+`
`59`	`62`	`[LibraryImport("rl_ball_sym", EntryPoint = "step")]`
`60`	`63`	`private static unsafe partial BallSlice* Step(BallSlice ball, ushort ticks);`
`61`	`64`
`@@ -122,7 +125,8 @@ public static PredictionMode UpdateMode(MatchConfigurationT matchConfig)`
`122`	`125`	`public static BallPredictionT Generate(`
`123`	`126`	`float currentTime,`
`124`	`127`	`BallInfoT currentBall,`
`125`		`- (TouchT, uint)? lastTouch`
	`128`	`+ (TouchT, uint)? lastTouch,`
	`129`	`+ float gravityZ`
`126`	`130`	`)`
`127`	`131`	`{`
`128`	`132`	`BallSlice ball = new()`
`@@ -165,6 +169,8 @@ public static BallPredictionT Generate(`
`165`	`169`	`}`
`166`	`170`	`}`
`167`	`171`
	`172`	`+ SetGravity(gravityZ);`
	`173`	`+`
`168`	`174`	`unsafe`
`169`	`175`	`{`
`170`	`176`	`var ballSlices = Step(ball, numSlices);`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ private void LoadMatch(MatchConfigurationT matchConfig, PlayerSpawner spawner)`
`305`	`305`	`{`
`306`	`306`	`spawner.DespawnPlayers(toDespawnIds);`
`307`	`307`	`}`
`308`		`-`
	`308`	`+`
`309`	`309`	`// We can flush C&S despawn commands immediately`
`310`	`310`	`spawner.Flush();`
`311`	`311`	`}`
`@@ -451,7 +451,7 @@ private bool SpawnCars(`
`451`	`451`	`{`
`452`	`452`	`spawner.Flush();`
`453`	`453`	`}`
`454`		`-`
	`454`	`+`
`455`	`455`	`return true;`
`456`	`456`	`}`
`457`	`457`
Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,17 @@ public void SpawnHuman(PlayerConfigurationT config, uint desiredIndex)`
`54`	`54`	`.FirstOrDefault(kp => config.SpawnId == kp.SpawnId);`
`55`	`55`	`if (alreadySpawnedPlayer != null)`
`56`	`56`	`{`
`57`		`- _gameState.PlayerMapping.QueueIndexChange(alreadySpawnedPlayer.PlayerIndex, desiredIndex);`
	`57`	`+ _gameState.PlayerMapping.QueueIndexChange(`
	`58`	`+ alreadySpawnedPlayer.PlayerIndex,`
	`59`	`+ desiredIndex`
	`60`	`+ );`
`58`	`61`	`return;`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`_gameState.PlayerMapping.AddPendingSpawn(`
`62`	`65`	`new SpawnTracker`
`63`	`66`	`{`
`64`		`- CommandId = 0, // Human spawning must use command id 0 for reasons in bridge`
	`67`	`+ CommandId = 0, // Human spawning must use command id 0 for reasons in bridge`
`65`	`68`	`SpawnId = config.SpawnId,`
`66`	`69`	`DesiredPlayerIndex = desiredIndex,`
`67`	`70`	`IsBot = false,`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ MatchStarter matchStarter`
`44`	`44`	`public PerfMonitor PerfMonitor { get; } = new();`
`45`	`45`
`46`	`46`	`public PlayerSpawner GetPlayerSpawner() => new(ref GameState, SpawnCommandQueue);`
	`47`	`+`
`47`	`48`	`public void UpdateTimeMutators()`
`48`	`49`	`{`
`49`	`50`	`var mutators = MatchConfig!.Mutators;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,11 @@ private async Task HandleServer()`
`137`	`137`	`_context.PerfMonitor.ClearAll();`
`138`	`138`	`}`
`139`	`139`
`140`		`- if (_context.MatchStarter.HasSpawnedMap && _context.GameState.MatchPhase == MatchPhase.Paused && _context.SpawnCommandQueue.Count > 0)`
	`140`	`+ if (`
	`141`	`+ _context.MatchStarter.HasSpawnedMap`
	`142`	`+ && _context.GameState.MatchPhase == MatchPhase.Paused`
	`143`	`+ && _context.SpawnCommandQueue.Count > 0`
	`144`	`+ )`
`141`	`145`	`{`
`142`	`146`	`_context.Logger.LogDebug("Sending queued spawning commands");`
`143`	`147`	`_context.SpawnCommandQueue.Flush();`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,12 @@ public void HandleMessage(BridgeContext context)`
`13`	`13`	`if (GameState.MatchInfo is { } matchInfo)`
`14`	`14`	`{`
`15`	`15`	`if (matchInfo.WorldGravityZ is { } gravity)`
	`16`	`+ {`
`16`	`17`	`context.MatchCommandQueue.AddConsoleCommand(`
`17`	`18`	`FlatToCommand.MakeGravityCommand(gravity.Val)`
`18`	`19`	`);`
	`20`	`+ context.GameState.WorldGravityZ = gravity.Val;`
	`21`	`+ }`
`19`	`22`
`20`	`23`	`if (matchInfo.GameSpeed is { } speed)`
`21`	`24`	`context.MatchCommandQueue.AddConsoleCommand(`
`@@ -58,10 +61,7 @@ public void HandleMessage(BridgeContext context)`
`58`	`61`
`59`	`62`	`if (car.BoostAmount is { } boostAmount)`
`60`	`63`	`{`
`61`		`- context.MatchCommandQueue.AddSetBoostCommand(`
`62`		`- (ushort)id,`
`63`		`- (int)boostAmount.Val`
`64`		`- );`
	`64`	`+ context.MatchCommandQueue.AddSetBoostCommand((ushort)id, (int)boostAmount.Val);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ private void AddSession(TcpClient client)`
`32`	`32`	`Thread sessionThread = new(() =>`
`33`	`33`	`{`
`34`	`34`	`_context.Logger.LogDebug("Client {} connected", clientId);`
`35`		`-`
	`35`	`+`
`36`	`36`	`FlatBuffersSession session = new(`
`37`	`37`	`client,`
`38`	`38`	`clientId,`