diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-01-12 00:57:58 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-01-12 00:57:58 +0100 |
| commit | c810b040f875333fb9b1fe5d2269ba08d0c878f2 (patch) | |
| tree | f8b93771cab1d736d04156a6a82ea961bd6c3d7b /shared | |
| parent | e4500d6bbd512d2744916c8288a8c423af21416f (diff) | |
| download | weareserver-c810b040f875333fb9b1fe5d2269ba08d0c878f2.tar weareserver-c810b040f875333fb9b1fe5d2269ba08d0c878f2.tar.bz2 weareserver-c810b040f875333fb9b1fe5d2269ba08d0c878f2.tar.zst | |
switch to 32-bit index format
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/helper.rs | 6 | ||||
| -rw-r--r-- | shared/src/resources.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/shared/src/helper.rs b/shared/src/helper.rs index 61e149f..4702aef 100644 --- a/shared/src/helper.rs +++ b/shared/src/helper.rs @@ -104,7 +104,7 @@ impl ReadWrite for Vec<Vec2> { .collect()) } } -impl ReadWrite for Vec<[u16; 3]> { +impl ReadWrite for Vec<[u32; 3]> { fn write(&self, w: &mut dyn Write) -> Result<()> { for e in self { w.write_all(&e[0].to_be_bytes())?; @@ -118,8 +118,8 @@ impl ReadWrite for Vec<[u16; 3]> { r.read_to_end(&mut buf)?; Ok(buf .into_iter() - .array_chunks::<2>() - .map(u16::from_be_bytes) + .array_chunks::<4>() + .map(u32::from_be_bytes) .array_chunks::<3>() .collect()) } diff --git a/shared/src/resources.rs b/shared/src/resources.rs index f422611..9e0e7b8 100644 --- a/shared/src/resources.rs +++ b/shared/src/resources.rs @@ -47,7 +47,7 @@ pub struct EnvironmentPart { #[derive(Debug, Default, Clone)] pub struct MeshPart { pub name: Option<String>, - pub index: Option<Resource<Vec<[u16; 3]>>>, + pub index: Option<Resource<Vec<[u32; 3]>>>, pub g_metallic: Option<f32>, pub g_roughness: Option<f32>, pub g_albedo: Option<Vec3A>, @@ -89,7 +89,7 @@ pub struct CollisionPart { pub sh_cylinder: Option<(f32, f32, f32)>, pub sh_capsule: Option<(f32, f32, f32)>, pub sh_convex_hull: Option<Resource>, - pub sh_mesh: Option<(Resource<Vec<[u16; 3]>>, Resource<Vec<Vec3A>>)>, + pub sh_mesh: Option<(Resource<Vec<[u32; 3]>>, Resource<Vec<Vec3A>>)>, } #[derive(Debug, Default, Clone)] |