From 02c34c4f2537386fb1087c1fb3528f96011a54e0 Mon Sep 17 00:00:00 2001 From: tom barrett Date: Sun, 16 Jun 2019 12:26:06 -0500 Subject: movement of camera --- src/map.rs | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'src/map.rs') diff --git a/src/map.rs b/src/map.rs index db79deb..ed90f1a 100644 --- a/src/map.rs +++ b/src/map.rs @@ -2,24 +2,6 @@ use ggez::filesystem::File; use std::io::BufReader; use xml::reader::{EventReader, XmlEvent}; -pub struct Layer { - pub id: usize, - pub data: Vec, -} - -impl Layer { - pub fn new(text: String, id: usize) -> Layer { - Layer { - id, - data: text - .replace("\n", "") - .split(',') - .map(|s| s.parse().unwrap()) - .collect(), - } - } -} - pub struct Map { pub width: usize, pub height: usize, @@ -47,7 +29,7 @@ impl Map { } } } else if let Ok(XmlEvent::Characters(text)) = e { - layers.push(Layer::new(text, layers.len() + 1)); + layers.push(Layer::new(text)); } } @@ -59,3 +41,18 @@ impl Map { } } +pub struct Layer { + pub data: Vec, +} + +impl Layer { + pub fn new(text: String) -> Layer { + Layer { + data: text + .replace("\n", "") + .split(',') + .map(|s| s.parse().unwrap()) + .collect(), + } + } +} -- cgit v1.2.3