From 53ffc502429186dd5d039f3cc556916c8be28046 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Thu, 30 May 2019 21:39:51 +0200 Subject: [PATCH] Even more assets with offsets --- assets/world/tree/pine_green_2/1.vox | 3 + assets/world/tree/pine_green_2/10.vox | 3 - assets/world/tree/pine_green_2/2.vox | 3 + assets/world/tree/pine_green_2/3.vox | 4 +- assets/world/tree/pine_green_2/4.vox | 4 +- assets/world/tree/pine_green_2/5.vox | 4 +- assets/world/tree/pine_green_2/6.vox | 4 +- assets/world/tree/pine_green_2/7.vox | 4 +- assets/world/tree/pine_green_2/8.vox | 4 +- assets/world/tree/pine_green_2/9.vox | 3 - assets/world/tree/snow_pine/1.vox | 2 +- assets/world/tree/snow_pine/2.vox | 2 +- assets/world/tree/snow_pine/3.vox | 2 +- assets/world/tree/snow_pine/4.vox | 2 +- assets/world/tree/snow_pine/5.vox | 2 +- assets/world/tree/snow_pine/6.vox | 2 +- assets/world/tree/snow_pine/7.vox | 2 +- assets/world/tree/snow_pine/8.vox | 2 +- assets/world/tree/{willows => willow}/1.vox | 0 assets/world/tree/{willows => willow}/2.vox | 0 world/src/sim.rs | 107 +++++++++++++++++++- 21 files changed, 131 insertions(+), 28 deletions(-) create mode 100644 assets/world/tree/pine_green_2/1.vox delete mode 100644 assets/world/tree/pine_green_2/10.vox create mode 100644 assets/world/tree/pine_green_2/2.vox delete mode 100644 assets/world/tree/pine_green_2/9.vox rename assets/world/tree/{willows => willow}/1.vox (100%) rename assets/world/tree/{willows => willow}/2.vox (100%) diff --git a/assets/world/tree/pine_green_2/1.vox b/assets/world/tree/pine_green_2/1.vox new file mode 100644 index 0000000000..9561117f9b --- /dev/null +++ b/assets/world/tree/pine_green_2/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fab641dd7b3858487ac22217f6e65f01e1a384371c9761f930094bb7eee4b96d +size 50576 diff --git a/assets/world/tree/pine_green_2/10.vox b/assets/world/tree/pine_green_2/10.vox deleted file mode 100644 index d9be5ee8b5..0000000000 --- a/assets/world/tree/pine_green_2/10.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2477663110a05bb5f719f88b9a4cb6d05a5e588680883c1a8774098f63b10a1 -size 50265 diff --git a/assets/world/tree/pine_green_2/2.vox b/assets/world/tree/pine_green_2/2.vox new file mode 100644 index 0000000000..837fb7a06c --- /dev/null +++ b/assets/world/tree/pine_green_2/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4597e947fdf0bdfbae6e1207ef29cf2502e2683fd31bbb336918cf8d988d10e +size 54148 diff --git a/assets/world/tree/pine_green_2/3.vox b/assets/world/tree/pine_green_2/3.vox index 9561117f9b..e4b0c94f57 100644 --- a/assets/world/tree/pine_green_2/3.vox +++ b/assets/world/tree/pine_green_2/3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fab641dd7b3858487ac22217f6e65f01e1a384371c9761f930094bb7eee4b96d -size 50576 +oid sha256:1d195109ce7c45f6513ba1fb5b9c6de481ac2ab230eb33333b4bffaaff4f31da +size 56140 diff --git a/assets/world/tree/pine_green_2/4.vox b/assets/world/tree/pine_green_2/4.vox index 837fb7a06c..cac28fff2e 100644 --- a/assets/world/tree/pine_green_2/4.vox +++ b/assets/world/tree/pine_green_2/4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4597e947fdf0bdfbae6e1207ef29cf2502e2683fd31bbb336918cf8d988d10e -size 54148 +oid sha256:572a4d32701175e39780a7f2baebc80d12cd32e00ad7b258d04f98933896ffbc +size 48309 diff --git a/assets/world/tree/pine_green_2/5.vox b/assets/world/tree/pine_green_2/5.vox index e4b0c94f57..f9ccda156e 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:1d195109ce7c45f6513ba1fb5b9c6de481ac2ab230eb33333b4bffaaff4f31da -size 56140 +oid sha256:9522d3e1ef3082f11157384a9ec7481ead62b84177d1f05099673cf20ace1c89 +size 51128 diff --git a/assets/world/tree/pine_green_2/6.vox b/assets/world/tree/pine_green_2/6.vox index cac28fff2e..f4c7127a8b 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:572a4d32701175e39780a7f2baebc80d12cd32e00ad7b258d04f98933896ffbc -size 48309 +oid sha256:76875a53fbad2782791351e4592483f11d84774aca96a53ed7174a920b51e718 +size 49053 diff --git a/assets/world/tree/pine_green_2/7.vox b/assets/world/tree/pine_green_2/7.vox index f9ccda156e..d7a7312d39 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:9522d3e1ef3082f11157384a9ec7481ead62b84177d1f05099673cf20ace1c89 -size 51128 +oid sha256:44f8df2859a165faa4197cb4fbe440ff9315501217de06aeef491ac91303a7c6 +size 54812 diff --git a/assets/world/tree/pine_green_2/8.vox b/assets/world/tree/pine_green_2/8.vox index f4c7127a8b..d9be5ee8b5 100644 --- a/assets/world/tree/pine_green_2/8.vox +++ b/assets/world/tree/pine_green_2/8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76875a53fbad2782791351e4592483f11d84774aca96a53ed7174a920b51e718 -size 49053 +oid sha256:e2477663110a05bb5f719f88b9a4cb6d05a5e588680883c1a8774098f63b10a1 +size 50265 diff --git a/assets/world/tree/pine_green_2/9.vox b/assets/world/tree/pine_green_2/9.vox deleted file mode 100644 index d7a7312d39..0000000000 --- a/assets/world/tree/pine_green_2/9.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44f8df2859a165faa4197cb4fbe440ff9315501217de06aeef491ac91303a7c6 -size 54812 diff --git a/assets/world/tree/snow_pine/1.vox b/assets/world/tree/snow_pine/1.vox index 1f4e40a851..79b2617747 100644 --- a/assets/world/tree/snow_pine/1.vox +++ b/assets/world/tree/snow_pine/1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a57cb6886927031b01b8ddbb5107d4e41acff343b63d1f52dc0da35cd6e2f15 +oid sha256:2fcf730ceefdb6286262e5929585e76e0128f5736278d1f799effd0f46bca114 size 54468 diff --git a/assets/world/tree/snow_pine/2.vox b/assets/world/tree/snow_pine/2.vox index 2f52465cfa..fd92351363 100644 --- a/assets/world/tree/snow_pine/2.vox +++ b/assets/world/tree/snow_pine/2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c41b3a40a5d1cd3b6c28ed1603a83dce549e30d70697af1b2bc50d82c263e12 +oid sha256:58bcfda9bfc5e9614c98ff105505a49a2058e5809cdffe6d7bd08160c994d836 size 60716 diff --git a/assets/world/tree/snow_pine/3.vox b/assets/world/tree/snow_pine/3.vox index eeccc5e5f8..55eb71f4c8 100644 --- a/assets/world/tree/snow_pine/3.vox +++ b/assets/world/tree/snow_pine/3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14b02582699a11f2e26dc153fec7c95d4924ba06f8ebd3a74de0c58887a4804f +oid sha256:da5d26637081c66f6e57e213135b523be4d07f69316990a27370eafff9e6ea5c size 64096 diff --git a/assets/world/tree/snow_pine/4.vox b/assets/world/tree/snow_pine/4.vox index ef1b876aeb..9f7199e2c2 100644 --- a/assets/world/tree/snow_pine/4.vox +++ b/assets/world/tree/snow_pine/4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2b83a8f72204a194d019362beea486bcafefd1947ec0f2864edabd0cd607e0b +oid sha256:41ede784f074741b19fb7ebf6d51fe9dcde0d515784ff35e21660dc331f48174 size 50181 diff --git a/assets/world/tree/snow_pine/5.vox b/assets/world/tree/snow_pine/5.vox index c84bffb00d..a6f54bf5d2 100644 --- a/assets/world/tree/snow_pine/5.vox +++ b/assets/world/tree/snow_pine/5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81c09d3d1dddda2420a0efc001a0a4327fcd394d71df728a240ad00308ac8c40 +oid sha256:8c59f39ec63e7476606a38d38f465298170331ad71c5aa4ce9ca2d5a33488b01 size 53928 diff --git a/assets/world/tree/snow_pine/6.vox b/assets/world/tree/snow_pine/6.vox index 40709a7328..e2fb8c3ab6 100644 --- a/assets/world/tree/snow_pine/6.vox +++ b/assets/world/tree/snow_pine/6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10cc5b12ac9af042830f43d890ab305ac1ceb6a90d1a6cf25907ab0f7136a4be +oid sha256:261b0c6636b07bfe673350f11dd60379bdc0e514989032386136f8189cd7cc06 size 50893 diff --git a/assets/world/tree/snow_pine/7.vox b/assets/world/tree/snow_pine/7.vox index 8cd6f87a25..fbf366bc96 100644 --- a/assets/world/tree/snow_pine/7.vox +++ b/assets/world/tree/snow_pine/7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e24ad0cc8a872cef61b98c174be979bd33e3e06f693bdeacc15ffb56782f7ff1 +oid sha256:631ec5ac5a5ec82e491837685936dbe2da58fb50f4770db0ae7e56886197ff02 size 58956 diff --git a/assets/world/tree/snow_pine/8.vox b/assets/world/tree/snow_pine/8.vox index f1a1988078..db3e71f929 100644 --- a/assets/world/tree/snow_pine/8.vox +++ b/assets/world/tree/snow_pine/8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:027cdd3b0bc0a71543b9716c7a214969484897236cda1c0dc7638291ed65f34f +oid sha256:9bd510dbdec14a5a96e574ff7b47874dc6c741e4d731bb8bf313abe31079b822 size 52937 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(), + + */ + ]; }