diff --git a/src/lib.rs b/src/lib.rs index 187d1f1..85937d7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,13 +6,13 @@ extern crate piston_window; extern crate sprite; extern crate uuid; -mod object; +mod mobs; use gfx_device_gl::Resources; use graphics::Image; use graphics::rectangle::square; use piston_window::*; -use object::Object; +use mobs::Hero; use sprite::*; // TODO move this into the player object @@ -20,7 +20,7 @@ const MV_FACT: f64 = 2500.0; pub struct Game { scene: Scene>, - player: Object, + player: Hero, up_d: bool, down_d: bool, left_d: bool, @@ -30,7 +30,7 @@ pub struct Game { impl Game { pub fn new(w: &mut PistonWindow) -> Game { let mut scene = Scene::new(); - let player = Object::new(w, &mut scene); + let player = Hero::new(w, &mut scene); Game { scene: scene, player: player, diff --git a/src/object.rs b/src/mobs.rs similarity index 96% rename from src/object.rs rename to src/mobs.rs index 0aae264..cb6dbc6 100644 --- a/src/object.rs +++ b/src/mobs.rs @@ -8,14 +8,14 @@ use std::rc::Rc; // TODO add size of player sprite for boundary checking -pub struct Object { +pub struct Hero { pub sprite_id: Uuid, pub x: f64, pub y: f64, } -impl Object { - pub fn new(w: &mut PistonWindow, scene: &mut Scene>) -> Object { +impl Hero { + pub fn new(w: &mut PistonWindow, scene: &mut Scene>) -> Hero { let assets = find_folder::Search::ParentsThenKids(3, 3) .for_folder("assets") .unwrap(); @@ -27,7 +27,7 @@ impl Object { let mut sprite = Sprite::from_texture(tex); sprite.set_position(320.0, 240.0); let sprite_id = scene.add_child(sprite); - Object { + Hero { x: 320.0, y: 240.0, sprite_id: sprite_id,