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

Implemented asset system for caching json data

Browse Source
This commit is contained in:
scorpion9979 2019-06-04 01:11:27 +03:00 committed by Forest Anderson
parent 29f230d23e
commit 7919442d3d
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
common/assets/npc_names.json → assets/common/npc_names.json
View File

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

@ -1,6 +1,7 @@
use dot_vox::DotVoxData;
use image::DynamicImage;
use lazy_static::lazy_static;
use serde_json::Value;
use std::{
any::Any,
collections::HashMap,
@ -106,6 +107,16 @@ impl Asset for DotVoxData {
}
}
impl Asset for Value {
fn load(specifier: &str) -> Result<Self, Error> {
let file =
File::open(specifier).expect(&format!("opening {} in read-only mode", specifier));
let json: serde_json::Value = serde_json::from_reader(file)
.expect(&format!("reading json contents from {}", specifier));
Ok(json)
}
}
// TODO: System to load file from specifiers (e.g.: "core.ui.backgrounds.city").
fn try_open_with_path(name: &str) -> Option<File> {
debug!("Trying to access \"{}\"", name);

14
common/src/npc.rs
View File

@ -1,7 +1,10 @@
use crate::assets;
use lazy_static::lazy_static;
use rand::seq::SliceRandom;
use serde_json;
use std::fs::File;
use std::io::Error;
use std::sync::Arc;
pub enum NpcKind {
Wolf,
@ -17,14 +20,13 @@ impl NpcKind {
}
}
const npc_names_dir: &str = "common/assets/npc_names.json";
lazy_static! {
static ref NPC_NAMES_JSON: Arc<serde_json::Value> =
assets::load_expect("assets/common/npc_names.json");
}
pub fn get_npc_name(npc_type: NpcKind) -> String {
let npc_names_file =
File::open(npc_names_dir).expect(&format!("opening {} in read-only mode", npc_names_dir));
let npc_names_json: serde_json::Value = serde_json::from_reader(npc_names_file)
.expect(&format!("reading json contents from {}", npc_names_dir));
let npc_names = npc_names_json
let npc_names = NPC_NAMES_JSON
.get(npc_type.as_str())
.expect("accessing json using NPC type provided as key")
.as_array()