cmdln/susuwatari-game
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename module

Browse source
This commit is contained in:
Thomas Gideon 2017-07-13 12:49:08 -04:00
parent 010028fef9
commit ce783a3609
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib.rs
View file

@ -6,13 +6,13 @@ extern crate piston_window;
extern crate sprite; extern crate sprite;
extern crate uuid; extern crate uuid;
mod object; mod mobs;
use gfx_device_gl::Resources; use gfx_device_gl::Resources;
use graphics::Image; use graphics::Image;
use graphics::rectangle::square; use graphics::rectangle::square;
use piston_window::*; use piston_window::*;
use object::Object; use mobs::Hero;
use sprite::*; use sprite::*;
// TODO move this into the player object // TODO move this into the player object
@ -20,7 +20,7 @@ const MV_FACT: f64 = 2500.0;
pub struct Game { pub struct Game {
scene: Scene<Texture<Resources>>, scene: Scene<Texture<Resources>>,
player: Object, player: Hero,
up_d: bool, up_d: bool,
down_d: bool, down_d: bool,
left_d: bool, left_d: bool,
@ -30,7 +30,7 @@ pub struct Game {
impl Game { impl Game {
pub fn new(w: &mut PistonWindow) -> Game { pub fn new(w: &mut PistonWindow) -> Game {
let mut scene = Scene::new(); let mut scene = Scene::new();
let player = Object::new(w, &mut scene); let player = Hero::new(w, &mut scene);
Game { Game {
scene: scene, scene: scene,
player: player, player: player,

8
src/object.rs → src/mobs.rs
View file

@ -8,14 +8,14 @@ use std::rc::Rc;
// TODO add size of player sprite for boundary checking // TODO add size of player sprite for boundary checking
pub struct Object { pub struct Hero {
pub sprite_id: Uuid, pub sprite_id: Uuid,
pub x: f64, pub x: f64,
pub y: f64, pub y: f64,
} }
impl Object { impl Hero {
pub fn new(w: &mut PistonWindow, scene: &mut Scene<Texture<Resources>>) -> Object { pub fn new(w: &mut PistonWindow, scene: &mut Scene<Texture<Resources>>) -> Hero {
let assets = find_folder::Search::ParentsThenKids(3, 3) let assets = find_folder::Search::ParentsThenKids(3, 3)
.for_folder("assets") .for_folder("assets")
.unwrap(); .unwrap();
@ -27,7 +27,7 @@ impl Object {
let mut sprite = Sprite::from_texture(tex); let mut sprite = Sprite::from_texture(tex);
sprite.set_position(320.0, 240.0); sprite.set_position(320.0, 240.0);
let sprite_id = scene.add_child(sprite); let sprite_id = scene.add_child(sprite);
Object { Hero {
x: 320.0, x: 320.0,
y: 240.0, y: 240.0,
sprite_id: sprite_id, sprite_id: sprite_id,