From 73dc281fea1bffdfb5ec7567583b4d4f6902b4f9 Mon Sep 17 00:00:00 2001 From: Axel Magnuson <axelmagn@gmail.com> Date: Sat, 31 Oct 2015 23:47:51 -0600 Subject: [PATCH] Fix dependencies and remove old piston example --- Cargo.toml | 21 ++---------- examples/piston.rs | 82 ---------------------------------------------- 2 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 examples/piston.rs diff --git a/Cargo.toml b/Cargo.toml index c01df16..b655197 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,24 +17,7 @@ path = "src/lib.rs" name = "example" path = "examples/main.rs" -[[example]] -name = "piston" -path = "examples/piston.rs" - [dependencies] -flate2 = "*" -rustc-serialize = "*" +flate2 = "0.2" +rustc-serialize = "0.3" xml-rs = "0.1.26" - - -[dev-dependencies.pistoncore-sdl2_window] -git = "https://github.com/pistondevelopers/sdl2_window" - -[dev-dependencies.piston] -git = "https://github.com/pistondevelopers/piston" - -[dev-dependencies.piston2d-graphics] -git = "https://github.com/pistondevelopers/graphics" - -[dev-dependencies.piston2d-opengl_graphics] -git = "https://github.com/pistondevelopers/opengl_graphics" diff --git a/examples/piston.rs b/examples/piston.rs deleted file mode 100644 index e689317..0000000 --- a/examples/piston.rs +++ /dev/null @@ -1,82 +0,0 @@ -extern crate piston; -extern crate graphics; -extern crate sdl2_window; -extern crate opengl_graphics; -extern crate tiled; - -use std::cell::RefCell; -use std::rc::Rc; -use std::path::Path; -use std::fs::File; - -use sdl2_window::Sdl2Window; -use opengl_graphics::{ - OpenGL, - Texture, -}; -use graphics::{Image, Graphics, default_draw_state}; -use graphics::math::Matrix2d; -use piston::event::*; - -fn main() { - let (width, height) = (500, 500); - let opengl = OpenGL::_3_2; - let window = Sdl2Window::new( - opengl, - piston::window::WindowSettings::new( - "Tiled + Piston Example".to_string(), - piston::window::Size {width: width, height: height} - ).exit_on_esc(true) - ); - let window = Rc::new(RefCell::new(window)); - let ref mut gl = opengl_graphics::GlGraphics::new(opengl); - let mut blank_image = Image::new(); - - let tmx_file = File::open(&Path::new("assets/tiled_base64_zlib.tmx")).ok().expect("could not open tmx"); - let tmx_map = tiled::parse(tmx_file).unwrap(); - let image_path = Path::new("assets/tilesheet.png"); - let image_tex = Texture::from_path(&image_path).unwrap(); - - for e in window.events() { - use piston::event::{RenderEvent}; - - if let Some(args) = e.render_args() { - gl.draw(args.viewport(), |c, gl| { - graphics::clear([0.0, 0.0, 0.0, 1.0], gl); - render_tiled_map(&tmx_map, &image_tex, &mut blank_image, c.transform, gl); - }); - } - } -} - -fn render_tiled_map<G>(map: &tiled::Map, - image_tex: &<G as Graphics>::Texture, - drawn_image: &mut Image, - transform: Matrix2d, - g: &mut G) - where G: Graphics -{ - let ref tile_set = map.tilesets[0]; - let (tile_width, tile_height) = (tile_set.tile_width, tile_set.tile_height); - let tiles_in_row = (tile_set.images[0].width + tile_set.spacing as i32 )/ (tile_width as i32 + tile_set.spacing as i32); - - for layer in map.layers.iter() { - for (i, tile_row) in layer.tiles.iter().enumerate() { - for (j, tile_val) in tile_row.iter().enumerate() { - if *tile_val == 0 { - continue; - } - let tile_x = *tile_val % tiles_in_row as u32 - 1; - let tile_y = *tile_val / tiles_in_row as u32; - - let pixel_x = ((tile_x) * tile_width) + ((tile_x) * tile_set.spacing); - let pixel_y = ((tile_y) * tile_height) + ((tile_y) * tile_set.spacing); - - drawn_image.src_rect([pixel_x as i32, pixel_y as i32, tile_width as i32, tile_height as i32]) - .rect([j as f64 * tile_width as f64, i as f64 * tile_height as f64, - tile_width as f64, tile_height as f64]) - .draw(image_tex, default_draw_state(), transform, g); - } - } - } -} -- GitLab