diff --git a/assets/world/tree/birch/1.vox b/assets/world/tree/birch/1.vox index 4dc366d7d0..a83f923469 100644 Binary files a/assets/world/tree/birch/1.vox and b/assets/world/tree/birch/1.vox differ diff --git a/assets/world/tree/birch/10.vox b/assets/world/tree/birch/10.vox index 55056b52d2..21c3b2b055 100644 Binary files a/assets/world/tree/birch/10.vox and b/assets/world/tree/birch/10.vox differ diff --git a/assets/world/tree/birch/11.vox b/assets/world/tree/birch/11.vox index f028274a8a..3e0733cc0a 100644 Binary files a/assets/world/tree/birch/11.vox and b/assets/world/tree/birch/11.vox differ diff --git a/assets/world/tree/birch/12.vox b/assets/world/tree/birch/12.vox index 98734aa046..3e0733cc0a 100644 Binary files a/assets/world/tree/birch/12.vox and b/assets/world/tree/birch/12.vox differ diff --git a/assets/world/tree/birch/2.vox b/assets/world/tree/birch/2.vox index f22e194e6a..729cb5236e 100644 Binary files a/assets/world/tree/birch/2.vox and b/assets/world/tree/birch/2.vox differ diff --git a/assets/world/tree/birch/3.vox b/assets/world/tree/birch/3.vox index 0608eaef39..ffde348048 100644 Binary files a/assets/world/tree/birch/3.vox and b/assets/world/tree/birch/3.vox differ diff --git a/assets/world/tree/birch/4.vox b/assets/world/tree/birch/4.vox index 8bf482fba8..180ab275ef 100644 Binary files a/assets/world/tree/birch/4.vox and b/assets/world/tree/birch/4.vox differ diff --git a/assets/world/tree/birch/5.vox b/assets/world/tree/birch/5.vox index 1822de9609..50473b1ad6 100644 Binary files a/assets/world/tree/birch/5.vox and b/assets/world/tree/birch/5.vox differ diff --git a/assets/world/tree/birch/6.vox b/assets/world/tree/birch/6.vox index 6fe852267a..9730ea2458 100644 Binary files a/assets/world/tree/birch/6.vox and b/assets/world/tree/birch/6.vox differ diff --git a/assets/world/tree/birch/7.vox b/assets/world/tree/birch/7.vox index 23792dcbbb..b12885b906 100644 Binary files a/assets/world/tree/birch/7.vox and b/assets/world/tree/birch/7.vox differ diff --git a/assets/world/tree/birch/8.vox b/assets/world/tree/birch/8.vox index 9f1aae7bb0..d851ea3696 100644 Binary files a/assets/world/tree/birch/8.vox and b/assets/world/tree/birch/8.vox differ diff --git a/assets/world/tree/birch/9.vox b/assets/world/tree/birch/9.vox index 02a105d49b..380d43c550 100644 Binary files a/assets/world/tree/birch/9.vox and b/assets/world/tree/birch/9.vox differ diff --git a/assets/world/tree/oak_green/4.vox b/assets/world/tree/oak_green/4.vox index 3a8e560762..64aa5b5eba 100644 Binary files a/assets/world/tree/oak_green/4.vox and b/assets/world/tree/oak_green/4.vox differ diff --git a/assets/world/tree/oak_green/5.vox b/assets/world/tree/oak_green/5.vox index 0cdf0e9f99..19a389d403 100644 Binary files a/assets/world/tree/oak_green/5.vox and b/assets/world/tree/oak_green/5.vox differ diff --git a/assets/world/tree/oak_green/6.vox b/assets/world/tree/oak_green/6.vox index 733e7d458c..1299787cc2 100644 Binary files a/assets/world/tree/oak_green/6.vox and b/assets/world/tree/oak_green/6.vox differ diff --git a/assets/world/tree/oak_green/8.vox b/assets/world/tree/oak_green/8.vox index 45c68de502..a9b8a1e950 100644 Binary files a/assets/world/tree/oak_green/8.vox and b/assets/world/tree/oak_green/8.vox differ diff --git a/assets/world/tree/pine_green/7.vox b/assets/world/tree/pine_green/7.vox index 15a05ed98f..37901da197 100644 Binary files a/assets/world/tree/pine_green/7.vox and b/assets/world/tree/pine_green/7.vox differ diff --git a/assets/world/tree/pine_green_2/5.vox b/assets/world/tree/pine_green_2/5.vox index 5e896f99c0..a883f7c216 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 611625a024..cbb2647e42 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 4dbb19abbe..5c193e246c 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/snow_birch/1.vox b/assets/world/tree/snow_birch/1.vox deleted file mode 100644 index 9526cec46e..0000000000 Binary files a/assets/world/tree/snow_birch/1.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/10.vox b/assets/world/tree/snow_birch/10.vox deleted file mode 100644 index c8cc51f1d2..0000000000 Binary files a/assets/world/tree/snow_birch/10.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/11.vox b/assets/world/tree/snow_birch/11.vox deleted file mode 100644 index d537be2056..0000000000 Binary files a/assets/world/tree/snow_birch/11.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/12.vox b/assets/world/tree/snow_birch/12.vox deleted file mode 100644 index 4346912cfb..0000000000 Binary files a/assets/world/tree/snow_birch/12.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/2.vox b/assets/world/tree/snow_birch/2.vox deleted file mode 100644 index f0b532ddaf..0000000000 Binary files a/assets/world/tree/snow_birch/2.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/3.vox b/assets/world/tree/snow_birch/3.vox deleted file mode 100644 index e3166239bb..0000000000 Binary files a/assets/world/tree/snow_birch/3.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/4.vox b/assets/world/tree/snow_birch/4.vox deleted file mode 100644 index 3d52c8c057..0000000000 Binary files a/assets/world/tree/snow_birch/4.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/5.vox b/assets/world/tree/snow_birch/5.vox deleted file mode 100644 index 4ad46f34d1..0000000000 Binary files a/assets/world/tree/snow_birch/5.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/6.vox b/assets/world/tree/snow_birch/6.vox deleted file mode 100644 index d3ec468639..0000000000 Binary files a/assets/world/tree/snow_birch/6.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/7.vox b/assets/world/tree/snow_birch/7.vox deleted file mode 100644 index 34efddf3e6..0000000000 Binary files a/assets/world/tree/snow_birch/7.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/8.vox b/assets/world/tree/snow_birch/8.vox deleted file mode 100644 index 10a53a0006..0000000000 Binary files a/assets/world/tree/snow_birch/8.vox and /dev/null differ diff --git a/assets/world/tree/snow_birch/9.vox b/assets/world/tree/snow_birch/9.vox deleted file mode 100644 index 826991f207..0000000000 Binary files a/assets/world/tree/snow_birch/9.vox and /dev/null differ diff --git a/world/src/block/tree.rs b/world/src/block/tree.rs index 7f98b7a895..ee6dfb3015 100644 --- a/world/src/block/tree.rs +++ b/world/src/block/tree.rs @@ -1,10 +1,7 @@ +use common::{assets, terrain::Structure}; +use lazy_static::lazy_static; use std::sync::Arc; use vek::*; -use lazy_static::lazy_static; -use common::{ - assets, - terrain::Structure, -}; lazy_static! { pub static ref TREES: [Arc; 61] = [ @@ -132,40 +129,40 @@ lazy_static! { .unwrap(), // birch assets::load_map("world/tree/birch/1.vox", |s: Structure| s - .with_center(Vec3::new(12, 9, 5))) + .with_center(Vec3::new(12, 9, 10))) .unwrap(), assets::load_map("world/tree/birch/2.vox", |s: Structure| s - .with_center(Vec3::new(11, 10, 5))) + .with_center(Vec3::new(11, 10, 10))) .unwrap(), assets::load_map("world/tree/birch/3.vox", |s: Structure| s - .with_center(Vec3::new(9, 10, 5))) + .with_center(Vec3::new(9, 10, 10))) .unwrap(), assets::load_map("world/tree/birch/4.vox", |s: Structure| s - .with_center(Vec3::new(9, 10, 5))) + .with_center(Vec3::new(9, 10, 10))) .unwrap(), assets::load_map("world/tree/birch/5.vox", |s: Structure| s - .with_center(Vec3::new(9, 11, 5))) + .with_center(Vec3::new(9, 11, 10))) .unwrap(), assets::load_map("world/tree/birch/6.vox", |s: Structure| s - .with_center(Vec3::new(9, 9, 5))) + .with_center(Vec3::new(9, 9, 10))) .unwrap(), assets::load_map("world/tree/birch/7.vox", |s: Structure| s - .with_center(Vec3::new(10, 10, 5))) + .with_center(Vec3::new(10, 10, 10))) .unwrap(), assets::load_map("world/tree/birch/8.vox", |s: Structure| s - .with_center(Vec3::new(9, 9, 5))) + .with_center(Vec3::new(9, 9, 10))) .unwrap(), assets::load_map("world/tree/birch/9.vox", |s: Structure| s - .with_center(Vec3::new(9, 10, 5))) + .with_center(Vec3::new(9, 10, 10))) .unwrap(), assets::load_map("world/tree/birch/10.vox", |s: Structure| s - .with_center(Vec3::new(10, 9, 5))) + .with_center(Vec3::new(10, 9, 10))) .unwrap(), assets::load_map("world/tree/birch/11.vox", |s: Structure| s - .with_center(Vec3::new(9, 10, 5))) + .with_center(Vec3::new(9, 10, 10))) .unwrap(), assets::load_map("world/tree/birch/12.vox", |s: Structure| s - .with_center(Vec3::new(10, 9, 5))) + .with_center(Vec3::new(10, 9, 10))) .unwrap(), // poplar assets::load_map("world/tree/poplar/1.vox", |s: Structure| s