upgrade sdl2 and sdl2_image. use beta 2

This commit is contained in:
2015-04-22 13:32:21 +02:00
parent d7d1ab1dc7
commit b91ae6cb29
4 changed files with 16 additions and 18 deletions

View File

@@ -52,15 +52,14 @@ enum Tile<'a> {
fn main() {
let sdl_context = sdl2::init(sdl2::INIT_EVERYTHING).unwrap();
sdl2_image::init(sdl2_image::INIT_PNG);
let window = match Window::new("Super Matte Bros", WindowPos::PosCentered, WindowPos::PosCentered, SCREEN_WIDTH, SCREEN_HEIGHT, OPENGL) {
let window = match Window::new(&sdl_context, "Super Matte Bros", WindowPos::PosCentered, WindowPos::PosCentered, SCREEN_WIDTH, SCREEN_HEIGHT, OPENGL) {
Ok(window) => window,
Err(err) => panic!("failed to create window: {}", err)
};
let renderer = match sdl2::render::Renderer::from_window(window, sdl2::render::RenderDriverIndex::Auto, sdl2::render::ACCELERATED) {
let mut renderer = match sdl2::render::Renderer::from_window(window, sdl2::render::RenderDriverIndex::Auto, sdl2::render::ACCELERATED) {
Ok(renderer) => renderer,
Err(err) => panic!("failed to create renderer: {}", err)
};

View File

@@ -9,7 +9,7 @@ pub trait Sprite {
pub struct StaticSprite<'a> {
texture: &'a Texture<'a>,
texture: &'a Texture,
x: i32,
y: i32
}
@@ -32,7 +32,7 @@ impl<'a> Sprite for StaticSprite<'a> {
pub struct AnimatedSprite<'a> {
texture: &'a Texture<'a>,
texture: &'a Texture,
x: i32,
y: i32,
frame: i32,