From f1b10e9b80a20016f0c0066e2cadb4603ec64ddf Mon Sep 17 00:00:00 2001 From: "druerridge@gmail.com" Date: Mon, 4 Feb 2019 20:41:35 -0800 Subject: [PATCH] Removing other unused things --- src/asset_loader.rs | 4 ---- src/font_manager.rs | 20 -------------------- src/main.rs | 9 --------- 3 files changed, 33 deletions(-) delete mode 100644 src/font_manager.rs diff --git a/src/asset_loader.rs b/src/asset_loader.rs index 08c64f5..48b5b39 100644 --- a/src/asset_loader.rs +++ b/src/asset_loader.rs @@ -20,10 +20,6 @@ impl AssetLoader { .unwrap() } - pub fn load_font(&self, relative_path: &str) -> Glyphs { - Glyphs::new(self.assets_path.join(relative_path), self.factory.clone(), TextureSettings::new()).unwrap() - } - pub fn load_sound(&self, relative_path: &str) -> Sound { Sound::new(self.assets_path.join(relative_path).to_str().unwrap()).unwrap() } diff --git a/src/font_manager.rs b/src/font_manager.rs deleted file mode 100644 index 6f1b6c8..0000000 --- a/src/font_manager.rs +++ /dev/null @@ -1,20 +0,0 @@ -use piston_window::*; -use crate::asset_loader::AssetLoader; -use std::rc::Rc; -use std::cell::RefCell; -use std::collections::HashMap; -use std::ops::Deref; - -pub struct FontManager { - pub asset_loader: Rc, - pub fonts_by_filename: HashMap<&'static str, Rc>> -} - -impl FontManager { - pub fn get(&mut self, font_name: &'static str) -> Rc> { - let asset_loader = &self.asset_loader; - self.fonts_by_filename.entry(font_name).or_insert_with(|| { - Rc::new(RefCell::new(asset_loader.deref().load_font(font_name))) - }).clone() - } -} \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index fdf7fd6..f6c1396 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,6 @@ mod input; mod vector2; mod asset_loader; mod texture_manager; -mod font_manager; mod sound_manager; mod world; mod renderable_object; @@ -53,7 +52,6 @@ use std::rc::Rc; use std::cell::RefCell; use crate::texture_manager::TextureManager; use crate::sound_manager::SoundManager; -use crate::font_manager::FontManager; use std::fs::File; use std::sync::mpsc::channel; use std::thread; @@ -432,11 +430,6 @@ fn main() { }; let asset_loader = Rc::new(asset_loader); - let mut font_manager = FontManager { - asset_loader: asset_loader.clone(), - fonts_by_filename: HashMap::new(), - }; - let texture_manager = TextureManager { asset_loader: asset_loader.clone(), textures_by_filename: HashMap::new(), @@ -447,8 +440,6 @@ fn main() { sounds_by_filename: HashMap::new(), }; - font_manager.get("Roboto-Regular.ttf"); - let world_list = Rc::new(vec!["Sunday-Gunday", "Multi-Level Mark-hitting"]); let menu_screen = make_menu_screen(world_list.clone(), &asset_loader);