diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-02-08 02:13:29 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-02-08 02:13:29 +0100 |
| commit | 8ec0c2a7dbe832e71971e2c68dc929f2c86c8bc8 (patch) | |
| tree | 77be4095a0da5142a269bdbd81e2e313d678287a /world/src/main.rs | |
| parent | a8e2b45074d5f3cd3bdfb1740cd0bee1dfae3277 (diff) | |
| download | weareserver-8ec0c2a7dbe832e71971e2c68dc929f2c86c8bc8.tar weareserver-8ec0c2a7dbe832e71971e2c68dc929f2c86c8bc8.tar.bz2 weareserver-8ec0c2a7dbe832e71971e2c68dc929f2c86c8bc8.tar.zst | |
mesh colliders
Diffstat (limited to 'world/src/main.rs')
| -rw-r--r-- | world/src/main.rs | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/world/src/main.rs b/world/src/main.rs index 278cfb3..9dded85 100644 --- a/world/src/main.rs +++ b/world/src/main.rs @@ -212,19 +212,21 @@ fn main() -> Result<()> { .map(|(trans, node)| { let mut prefab = Prefab::default(); - if let Some(mesh) = node.mesh() { - import_mesh( - mesh, - *trans, - &buffers, - &store, - path_base, - node, - &mut prefab, - &args, - &texture_cache, - &skin_index_to_arm_index, - )?; + if !node.name().unwrap_or_default().ends_with("-collider") { + if let Some(mesh) = node.mesh() { + import_mesh( + mesh, + *trans, + &buffers, + &store, + path_base, + node, + &mut prefab, + &args, + &texture_cache, + &skin_index_to_arm_index, + )?; + } } let (position, _, _) = node.transform().decomposed(); if let Some(light) = node.light() { @@ -319,7 +321,7 @@ fn main() -> Result<()> { info!("adding object {ob}"); Packet::Add(ob, p.clone()).write(&mut sock)?; if args.line_up { - Packet::Position(ob, vec3a(i as f32, 0., i as f32 * 0.3), Vec3A::ZERO) + Packet::Position(ob, vec3a(i as f32 * 1.2, 0., i as f32 * 0.0), Vec3A::ZERO) .write(&mut sock)?; } obs.push(ob); |