Rustfmt and remove dead code
This commit is contained in:
parent
7d41502e9e
commit
5e933dca67
16
src/lib.rs
16
src/lib.rs
|
@ -2,8 +2,10 @@ use std::{cell::Cell, path::Path};
|
|||
|
||||
use sdl2::{
|
||||
render::Canvas,
|
||||
video::{Window, WindowBuildError, WindowSurfaceRef},
|
||||
IntegerOrSdlError, rect::Rect, surface::Surface, rwops::RWops, image::ImageRWops, EventPump, event::EventPollIterator,
|
||||
rwops::RWops,
|
||||
surface::Surface,
|
||||
video::{Window, WindowBuildError},
|
||||
EventPump, IntegerOrSdlError, image::ImageRWops, rect::Rect,
|
||||
};
|
||||
|
||||
pub use sdl2::event::Event;
|
||||
|
@ -46,7 +48,7 @@ impl From<IntegerOrSdlError> for CatboxError {
|
|||
pub type Result<T> = std::result::Result<T, CatboxError>;
|
||||
|
||||
pub struct Events {
|
||||
pump: EventPump
|
||||
pump: EventPump,
|
||||
}
|
||||
|
||||
impl AsRef<EventPump> for Events {
|
||||
|
@ -77,7 +79,7 @@ pub struct Sprite {
|
|||
impl Sprite {
|
||||
pub fn new<P: AsRef<Path>>(path: P, x: i32, y: i32) -> Result<Self> {
|
||||
let ops = RWops::from_file(path, "r")?;
|
||||
let surf = ops.load()?;
|
||||
let surf = ops.load()?;
|
||||
|
||||
let srect = surf.rect();
|
||||
let dest_rect: Rect = Rect::from_center((x, y), srect.width(), srect.height());
|
||||
|
@ -140,10 +142,7 @@ impl Game {
|
|||
|
||||
let event_pump = sdl_context.event_pump()?;
|
||||
|
||||
let mut events = Events {
|
||||
pump: event_pump
|
||||
};
|
||||
|
||||
let mut events = Events { pump: event_pump };
|
||||
|
||||
loop {
|
||||
if self.stopped.get() {
|
||||
|
@ -152,7 +151,6 @@ impl Game {
|
|||
canvas.set_draw_color(Color::RGB(0, 0, 0));
|
||||
canvas.clear();
|
||||
func(&mut canvas, &mut events);
|
||||
// canvas.present();
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
|
10
src/main.rs
10
src/main.rs
|
@ -3,18 +3,10 @@ use catbox::{Event, Game, Keycode, Sprite};
|
|||
fn main() {
|
||||
let game = Game::new("catbox demo", 1000, 800);
|
||||
|
||||
let mut i = 0;
|
||||
let mut s = Sprite::new("/home/yashkarandikar/code/catbox/duck.png", 500, 400).unwrap();
|
||||
game.run(|canvas, event_pump| {
|
||||
i = (i + 1) % 255;
|
||||
// canvas.set_draw_color(catbox::Color::RGB(i, 64, 255));
|
||||
// canvas.clear();
|
||||
s.draw(canvas, event_pump).unwrap();
|
||||
|
||||
// let m = sdl2::mouse::MouseState::new(event_pump.as_ref());
|
||||
// println!("{}, {}", m.x(), m.y());
|
||||
|
||||
|
||||
for event in event_pump {
|
||||
match event {
|
||||
Event::Quit { .. }
|
||||
|
@ -29,7 +21,7 @@ fn main() {
|
|||
Keycode::S | Keycode::Down => (0, -5),
|
||||
Keycode::A | Keycode::Left => (-5, 0),
|
||||
Keycode::D | Keycode::Right => (5, 0),
|
||||
_ => (0, 0)
|
||||
_ => (0, 0),
|
||||
};
|
||||
|
||||
s.translate(offset);
|
||||
|
|
Loading…
Reference in a new issue