Skip to content

Commit

Permalink
Removing other unused things
Browse files Browse the repository at this point in the history
  • Loading branch information
druerridge committed Feb 5, 2019
1 parent 8819710 commit f1b10e9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 33 deletions.
4 changes: 0 additions & 4 deletions src/asset_loader.rs
Expand Up @@ -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()
}
Expand Down
20 changes: 0 additions & 20 deletions src/font_manager.rs

This file was deleted.

9 changes: 0 additions & 9 deletions src/main.rs
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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(),
Expand All @@ -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);
Expand Down

0 comments on commit f1b10e9

Please sign in to comment.