Merge branch 'master' into 'master'

Fixed aspect on scene start, added more information to post errors

See merge request veloren/veloren!24

Former-commit-id: d1008de1cccdc3d6748cbc2506e027f626cf6cba

assets/voxygen

@@ -1 +1 @@
-Subproject commit 6b64a65356c1fb4c77ad0295908f4006f75a5448
+Subproject commit e3083ec8e8e634af8c9daed00ea82435da195979

common/src/net/post2.rs

@@ -12,21 +12,21 @@ use serde::{Serialize, de::DeserializeOwned};
 
 #[derive(Clone, Debug)]
 pub enum Error {
-    Io, //Io(io::Error),
-    Bincode, //Bincode(bincode::Error),
+    Io(Arc<io::Error>),
+    Bincode(Arc<bincode::Error>),
     ChannelFailure,
     InvalidMessage,
 }
 
 impl From<io::Error> for Error {
     fn from(err: io::Error) -> Self {
-        Error::Io //(err)
+        Error::Io(Arc::new(err))
     }
 }
 
 impl From<bincode::Error> for Error {
     fn from(err: bincode::Error) -> Self {
-        Error::Bincode //(err)
+        Error::Bincode(Arc::new(err))
     }
 }
 

voxygen/src/scene/camera.rs

@@ -17,13 +17,13 @@ pub struct Camera {
 
 impl Camera {
     /// Create a new `Camera` with default parameters.
-    pub fn new() -> Self {
+    pub fn new(aspect: f32) -> Self {
         Self {
             focus: Vec3::unit_z() * 10.0,
             ori: Vec3::zero(),
             dist: 150.0,
             fov: 1.3,
-            aspect: 1.618,
+            aspect,
         }
     }
 

voxygen/src/scene/mod.rs

@@ -53,11 +53,13 @@ pub struct Scene {
 impl Scene {
     /// Create a new `Scene` with default parameters.
     pub fn new(renderer: &mut Renderer, client: &Client) -> Self {
+        let resolution = renderer.get_resolution().map(|e| e as f32);
+
         Self {
             globals: renderer
                 .create_consts(&[Globals::default()])
                 .unwrap(),
-            camera: Camera::new(),
+            camera: Camera::new(resolution.x / resolution.y),
 
             skybox: Skybox {
                 model: renderer