diff options
author | metamuffin <metamuffin@disroot.org> | 2025-01-09 21:58:28 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-01-09 21:58:28 +0100 |
commit | ecaa6a08527bad93c71bdb8211b6c2f8232ff878 (patch) | |
tree | 215452e5363be74cb7b4f210c28b66f9f2aaacf9 /world/src | |
parent | 20db20d2702f7b547e1c9c0a2698b6d576cd79d8 (diff) | |
download | weareserver-ecaa6a08527bad93c71bdb8211b6c2f8232ff878.tar weareserver-ecaa6a08527bad93c71bdb8211b6c2f8232ff878.tar.bz2 weareserver-ecaa6a08527bad93c71bdb8211b6c2f8232ff878.tar.zst |
add name to mesh parts and prefabs
Diffstat (limited to 'world/src')
-rw-r--r-- | world/src/main.rs | 7 | ||||
-rw-r--r-- | world/src/mesh.rs | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/world/src/main.rs b/world/src/main.rs index eeea1c9..7f531b4 100644 --- a/world/src/main.rs +++ b/world/src/main.rs @@ -118,10 +118,9 @@ fn main() -> Result<()> { let pres = store.set(&prefab)?; - if let Some(name) = args.name { - Packet::PrefabName(pres.clone(), name).write(&mut sock)?; - sock.flush()?; - } + Packet::AnnouncePrefab(pres.clone()).write(&mut sock)?; + sock.flush()?; + let ob = if args.add { let ob = Object::new(); Packet::Add(ob, pres.clone()).write(&mut sock)?; diff --git a/world/src/mesh.rs b/world/src/mesh.rs index c5bbb7f..2c868ab 100644 --- a/world/src/mesh.rs +++ b/world/src/mesh.rs @@ -303,7 +303,13 @@ pub fn import_mesh( let g_refractive_index = p.material().ior(); let g_thickness = p.material().volume().map(|v| v.thickness_factor()); + let name = mesh.name().map(|e| e.to_owned()); + if let Some(name) = &name { + info!("name is {name:?}"); + } + let mesh = store.set(&MeshPart { + name, index, g_albedo, g_alpha, |