ObjectGroup: set defaults (lafriks#52)

Author: pierrec

tiled_test.go

@@ -81,8 +81,10 @@ func TestLoadFromFile(t *testing.T) {
 	assert.Len(t, m.Layers, 1)
 	assert.Equal(t, uint32(1), m.Layers[0].ID)
 
+	// Test ObjectGroups.Visible defaults to true
 	assert.Len(t, m.ObjectGroups, 1)
 	assert.Equal(t, uint32(2), m.ObjectGroups[0].ID)
+	assert.Equal(t, true, m.ObjectGroups[0].Visible)
 
 	// Test Object.Visible defaults to true
 	assert.Len(t, m.ObjectGroups[0].Objects, 1)

tmx_defaults.go

@@ -29,6 +29,7 @@ type aliasLayer struct {
 }
 type aliasMap Map
 type aliasObject Object
+type aliasObjectGroup ObjectGroup
 type aliasText Text
 
 // SetDefaults provides default values for Group.
@@ -59,6 +60,12 @@ func (a *aliasObject) SetDefaults() {
 	a.Visible = true
 }
 
+// SetDefaults provides default values for ObjectGroup.
+func (a *aliasObjectGroup) SetDefaults() {
+	a.Visible = true
+	a.Opacity = 1
+}
+
 // SetDefaults provides default values for Text.
 func (a *aliasText) SetDefaults() {
 	a.FontFamily = "sans-serif"

tmx_object.go

@@ -72,6 +72,20 @@ func (g *ObjectGroup) DecodeObjectGroup(m *Map) {
 	}
 }
 
+// UnmarshalXML decodes a single XML element beginning with the given start element.
+func (g *ObjectGroup) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	item := aliasObjectGroup{}
+	item.SetDefaults()
+
+	if err := d.DecodeElement(&item, &start); err != nil {
+		return err
+	}
+
+	*g = (ObjectGroup)(item)
+
+	return nil
+}
+
 // 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.