diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index bfe36b9a90..d707e66608 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -189,6 +189,7 @@ pub struct Hud { inventory_space: u32, show: Show, to_focus: Option>, + settings: Settings, } impl Hud { @@ -222,6 +223,7 @@ impl Hud { mini_map: false, }, to_focus: None, + settings, } } diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs index 72f74b8433..e48cfc6d1b 100644 --- a/voxygen/src/main.rs +++ b/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 diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 0754a73b34..ae074603de 100644 --- a/voxygen/src/scene/figure.rs +++ b/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 { diff --git a/voxygen/src/ui/mod.rs b/voxygen/src/ui/mod.rs index 664f7d4750..6dd5496b42 100644 --- a/voxygen/src/ui/mod.rs +++ b/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) { self.graphic_cache.clear_cache(new_size);