From 19eb6361f52c9a2320e6fe10b4d71924f2ea810d Mon Sep 17 00:00:00 2001
From: Josh Deprez <DrJosh9000@users.noreply.github.com>
Date: Mon, 2 Aug 2021 16:32:27 +1000
Subject: [PATCH] support rectangular tile sources

---
 .DS_Store        | Bin 6148 -> 6148 bytes
 assets/boxes.png | Bin 1186 -> 1470 bytes
 engine/tiles.go  |   9 ++++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 103ec41e77681e130746129bb3b7038aef1858fd..4dab03e158312054410e3787b1afff4dc04adc04 100644
GIT binary patch
delta 38
ucmZoMXfc@J&&a$nU^gQp^JE^Tube5x$vH{+`8kZ6KQjGg+04%ImmdK4+6{C7

delta 33
pcmZoMXfc@J&&aefU^nAr0}+<V{7j!VOEJG?nb;t?nVsV=KLERc3o-xz

diff --git a/assets/boxes.png b/assets/boxes.png
index f541567c9322eac19a274bddbc6da23eccb27dc7..fb638c9d3c7ef42b8ca3385d716dc32d880a0e3d 100644
GIT binary patch
literal 1470
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$4!3-ofz2%PsQjEnx?oJHr&dI!FU|?nl@Ck7R
z3Mwg>xN6v>SsM0-S>G>IySX6k-QiikKbg&Z8j!Wmz<f%cccy-jw~CRCrM-QLK|)h>
z-oxbC|Kra-Ieq)j|NsAIuif5K*PfY`6&V&(=G3*u$mnKx^7ZOn{nNd=@(qCIkAl$<
z7_=d9p{{}nm@gPgg8YIRfT?*T1Fq>`Y=B{r;OXKR;?cQv%5A<D1s)e&8%4X_6JPxQ
z|19X#)}qUA{HEkwf0EKBCiXSpx<hvy_sYQBb57#xbpz6!9QMy+SQUDlosny9M%2n{
z5A~Ur)v)Ni(%KLn?O-C>P-)A0M)o{|@m=Ll?^#U3I8P{jUZ*4=+OS<u_|y}=%a<8;
zP20!%$?)OC{N%^MX3GEfY5td=eK2A63bzzHv%6J~Ui|%4RH0#f!D!cg72*Bz<;zk<
z7+n;1uATk1xAyMlm5+lnq&Nf`sy5rWJX)n&a9{9=IQyG>`3^dqEmL2dw~jgauyM@>
z0fRGXxd8_^pOD{i;@Z;3T+ctqRWk4>E#K09D0e~Ln}?#o%Wf;n{kt=dnd@O=5ckF6
zin&)`b9|a+vEV3U#Eb*qRRzvE{t3MjnsDZJw~xTd*KLO<Tb`NC<T}0bFVl=q6W4Eg
z=aR=;cFU^6dFHEIo-^%EZ<<lGDqH>O#is{eS3hY?SkU~E+u_-oWs%?9IYF7i)78&q
Iol`;+0Pi#J)c^nh

delta 416
zcmV;R0bl;U3!(`jiBL{Q4GJ0x0000DNk~Le0001>0000G2m=5B0H)i7YOyX31AhPk
zbW%=J06^y0W&i*IP)S5VR7i=%mfMblFbqWN<SCeERz&6he{<uQT<oMkO1nFPr~^_t
z8pno*8`O4FR!RT=qV&K?$enrr6xv2T7$G}P^MrK9V|MG05CLK(0y_2|0t85aI0rsL
zq!k0;vJlw55TFZ}(?LLvl0shDV}H8DfTdmxFyw*REHI{}{PqMVPH-i*wDbXwe0X3E
zB>}X4dwCyrHqH-Xi9?E!)5HXu5}yOsiQWfH;v{(wnz#Y6zX$6cYD=o`GoTMD0J^04
zlJFYPGN3U#phaW43F@vTKvDv1x|pBoRbtyU4|R(~z<>u3;0&Et0b|R44|R~jgZxYQ
z3u8u?xEV9PF4^m@6@YDt8Omz^M@{ln3D!*lqKmbE3vhhQ908Vka&FRJ0z4ViKI^SP
zUA7+Np;&zHO`^xlq5tH&*ovvmzVjye-;V|D+Y%4T-xQo^Rr&>8v#h56&oCAM0000<
KMNUMnLSTY9QnPXZ

diff --git a/engine/tiles.go b/engine/tiles.go
index 571c005..d60c1a0 100644
--- a/engine/tiles.go
+++ b/engine/tiles.go
@@ -19,7 +19,7 @@ type Tilemap struct {
 	Hidden   bool
 	ID
 	Map       [][]Tile
-	Src       ImageRef // must be a horizontal tile set
+	Src       ImageRef
 	TileSize  int
 	Transform GeoMDef
 	ZPos
@@ -30,6 +30,8 @@ func (t *Tilemap) Draw(screen *ebiten.Image, geom ebiten.GeoM) {
 	if t.Hidden {
 		return
 	}
+	src := t.Src.Image()
+	w, _ := src.Size()
 	geom.Concat(*t.Transform.GeoM())
 	for j, row := range t.Map {
 		for i, tile := range row {
@@ -40,8 +42,9 @@ func (t *Tilemap) Draw(screen *ebiten.Image, geom ebiten.GeoM) {
 			op.GeoM.Translate(float64(i*t.TileSize), float64(j*t.TileSize))
 			op.GeoM.Concat(geom)
 
-			sx := tile.TileIndex() * t.TileSize
-			src := t.Src.Image().SubImage(image.Rect(sx, 0, sx+t.TileSize, t.TileSize)).(*ebiten.Image)
+			s := tile.TileIndex() * t.TileSize
+			sx, sy := s%w, (s/w)*t.TileSize
+			src := src.SubImage(image.Rect(sx, sy, sx+t.TileSize, sy+t.TileSize)).(*ebiten.Image)
 			screen.DrawImage(src, &op)
 		}
 	}