| Revision | dd678f61dad00ae206ef53834523760efe5d890f (tree) |
|---|---|
| Time | 2021-10-20 04:02:59 |
| Author | SecT |
| Commiter | SecT |
Refactoring - moved textures outside of controller
src/controller.rs (diff) src/main.rs (diff)| @@ -25,14 +25,17 @@ | ||
| 25 | 25 | characterA : Option<&'a Character<'a>>, |
| 26 | 26 | characterB : Option<&'a Character<'a>>, |
| 27 | 27 | |
| 28 | + textures: [&'a SfBox<Texture>; 4] | |
| 28 | 29 | } |
| 29 | 30 | |
| 30 | 31 | impl<'a> Controller<'a> { |
| 31 | 32 | |
| 32 | - pub fn new() -> Self { | |
| 33 | + pub fn new(textures: [&'a SfBox<Texture>;4] ) -> Self { | |
| 34 | + | |
| 33 | 35 | Controller { |
| 34 | 36 | characterA: None, |
| 35 | - characterB: None | |
| 37 | + characterB: None, | |
| 38 | + textures | |
| 36 | 39 | } |
| 37 | 40 | } |
| 38 | 41 |
| @@ -60,31 +63,14 @@ | ||
| 60 | 63 | |
| 61 | 64 | let key_processor = key_processing::KeyProcessor::new(); |
| 62 | 65 | |
| 63 | - //Player A | |
| 64 | - let fighter = Texture::from_file("sprites//sub_zero//01.gif").unwrap(); | |
| 65 | - let fighter2 = Texture::from_file("sprites//sub_zero//02.gif").unwrap(); | |
| 66 | - let fighter_walk0 = Texture::from_file("sprites//sub_zero//a01.gif").unwrap(); | |
| 67 | - let fighter_walk1 = Texture::from_file("sprites//sub_zero//a03.gif").unwrap(); | |
| 68 | - | |
| 69 | - //Player B | |
| 70 | - // let fighter_b = Texture::from_file("sprites//sub_zero//01.gif").unwrap(); | |
| 71 | - // let fighter_b2 = Texture::from_file("sprites//sub_zero//02.gif").unwrap(); | |
| 72 | - // let fighter_b_walk0 = Texture::from_file("sprites//sub_zero//a01.gif").unwrap(); | |
| 73 | - // let fighter_b_walk1 = Texture::from_file("sprites//sub_zero//a03.gif").unwrap(); | |
| 74 | - | |
| 75 | - | |
| 76 | - let textures: [&SfBox<Texture>; 4] = [&fighter, &fighter2, &fighter_walk0, &fighter_walk1]; | |
| 77 | -// let textures_b: [&SfBox<Texture>; 4] = [&fighter_b, &fighter_b2, &fighter_b_walk0, &fighter_b_walk1]; | |
| 78 | 66 | |
| 79 | 67 | //let mut character_sprite = sprite_rendering::CharacterSprite::new(&textures); |
| 80 | 68 | //let mut character_sprite_b = sprite_rendering::CharacterSprite::new(&textures); |
| 81 | 69 | |
| 82 | - let mut character_A: Character = Character ::new("Sub Zero", &textures); | |
| 83 | - let mut character_B: Character = Character ::new("Sub Zero", &textures); | |
| 70 | + let mut character_A: Character = Character ::new("Sub Zero", &self.textures); | |
| 71 | + let mut character_B: Character = Character ::new("Sub Zero", &self.textures); | |
| 84 | 72 | |
| 85 | 73 | println!("{} vs {}", character_A.get_name(), character_B.get_name()); |
| 86 | - //let mut state = 0; | |
| 87 | - //let mut state_b = 0; | |
| 88 | 74 | |
| 89 | 75 | character_B.char_sprite.sprite.set_position(Vector2f::new(600.0, 0.0)); |
| 90 | 76 | character_B.char_sprite.sprite.set_scale(Vector2f::new(-1.0, 1.0)); |
| @@ -136,7 +122,7 @@ | ||
| 136 | 122 | // counter = 0; |
| 137 | 123 | // } |
| 138 | 124 | } |
| 139 | - | |
| 125 | + | |
| 140 | 126 | |
| 141 | 127 | character_A.update_sprite(); |
| 142 | 128 | character_B.update_sprite(); |
| @@ -16,10 +16,24 @@ | ||
| 16 | 16 | mod character; |
| 17 | 17 | mod controller; |
| 18 | 18 | |
| 19 | +use sfml::{ | |
| 20 | + graphics::{ | |
| 21 | + Texture | |
| 22 | + }, | |
| 23 | + SfBox | |
| 24 | +}; | |
| 19 | 25 | |
| 20 | 26 | fn main() { |
| 21 | 27 | println!("Silny-Kombat!"); |
| 22 | - let controller = controller::Controller::new(); | |
| 28 | + | |
| 29 | + let fighter = Texture::from_file("sprites//sub_zero//01.gif").unwrap(); | |
| 30 | + let fighter2 = Texture::from_file("sprites//sub_zero//02.gif").unwrap(); | |
| 31 | + let fighter_walk0 = Texture::from_file("sprites//sub_zero//a01.gif").unwrap(); | |
| 32 | + let fighter_walk1 = Texture::from_file("sprites//sub_zero//a03.gif").unwrap(); | |
| 33 | + | |
| 34 | + let textures: [&SfBox<Texture>; 4] = [&fighter, &fighter2, &fighter_walk0, &fighter_walk1]; | |
| 35 | + | |
| 36 | + let controller = controller::Controller::new(textures); | |
| 23 | 37 | controller.run(); |
| 24 | 38 | } |
| 25 | 39 |
Fork