Updated changelog, removed old models

CHANGELOG.md

@@ -62,6 +62,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Allowed collecting nearby blocks without aiming at them
 - Made voxygen wait until singleplayer server is initialized before attempting to connect, removing the chance for it to give up on connecting if the server takes a while to start
 - Log where userdata folder is located
+- Switched to a Whittaker map for better tree spawning patterns
+- Switched to procedural snow cover on trees
+- Significantly improved terrain generation performance
 
 ### Removed
 

assets/world/manifests/snow_pines.ron

@@ -1,36 +0,0 @@
-#![enable(unwrap_newtypes)]
-
-[
-    (
-        specifier: "world.tree.snow_pine.1",
-        center: (15, 15, 14)
-    ),
-    (
-        specifier: "world.tree.snow_pine.2",
-        center: (15, 15, 14)
-    ),
-    (
-        specifier: "world.tree.snow_pine.3",
-        center: (17, 15, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.4",
-        center: (10, 8, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.5",
-        center: (12, 12, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.6",
-        center: (11, 10, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.7",
-        center: (16, 15, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.8",
-        center: (12, 10, 12)
-    ),
-]

world/src/layer/tree.rs

@@ -18,7 +18,6 @@ lazy_static! {
     pub static ref OAK_STUMPS: Vec<Arc<Structure>> = Structure::load_group("oak_stumps");
     pub static ref PINES: Vec<Arc<Structure>> = Structure::load_group("pines");
     pub static ref PALMS: Vec<Arc<Structure>> = Structure::load_group("palms");
-    // pub static ref SNOW_PINES: Vec<Arc<Structure>> = Structure::load_group("snow_pines");
     pub static ref ACACIAS: Vec<Arc<Structure>> = Structure::load_group("acacias");
     pub static ref FRUIT_TREES: Vec<Arc<Structure>> = Structure::load_group("fruit_trees");
     pub static ref BIRCHES: Vec<Arc<Structure>> = Structure::load_group("birch");
@@ -70,14 +69,17 @@ pub fn apply_trees_to(canvas: &mut Canvas) {
                             }
                         } else {
                             match col.forest_kind {
-                                ForestKind::Palm => &PALMS,
-                                ForestKind::Savannah => &ACACIAS,
                                 ForestKind::Oak if QUIRKY_RAND.get(seed) % 16 == 7 => &OAK_STUMPS,
                                 ForestKind::Oak if QUIRKY_RAND.get(seed) % 19 == 7 => &FRUIT_TREES,
-                                ForestKind::Oak if QUIRKY_RAND.get(seed) % 14 == 7 => &BIRCHES,
+                                ForestKind::Oak | ForestKind::Pine
+                                    if QUIRKY_RAND.get(seed) % 14 == 7 =>
+                                {
+                                    &BIRCHES
+                                },
+                                ForestKind::Palm => &PALMS,
+                                ForestKind::Savannah => &ACACIAS,
                                 ForestKind::Oak => &OAKS,
                                 ForestKind::Pine => &PINES,
-                                // ForestKind::SnowPine => &SNOW_PINES,
                                 ForestKind::Mangrove => &MANGROVE_TREES,
                             }
                         };