diff --git a/assets/world/tree/birch/1.vox b/assets/world/tree/birch/1.vox index d3db900808..60e2399fe0 100644 --- a/assets/world/tree/birch/1.vox +++ b/assets/world/tree/birch/1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c0fe6707b5bdf8f89fad26a5e1b1f879369262d7e065f77c07f6be6a8c5e717 -size 54700 +oid sha256:bc2c462afb68c98afb12c7cbbc9501e9b2d3f6fcf325f0cc5127dd808755086f +size 55718 diff --git a/assets/world/tree/birch/10.vox b/assets/world/tree/birch/10.vox index 204998f931..042eefc154 100644 --- a/assets/world/tree/birch/10.vox +++ b/assets/world/tree/birch/10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd1160d82bdd836de8d4e850a96cd79d948d0a6c94b616f15135fc48c4b5e7d5 -size 51652 +oid sha256:a38a1aae8dd877392c2edc3c8b8771590967a1167dc5561f4f57742a07917221 +size 52671 diff --git a/assets/world/tree/birch/11.vox b/assets/world/tree/birch/11.vox index 4239b07ec8..d8f15f132b 100644 --- a/assets/world/tree/birch/11.vox +++ b/assets/world/tree/birch/11.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a1b137704a88b9fcbcce7bbd741a6fa0c89b988684df0f712aa3f869355d0a6 -size 48408 +oid sha256:d8f1e99ecb0ef617f506e1889a38fe26046b6d6000f26ce9efa875bc9b704f2e +size 49427 diff --git a/assets/world/tree/birch/12.vox b/assets/world/tree/birch/12.vox index 54a54a88ce..d8f15f132b 100644 --- a/assets/world/tree/birch/12.vox +++ b/assets/world/tree/birch/12.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2da180f2beabd73abc7655bae02827e0929b7d432f54e1f7c1565232055df58b -size 50968 +oid sha256:d8f1e99ecb0ef617f506e1889a38fe26046b6d6000f26ce9efa875bc9b704f2e +size 49427 diff --git a/assets/world/tree/birch/2.vox b/assets/world/tree/birch/2.vox index c5426e1836..3fcc95b7fe 100644 --- a/assets/world/tree/birch/2.vox +++ b/assets/world/tree/birch/2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa9a270158afb8a426a893e57e0de1ea8af21314473d55b77c204e330120b370 -size 52240 +oid sha256:d6dd7ee0ec36105a2ed2160ea01bb7f898c0e86a28d19d597688b450342f9d1b +size 53263 diff --git a/assets/world/tree/birch/3.vox b/assets/world/tree/birch/3.vox index ba44aa8f69..d40eb79fa1 100644 --- a/assets/world/tree/birch/3.vox +++ b/assets/world/tree/birch/3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:797745df064b6b1020aa6c12aa140f868da6b28b36436fe08c03cdd3b5f989f3 -size 53348 +oid sha256:66c5bd4c89ee04b86637b39cb34fe82e885c26ce5cb4808b35fd9c68f564a890 +size 54370 diff --git a/assets/world/tree/birch/4.vox b/assets/world/tree/birch/4.vox index 3e52be1e19..c8c0afb6f7 100644 --- a/assets/world/tree/birch/4.vox +++ b/assets/world/tree/birch/4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a144ae5672726ff73a4a08239bab43c84613d838d7d8f36542e95c0256046cba -size 50404 +oid sha256:8c7e56eb7eca88830ba1f299411cbbea77aa98fb4645755ecfbd6f73ff047ddb +size 51427 diff --git a/assets/world/tree/birch/5.vox b/assets/world/tree/birch/5.vox index c147235f5d..3368805a41 100644 --- a/assets/world/tree/birch/5.vox +++ b/assets/world/tree/birch/5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:891d8cf201209259b0be75218144a3ba5cae9e4eaeda47bab95e98f04d3a15c4 -size 53252 +oid sha256:79def0c956a88ec62ebcee1a7d01c2a3db767855855b0510915ed3319f7832da +size 54270 diff --git a/assets/world/tree/birch/6.vox b/assets/world/tree/birch/6.vox index 1cf84277e2..1cd46fc796 100644 --- a/assets/world/tree/birch/6.vox +++ b/assets/world/tree/birch/6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0b180315df03df883987c8aef2a929c8fcb7d30b551aadb22b629c71e939982 -size 47588 +oid sha256:c3a280c4d03a0049de303654081b0ffda7ca36643a85c0d2076e8ac0d30d1249 +size 48606 diff --git a/assets/world/tree/birch/7.vox b/assets/world/tree/birch/7.vox index f91ff6ef53..b64ba51b4d 100644 --- a/assets/world/tree/birch/7.vox +++ b/assets/world/tree/birch/7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffed4d82b9af8d9d05bedcb295d447b82d168f4212a9091d74ad3d1ece399f82 -size 49088 +oid sha256:b2c5023855fe827cc45c4a65ace5d3d59d16213c00eb05b781f755263a6b0886 +size 50106 diff --git a/assets/world/tree/birch/8.vox b/assets/world/tree/birch/8.vox index 6714b6b64f..10f49e29d3 100644 --- a/assets/world/tree/birch/8.vox +++ b/assets/world/tree/birch/8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7cd4451e1c530d33c6645507295f08390d01893c5ea150d5e8dca31dbf870bb -size 51168 +oid sha256:b8349ccf7a3a71ac3d612eaa4e6ff56b1729a1d010f6f7b93773218f6c3958b4 +size 52186 diff --git a/assets/world/tree/birch/9.vox b/assets/world/tree/birch/9.vox index 7503b6f925..de882c9579 100644 --- a/assets/world/tree/birch/9.vox +++ b/assets/world/tree/birch/9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08b818556176ae0029537874b4edfa28e1dfa22dab3496c54621b5bbfa4f7412 -size 48720 +oid sha256:568fa985313f586b33f72520417255f1e16843c638ca29558abaadf995f07539 +size 49738 diff --git a/assets/world/tree/oak_green/4.vox b/assets/world/tree/oak_green/4.vox index d04842d512..0825eb9557 100644 --- a/assets/world/tree/oak_green/4.vox +++ b/assets/world/tree/oak_green/4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b984ae894d1e1f22fedd7be18ac7513379d55a5dcb955a922e75c74e00cd8ecb -size 90086 +oid sha256:133a6c7a25ac684fe2c6e7ff45e522ef13fdc57070c115d8e8384091ce9801ce +size 89944 diff --git a/assets/world/tree/oak_green/5.vox b/assets/world/tree/oak_green/5.vox index 2c0e2113da..869bc27c6f 100644 --- a/assets/world/tree/oak_green/5.vox +++ b/assets/world/tree/oak_green/5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f20ee21f4fe943a58fb526866938344d0eadea4fe7ba5eb346be38a9608f1862 -size 95770 +oid sha256:e5c2bb0810ae0a7fb933b7211c6d4b815ec03a946b16db198612341f7c659e23 +size 95628 diff --git a/assets/world/tree/oak_green/6.vox b/assets/world/tree/oak_green/6.vox index 4703debd98..5a2ab7fc4a 100644 --- a/assets/world/tree/oak_green/6.vox +++ b/assets/world/tree/oak_green/6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da81618dd17267b9f77288820d50cc90beb8449a5ad0359a30a95dab97f0cf68 -size 114626 +oid sha256:06f903b21f6d09415bf16ce6d74d7dadcf341e7a23f4903fd436e4fa21509c17 +size 114484 diff --git a/assets/world/tree/oak_green/8.vox b/assets/world/tree/oak_green/8.vox index 14b5e4ccfc..1fe0b01ce1 100644 --- a/assets/world/tree/oak_green/8.vox +++ b/assets/world/tree/oak_green/8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d27a639f1bcd6a12a015db29732f7a5524b6deee524a1746c6009a1aad102fa -size 117482 +oid sha256:6e1d9bcc717afa853c9a22592447177ea96c6689f871faa30be03631a7d0ff34 +size 117340 diff --git a/assets/world/tree/pine_green/7.vox b/assets/world/tree/pine_green/7.vox index 3ef50ffeaf..e9cb75abd3 100644 --- a/assets/world/tree/pine_green/7.vox +++ b/assets/world/tree/pine_green/7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3158ad1e2e37a9900b0bf46a950f0fa2d885a294109a7bba2881435442a6f055 +oid sha256:dc579d8ead42e0502ad9f20ff150347824dae1f0557a606b099f0c1575df99b3 size 54812 diff --git a/assets/world/tree/pine_green_2/5.vox b/assets/world/tree/pine_green_2/5.vox index f9ccda156e..b373516f00 100644 --- a/assets/world/tree/pine_green_2/5.vox +++ b/assets/world/tree/pine_green_2/5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9522d3e1ef3082f11157384a9ec7481ead62b84177d1f05099673cf20ace1c89 +oid sha256:f81680a7d43bebf964dd58815355dbbaca4bfa5e2a5b051772680c1b71ad1c9c size 51128 diff --git a/assets/world/tree/pine_green_2/6.vox b/assets/world/tree/pine_green_2/6.vox index f4c7127a8b..d091ef076b 100644 --- a/assets/world/tree/pine_green_2/6.vox +++ b/assets/world/tree/pine_green_2/6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76875a53fbad2782791351e4592483f11d84774aca96a53ed7174a920b51e718 +oid sha256:61ef309f4d08018c8894291c0559afa971e154c75c5e54b176233648bc9918da size 49053 diff --git a/assets/world/tree/pine_green_2/7.vox b/assets/world/tree/pine_green_2/7.vox index d7a7312d39..e46d1b297e 100644 --- a/assets/world/tree/pine_green_2/7.vox +++ b/assets/world/tree/pine_green_2/7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44f8df2859a165faa4197cb4fbe440ff9315501217de06aeef491ac91303a7c6 +oid sha256:35bcde865dff7d2023f2b42c8f60c79e13b2c44dc6d241b8f7b377f82dbaf08b size 54812 diff --git a/assets/world/tree/snow_birch/1.vox b/assets/world/tree/snow_birch/1.vox deleted file mode 100644 index 90668d827b..0000000000 --- a/assets/world/tree/snow_birch/1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48c7600338abb4c22b3faf934d4dbb526863d8192b478e672439d395d1e11f80 -size 45440 diff --git a/assets/world/tree/snow_birch/10.vox b/assets/world/tree/snow_birch/10.vox deleted file mode 100644 index 2cb160d29a..0000000000 --- a/assets/world/tree/snow_birch/10.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:141304b301dc41523fb8ea0ad523b7e5b8f77d3514951d34c5143196a496bc4b -size 45548 diff --git a/assets/world/tree/snow_birch/11.vox b/assets/world/tree/snow_birch/11.vox deleted file mode 100644 index e848c822ca..0000000000 --- a/assets/world/tree/snow_birch/11.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68a6d760e102d53e573a0cc8b8a78e884b854bd342da8dd6a738bc17e2a94c47 -size 45484 diff --git a/assets/world/tree/snow_birch/12.vox b/assets/world/tree/snow_birch/12.vox deleted file mode 100644 index 5d19c2dbf5..0000000000 --- a/assets/world/tree/snow_birch/12.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81d8a8731f64f9e26ffe44a156b210a82b6d56d1e42a1b635ed6bd4c899b6260 -size 45584 diff --git a/assets/world/tree/snow_birch/2.vox b/assets/world/tree/snow_birch/2.vox deleted file mode 100644 index 35ddfd97f4..0000000000 --- a/assets/world/tree/snow_birch/2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fce148f46839a57aba9acb51f03130920e2258d0e6e5cb212ea8c59dc6600e5 -size 45408 diff --git a/assets/world/tree/snow_birch/3.vox b/assets/world/tree/snow_birch/3.vox deleted file mode 100644 index 5633fe1a9c..0000000000 --- a/assets/world/tree/snow_birch/3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f0b0f3f1a28cf880d43986329dbd83bc057f526fb02acca6ffe2e7feb04d9c2 -size 45280 diff --git a/assets/world/tree/snow_birch/4.vox b/assets/world/tree/snow_birch/4.vox deleted file mode 100644 index 29307be53c..0000000000 --- a/assets/world/tree/snow_birch/4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2aa2ff75164c512a55baee1a8a325d1ee0b3b17dac5cf6ad59541f8ac89d6103 -size 45452 diff --git a/assets/world/tree/snow_birch/5.vox b/assets/world/tree/snow_birch/5.vox deleted file mode 100644 index 2ea066bb5c..0000000000 --- a/assets/world/tree/snow_birch/5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b22dc5a4bc6541595ab3aafc7c98e0edf9d5decd555f7f8a5942d031ca220af7 -size 45356 diff --git a/assets/world/tree/snow_birch/6.vox b/assets/world/tree/snow_birch/6.vox deleted file mode 100644 index 042eb23307..0000000000 --- a/assets/world/tree/snow_birch/6.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0f62904d3c7a9e5eed4bdb04d21a743c3063cc3079f85a6c99cd3e16de85bad -size 45236 diff --git a/assets/world/tree/snow_birch/7.vox b/assets/world/tree/snow_birch/7.vox deleted file mode 100644 index 64b1f2dd7e..0000000000 --- a/assets/world/tree/snow_birch/7.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a9255a5223b69a7bcce7fc544bbf47f54e6a1d321077246a0fbdcac1ec8dfad -size 45292 diff --git a/assets/world/tree/snow_birch/8.vox b/assets/world/tree/snow_birch/8.vox deleted file mode 100644 index e5a1e71a74..0000000000 --- a/assets/world/tree/snow_birch/8.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbf8f4e3f2dcc66a48a3836e302ffa3d854f491728685ab0df7050c2f018b7b6 -size 45236 diff --git a/assets/world/tree/snow_birch/9.vox b/assets/world/tree/snow_birch/9.vox deleted file mode 100644 index 7198d269c1..0000000000 --- a/assets/world/tree/snow_birch/9.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aca48ec226bb2382369eb3375ac8ad9f013de03b0d48d108d8d9e21f388609b2 -size 45316 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