rebase

Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2

voxygen/src/hud/mod.rs

@@ -189,6 +189,7 @@ pub struct Hud {
     inventory_space: u32,
     show: Show,
     to_focus: Option<Option<widget::Id>>,
+    settings: Settings,
 }
 
 impl Hud {
@@ -222,6 +223,7 @@ impl Hud {
                 mini_map: false,
             },
             to_focus: None,
+            settings,
         }
     }
 

voxygen/src/main.rs

@@ -14,7 +14,6 @@ pub mod scene;
 pub mod session;
 pub mod settings;
 pub mod singleplayer;
-pub mod ui;
 pub mod window;
 
 // Reexports

voxygen/src/scene/figure.rs

@@ -21,6 +21,7 @@ use common::{
 };
 use specs::{Component, Entity as EcsEntity, Join, VecStorage};
 use std::{collections::HashMap, f32};
+use dot_vox::DotVoxData;
 use vek::*;
 
 pub struct FigureCache {

voxygen/src/ui/mod.rs

@@ -21,6 +21,7 @@ use conrod_core::{
     event::Input,
     image::{Id as ImgId, Map},
     input::{touch::Touch, Button, Motion, Widget},
+    graph::Graph,
     render::Primitive,
     text::{font::Id as FontId, Font, GlyphCache},
     widget::{id::Generator, Id as WidgId},
@@ -117,7 +118,7 @@ impl Cache {
         (&mut self.graphic_cache, &self.graphic_cache_tex)
     }
     pub fn add_graphic(&mut self, graphic: Graphic) -> GraphicId {
-        self.graphic_cache.new_graphic(graphic)
+        self.graphic_cache.add_graphic(graphic)
     }
     pub fn clear_graphic_cache(&mut self, renderer: &mut Renderer, new_size: Vec2<u16>) {
         self.graphic_cache.clear_cache(new_size);