From ecaa6a08527bad93c71bdb8211b6c2f8232ff878 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Thu, 9 Jan 2025 21:58:28 +0100
Subject: add name to mesh parts and prefabs

---
 shared/src/helper.rs    | 8 ++------
 shared/src/packets.rs   | 7 +++----
 shared/src/resources.rs | 6 ++++++
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'shared')

diff --git a/shared/src/helper.rs b/shared/src/helper.rs
index 65918ad..d91313c 100644
--- a/shared/src/helper.rs
+++ b/shared/src/helper.rs
@@ -67,16 +67,12 @@ impl ReadWrite for Vec<u8> {
 }
 impl ReadWrite for String {
     fn write(&self, w: &mut dyn Write) -> Result<()> {
-        w.write_all(&(self.len() as u32).to_be_bytes())?;
         w.write_all(self.as_bytes())?;
         Ok(())
     }
     fn read(r: &mut dyn Read) -> Result<Self> {
-        let mut size = [0; 4];
-        r.read_exact(&mut size)?;
-        let size = u32::from_be_bytes(size);
-        let mut buf = vec![0; size as usize];
-        r.read_exact(&mut buf)?;
+        let mut buf = Vec::new();
+        r.read_to_end(&mut buf)?;
         Ok(String::from_utf8(buf)?)
     }
 }
diff --git a/shared/src/packets.rs b/shared/src/packets.rs
index a35b4e9..2100edc 100644
--- a/shared/src/packets.rs
+++ b/shared/src/packets.rs
@@ -61,7 +61,7 @@ pub enum Packet {
     Parent(Object, Object),
     Sound(Object, Data),
     PrefabIndex(Resource<PrefabIndex>),
-    PrefabName(Resource<Prefab>, String),
+    AnnouncePrefab(Resource<Prefab>),
 }
 
 impl Object {
@@ -121,10 +121,9 @@ impl Packet {
                 w.write_all(&[0x09])?;
                 resource.write(w)?;
             }
-            Packet::PrefabName(resource, name) => {
+            Packet::AnnouncePrefab(resource) => {
                 w.write_all(&[0x0a])?;
                 resource.write(w)?;
-                name.write(w)?;
             }
         }
         Ok(())
@@ -155,7 +154,7 @@ impl ReadWrite for Packet {
             0x07 => Packet::Parent(Object::read(r)?, Object::read(r)?),
             0x08 => Packet::Sound(Object::read(r)?, Data::read(r)?),
             0x09 => Packet::PrefabIndex(Resource::read(r)?),
-            0x0a => Packet::PrefabName(Resource::read(r)?, String::read(r)?),
+            0x0a => Packet::AnnouncePrefab(Resource::read(r)?),
             _ => {
                 for _ in 0..packet_len.max(1) - 1 {
                     r.read_exact(&mut [0])?;
diff --git a/shared/src/resources.rs b/shared/src/resources.rs
index 08fb6f5..25dd965 100644
--- a/shared/src/resources.rs
+++ b/shared/src/resources.rs
@@ -25,6 +25,7 @@ use std::{
 
 #[derive(Debug, Default, Clone)]
 pub struct Prefab {
+    pub name: Option<String>,
     pub mesh: Vec<(Affine3A, Resource<MeshPart>)>,
     pub light: Vec<(Vec3A, Resource<LightPart>)>,
     pub environment: Option<Resource<EnvironmentPart>>,
@@ -44,6 +45,7 @@ pub struct EnvironmentPart {
 
 #[derive(Debug, Default, Clone)]
 pub struct MeshPart {
+    pub name: Option<String>,
     pub index: Option<Resource<IndexArray>>,
     pub g_metallic: Option<f32>,
     pub g_roughness: Option<f32>,
@@ -107,6 +109,7 @@ impl ReadWrite for PrefabIndex {
 
 impl ReadWrite for Prefab {
     fn write(&self, w: &mut dyn Write) -> Result<()> {
+        write_kv_opt(w, b"name", &self.name)?;
         for x in &self.mesh {
             write_kv_opt(w, b"mesh", &Some(x.clone()))?;
         }
@@ -119,6 +122,7 @@ impl ReadWrite for Prefab {
     fn read(r: &mut dyn Read) -> Result<Self> {
         let mut s = Self::default();
         read_kv_iter(r, |k, v| match k {
+            b"name" => Ok(s.name = Some(read_slice(v)?)),
             b"mesh" => Ok(s.mesh.push(read_slice(v)?)),
             b"light" => Ok(s.light.push(read_slice(v)?)),
             b"environment" => Ok(s.environment = Some(read_slice(v)?)),
@@ -171,6 +175,7 @@ impl ReadWrite for EnvironmentPart {
 }
 impl ReadWrite for MeshPart {
     fn write(&self, w: &mut dyn Write) -> Result<()> {
+        write_kv_opt(w, b"name", &self.name)?;
         write_kv_opt(w, b"index", &self.index)?;
         write_kv_opt(w, b"g_metallic", &self.g_metallic)?;
         write_kv_opt(w, b"g_roughness", &self.g_roughness)?;
@@ -199,6 +204,7 @@ impl ReadWrite for MeshPart {
     fn read(r: &mut dyn Read) -> Result<Self> {
         let mut s = Self::default();
         read_kv_iter(r, |k, v| match k {
+            b"name" => Ok(s.name = Some(read_slice(v)?)),
             b"index" => Ok(s.index = Some(read_slice(v)?)),
             b"g_metallic" => Ok(s.g_metallic = Some(read_slice(v)?)),
             b"g_roughness" => Ok(s.g_roughness = Some(read_slice(v)?)),
-- 
cgit v1.2.3-70-g09d2