From a4b55fd528d559a0c0fcdcfcd0a023c0810edc20 Mon Sep 17 00:00:00 2001
From: Patrick Erber <patrick.erber@unwired.at>
Date: Sun, 7 Apr 2019 00:14:06 +0200
Subject: [PATCH 1/5] feat: add margin, and spacing support

---
 tile.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tile.go b/tile.go
index 7231ef3..5dff19e 100644
--- a/tile.go
+++ b/tile.go
@@ -89,10 +89,9 @@ func (t *DecodedTile) setSprite(columns, numRows int, ts *Tileset) {
 	if t.sprite == nil {
 		// Calculate the framing for the tile within its tileset's source image
 		x, y := tileIDToCoord(t.ID, columns, numRows)
-
-		iX := float64(x) * float64(ts.TileWidth)
+		iX := float64(x)*float64(ts.TileWidth) + float64(ts.Margin+ts.Spacing*x-1)
 		fX := iX + float64(ts.TileWidth)
-		iY := float64(y) * float64(ts.TileHeight)
+		iY := float64(y)*float64(ts.TileHeight) + float64(ts.Margin+ts.Spacing*y-1)
 		fY := iY + float64(ts.TileHeight)
 
 		t.sprite = pixel.NewSprite(ts.sprite.Picture(), pixel.R(iX, iY, fX, fY))

From 6be4c1be3c26cd8b4ec8f0cbef9a3c8d8d53bc76 Mon Sep 17 00:00:00 2001
From: Patrick Erber <patrick.erber@unwired.at>
Date: Sun, 7 Apr 2019 00:31:09 +0200
Subject: [PATCH 2/5] update contributors.md

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 5f50e5e..86fad7e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -22,4 +22,5 @@ Ben @bcvery1
  - Andrea Manzini @ilmanzo
  - Y.Horie @u5surf
  - Thomas Lacroix @TooHTooH
+ - Patrick Erber @perber
 

From 952c90590822632deacdd8a3cf1fea83d0d26c60 Mon Sep 17 00:00:00 2001
From: Patrick Erber <patrick.erber@unwired.at>
Date: Mon, 8 Apr 2019 21:00:10 +0200
Subject: [PATCH 3/5] fix: changing distro

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e239955..67666b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: go
+# https://github.com/golang/go/issues/31293
+dist: xenial
 sudo: false
 # The follow addons are a requirement for the pixel library
 addons:

From 5a2cebb4c5f96bd9570633dfa97f81d8684d7f6b Mon Sep 17 00:00:00 2001
From: Patrick Erber <patrick.erber@unwired.at>
Date: Mon, 8 Apr 2019 21:12:51 +0200
Subject: [PATCH 4/5] fix: adding mesa dependency

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 67666b7..fbc71a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ addons:
       - libxi-dev
       - libopenal-dev
       - libasound2-dev
+      - ibgl1-mesa-dev
 go:
   - tip
   - 1.12.x

From 87e0abdb71bd4e33baa31fe0237016ded6e5178c Mon Sep 17 00:00:00 2001
From: Patrick Erber <patrick.erber@unwired.at>
Date: Mon, 8 Apr 2019 21:22:53 +0200
Subject: [PATCH 5/5] typo in dep name

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fbc71a5..cbb1b87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
       - libxi-dev
       - libopenal-dev
       - libasound2-dev
-      - ibgl1-mesa-dev
+      - libgl1-mesa-dev
 go:
   - tip
   - 1.12.x