From 3331150162e34471bf0294bdb61a1a748cb94ee5 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 28 Jan 2025 14:50:56 +0100 Subject: server+world: tangent handedness --- shared/src/helper.rs | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'shared/src/helper.rs') diff --git a/shared/src/helper.rs b/shared/src/helper.rs index 366ea52..be7d929 100644 --- a/shared/src/helper.rs +++ b/shared/src/helper.rs @@ -16,7 +16,7 @@ */ use crate::packets::{Data, Message, Object, Resource}; use anyhow::Result; -use glam::{Affine3A, Vec2, Vec3, Vec3A}; +use glam::{Affine3A, Vec2, Vec3, Vec3A, Vec4}; use std::{ borrow::Cow, io::{Read, Write}, @@ -122,6 +122,25 @@ 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(f32::from_be_bytes) + .array_chunks::<4>() + .map(Vec4::from_array) + .collect()) + } +} impl ReadWrite for Vec { fn write(&self, w: &mut dyn Write) -> Result<()> { for e in self { @@ -382,6 +401,23 @@ impl ReadWrite for Vec3A { Ok(Self::new(f32::read(r)?, f32::read(r)?, f32::read(r)?)) } } +impl ReadWrite for Vec4 { + fn write(&self, w: &mut dyn Write) -> Result<()> { + self.x.write(w)?; + self.y.write(w)?; + self.z.write(w)?; + self.w.write(w)?; + Ok(()) + } + fn read(r: &mut dyn Read) -> Result { + Ok(Self::new( + f32::read(r)?, + f32::read(r)?, + f32::read(r)?, + f32::read(r)?, + )) + } +} impl ReadWrite for Vec3 { fn write(&self, w: &mut dyn Write) -> Result<()> { self.x.write(w)?; -- cgit v1.2.3-70-g09d2