Functions to load/save tileset

Author: MetalBlueberry

assets/tilesets/testLoadTile.tsx

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.2" tiledversion="1.2.3" name="ProjectUtumno_full" tilewidth="32" tileheight="32" tilecount="6080" columns="64">
+ <image source="ProjectUtumno_full.png" width="2048" height="3040"/>
+ <tile id="464">
+  <objectgroup draworder="index">
+   <object id="1" x="-0.25" y="17.75" width="32.375" height="6.125"/>
+  </objectgroup>
+  <animation>
+   <frame tileid="75" duration="500"/>
+   <frame tileid="76" duration="500"/>
+  </animation>
+ </tile>
+</tileset>

assets/tilesets/testLoadTileset.tsx

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.2" tiledversion="1.2.3" name="ProjectUtumno_full" tilewidth="32" tileheight="32" tilecount="6080" columns="64">
+ <image source="ProjectUtumno_full.png" width="2048" height="3040"/>
+ <tile id="116" type="door"></tile>
+</tileset>

tiled.go

@@ -90,3 +90,23 @@ func (l *Loader) LoadFromFile(fileName string) (*Map, error) {
 
 	return l.LoadFromReader(dir, f)
 }
+
+func LoadTilesetFromReader(baseDir string, r io.Reader) (*Tileset, error) {
+	d := xml.NewDecoder(r)
+
+	m := &Tileset{
+		baseDir:      baseDir,
+		SourceLoaded: true,
+	}
+	if err := d.Decode(m); err != nil {
+		return nil, err
+	}
+
+	return m, nil
+}
+
+func SaveTilesetToWriter(tileset *Tileset, w io.Writer) error {
+	encoder := xml.NewEncoder(w)
+	encoder.Indent("", " ")
+	return encoder.Encode(tileset)
+}

tmx_group.go

@@ -43,7 +43,7 @@ type Group struct {
 	// Whether the layer is shown (1) or hidden (0). Defaults to 1.
 	Visible bool `xml:"visible,attr"`
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties"`
 	// Map layers
 	Layers []*Layer `xml:"layer"`
 	// Map object groups

tmx_image.go

@@ -47,7 +47,7 @@ type ImageLayer struct {
 	// Whether the layer is shown (1) or hidden (0). Defaults to 1.
 	Visible bool `xml:"visible,attr"`
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties"`
 	// The group image
 	Image *Image `xml:"image"`
 }
@@ -73,16 +73,16 @@ func (l *ImageLayer) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error
 // Image source
 type Image struct {
 	// Used for embedded images, in combination with a data child element. Valid values are file extensions like png, gif, jpg, bmp, etc.
-	Format string `xml:"format,attr"`
+	Format string `xml:"format,attr,omitempty"`
 	// The reference to the tileset image file
 	Source string `xml:"source,attr"`
 	// Defines a specific color that is treated as transparent (example value: "#FF00FF" for magenta).
 	// Up until Tiled 0.12, this value is written out without a # but this is planned to change.
-	Trans *HexColor `xml:"trans,attr"`
+	Trans *HexColor `xml:"trans,attr,omitempty"`
 	// The image width in pixels (optional, used for tile index correction when the image changes)
-	Width int `xml:"width,attr"`
+	Width int `xml:"width,attr,omitempty"`
 	// The image height in pixels (optional)
-	Height int `xml:"height,attr"`
+	Height int `xml:"height,attr,omitempty"`
 	// Embedded image content
-	Data *Data `xml:"data,attr"`
+	Data *Data `xml:"data,attr,omitempty"`
 }

tmx_layer.go

@@ -78,7 +78,7 @@ type Layer struct {
 	// Rendering offset for this layer in pixels. Defaults to 0. (since 0.14)
 	OffsetY int `xml:"offsety,attr"`
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties"`
 	// This is the attribute you'd like to use, not Data. Tile entry at (x,y) is obtained using l.DecodedTiles[y*map.Width+x].
 	Tiles []*LayerTile
 	// Data

tmx_map.go

@@ -79,7 +79,7 @@ type Map struct {
 	// Stores the next available ID for new objects. This number is stored to prevent reuse of the same ID after objects have been removed. (since 0.11)
 	NextObjectID uint32 `xml:"nextobjectid,attr"`
 	// Custom properties
-	Properties *Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties"`
 	// Map tilesets
 	Tilesets []*Tileset `xml:"tileset"`
 	// Map layers

tmx_object.go

@@ -39,60 +39,60 @@ type ObjectGroup struct {
 	// Unique ID of the layer.
 	// Each layer that added to a map gets a unique id. Even if a layer is deleted,
 	// no layer ever gets the same ID. Can not be changed in Tiled. (since Tiled 1.2)
-	ID uint32 `xml:"id,attr"`
+	ID uint32 `xml:"id,attr,omitempty"`
 	// The name of the object group.
-	Name string `xml:"name,attr"`
+	Name string `xml:"name,attr,omitempty"`
 	// The color used to display the objects in this group.
-	Color *HexColor `xml:"color,attr"`
+	Color *HexColor `xml:"color,attr,omitempty"`
 	// The opacity of the layer as a value from 0 to 1. Defaults to 1.
-	Opacity float32 `xml:"opacity,attr"`
+	Opacity float32 `xml:"opacity,attr,omitempty"`
 	// Whether the layer is shown (1) or hidden (0). Defaults to 1.
-	Visible bool `xml:"visible,attr"`
+	Visible *bool `xml:"visible,attr"` // TODO: default to non 0 value
 	// Rendering offset for this layer in pixels. Defaults to 0. (since 0.14)
-	OffsetX int `xml:"offsetx,attr"`
+	OffsetX int `xml:"offsetx,attr,omitempty"`
 	// Rendering offset for this layer in pixels. Defaults to 0. (since 0.14)
-	OffsetY int `xml:"offsety,attr"`
+	OffsetY int `xml:"offsety,attr,omitempty"`
 	// Whether the objects are drawn according to the order of appearance ("index") or sorted by their y-coordinate ("topdown"). Defaults to "topdown".
-	DrawOrder string `xml:"draworder,attr"`
+	DrawOrder string `xml:"draworder,attr,omitempty"`
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties,omitempty"`
 	// Group objects
-	Objects []*Object `xml:"object"`
+	Objects []*Object `xml:"object,omitempty"`
 }
 
 // Object is used to add custom information to your tile map, such as spawn points, warps, exits, etc.
 type Object struct {
 	// Unique ID of the object. Each object that is placed on a map gets a unique id. Even if an object was deleted, no object gets the same ID.
 	// Can not be changed in Tiled Qt. (since Tiled 0.11)
-	ID uint32 `xml:"id,attr"`
+	ID uint32 `xml:"id,attr,omitempty"`
 	// The name of the object. An arbitrary string.
-	Name string `xml:"name,attr"`
+	Name string `xml:"name,attr,omitempty"`
 	// The type of the object. An arbitrary string.
-	Type string `xml:"type,attr"`
+	Type string `xml:"type,attr,omitempty"`
 	// The x coordinate of the object.
-	X float64 `xml:"x,attr"`
+	X float64 `xml:"x,attr,omitempty"`
 	// The y coordinate of the object.
-	Y float64 `xml:"y,attr"`
+	Y float64 `xml:"y,attr,omitempty"`
 	// The width of the object (defaults to 0).
-	Width float64 `xml:"width,attr"`
+	Width float64 `xml:"width,attr,omitempty"`
 	// The height of the object (defaults to 0).
-	Height float64 `xml:"height,attr"`
+	Height float64 `xml:"height,attr,omitempty"`
 	// The rotation of the object in degrees clockwise (defaults to 0). (since 0.10)
-	Rotation float64 `xml:"rotation,attr"`
+	Rotation float64 `xml:"rotation,attr,omitempty"`
 	// An reference to a tile (optional).
-	GID uint32 `xml:"gid,attr"`
+	GID uint32 `xml:"gid,attr,omitempty"`
 	// Whether the object is shown (1) or hidden (0). Defaults to 1. (since 0.9)
-	Visible bool `xml:"visible,attr"`
+	Visible *bool `xml:"visible,attr"` // TODO: default not 0
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties,omitempty"`
 	// Used to mark an object as an ellipse. The existing x, y, width and height attributes are used to determine the size of the ellipse.
-	Ellipses []*Ellipse `xml:"ellipse"`
+	Ellipses []*Ellipse `xml:"ellipse,omitempty"`
 	// Polygons
-	Polygons []*Polygon `xml:"polygon"`
+	Polygons []*Polygon `xml:"polygon,omitempty"`
 	// Poly lines
-	PolyLines []*PolyLine `xml:"polyline"`
+	PolyLines []*PolyLine `xml:"polyline,omitempty"`
 	// Text
-	Text *Text `xml:"text"`
+	Text *Text `xml:"text,omitempty"`
 }
 
 // Ellipse is used to mark an object as an ellipse.

tmx_property.go

@@ -25,7 +25,9 @@ package tiled
 import "strconv"
 
 // Properties wraps any number of custom properties
-type Properties []*Property
+type Properties struct {
+	Property []*Property `xml:"property"`
+}
 
 // Property is used for custom properties
 type Property struct {
@@ -43,7 +45,7 @@ type Property struct {
 // Get finds all properties by specified name
 func (p Properties) Get(name string) []string {
 	var values []string
-	for _, property := range p {
+	for _, property := range p.Property {
 		if property.Name == name {
 			values = append(values, property.Value)
 		}
@@ -54,7 +56,7 @@ func (p Properties) Get(name string) []string {
 // GetString finds first string property by specified name
 func (p Properties) GetString(name string) string {
 	var v string
-	for _, property := range p {
+	for _, property := range p.Property {
 		if property.Name == name {
 			if property.Type == "" {
 				return property.Value
@@ -68,7 +70,7 @@ func (p Properties) GetString(name string) string {
 
 // GetBool finds first bool property by specified name
 func (p Properties) GetBool(name string) bool {
-	for _, property := range p {
+	for _, property := range p.Property {
 		if property.Name == name && property.Type == "boolean" {
 			return property.Value == "true"
 		}
@@ -78,7 +80,7 @@ func (p Properties) GetBool(name string) bool {
 
 // GetInt finds first int property by specified name
 func (p Properties) GetInt(name string) int {
-	for _, property := range p {
+	for _, property := range p.Property {
 		if property.Name == name && property.Type == "int" {
 			v, err := strconv.Atoi(property.Value)
 			if err != nil {
@@ -92,7 +94,7 @@ func (p Properties) GetInt(name string) int {
 
 // GetFloat finds first float property by specified name
 func (p Properties) GetFloat(name string) float64 {
-	for _, property := range p {
+	for _, property := range p.Property {
 		if property.Name == name && property.Type == "float" {
 			v, err := strconv.ParseFloat(property.Value, 64)
 			if err != nil {

tmx_tileset.go

@@ -9,43 +9,46 @@ type Tileset struct {
 	// Base directory
 	baseDir string
 
+	// XMLName holds the xml name for this struct
+	XMLName struct{} `xml:"tileset"`
+
 	// The TMX format version, generally 1.0.
-	Version string `xml:"version,attr"`
+	Version string `xml:"version,attr,omitempty"`
 	// The Tiled version used to generate this file
-	TiledVersion string `xml:"tiledversion,attr"`
+	TiledVersion string `xml:"tiledversion,attr,omitempty"`
 	// The first global tile ID of this tileset (this global ID maps to the first tile in this tileset).
-	FirstGID uint32 `xml:"firstgid,attr"`
+	FirstGID uint32 `xml:"firstgid,attr,omitempty"`
 	// If this tileset is stored in an external TSX (Tile Set XML) file, this attribute refers to that file.
 	// That TSX file has the same structure as the <tileset> element described here. (There is the firstgid
 	// attribute missing and this source attribute is also not there. These two attributes are kept in the
 	// TMX map, since they are map specific.)
-	Source string `xml:"source,attr"`
+	Source string `xml:"source,attr,omitempty"`
 	// External TSX source loaded.
 	SourceLoaded bool `xml:"-"`
 	// The name of this tileset.
-	Name string `xml:"name,attr"`
+	Name string `xml:"name,attr,omitempty"`
 	// The (maximum) width of the tiles in this tileset.
-	TileWidth int `xml:"tilewidth,attr"`
+	TileWidth int `xml:"tilewidth,attr,omitempty"`
 	// The (maximum) height of the tiles in this tileset.
-	TileHeight int `xml:"tileheight,attr"`
+	TileHeight int `xml:"tileheight,attr,omitempty"`
 	// The spacing in pixels between the tiles in this tileset (applies to the tileset image).
-	Spacing int `xml:"spacing,attr"`
+	Spacing int `xml:"spacing,attr,omitempty"`
 	// The margin around the tiles in this tileset (applies to the tileset image).
-	Margin int `xml:"margin,attr"`
+	Margin int `xml:"margin,attr,omitempty"`
 	// The number of tiles in this tileset (since 0.13)
-	TileCount int `xml:"tilecount,attr"`
+	TileCount int `xml:"tilecount,attr,omitempty"`
 	// The number of tile columns in the tileset. For image collection tilesets it is editable and is used when displaying the tileset. (since 0.15)
-	Columns int `xml:"columns,attr"`
+	Columns int `xml:"columns,attr,omitempty"`
 	// Offset in pixels, to be applied when drawing a tile from the related tileset. When not present, no offset is applied.
-	TileOffset *TilesetTileOffset `xml:"tileoffset"`
+	TileOffset *TilesetTileOffset `xml:"tileoffset,omitempty"`
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties,omitempty"`
 	// Embedded image
-	Image *Image `xml:"image"`
+	Image *Image `xml:"image,omitempty"`
 	// Defines an array of terrain types, which can be referenced from the terrain of the tile element.
-	TerrainTypes []*Terrain `xml:"terraintypes>terrain"`
+	TerrainTypes *TerrainTypes `xml:"terraintypes,omitempty"`
 	// Tiles in tileset
-	Tiles []*TilesetTile `xml:"tile"`
+	Tiles []*TilesetTile `xml:"tile,omitempty"`
 }
 
 // GetFileFullPath returns path to file relative to tileset file
@@ -61,36 +64,44 @@ type TilesetTileOffset struct {
 	Y int `xml:"y,attr"`
 }
 
+type TerrainTypes struct {
+	Terrain []*Terrain
+}
+
 // Terrain type
 type Terrain struct {
 	// The name of the terrain type.
 	Name string `xml:"name,attr"`
 	// The local tile-id of the tile that represents the terrain visually.
 	Tile uint32 `xml:"tile,attr"`
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties"`
 }
 
 // TilesetTile information
 type TilesetTile struct {
 	// The local tile ID within its tileset.
 	ID uint32 `xml:"id,attr"`
 	// The type of the tile. Refers to an object type and is used by tile objects. (optional) (since 1.0)
-	Type string `xml:"type,attr"`
+	Type string `xml:"type,attr,omitempty"`
 	// Defines the terrain type of each corner of the tile, given as comma-separated indexes in the terrain types
 	// array in the order top-left, top-right, bottom-left, bottom-right.
 	// Leaving out a value means that corner has no terrain. (optional) (since 0.9)
-	Terrain string `xml:"terrain,attr"`
+	Terrain string `xml:"terrain,attr,omitempty"`
 	// A percentage indicating the probability that this tile is chosen when it competes with others while editing with the terrain tool. (optional) (since 0.9)
-	Probability int `xml:"probability,attr"`
+	Probability int `xml:"probability,attr,omitempty"`
 	// Custom properties
-	Properties Properties `xml:"properties>property"`
+	Properties *Properties `xml:"properties,omitempty"`
 	// Embedded image
 	Image *Image `xml:"image"`
 	// Tile object groups
 	ObjectGroups []*ObjectGroup `xml:"objectgroup"`
 	// List of animation frames
-	Animation []*AnimationFrame `xml:"animation>frame"`
+	Animation *Animation `xml:"animation,omitempty"`
+}
+
+type Animation struct {
+	Frame []*AnimationFrame `xml:"frame"`
 }
 
 // AnimationFrame is single frame of animation