summaryrefslogtreecommitdiff
path: root/world/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'world/src/main.rs')
-rw-r--r--world/src/main.rs30
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);