Skip to content
Snippets Groups Projects
Unverified Commit 3c2f804b authored by Alejandro Perea's avatar Alejandro Perea Committed by GitHub
Browse files

Make tileset names optional (#155)

parent dfceb8f7
No related branches found
No related tags found
No related merge requests found
...@@ -133,17 +133,17 @@ impl Tileset { ...@@ -133,17 +133,17 @@ impl Tileset {
attrs: &Vec<OwnedAttribute>, attrs: &Vec<OwnedAttribute>,
path_relative_to: Option<&Path>, path_relative_to: Option<&Path>,
) -> Result<EmbeddedParseResult, TiledError> { ) -> Result<EmbeddedParseResult, TiledError> {
let ((spacing, margin, columns), (tilecount, first_gid, name, tile_width, tile_height)) = get_attrs!( let ((spacing, margin, columns, name), (tilecount, first_gid, tile_width, tile_height)) = get_attrs!(
attrs, attrs,
optionals: [ optionals: [
("spacing", spacing, |v:String| v.parse().ok()), ("spacing", spacing, |v:String| v.parse().ok()),
("margin", margin, |v:String| v.parse().ok()), ("margin", margin, |v:String| v.parse().ok()),
("columns", columns, |v:String| v.parse().ok()), ("columns", columns, |v:String| v.parse().ok()),
("name", name, |v| Some(v)),
], ],
required: [ required: [
("tilecount", tilecount, |v:String| v.parse().ok()), ("tilecount", tilecount, |v:String| v.parse().ok()),
("firstgid", first_gid, |v:String| v.parse().ok().map(|n| Gid(n))), ("firstgid", first_gid, |v:String| v.parse().ok().map(|n| Gid(n))),
("name", name, |v| Some(v)),
("tilewidth", width, |v:String| v.parse().ok()), ("tilewidth", width, |v:String| v.parse().ok()),
("tileheight", height, |v:String| v.parse().ok()), ("tileheight", height, |v:String| v.parse().ok()),
], ],
...@@ -155,7 +155,7 @@ impl Tileset { ...@@ -155,7 +155,7 @@ impl Tileset {
TilesetProperties { TilesetProperties {
spacing, spacing,
margin, margin,
name, name: name.unwrap_or_default(),
path_relative_to: path_relative_to.map(Path::to_owned), path_relative_to: path_relative_to.map(Path::to_owned),
columns, columns,
tilecount, tilecount,
...@@ -201,16 +201,16 @@ impl Tileset { ...@@ -201,16 +201,16 @@ impl Tileset {
attrs: &Vec<OwnedAttribute>, attrs: &Vec<OwnedAttribute>,
path: Option<&Path>, path: Option<&Path>,
) -> Result<Tileset, TiledError> { ) -> Result<Tileset, TiledError> {
let ((spacing, margin, columns), (tilecount, name, tile_width, tile_height)) = get_attrs!( let ((spacing, margin, columns, name), (tilecount, tile_width, tile_height)) = get_attrs!(
attrs, attrs,
optionals: [ optionals: [
("spacing", spacing, |v:String| v.parse().ok()), ("spacing", spacing, |v:String| v.parse().ok()),
("margin", margin, |v:String| v.parse().ok()), ("margin", margin, |v:String| v.parse().ok()),
("columns", columns, |v:String| v.parse().ok()), ("columns", columns, |v:String| v.parse().ok()),
("name", name, |v| Some(v)),
], ],
required: [ required: [
("tilecount", tilecount, |v:String| v.parse().ok()), ("tilecount", tilecount, |v:String| v.parse().ok()),
("name", name, |v| Some(v)),
("tilewidth", width, |v:String| v.parse().ok()), ("tilewidth", width, |v:String| v.parse().ok()),
("tileheight", height, |v:String| v.parse().ok()), ("tileheight", height, |v:String| v.parse().ok()),
], ],
...@@ -224,7 +224,7 @@ impl Tileset { ...@@ -224,7 +224,7 @@ impl Tileset {
TilesetProperties { TilesetProperties {
spacing, spacing,
margin, margin,
name, name: name.unwrap_or_default(),
path_relative_to: source_path, path_relative_to: source_path,
columns, columns,
tilecount, tilecount,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment