X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fmain.rs;h=7216479dade760c7ac65d8d63a8e2a0bc2e7b4c1;hb=cdf8f998d161abafcff3cd8503c9ec81e9c372f3;hp=7182836a5925442e970bbfe8c7deb9e4d68e39bc;hpb=296187ca027364405cf2fd95e727d5d1eaaec4fc;p=kaka%2Frust-sdl-test.git diff --git a/src/main.rs b/src/main.rs index 7182836..7216479 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,37 +2,37 @@ extern crate rand; extern crate sdl2; extern crate time; -use std::collections::hash_map::RandomState; -use std::collections::HashMap; use std::f32::consts::PI; use rand::Rng; use sdl2::event::Event; use sdl2::EventPump; use sdl2::gfx::primitives::DrawRenderer; -use sdl2::image::LoadTexture; use sdl2::keyboard::Keycode; use sdl2::pixels::Color; use sdl2::rect::Rect; use sdl2::render::BlendMode; use sdl2::render::Canvas; -use sdl2::render::Texture; -use sdl2::render::TextureCreator; use sdl2::video::Window; -use sdl2::video::WindowContext; use time::PreciseTime; -use boll::Boll; +use boll::{Boll, CircleBoll, SquareBoll}; use common::Point2D; +use sprites::SpriteManager; +use sdl2::video::WindowContext; +use sdl2::render::TextureCreator; #[macro_use] mod common; mod boll; +mod sprites; const SCREEN_WIDTH: u32 = 1280; const SCREEN_HEIGHT: u32 = (SCREEN_WIDTH as f64 * (1440.0 / 2560.0)) as u32; const FPS: u32 = 60; const NS_PER_FRAME: u32 = 1_000_000_000 / FPS; +type Bollar = Vec>; + fn init() -> (Canvas, EventPump) { let context = sdl2::init().unwrap(); let video = context.video().unwrap(); @@ -52,11 +52,11 @@ fn init() -> (Canvas, EventPump) { (canvas, event_pump) } -fn load_textures(texture_creator: &TextureCreator) -> HashMap<&str, Texture, RandomState> { - let mut textures = HashMap::new(); - textures.insert("block", texture_creator.load_texture("res/block.bmp").unwrap()); - textures.insert("mario", texture_creator.load_texture("res/mario-trans.png").unwrap()); - textures +fn load_sprites(texture_creator: &TextureCreator) -> SpriteManager { + let mut texman = SpriteManager::new(texture_creator); + texman.load("block", "res/block.bmp"); + texman.load("mario", "res/mario-trans.png"); + texman } fn main() { @@ -66,11 +66,11 @@ fn main() { let mut frame_count: u64 = 0; let mut fps_time = PreciseTime::now(); - let mut bolls: Vec = Vec::new(); + let mut bolls: Bollar = Bollar::new(); let mut boll_size = 1; let texture_creator = canvas.texture_creator(); - let textures = load_textures(&texture_creator); + let sprites = load_sprites(&texture_creator); let mut mario_angle = 0.0; 'running: loop { @@ -82,10 +82,10 @@ fn main() { let size = 32; let offset = point!((SCREEN_WIDTH as i32 - (blocks + 1) * size) / 2, (SCREEN_HEIGHT as i32 - (blocks + 1) * size) / 2); for i in 0..blocks { - canvas.copy(&(textures.get("block").unwrap()), None, Rect::new((i) * size + offset.x, (0) * size + offset.y, size as u32, size as u32)).unwrap(); - canvas.copy(&(textures.get("block").unwrap()), None, Rect::new((blocks - i) * size + offset.x, (blocks) * size + offset.y, size as u32, size as u32)).unwrap(); - canvas.copy(&(textures.get("block").unwrap()), None, Rect::new((0) * size + offset.x, (blocks - i) * size + offset.y, size as u32, size as u32)).unwrap(); - canvas.copy(&(textures.get("block").unwrap()), None, Rect::new((blocks) * size + offset.x, (i) * size + offset.y, size as u32, size as u32)).unwrap(); + canvas.copy(sprites.get("block"), None, Rect::new((i) * size + offset.x, (0) * size + offset.y, size as u32, size as u32)).unwrap(); + canvas.copy(sprites.get("block"), None, Rect::new((blocks - i) * size + offset.x, (blocks) * size + offset.y, size as u32, size as u32)).unwrap(); + canvas.copy(sprites.get("block"), None, Rect::new((0) * size + offset.x, (blocks - i) * size + offset.y, size as u32, size as u32)).unwrap(); + canvas.copy(sprites.get("block"), None, Rect::new((blocks) * size + offset.x, (i) * size + offset.y, size as u32, size as u32)).unwrap(); } } { @@ -94,7 +94,7 @@ fn main() { let radius = 110.0 + size as f32 * 0.5; let angle = (mario_angle as f32 - 90.0) * PI / 180.0; let offset2 = point!((angle.cos() * radius) as i32, (angle.sin() * radius) as i32); - canvas.copy_ex(&(textures.get("mario").unwrap()), None, Rect::new(offset.x + offset2.x, offset.y + offset2.y, size as u32, size as u32), mario_angle, sdl2::rect::Point::new(size / 2, size / 2), false, false).unwrap(); + canvas.copy_ex(sprites.get("mario"), None, Rect::new(offset.x + offset2.x, offset.y + offset2.y, size as u32, size as u32), mario_angle, sdl2::rect::Point::new(size / 2, size / 2), false, false).unwrap(); mario_angle += 1.0; if mario_angle >= 360.0 { mario_angle -= 360.0 } } @@ -123,10 +123,12 @@ fn main() { } Event::KeyDown { keycode: Some(Keycode::KpPlus), .. } => { boll_size = std::cmp::min(boll_size + 1, 32) } Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => { boll_size = std::cmp::max(boll_size - 1, 1) } - Event::MouseMotion { x, y, .. } => { bolls.push(Boll { - pos: point!(x as f64, y as f64), - vel: point!(0.0, 0.0), - }) } + Event::MouseMotion { x, y, .. } => { + bolls.push(Box::new(CircleBoll::new( + point!(x as f64, y as f64), + point!(0.0, 0.0), + ))) + } _ => {} } } @@ -150,7 +152,7 @@ fn main() { println!("number of bolls: {}", bolls.len()); } -fn change_boll_count(mut bolls: &mut Vec, delta: i32) { +fn change_boll_count(mut bolls: &mut Bollar, delta: i32) { if delta > 0 { for _i in 0..delta { add_boll(&mut bolls); @@ -162,10 +164,10 @@ fn change_boll_count(mut bolls: &mut Vec, delta: i32) { } } -fn add_boll(bolls: &mut Vec) { +fn add_boll(bolls: &mut Bollar) { let mut rng = rand::thread_rng(); - bolls.push(Boll { + bolls.push(Box::new(SquareBoll { pos: point!(rng.gen_range(0, SCREEN_WIDTH) as f64, rng.gen_range(0, SCREEN_HEIGHT) as f64), vel: point!(rng.gen_range(-2.0, 2.0), rng.gen_range(-2.0, 2.0)), - }); + })); }