Asset path change

2024-08-30 18:12:32 +00:00 · 2019-05-30 16:19:40 +02:00 · 2019-05-30 16:19:40 +02:00 · 04ec381715
commit 04ec381715
parent 6725e99798
85 changed files with 265 additions and 16 deletions
--- a/assets/world/tree/desert_palm/1.vox
+++ b/assets/world/tree/desert_palm/1.vox
--- a/assets/world/tree/desert_palm/10.vox
+++ b/assets/world/tree/desert_palm/10.vox
--- a/assets/world/tree/desert_palm/2.vox
+++ b/assets/world/tree/desert_palm/2.vox
--- a/assets/world/tree/desert_palm/3.vox
+++ b/assets/world/tree/desert_palm/3.vox
--- a/assets/world/tree/desert_palm/4.vox
+++ b/assets/world/tree/desert_palm/4.vox
--- a/assets/world/tree/desert_palm/5.vox
+++ b/assets/world/tree/desert_palm/5.vox
--- a/assets/world/tree/desert_palm/6.vox
+++ b/assets/world/tree/desert_palm/6.vox
--- a/assets/world/tree/desert_palm/7.vox
+++ b/assets/world/tree/desert_palm/7.vox
--- a/assets/world/tree/desert_palm/8.vox
+++ b/assets/world/tree/desert_palm/8.vox
--- a/assets/world/tree/desert_palm/9.vox
+++ b/assets/world/tree/desert_palm/9.vox
--- a/assets/world/tree/pine/5.vox
+++ b/assets/world/tree/pine/5.vox
--- a/assets/world/tree/snow_birch/1.vox
+++ b/assets/world/tree/snow_birch/1.vox
--- a/assets/world/tree/snow_birch/10.vox
+++ b/assets/world/tree/snow_birch/10.vox
--- a/assets/world/tree/snow_birch/11.vox
+++ b/assets/world/tree/snow_birch/11.vox
--- a/assets/world/tree/snow_birch/12.vox
+++ b/assets/world/tree/snow_birch/12.vox
--- a/assets/world/tree/snow_birch/2.vox
+++ b/assets/world/tree/snow_birch/2.vox
--- a/assets/world/tree/snow_birch/3.vox
+++ b/assets/world/tree/snow_birch/3.vox
--- a/assets/world/tree/snow_birch/4.vox
+++ b/assets/world/tree/snow_birch/4.vox
--- a/assets/world/tree/snow_birch/5.vox
+++ b/assets/world/tree/snow_birch/5.vox
--- a/assets/world/tree/snow_birch/6.vox
+++ b/assets/world/tree/snow_birch/6.vox
--- a/assets/world/tree/snow_birch/7.vox
+++ b/assets/world/tree/snow_birch/7.vox
--- a/assets/world/tree/snow_birch/8.vox
+++ b/assets/world/tree/snow_birch/8.vox
--- a/assets/world/tree/snow_birch/9.vox
+++ b/assets/world/tree/snow_birch/9.vox
--- a/assets/world/tree/snow_pine/10.vox
+++ b/assets/world/tree/snow_pine/10.vox
--- a/assets/world/tree/snow_pine/3.vox
+++ b/assets/world/tree/snow_pine/3.vox
--- a/assets/world/tree/snow_pine/4.vox
+++ b/assets/world/tree/snow_pine/4.vox
--- a/assets/world/tree/snow_pine/5.vox
+++ b/assets/world/tree/snow_pine/5.vox
--- a/assets/world/tree/snow_pine/6.vox
+++ b/assets/world/tree/snow_pine/6.vox
--- a/assets/world/tree/snow_pine/7.vox
+++ b/assets/world/tree/snow_pine/7.vox
--- a/assets/world/tree/snow_pine/8.vox
+++ b/assets/world/tree/snow_pine/8.vox
--- a/assets/world/tree/snow_pine/9.vox
+++ b/assets/world/tree/snow_pine/9.vox
--- a/assets/world/tree/temperate_birch/1.vox
+++ b/assets/world/tree/temperate_birch/1.vox
--- a/assets/world/tree/temperate_birch/10.vox
+++ b/assets/world/tree/temperate_birch/10.vox
--- a/assets/world/tree/temperate_birch/11.vox
+++ b/assets/world/tree/temperate_birch/11.vox
--- a/assets/world/tree/temperate_birch/12.vox
+++ b/assets/world/tree/temperate_birch/12.vox
--- a/assets/world/tree/temperate_birch/2.vox
+++ b/assets/world/tree/temperate_birch/2.vox
--- a/assets/world/tree/temperate_birch/3.vox
+++ b/assets/world/tree/temperate_birch/3.vox
--- a/assets/world/tree/temperate_birch/4.vox
+++ b/assets/world/tree/temperate_birch/4.vox
--- a/assets/world/tree/temperate_birch/5.vox
+++ b/assets/world/tree/temperate_birch/5.vox
--- a/assets/world/tree/temperate_birch/6.vox
+++ b/assets/world/tree/temperate_birch/6.vox
--- a/assets/world/tree/temperate_birch/7.vox
+++ b/assets/world/tree/temperate_birch/7.vox
--- a/assets/world/tree/temperate_birch/8.vox
+++ b/assets/world/tree/temperate_birch/8.vox
--- a/assets/world/tree/temperate_birch/9.vox
+++ b/assets/world/tree/temperate_birch/9.vox
--- a/assets/world/tree/temperate_oak_green/1.vox
+++ b/assets/world/tree/temperate_oak_green/1.vox
--- a/assets/world/tree/temperate_oak_green/2.vox
+++ b/assets/world/tree/temperate_oak_green/2.vox
--- a/assets/world/tree/temperate_oak_green/3.vox
+++ b/assets/world/tree/temperate_oak_green/3.vox
--- a/assets/world/tree/temperate_oak_green/4.vox
+++ b/assets/world/tree/temperate_oak_green/4.vox
--- a/assets/world/tree/temperate_oak_green/5.vox
+++ b/assets/world/tree/temperate_oak_green/5.vox
--- a/assets/world/tree/temperate_oak_green/6.vox
+++ b/assets/world/tree/temperate_oak_green/6.vox
--- a/assets/world/tree/temperate_oak_green/7.vox
+++ b/assets/world/tree/temperate_oak_green/7.vox
--- a/assets/world/tree/temperate_oak_green/8.vox
+++ b/assets/world/tree/temperate_oak_green/8.vox
--- a/assets/world/tree/temperate_oak_green/9.vox
+++ b/assets/world/tree/temperate_oak_green/9.vox
--- a/assets/world/tree/temperate_pine_blue/10.vox
+++ b/assets/world/tree/temperate_pine_blue/10.vox
--- a/assets/world/tree/temperate_pine_blue/3.vox
+++ b/assets/world/tree/temperate_pine_blue/3.vox
--- a/assets/world/tree/temperate_pine_blue/4.vox
+++ b/assets/world/tree/temperate_pine_blue/4.vox
--- a/assets/world/tree/temperate_pine_blue/5.vox
+++ b/assets/world/tree/temperate_pine_blue/5.vox
--- a/assets/world/tree/temperate_pine_blue/6.vox
+++ b/assets/world/tree/temperate_pine_blue/6.vox
--- a/assets/world/tree/temperate_pine_blue/7.vox
+++ b/assets/world/tree/temperate_pine_blue/7.vox
--- a/assets/world/tree/temperate_pine_blue/8.vox
+++ b/assets/world/tree/temperate_pine_blue/8.vox
--- a/assets/world/tree/temperate_pine_blue/9.vox
+++ b/assets/world/tree/temperate_pine_blue/9.vox
--- a/assets/world/tree/temperate_pine_green/1.vox
+++ b/assets/world/tree/temperate_pine_green/1.vox
--- a/assets/world/tree/temperate_pine_green/2.vox
+++ b/assets/world/tree/temperate_pine_green/2.vox
--- a/assets/world/tree/temperate_pine_green/3.vox
+++ b/assets/world/tree/temperate_pine_green/3.vox
--- a/assets/world/tree/temperate_pine_green/4.vox
+++ b/assets/world/tree/temperate_pine_green/4.vox
--- a/assets/world/tree/temperate_pine_green/5.vox
+++ b/assets/world/tree/temperate_pine_green/5.vox
--- a/assets/world/tree/temperate_pine_green/6.vox
+++ b/assets/world/tree/temperate_pine_green/6.vox
--- a/assets/world/tree/temperate_pine_green/7.vox
+++ b/assets/world/tree/temperate_pine_green/7.vox
--- a/assets/world/tree/temperate_pine_green/8.vox
+++ b/assets/world/tree/temperate_pine_green/8.vox
--- a/assets/world/tree/temperate_pine_green_2/10.vox
+++ b/assets/world/tree/temperate_pine_green_2/10.vox
--- a/assets/world/tree/temperate_pine_green_2/3.vox
+++ b/assets/world/tree/temperate_pine_green_2/3.vox
--- a/assets/world/tree/temperate_pine_green_2/4.vox
+++ b/assets/world/tree/temperate_pine_green_2/4.vox
--- a/assets/world/tree/temperate_pine_green_2/5.vox
+++ b/assets/world/tree/temperate_pine_green_2/5.vox
--- a/assets/world/tree/temperate_pine_green_2/6.vox
+++ b/assets/world/tree/temperate_pine_green_2/6.vox
--- a/assets/world/tree/temperate_pine_green_2/7.vox
+++ b/assets/world/tree/temperate_pine_green_2/7.vox
--- a/assets/world/tree/temperate_pine_green_2/8.vox
+++ b/assets/world/tree/temperate_pine_green_2/8.vox
--- a/assets/world/tree/temperate_pine_green_2/9.vox
+++ b/assets/world/tree/temperate_pine_green_2/9.vox
--- a/assets/world/tree/temperate_small/1.vox
+++ b/assets/world/tree/temperate_small/1.vox
--- a/assets/world/tree/temperate_small/2.vox
+++ b/assets/world/tree/temperate_small/2.vox
--- a/assets/world/tree/temperate_small/3.vox
+++ b/assets/world/tree/temperate_small/3.vox
--- a/assets/world/tree/temperate_small/4.vox
+++ b/assets/world/tree/temperate_small/4.vox
--- a/assets/world/tree/temperate_small/5.vox
+++ b/assets/world/tree/temperate_small/5.vox
--- a/assets/world/tree/temperate_small/6.vox
+++ b/assets/world/tree/temperate_small/6.vox
--- a/assets/world/tree/willows/1.vox
+++ b/assets/world/tree/willows/1.vox
--- a/assets/world/tree/willows/2.vox
+++ b/assets/world/tree/willows/2.vox
--- a/world/src/sim.rs
+++ b/world/src/sim.rs
@ -333,41 +333,77 @@ impl<'a> Sampler<'a> {
 }

 lazy_static! {
-    static ref TREES: [Arc<Structure>; 12] = [
-        assets::load_map("world/tree/oak/1.vox", |s: Structure| s
+    static ref TREES: [Arc<Structure>; 23] = [
+        // green oaks
+        assets::load_map("world/tree/temperate_oak_green/1.vox", |s: Structure| s
            .with_center(Vec3::new(15, 18, 14)))
        .unwrap(),
-        assets::load_map("world/tree/oak/2.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_oak_green/2.vox", |s: Structure| s
            .with_center(Vec3::new(15, 18, 14)))
        .unwrap(),
-        assets::load_map("world/tree/oak/3.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_oak_green/3.vox", |s: Structure| s
            .with_center(Vec3::new(15, 18, 14)))
        .unwrap(),
-        assets::load_map("world/tree/pine/3.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_oak_green/4.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 18, 14)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_oak_green/5.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 18, 14)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_oak_green/6.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 18, 14)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_oak_green/7.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 18, 14)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_oak_green/8.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 18, 14)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_oak_green/9.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 18, 14)))
+        .unwrap(),
+        // green pines
+        assets::load_map("world/tree/temperate_pine_green/1.vox", |s: Structure| s
            .with_center(Vec3::new(15, 15, 14)))
        .unwrap(),
-        assets::load_map("world/tree/pine/4.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_pine_green/2.vox", |s: Structure| s
            .with_center(Vec3::new(15, 15, 14)))
        .unwrap(),
-        assets::load_map("world/tree/pine/5.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_pine_green/3.vox", |s: Structure| s
            .with_center(Vec3::new(15, 15, 12)))
        .unwrap(),
-        assets::load_map("world/tree/temperate/1.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_pine_green/4.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 15, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_pine_green/5.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 15, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_pine_green/6.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 15, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_pine_green/7.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 15, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/temperate_pine_green/8.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 15, 12)))
+        .unwrap(),
+        // temperate small
+        assets::load_map("world/tree/temperate_small/1.vox", |s: Structure| s
            .with_center(Vec3::new(4, 4, 7)))
        .unwrap(),
-        assets::load_map("world/tree/temperate/2.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_small/2.vox", |s: Structure| s
            .with_center(Vec3::new(4, 4, 7)))
        .unwrap(),
-        assets::load_map("world/tree/temperate/3.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_small/3.vox", |s: Structure| s
            .with_center(Vec3::new(4, 4, 7)))
        .unwrap(),
-        assets::load_map("world/tree/temperate/4.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_small/4.vox", |s: Structure| s
            .with_center(Vec3::new(4, 4, 7)))
        .unwrap(),
-        assets::load_map("world/tree/temperate/5.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_small/5.vox", |s: Structure| s
            .with_center(Vec3::new(4, 4, 7)))
        .unwrap(),
-        assets::load_map("world/tree/temperate/6.vox", |s: Structure| s
+        assets::load_map("world/tree/temperate_small/6.vox", |s: Structure| s
            .with_center(Vec3::new(4, 4, 7)))
        .unwrap(),
    ];