Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

More trees, adjusted camera tilt

Browse Source
This commit is contained in:
Joshua Barretto 2019-06-10 12:03:49 +01:00
parent 38c836d6c5
commit 8071670a37
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/scene/mod.rs
View File

@ -117,7 +117,7 @@ impl Scene {
// Alter camera position to match player. // Alter camera position to match player.
let tilt = self.camera.get_orientation().y; let tilt = self.camera.get_orientation().y;
let dist = self.camera.get_distance(); 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. // Tick camera for interpolation.
self.camera.update(client.state().get_time()); self.camera.update(client.state().get_time());

8
world/src/block/tree.rs
View File

@ -4,7 +4,7 @@ use std::sync::Arc;
use vek::*; use vek::*;
lazy_static! { lazy_static! {
pub static ref TREES: [Arc<Structure>; 9] = [ pub static ref TREES: [Arc<Structure>; 81] = [
// green oaks // green oaks
assets::load_map("world/tree/oak_green/1.vox", |s: Structure| s assets::load_map("world/tree/oak_green/1.vox", |s: Structure| s
.with_center(Vec3::new(15, 18, 14))) .with_center(Vec3::new(15, 18, 14)))
@ -34,7 +34,7 @@ lazy_static! {
.with_center(Vec3::new(26, 26, 14))) .with_center(Vec3::new(26, 26, 14)))
.unwrap(), .unwrap(),
// green pines // 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))) .with_center(Vec3::new(15, 15, 14)))
.unwrap(), .unwrap(),
assets::load_map("world/tree/pine_green/2.vox", |s: Structure| s 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 assets::load_map("world/tree/snow_pine/8.vox", |s: Structure| s
.with_center(Vec3::new(12, 10, 12))) .with_center(Vec3::new(12, 10, 12)))
.unwrap(), .unwrap(),
/*
// snow birches -> need roots! // snow birches -> need roots!
assets::load_map("world/tree/snow_birch/1.vox", |s: Structure| s assets::load_map("world/tree/snow_birch/1.vox", |s: Structure| s
.with_center(Vec3::new(12, 9, 4))) .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 assets::load_map("world/tree/snow_birch/12.vox", |s: Structure| s
.with_center(Vec3::new(10, 9, 4))) .with_center(Vec3::new(10, 9, 4)))
.unwrap(), .unwrap(),
*/
// willows // willows
assets::load_map("world/tree/willow/1.vox", |s: Structure| s assets::load_map("world/tree/willow/1.vox", |s: Structure| s
.with_center(Vec3::new(15, 14, 1))) .with_center(Vec3::new(15, 14, 1)))
@ -295,7 +297,5 @@ lazy_static! {
assets::load_map("world/tree/willow/2.vox", |s: Structure| s assets::load_map("world/tree/willow/2.vox", |s: Structure| s
.with_center(Vec3::new(11, 12, 1))) .with_center(Vec3::new(11, 12, 1)))
.unwrap(), .unwrap(),
*/
]; ];
} }