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

remove poison err & Segment Asset impl, cleanup

Browse Source 
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
This commit is contained in:
Imbris 2019-04-27 22:12:30 -04:00
parent 1d5020634d
commit 990b42a6b0
7 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/src/assets/mod.rs
View File

@ -6,15 +6,13 @@ use std::{
collections::HashMap,
fs::File,
io::Read,
sync::{Arc, PoisonError, RwLock},
sync::{Arc, RwLock},
};
use crate::figure::Segment;
#[derive(Debug, Clone)]
pub enum Error {
InvalidType,
NotFound,
Poison,
}
impl From<Arc<dyn Any + 'static + Sync + Send>> for Error {
@ -29,12 +27,6 @@ impl From<std::io::Error> for Error {
}
}
impl<T> From<PoisonError<T>> for Error {
fn from(_err: PoisonError<T>) -> Self {
Error::Poison
}
}
lazy_static! {
static ref ASSETS: RwLock<HashMap<String, Arc<dyn Any + 'static + Sync + Send>>> =
RwLock::new(HashMap::new());
@ -50,7 +42,7 @@ lazy_static! {
// TODO: consider assets that we only need in one place or that don't need to be kept in memory?
pub fn load<A: Asset + 'static>(specifier: &str) -> Result<Arc<A>, Error> {
Ok(ASSETS
.write()?
.write().unwrap()
.entry(specifier.to_string())
.or_insert(Arc::new(A::load(specifier)?))
.clone()
@ -64,7 +56,9 @@ pub trait Asset: Send + Sync + Sized {
impl Asset for DynamicImage {
fn load(specifier: &str) -> Result<Self, Error> {
Ok(image::load_from_memory(load_from_path(specifier)?.as_slice()).unwrap())
Ok(image::load_from_memory(
load_from_path(specifier)?.as_slice()
).unwrap())
}
}
@ -74,22 +68,16 @@ impl Asset for DotVoxData {
}
}
impl Asset for Segment {
fn load(specifier: &str) -> Result<Self, Error> {
Ok(Segment::from(dot_vox::load_bytes(load_from_path(specifier)?.as_slice()).unwrap()))
}
}
// TODO: System to load file from specifiers (eg "core.ui.backgrounds.city")
fn try_load_from_path(name: &str) -> Option<File> {
let basepaths = [
[env!("CARGO_MANIFEST_DIR"), "/../assets"].concat(),
// if it's stupid and it works..,
"assets".to_string(),
"../../assets".to_string(),
"../assets".to_string(), /* optimizations */
[env!("CARGO_MANIFEST_DIR"), "/assets"].concat(),
[env!("CARGO_MANIFEST_DIR"), "/../../assets"].concat(),
[env!("CARGO_MANIFEST_DIR"), "/../assets"].concat(),
"../../../assets".to_string(),
[env!("CARGO_MANIFEST_DIR"), "/../../../assets"].concat(),
];
@ -97,11 +85,11 @@ fn try_load_from_path(name: &str) -> Option<File> {
let filename = [bp, name].concat();
match File::open(&filename) {
Ok(f) => {
debug!("loading {} succedeed", filename);
debug!("Loading {} successful", filename);
return Some(f);
},
Err(e) => {
debug!("loading {} did not work with error: {}", filename, e);
debug!("Loading {} failed: {}", filename, e);
}
};
};
@ -112,14 +100,10 @@ pub fn load_from_path(name: &str) -> Result<Vec<u8>, Error> {
match try_load_from_path(name) {
Some(mut f) => {
let mut content: Vec<u8> = vec!();
f.read_to_end(&mut content);
info!("loaded asset successful: {}", name);
f.read_to_end(&mut content)?;
Ok(content)
},
None => {
warn!("Loading asset failed, wanted to load {} but could not load it, check debug log!", name);
Err(Error::NotFound)
}
None => Err(Error::NotFound),
}
}

4
common/src/figure/mod.rs
View File

@ -18,8 +18,8 @@ use self::cell::Cell;
/// Figures are used to represent things like characters, NPCs, mobs, etc.
pub type Segment = Dyna<Cell, ()>;
impl From<DotVoxData> for Segment {
fn from(dot_vox_data: DotVoxData) -> Self {
impl From<&DotVoxData> for Segment {
fn from(dot_vox_data: &DotVoxData) -> Self {
if let Some(model) = dot_vox_data.models.get(0) {
let palette = dot_vox_data
.palette

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

@ -207,7 +207,7 @@ widget_ids! {
}
image_ids! {
pub(self) struct<common::figure::Segment> Voxs {
struct<dot_vox::DotVoxData> Voxs {
// Bag
bag_contents: "/voxygen/element/frames/bag.vox",
inv_grid: "/voxygen/element/frames/inv_grid.vox",

22
voxygen/src/menu/char_selection/ui.rs
View File

@ -5,8 +5,18 @@ use crate::{
};
use common::{
assets,
comp::character::{Belt, Character, Chest, Foot, Gender, Hand, Head, Pants, Race, Weapon},
figure::Segment,
comp::character::{
Character,
Race,
Gender,
Head,
Chest,
Belt,
Pants,
Hand,
Foot,
Weapon,
}
};
use conrod_core::{
color,
@ -235,14 +245,14 @@ impl Imgs {
let load_img = |filename, ui: &mut Ui| {
let fullpath: String = ["/voxygen/", filename].concat();
let image = assets::load::<image::DynamicImage>(fullpath.as_str())
.expect("Error loading file");
.unwrap();
ui.new_graphic(image.into())
};
let load_vox = |filename, ui: &mut Ui| {
let fullpath: String = ["/voxygen/", filename].concat();
let segment = assets::load::<common::figure::Segment>(fullpath.as_str())
.expect("Error loading file");
ui.new_graphic(segment.into())
let dot_vox = assets::load::<dot_vox::DotVoxData>(fullpath.as_str())
.unwrao();
ui.new_graphic(dot_vox.into())
};
Imgs {
v_logo: load_vox("element/v_logo.vox", ui),

12
voxygen/src/menu/main/ui.rs
View File

@ -1,18 +1,16 @@
use crate::{
render::Renderer,
ui::{self, ScaleMode, Ui},
window::Window,
GlobalState, DEFAULT_PUBLIC_SERVER,
};
use common::{
assets,
figure::Segment,
};
use conrod_core::{
color,
color::TRANSPARENT,
image::Id as ImgId,
position::{Dimension, Relative},
position::Relative,
text::font::Id as FontId,
widget::{text_box::Event as TextBoxEvent, Button, Image, List, Rectangle, Text, TextBox},
widget_ids, Borderable, Color, Colorable, Labelable, Positionable, Sizeable, Widget,
@ -70,14 +68,14 @@ impl Imgs {
let load_img = |filename, ui: &mut Ui| {
let fullpath: String = ["/voxygen/", filename].concat();
let image = assets::load::<image::DynamicImage>(fullpath.as_str())
.expect("Error loading file");
.unwrap();
ui.new_graphic(image.into())
};
let load_vox = |filename, ui: &mut Ui| {
let fullpath: String = ["/voxygen/", filename].concat();
let segment = assets::load::<common::figure::Segment>(fullpath.as_str())
.expect("Error loading file");
ui.new_graphic(segment.into())
let dot_vox = assets::load::<dot_vox::DotVoxData>(fullpath.as_str())
.unwrap();
ui.new_graphic(dot_vox.into())
};
Imgs {
bg: load_img("background/bg_main.png", ui),

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

@ -98,10 +98,11 @@ impl FigureCache {
.retain(|_, (_, last_used)| *last_used + 60 > tick);
}
fn load_mesh(filename: &'static str, position: Vec3<f32>) -> Mesh<FigurePipeline> {
fn load_mesh(filename: &str, position: Vec3<f32>) -> Mesh<FigurePipeline> {
let fullpath: String = ["/voxygen/voxel/", filename].concat();
assets::load::<Segment>(fullpath.as_str())
.expect("Error loading file")
Segment::from(
assets::load::<dot_vox::DotVoxData>(fullpath.as_str()).unwrap().as_ref()
)
.generate_mesh(position)
}

12
voxygen/src/ui/graphic/graphic.rs
View File

@ -1,13 +1,13 @@
use std::sync::Arc;
use common::figure::Segment;
use fnv::FnvHashMap;
use guillotiere::{size2, Allocation, AtlasAllocator};
use image::DynamicImage;
use dot_vox::DotVoxData;
use vek::*;
pub enum Graphic {
Image(Arc<DynamicImage>),
Voxel(Arc<Segment>),
Voxel(Arc<DotVoxData>),
Blank,
}
@ -16,8 +16,8 @@ impl From<Arc<DynamicImage>> for Graphic {
Graphic::Image(image)
}
}
impl From<Arc<Segment>> for Graphic {
fn from(vox: Arc<Segment>) -> Self {
impl From<Arc<DotVoxData>> for Graphic {
fn from(vox: Arc<DotVoxData>) -> Self {
Graphic::Voxel(vox)
}
}
@ -105,8 +105,8 @@ impl GraphicCache {
.pixels()
.map(|p| p.data)
.collect::<Vec<[u8; 4]>>(),
Graphic::Voxel(vox) => {
super::renderer::draw_vox(&vox, aabr.size().into())
Graphic::Voxel(ref vox) => {
super::renderer::draw_vox(&vox.as_ref().into(), aabr.size().into())
}
Graphic::Blank => return None,
};