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

rebase

Browse Source 
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
This commit is contained in:
Imbris 2019-05-07 01:39:32 -04:00
parent 0fc6dd317f
commit 99d6c92c8d
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
voxygen/src/main.rs
View File

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

1
voxygen/src/scene/figure.rs
View File

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

3
voxygen/src/ui/mod.rs
View File

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