diff --git a/assets/world/tree/pine_green_2/10.vox b/assets/world/tree/pine_green_2/1.vox similarity index 84% rename from assets/world/tree/pine_green_2/10.vox rename to assets/world/tree/pine_green_2/1.vox index 20bc3c1f2d..993e29eabe 100644 Binary files a/assets/world/tree/pine_green_2/10.vox and b/assets/world/tree/pine_green_2/1.vox differ diff --git a/assets/world/tree/pine_green_2/9.vox b/assets/world/tree/pine_green_2/2.vox similarity index 79% rename from assets/world/tree/pine_green_2/9.vox rename to assets/world/tree/pine_green_2/2.vox index 4dbb19abbe..0890a9df7d 100644 Binary files a/assets/world/tree/pine_green_2/9.vox and b/assets/world/tree/pine_green_2/2.vox differ diff --git a/assets/world/tree/pine_green_2/3.vox b/assets/world/tree/pine_green_2/3.vox index 993e29eabe..99d3b96838 100644 Binary files a/assets/world/tree/pine_green_2/3.vox and b/assets/world/tree/pine_green_2/3.vox differ diff --git a/assets/world/tree/pine_green_2/4.vox b/assets/world/tree/pine_green_2/4.vox index 0890a9df7d..864ef74967 100644 Binary files a/assets/world/tree/pine_green_2/4.vox and b/assets/world/tree/pine_green_2/4.vox differ diff --git a/assets/world/tree/pine_green_2/5.vox b/assets/world/tree/pine_green_2/5.vox index 99d3b96838..5e896f99c0 100644 Binary files a/assets/world/tree/pine_green_2/5.vox and b/assets/world/tree/pine_green_2/5.vox differ diff --git a/assets/world/tree/pine_green_2/6.vox b/assets/world/tree/pine_green_2/6.vox index 864ef74967..611625a024 100644 Binary files a/assets/world/tree/pine_green_2/6.vox and b/assets/world/tree/pine_green_2/6.vox differ diff --git a/assets/world/tree/pine_green_2/7.vox b/assets/world/tree/pine_green_2/7.vox index 5e896f99c0..4dbb19abbe 100644 Binary files a/assets/world/tree/pine_green_2/7.vox and b/assets/world/tree/pine_green_2/7.vox differ diff --git a/assets/world/tree/pine_green_2/8.vox b/assets/world/tree/pine_green_2/8.vox index 611625a024..20bc3c1f2d 100644 Binary files a/assets/world/tree/pine_green_2/8.vox and b/assets/world/tree/pine_green_2/8.vox differ diff --git a/assets/world/tree/snow_pine/1.vox b/assets/world/tree/snow_pine/1.vox index 244a2c7b94..58e1a0e7b5 100644 Binary files a/assets/world/tree/snow_pine/1.vox and b/assets/world/tree/snow_pine/1.vox differ diff --git a/assets/world/tree/snow_pine/2.vox b/assets/world/tree/snow_pine/2.vox index e0a6e1cd21..5b5c8d9bbb 100644 Binary files a/assets/world/tree/snow_pine/2.vox and b/assets/world/tree/snow_pine/2.vox differ diff --git a/assets/world/tree/snow_pine/3.vox b/assets/world/tree/snow_pine/3.vox index d24d7d09ca..a9889fb884 100644 Binary files a/assets/world/tree/snow_pine/3.vox and b/assets/world/tree/snow_pine/3.vox differ diff --git a/assets/world/tree/snow_pine/4.vox b/assets/world/tree/snow_pine/4.vox index 5a2cee2033..f037217ea3 100644 Binary files a/assets/world/tree/snow_pine/4.vox and b/assets/world/tree/snow_pine/4.vox differ diff --git a/assets/world/tree/snow_pine/5.vox b/assets/world/tree/snow_pine/5.vox index fe7a96f4d6..cfb30a791f 100644 Binary files a/assets/world/tree/snow_pine/5.vox and b/assets/world/tree/snow_pine/5.vox differ diff --git a/assets/world/tree/snow_pine/6.vox b/assets/world/tree/snow_pine/6.vox index c5dccf7390..36c20c60a5 100644 Binary files a/assets/world/tree/snow_pine/6.vox and b/assets/world/tree/snow_pine/6.vox differ diff --git a/assets/world/tree/snow_pine/7.vox b/assets/world/tree/snow_pine/7.vox index 398698c3f6..fae1fe0b74 100644 Binary files a/assets/world/tree/snow_pine/7.vox and b/assets/world/tree/snow_pine/7.vox differ diff --git a/assets/world/tree/snow_pine/8.vox b/assets/world/tree/snow_pine/8.vox index b8223944b6..02fbdb11e2 100644 Binary files a/assets/world/tree/snow_pine/8.vox and b/assets/world/tree/snow_pine/8.vox differ diff --git a/assets/world/tree/willows/1.vox b/assets/world/tree/willow/1.vox similarity index 100% rename from assets/world/tree/willows/1.vox rename to assets/world/tree/willow/1.vox diff --git a/assets/world/tree/willows/2.vox b/assets/world/tree/willow/2.vox similarity index 100% rename from assets/world/tree/willows/2.vox rename to assets/world/tree/willow/2.vox diff --git a/world/src/sim.rs b/world/src/sim.rs index 2cae6bc3f6..aa085288db 100644 --- a/world/src/sim.rs +++ b/world/src/sim.rs @@ -431,7 +431,7 @@ lazy_static! { assets::load_map("world/tree/temperate_small/6.vox", |s: Structure| s .with_center(Vec3::new(4, 4, 7))) .unwrap(), - // birch + // birch -> need roots! assets::load_map("world/tree/birch/1.vox", |s: Structure| s .with_center(Vec3::new(12, 9, 2))) .unwrap(), @@ -468,7 +468,7 @@ lazy_static! { assets::load_map("world/tree/birch/12.vox", |s: Structure| s .with_center(Vec3::new(10, 9, 2))) .unwrap(), - // poplar + // poplar -> need roots! assets::load_map("world/tree/poplar/1.vox", |s: Structure| s .with_center(Vec3::new(6, 6, 2))) .unwrap(), @@ -499,6 +499,109 @@ lazy_static! { assets::load_map("world/tree/poplar/10.vox", |s: Structure| s .with_center(Vec3::new(7, 7, 2))) .unwrap(), + // palm trees + /*assets::load_map("world/tree/desert_palm/1.vox", |s: Structure| s + .with_center(Vec3::new(12, 12, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/2.vox", |s: Structure| s + .with_center(Vec3::new(12, 10, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/3.vox", |s: Structure| s + .with_center(Vec3::new(12, 12, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/4.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/5.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/6.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/7.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/8.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/9.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 10))) + .unwrap(), + assets::load_map("world/tree/desert_palm/10.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 10))) + .unwrap(), + // snow pines + assets::load_map("world/tree/snow_pine/1.vox", |s: Structure| s + .with_center(Vec3::new(15, 15, 14))) + .unwrap(), + assets::load_map("world/tree/snow_pine/2.vox", |s: Structure| s + .with_center(Vec3::new(15, 15, 14))) + .unwrap(), + assets::load_map("world/tree/snow_pine/3.vox", |s: Structure| s + .with_center(Vec3::new(17, 15, 12))) + .unwrap(), + assets::load_map("world/tree/snow_pine/4.vox", |s: Structure| s + .with_center(Vec3::new(10, 8, 12))) + .unwrap(), + assets::load_map("world/tree/snow_pine/5.vox", |s: Structure| s + .with_center(Vec3::new(12, 12, 12))) + .unwrap(), + assets::load_map("world/tree/snow_pine/6.vox", |s: Structure| s + .with_center(Vec3::new(11, 10, 12))) + .unwrap(), + assets::load_map("world/tree/snow_pine/7.vox", |s: Structure| s + .with_center(Vec3::new(16, 15, 12))) + .unwrap(), + assets::load_map("world/tree/snow_pine/8.vox", |s: Structure| s + .with_center(Vec3::new(12, 10, 12))) + .unwrap(), + // snow birches -> need roots! + assets::load_map("world/tree/snow_birch/1.vox", |s: Structure| s + .with_center(Vec3::new(12, 9, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/2.vox", |s: Structure| s + .with_center(Vec3::new(11, 10, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/3.vox", |s: Structure| s + .with_center(Vec3::new(9, 10, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/4.vox", |s: Structure| s + .with_center(Vec3::new(9, 10, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/5.vox", |s: Structure| s + .with_center(Vec3::new(9, 11, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/6.vox", |s: Structure| s + .with_center(Vec3::new(9, 9, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/7.vox", |s: Structure| s + .with_center(Vec3::new(10, 10, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/8.vox", |s: Structure| s + .with_center(Vec3::new(9, 9, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/9.vox", |s: Structure| s + .with_center(Vec3::new(9, 10, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/10.vox", |s: Structure| s + .with_center(Vec3::new(10, 9, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/11.vox", |s: Structure| s + .with_center(Vec3::new(9, 10, 2))) + .unwrap(), + assets::load_map("world/tree/snow_birch/12.vox", |s: Structure| s + .with_center(Vec3::new(10, 9, 2))) + .unwrap(), + // willows + assets::load_map("world/tree/willow/1.vox", |s: Structure| s + .with_center(Vec3::new(15, 14, 1))) + .unwrap(), + assets::load_map("world/tree/willow/2.vox", |s: Structure| s + .with_center(Vec3::new(11, 12, 1))) + .unwrap(), + + */ + ]; }