From d5d2cf91f6c019d4b491e7ec245278a7703a5b03 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 20 Jan 2025 20:19:47 +0100 Subject: update armature types --- shared/src/helper.rs | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'shared/src/helper.rs') diff --git a/shared/src/helper.rs b/shared/src/helper.rs index 723f91e..14fb2bd 100644 --- a/shared/src/helper.rs +++ b/shared/src/helper.rs @@ -220,6 +220,63 @@ impl ReadWrite for Vec { .collect()) } } +impl ReadWrite for Vec { + fn write(&self, w: &mut dyn Write) -> Result<()> { + for e in self { + e.write(w)?; + } + Ok(()) + } + fn read(r: &mut dyn Read) -> Result { + let mut buf = Vec::new(); + r.read_to_end(&mut buf)?; + Ok(buf + .into_iter() + .array_chunks::<{ size_of::() }>() + .map(u16::from_be_bytes) + .collect()) + } +} +impl ReadWrite for Vec { + fn write(&self, w: &mut dyn Write) -> Result<()> { + for e in self { + e.write(w)?; + } + Ok(()) + } + fn read(r: &mut dyn Read) -> Result { + let mut buf = Vec::new(); + r.read_to_end(&mut buf)?; + Ok(buf + .into_iter() + .array_chunks::<{ size_of::() }>() + .map(f32::from_be_bytes) + .array_chunks::<12>() + .map(|m| Affine3A::from_cols_array(&m)) + .collect()) + } +} +impl ReadWrite for Vec { + fn write(&self, w: &mut dyn Write) -> Result<()> { + for e in self { + w.write_all(&(e.len() as u16).to_le_bytes())?; + w.write_all(e.as_bytes())?; + } + Ok(()) + } + fn read(r: &mut dyn Read) -> Result { + let mut buf = Vec::new(); + r.read_to_end(&mut buf)?; + let mut buf = buf.as_slice(); + let mut out = Vec::new(); + while !buf.is_empty() { + let size = u16::read(&mut buf)? as usize; + out.push(String::read(&mut &buf[..size])?); + buf = &buf[size..]; + } + Ok(out) + } +} impl ReadWrite for String { fn write(&self, w: &mut dyn Write) -> Result<()> { w.write_all(self.as_bytes())?; @@ -364,3 +421,14 @@ impl ReadWrite for u8 { Ok(buf[0]) } } +impl ReadWrite for u16 { + fn write(&self, w: &mut dyn Write) -> Result<()> { + w.write_all(&self.to_be_bytes())?; + Ok(()) + } + fn read(r: &mut dyn Read) -> Result { + let mut buf = [0u8; 2]; + r.read_exact(&mut buf)?; + Ok(u16::from_be_bytes(buf)) + } +} -- cgit v1.2.3-70-g09d2