Update to latest flatbuffers spec

Author: VirxEC

codegen/main.rs

@@ -25,7 +25,7 @@ pub enum PythonBindType {
 
 impl PythonBindType {
     pub const BASE_TYPES: [&'static str; 6] = ["bool", "i32", "u32", "f32", "String", "u8"];
-    pub const FROZEN_TYPES: [&'static str; 24] = [
+    pub const FROZEN_TYPES: [&'static str; 18] = [
         "FieldInfo",
         "BoostPad",
         "GoalInfo",
@@ -44,28 +44,9 @@ impl PythonBindType {
         "BallPrediction",
         "PredictionSlice",
         "Physics",
-        "MessagePacket",
-        "GameMessageWrapper",
-        "GameMessage",
-        "PlayerInputChange",
-        "PlayerSpectate",
-        "PlayerStatEvent",
-    ];
-    pub const FROZEN_NEEDS_PY: [&'static str; 6] = [
-        "GameTickPacket",
-        "BallInfo",
-        "CollisionShape",
-        "MessagePacket",
-        "GameMessageWrapper",
-        "GameMessage",
-    ];
-    pub const UNIONS: [&'static str; 5] = [
-        "PlayerClass",
-        "GameMessage",
-        "CollisionShape",
-        "RelativeAnchor",
-        "RenderType",
     ];
+    pub const FROZEN_NEEDS_PY: [&'static str; 3] = ["GameTickPacket", "BallInfo", "CollisionShape"];
+    pub const UNIONS: [&'static str; 4] = ["PlayerClass", "CollisionShape", "RelativeAnchor", "RenderType"];
 
     fn new(path: &Path) -> Option<Self> {
         // get the filename without the extension
@@ -82,7 +63,6 @@ impl PythonBindType {
             struct_name.push_str(&c[1..]);
         }
         struct_name = struct_name
-            .replace("Ranchor", "RAnchor")
             .replace("Rlbot", "RLBot")
             .replace("Halign", "HAlign")
             .replace("Valign", "VAlign");
@@ -165,7 +145,6 @@ fn mod_rs_generator(type_data: &[PythonBindType]) -> io::Result<()> {
 
 fn run_flatc() -> io::Result<()> {
     println!("cargo:rerun-if-changed=flatbuffers-schema/comms.fbs");
-    println!("cargo:rerun-if-changed=flatbuffers-schema/event.fbs");
     println!("cargo:rerun-if-changed=flatbuffers-schema/gamestate.fbs");
     println!("cargo:rerun-if-changed=flatbuffers-schema/matchstart.fbs");
     println!("cargo:rerun-if-changed=flatbuffers-schema/rendering.fbs");

flatbuffers-schema

@@ -7,9 +7,7 @@ def test_gtp():
     times = []
 
     gtp = flat.GameTickPacket(
-        ball=flat.BallInfo(
-            shape=flat.SphereShape(),
-        ),
+        balls=[flat.BallInfo(shape=flat.SphereShape()) for _ in range(32)],
         players=[flat.PlayerInfo() for _ in range(128)],
         boost_pad_states=[flat.BoostPadState() for _ in range(128)],
         teams=[flat.TeamInfo() for _ in range(2)],
@@ -32,13 +30,13 @@ def test_gtp():
 def test_ballpred():
     times = []
 
-    ballPred = flat.BallPrediction([flat.PredictionSlice() for _ in range(720)])
+    ballPred = flat.BallPrediction([flat.PredictionSlice(1) for _ in range(960)])
 
     for _ in range(10_000):
         start = time_ns()
 
-        ballpred_bytes = ballPred.pack()
-        flat.BallPrediction.unpack(ballpred_bytes)
+        packed = ballPred.pack()
+        flat.BallPrediction.unpack(packed)
 
         times.append(time_ns() - start)
 

pybench.py

@@ -39,9 +39,11 @@ def random_script_config():
     vec2 = Vector3(4, 5, 6)
     print(vec1 + vec2)
 
-    ready_message = ReadyMessage(True, wants_game_messages=True)
+    player_info = PlayerInfo(accolades=["MVP", "Hat Trick"])
+    eval(repr(player_info))
+
+    ready_message = ReadyMessage(True, close_after_match=True)
     print(hash(ready_message))
-    print(repr(ready_message))
     print(ready_message)
     eval(repr(ready_message))
     print()
@@ -63,10 +65,9 @@ def random_script_config():
             assert False
 
     dgs.console_commands = [ConsoleCommand("dump_items")]
-    dgs.ball_state = DesiredBallState()
+    dgs.ball_states = [DesiredBallState()]
 
     print(hash(dgs))
-    print(repr(dgs))
     print(dgs)
     eval(repr(dgs))
     print()
@@ -86,14 +87,12 @@ def random_script_config():
         raise ValueError("Expected Line3D")
 
     print(hash(render_type))
-    print(repr(render_type))
     print(render_type)
     eval(repr(render_type))
     print()
 
     comm = MatchComm(3, 1, False, "Ready!", b"Hello, world!")
     print(hash(comm))
-    print(repr(comm))
     print(comm)
     eval(repr(comm))
     print(comm.content.decode("utf-8"))
@@ -151,6 +150,14 @@ def random_script_config():
 
     print()
 
+    ballPred = BallPrediction([
+        PredictionSlice(1) for _ in range(5 * 120)
+    ])
+    data = ballPred.pack()
+    print(f"BallPrediction size: {len(data)} bytes")
+
+    print()
+
     print("Running quick benchmark...")
 
     num_trials = 60_000
@@ -161,15 +168,18 @@ def random_script_config():
     for _ in range(num_trials):
         start = time_ns()
         desired_game_state = DesiredGameState(
-            DesiredBallState(
-                DesiredPhysics(
-                    Vector3Partial(0, 0, 0),
-                    RotatorPartial(0, 0, 0),
-                    Vector3Partial(0, 0, 0),
-                    Vector3Partial(0, 0, 0),
+            [
+                DesiredBallState(
+                    DesiredPhysics(
+                        Vector3Partial(0, 0, 0),
+                        RotatorPartial(0, 0, 0),
+                        Vector3Partial(0, 0, 0),
+                        Vector3Partial(0, 0, 0),
+                    )
                 )
-            ),
-            car_states=[
+                for _ in range(16)
+            ],
+            [
                 DesiredCarState(
                     DesiredPhysics(
                         Vector3Partial(0, 0, 0),

pytest.py

@@ -196,8 +196,6 @@ pynamedmodule! {
         FieldInfo,
         Float,
         GameInfo,
-        GameMessage,
-        GameMessageWrapper,
         GameMode,
         GameSpeedOption,
         GameStateType,
@@ -212,7 +210,7 @@ pynamedmodule! {
         MatchLength,
         MatchSettings,
         MaxScore,
-        MessagePacket,
+        MultiBall,
         MutatorSettings,
         OvertimeOption,
         PartyMember,
@@ -221,10 +219,7 @@ pynamedmodule! {
         PlayerConfiguration,
         PlayerInfo,
         PlayerInput,
-        PlayerInputChange,
         PlayerLoadout,
-        PlayerSpectate,
-        PlayerStatEvent,
         PolyLine3D,
         PredictionSlice,
         Psyonix,