usercmd parsing and writing

src/demo/packet/mod.rs

@@ -25,7 +25,7 @@ pub enum Packet<'a> {
     Message(MessagePacket<'a>),
     SyncTick(SyncTickPacket),
     ConsoleCmd(ConsoleCmdPacket),
-    UserCmd(UserCmdPacket<'a>),
+    UserCmd(UserCmdPacket),
     DataTables(DataTablePacket),
     Stop(StopPacket),
     StringTables(StringTablePacket<'a>),

src/demo/packet/usercmd.rs

@@ -1,12 +1,52 @@
-use crate::Stream;
+use bitbuffer::{BitRead, BitReadStream, BitWrite, BitWriteStream, LittleEndian};
-use bitbuffer::{BitRead, BitWrite, LittleEndian};
 
-#[derive(Debug, BitRead, BitWrite, PartialEq)]
+#[derive(Debug, PartialEq)]
-#[endianness = "LittleEndian"]
+pub struct UserCmdPacket {
-pub struct UserCmdPacket<'a> {
     tick: u32,
     sequence_out: u32,
-    len: u32,
+    cmd: UserCmd,
-    #[size = "len.saturating_mul(8)"]
+}
-    data: Stream<'a>,
+
+impl<'a> BitRead<'a, LittleEndian> for UserCmdPacket {
+    fn read(stream: &mut BitReadStream<'a, LittleEndian>) -> bitbuffer::Result<Self> {
+        let tick = stream.read()?;
+        let sequence_out = stream.read()?;
+        let len: u32 = stream.read()?;
+        let mut data = stream.read_bits(len as usize * 8)?;
+        let cmd = data.read()?;
+        Ok(UserCmdPacket {
+            tick,
+            sequence_out,
+            cmd,
+        })
+    }
+}
+
+impl BitWrite<LittleEndian> for UserCmdPacket {
+    fn write(&self, stream: &mut BitWriteStream<LittleEndian>) -> bitbuffer::Result<()> {
+        self.tick.write(stream)?;
+        self.sequence_out.write(stream)?;
+        stream.reserve_byte_length(32, |stream| self.cmd.write(stream))
+    }
+}
+
+#[derive(Debug, PartialEq, BitRead, BitWrite)]
+pub struct UserCmd {
+    command_number: Option<u32>,
+    tick_count: Option<u32>,
+    view_angles: [Option<f32>; 3],
+    movement: [Option<f32>; 3],
+    buttons: Option<u32>,
+    impulse: Option<u8>,
+    weapon_select: Option<WeaponSelect>,
+    mouse_dx: Option<u16>,
+    mouse_dy: Option<u16>,
+}
+
+#[derive(Debug, PartialEq, BitRead, BitWrite)]
+pub struct WeaponSelect {
+    #[size = 11]
+    select: u16,
+    #[size = 6]
+    subtype: Option<u8>,
 }