From 8071670a37b000d72d04c8f51a16b8c8730962d7 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 10 Jun 2019 12:03:49 +0100
Subject: [PATCH] More trees, adjusted camera tilt

---
 voxygen/src/scene/mod.rs | 2 +-
 world/src/block/tree.rs  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index c27f38ba1a..da476c6248 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -117,7 +117,7 @@ impl Scene {
         // Alter camera position to match player.
         let tilt = self.camera.get_orientation().y;
         let dist = self.camera.get_distance();
-        self.camera.set_focus_pos(player_pos + Vec3::unit_z() * (2.1 - tilt.min(0.0) * dist * 0.5));
+        self.camera.set_focus_pos(player_pos + Vec3::unit_z() * (2.1 - tilt.min(0.0) * dist * 0.75));
 
         // Tick camera for interpolation.
         self.camera.update(client.state().get_time());
diff --git a/world/src/block/tree.rs b/world/src/block/tree.rs
index b3f61b4ee5..1568aa88bd 100644
--- a/world/src/block/tree.rs
+++ b/world/src/block/tree.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use vek::*;
 
 lazy_static! {
-    pub static ref TREES: [Arc<Structure>; 9] = [
+    pub static ref TREES: [Arc<Structure>; 81] = [
         // green oaks
         assets::load_map("world/tree/oak_green/1.vox", |s: Structure| s
             .with_center(Vec3::new(15, 18, 14)))
@@ -34,7 +34,7 @@ lazy_static! {
             .with_center(Vec3::new(26, 26, 14)))
         .unwrap(),
         // green pines
-        /*assets::load_map("world/tree/pine_green/1.vox", |s: Structure| s
+        assets::load_map("world/tree/pine_green/1.vox", |s: Structure| s
             .with_center(Vec3::new(15, 15, 14)))
         .unwrap(),
         assets::load_map("world/tree/pine_green/2.vox", |s: Structure| s
@@ -251,6 +251,7 @@ lazy_static! {
         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, 4)))
@@ -288,6 +289,7 @@ lazy_static! {
         assets::load_map("world/tree/snow_birch/12.vox", |s: Structure| s
             .with_center(Vec3::new(10, 9, 4)))
         .unwrap(),
+        */
         // willows
         assets::load_map("world/tree/willow/1.vox", |s: Structure| s
             .with_center(Vec3::new(15, 14, 1)))
@@ -295,7 +297,5 @@ lazy_static! {
         assets::load_map("world/tree/willow/2.vox", |s: Structure| s
             .with_center(Vec3::new(11, 12, 1)))
         .unwrap(),
-        */
-
     ];
 }