X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fmain.rs;h=31f9d3b823acc128f2d5659160577062f8401a7a;hb=6edafdc0938ce553fc8976b253f3f009309817c1;hp=9efa97de386265de519310f5f1b263c1f67cb047;hpb=cf7dc1049515059f1c5de79d6fead76c62bc766c;p=kaka%2Frust-sdl-test.git diff --git a/src/main.rs b/src/main.rs index 9efa97d..31f9d3b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,25 +4,19 @@ extern crate time; use std::f32::consts::PI; -use rand::Rng; use sdl2::event::Event; -use sdl2::EventPump; +use sdl2::event::WindowEvent; use sdl2::gfx::primitives::DrawRenderer; use sdl2::keyboard::Keycode; use sdl2::pixels::Color; use sdl2::rect::Rect; -use sdl2::render::BlendMode; -use sdl2::render::Canvas; use sdl2::video::FullscreenType; -use sdl2::video::Window; use time::PreciseTime; -use boll::{Boll, CircleBoll, SquareBoll}; +use game::app::*; use common::Point2D; -use sprites::SpriteManager; -use sdl2::video::WindowContext; -use sdl2::render::TextureCreator; +mod game; #[macro_use] mod common; mod boll; mod sprites; @@ -32,61 +26,38 @@ 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(); - let _image_context = sdl2::image::init(sdl2::image::InitFlag::PNG).unwrap(); - let window = video.window("SDL test", SCREEN_WIDTH, SCREEN_HEIGHT) - .position_centered() - .opengl() - .build() - .unwrap(); - context.mouse().show_cursor(false); - let mut canvas = window.into_canvas().build().unwrap(); - canvas.set_blend_mode(BlendMode::Add); - canvas.set_draw_color(Color::RGB(0, 0, 0)); - canvas.clear(); - canvas.present(); - let event_pump = context.event_pump().unwrap(); - (canvas, event_pump) -} - -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() { println!("starting..."); - let (mut canvas, mut event_pump) = init(); + let mut app = App::new() + .with_resolution(SCREEN_WIDTH as u16, SCREEN_HEIGHT as u16) + .with_fps(60) + .with_state(Box::new(ActiveState::new())) + .with_title("SDL test") + .start(); + app.load_sprites(&[ + ("block", "res/block.bmp"), + ("mario", "res/mario-trans.png"), + ]); let mut frame_count: u64 = 0; let mut fps_time = PreciseTime::now(); + let mut last_time = PreciseTime::now(); - let mut bolls: Bollar = Bollar::new(); - let mut boll_size = 1; - - let texture_creator = canvas.texture_creator(); - let sprites = load_sprites(&texture_creator); let mut mario_angle = 0.0; 'running: loop { - let loop_start = PreciseTime::now(); - canvas.set_draw_color(Color::RGB(0, 0, 0)); - canvas.clear(); + app.canvas.set_draw_color(Color::RGB(0, 0, 0)); + app.canvas.clear(); { let blocks = 20; let size = 32; let offset = point!((SCREEN_WIDTH as i32 - (blocks + 1) * size) / 2, (SCREEN_HEIGHT as i32 - (blocks + 1) * size) / 2); + let block = app.sprites.get("block"); for i in 0..blocks { - 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(); + app.canvas.copy(block, None, Rect::new((i) * size + offset.x, offset.y, size as u32, size as u32)).unwrap(); + app.canvas.copy(block, None, Rect::new((blocks - i) * size + offset.x, (blocks) * size + offset.y, size as u32, size as u32)).unwrap(); + app.canvas.copy(block, None, Rect::new(offset.x, (blocks - i) * size + offset.y, size as u32, size as u32)).unwrap(); + app.canvas.copy(block, None, Rect::new((blocks) * size + offset.x, (i) * size + offset.y, size as u32, size as u32)).unwrap(); } } { @@ -95,53 +66,51 @@ 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(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(); + app.canvas.copy_ex( + app.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 } } { let p = point!((SCREEN_WIDTH / 2) as i16, (SCREEN_HEIGHT / 2) as i16); - canvas.circle(p.x, p.y, 100, Color::RGB(255, 255, 255)).unwrap(); - canvas.aa_circle(p.x, p.y, 110, Color::RGB(255, 255, 255)).unwrap(); - canvas.ellipse(p.x, p.y, 50, 100, Color::RGB(255, 255, 255)).unwrap(); - canvas.aa_ellipse(p.x, p.y, 110, 55, Color::RGB(255, 255, 255)).unwrap(); - } - - for b in &mut bolls { - b.update(); - b.draw(&mut canvas, boll_size); + app.canvas.circle(p.x, p.y, 100, Color::RGB(255, 255, 255)).unwrap(); + app.canvas.aa_circle(p.x, p.y, 110, Color::RGB(255, 255, 255)).unwrap(); + app.canvas.ellipse(p.x, p.y, 50, 100, Color::RGB(255, 255, 255)).unwrap(); + app.canvas.aa_ellipse(p.x, p.y, 110, 55, Color::RGB(255, 255, 255)).unwrap(); } // window.gl_swap_window(); - for event in event_pump.poll_iter() { + for event in app.event_pump.poll_iter() { match event { Event::Quit { .. } | Event::KeyDown { keycode: Some(Keycode::Escape), .. } => { break 'running; } Event::KeyDown { keycode: Some(Keycode::F11), .. } => { - match canvas.window().fullscreen_state() { - FullscreenType::Off => canvas.window_mut().set_fullscreen(FullscreenType::Desktop), - _ => canvas.window_mut().set_fullscreen(FullscreenType::Off) + match app.canvas.window().fullscreen_state() { + FullscreenType::Off => app.canvas.window_mut().set_fullscreen(FullscreenType::Desktop), + _ => app.canvas.window_mut().set_fullscreen(FullscreenType::Off) }.unwrap(); } - 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(Box::new(CircleBoll::new( - point!(x as f64, y as f64), - point!(0.0, 0.0), - ))) - } - _ => {} + Event::Window { win_event: WindowEvent::Resized(x, y), .. } => { println!("window resized({}, {})", x, y) } + Event::Window { win_event: WindowEvent::Maximized, .. } => { println!("window maximized") } + Event::Window { win_event: WindowEvent::Restored, .. } => { println!("window restored") } + Event::Window { win_event: WindowEvent::Enter, .. } => { println!("window enter") } + Event::Window { win_event: WindowEvent::Leave, .. } => { println!("window leave") } + Event::Window { win_event: WindowEvent::FocusGained, .. } => { println!("window focus gained") } + Event::Window { win_event: WindowEvent::FocusLost, .. } => { println!("window focus lost") } + _ => { app.state.on_event(event) } } } - canvas.present(); - match loop_start.to(PreciseTime::now()).num_nanoseconds() { - Some(ns) if ns < (NS_PER_FRAME - 50_0000) as i64 => { change_boll_count(&mut bolls, 100) } - Some(ns) if ns > (NS_PER_FRAME + 50_0000) as i64 => { change_boll_count(&mut bolls, -100) } - _ => {} - } + let duration = last_time.to(PreciseTime::now()).num_nanoseconds().unwrap() as Nanoseconds; + last_time = PreciseTime::now(); + app.state.update(duration); + app.state.render(&mut app.canvas); + app.canvas.present(); frame_count += 1; if frame_count == FPS as u64 { @@ -152,25 +121,5 @@ fn main() { } } - println!("number of bolls: {}", bolls.len()); -} - -fn change_boll_count(mut bolls: &mut Bollar, delta: i32) { - if delta > 0 { - for _i in 0..delta { - add_boll(&mut bolls); - } - } else if delta < 0 { - for _i in 0..delta { - bolls.pop(); - } - } -} - -fn add_boll(bolls: &mut Bollar) { - let mut rng = rand::thread_rng(); - 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)), - })); + app.state.leave(); }