From 144d6201929ebd84f48f6ab5b056b3cf1d2dc5af Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 26 Sep 2014 04:12:27 +0200
Subject: [PATCH] Implement a very simple map file format for further testing

---
 resources/map/test.map               | 104 +++++++++++++++++++++++++++
 resources/sprite/tile/grass.png      | Bin 0 -> 1296 bytes
 resources/sprite/tile/road_left.png  | Bin 0 -> 245 bytes
 resources/sprite/tile/road_right.png | Bin 0 -> 242 bytes
 src/model/Map.cpp                    |  86 ++++++++++++++++------
 5 files changed, 170 insertions(+), 20 deletions(-)
 create mode 100644 resources/map/test.map
 create mode 100644 resources/sprite/tile/grass.png
 create mode 100644 resources/sprite/tile/road_left.png
 create mode 100644 resources/sprite/tile/road_right.png

diff --git a/resources/map/test.map b/resources/map/test.map
new file mode 100644
index 0000000..35fada7
--- /dev/null
+++ b/resources/map/test.map
@@ -0,0 +1,104 @@
+32 32 2
+
+G 0 grass
+< 0 road_left
+> 0 road_right
+
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+11111111111111111111111111111111
+
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+GGGGGGGGGGG<>GGGGGGGGGGGGGGGGGGG
+
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
+................................
diff --git a/resources/sprite/tile/grass.png b/resources/sprite/tile/grass.png
new file mode 100644
index 0000000000000000000000000000000000000000..7835867c844e5d76968a421f04ab39c2c1d14bfe
GIT binary patch
literal 1296
zcmV+r1@HQaP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00009a7bBm000XU
z000XU0RWnu7ytkS!bwCyR7l5_)$4Lp*AWHawYqzs8I5irVhLlwu2dev@1AE#rAPuI
zSOQ&`%Q<^@ul$Ies{EXn_&)yn*IzZOf1cZ$6$0qU+qAb}IK=TydAF>7nP31=2iS(=
z(4z$keHkX#w~U_xh4Hs;ufkrCjT!<$XJ`n5_Qb3@NJIA8kf;Hpe2w^Jf}wV0E3*wL
zcr!4^gW|$#TXJbGHpKf-BLX!F0FCIf{*PsR9WgO?X>0nW)0w~J_^$r3BY*$~>dP44
zI%d_aYL*t0lSa*o^Qc*nsYFV%`iHqb4GrZ%5!Y?p4qnH&?|$Vl(h#o$LakjuJr^?l
zO(Qv;vJz2b$}b#_xCs<^V17+?ud~t4z5TpG0W&~GK4rXZ^?>%%)G<ON0i`;v8JyS{
zWFYhmz3|q-NwrTsR~qcZ;e=r3e2L{t@ifq&x%$Up7gP9opuv9tAkalg)G+m`yW}gw
z0A}TBa${|AOc24fVL*#&S3IF@3~S&y+mCHLRh-*$+uOAv5pd`UI1`qPQ?R1;g@P8~
zs@O~}TNyiQuENMW@Qik1wJHzKufxwBhVgw^S9Mw=h-u@?Hm&zy0}nYmZE_0QmNK;?
z1m6T3nH=|-kArKQu90#-CkVeso}{e}duanZb!FL#7|MeEDW>5JTI~~;<{M)W1LJ;>
zz*an1eo1t|U}w^Tc;T2@JNMd?B-g@DIB*=Koeb2RnhQ~NpXy)`%P>22kQl;Hel3})
zJl-{bV|Hm8(u~~7evW!74CI5xzh)%H<W&-gQ0{>)y6d~RV_Yz|=)VoDBI+4DQ7x*D
z_QJ<g5>_eO0V{Aq4aH?6fg7Mu`_bOEvh;BOA;$gCL#Z%U6E_}BwM(9mmUsdNj6M5q
z*oy7aU}Z1eE@>-PQYaX0BB=hUqkt!&G`<YN3DDSH#q>7XYckU&<-Te`LB2Ll=(mgU
z(zRz50gSuMyP*<*%<d-v0wn<PW5|Fj`n#CkHv%A(%Et~#-Tc(`C||ouuF!YcWbOTA
zTB^MajzYoLh;w0EI>6Q;hfq~HJ`R0n|M#MlfiR5EU9)H~^L!A`48(ZKI>=8QUFL=b
z0Bn3q8ZcP9>i5+@st%P8X=h-9Wt97M<eB&?wA1+Kz+hZO-X%nym|p}7a7?FROlyXf
zWvD+T5)n7Slx?9?^NW?8i%3jPLSF`6#Q5CXyUB?0n06I*Vz^h19yb#kB`tqnrauSW
za7~FQpp>@*H;x8lvw_qNu|b`VN{l;zP+>f(zN@{R7=#d4K_@5Tid6z334pI%CQ)*X
zXUrcK0Mq+6t*rKlV|^EK)E{=N@5lZTJ@Yu<kNhLrD?iG2=(s<E?Kt1LI_?kapGH2E
zI%|?`T(c|;hOryfE4%*Zd*4<*_y7K(k`5V`R;*pA>yJNxmF&WzoI6z?feSmzcksAB
z>{#EA{Uh>0<G0!WvKo`ucF>5Z+|&Gb-z^yz7+Yi??K;c=0z(k~_`~9zL8t>Xgyipk
zJeI93j`h9f<NmN?eLwaOJJ$DO|FC0yKl+bjeLwaOi#LI9%KIMI!A3Zi4+|+ed2Kig
z#Q*soH^Gu`VKTp1wRg?W5wG2XxEq);K6abfoO~`jv;P48l@EWK2hC*w0000<MNUMn
GLSTZXJ81O)

literal 0
HcmV?d00001

diff --git a/resources/sprite/tile/road_left.png b/resources/sprite/tile/road_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..341772d458817f0fab05bcd9a512ec218b9eab68
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8px|;(
z7sn8f<8P-L@-Zv&u<&y6@3>O)=-u<0*OzWg)7T(7$Ea(8iL1)CJ865?TwpWSUV32t
zyX&=c#Va(v-E$A0)i8NcSKqo-yBJ;6k9Sq5O^9T&cet$iVDGkOfiv761TM}o78X`C
zGBgrmV$pXn_$?QmovNhdv}npCe<lVA`&%Dv_AnH_^6UP{aw4lCE1D-_?t-=TN|7;}
qloQ?`yw|*!y_)}<+@Hg8H4IKiwr+3Z-(m}NGJ~h9pUXO@geCxLn_0yG

literal 0
HcmV?d00001

diff --git a/resources/sprite/tile/road_right.png b/resources/sprite/tile/road_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a04f0979d1ef99727237e76c89d60416178cd09e
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8px_cu
z7sn8f<8P-L@-Zv&u$<MD-*Kg6r~HSae+Rwwc(Xg1q7`2TJ<)ipBow_c*KJ#?+LWLZ
zN}5aOeD<%jJKx)5bZp18OGkMYESem2l}ABqa*&Stgqtj74eNproc_+HxF<i&T%gy`
zNMgm*gHyG&0u7jDjz9jLx7Lth0aF@-(yqEKfA{4-kre&P+F|an_5aVVUH`j|{5;Xt
h@U$5Unf>K!7%c17pGY#9=>&8ygQu&X%Q~loCIDurTyp>b

literal 0
HcmV?d00001

diff --git a/src/model/Map.cpp b/src/model/Map.cpp
index cb1cb30..ac0b6ee 100644
--- a/src/model/Map.cpp
+++ b/src/model/Map.cpp
@@ -26,6 +26,10 @@
 
 #include "Map.hpp"
 
+#include <cstdio>
+#include <cstdlib>
+#include <fstream>
+
 
 namespace RPGEdit {
 
@@ -85,32 +89,74 @@ void Map::finishEntityTransition(Entity *entity) {
 }
 
 std::unique_ptr<Map> Map::load(__attribute__((unused)) const std::string &name) {
-	std::unique_ptr<Map> map(new Map(16, 16, 2));
+	std::string filename = "../resources/map/" + name + ".map";
 
-	map->tileset.emplace_back("dirt", 0);
-	map->tileset.emplace_back("horizontal_bar", 0);
-	map->tileset.emplace_back("horizontal_bar", 2);
+	std::ifstream file;
 
-	for (int i = 0; i < 16; i++) {
-		for (int j = 0; j < 16; j++) {
-			if (4 <= i && i < 12 && 4 <= j && j < 12) {
-				map->setTileAt(0, Position<int>{i, j}, 1);
-				map->setCollisionAt(Position<int>{i, j}, CollisionType::EMPTY);
-			}
-			else {
-				map->setTileAt(0, Position<int>{i, j}, 0);
-			}
+	file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+	file.open(filename.c_str());
 
-			if (4 <= i && i < 12 && j == 7)
-				map->setTileAt(1, Position<int>{i, j}, 3);
-			else if (4 <= i && i < 12 && j == 8)
-				map->setTileAt(1, Position<int>{i, j}, 2);
-			else
-				map->setTileAt(1, Position<int>{i, j}, 0);
+	std::string line;
+
+	std::getline(file, line);
+	size_t w, h, layers;
+	if (std::sscanf(line.c_str(), "%zu %zu %zu", &w, &h, &layers) != 3)
+		throw std::invalid_argument("invalid map file");
+
+	std::unique_ptr<Map> map(new Map(w, h, layers));
+
+	std::getline(file, line);
+	if (line.length())
+		throw std::invalid_argument("invalid map file");
+
+	size_t n = 1;
+	std::unordered_map<char, size_t> tileset;
+
+	for (std::getline(file, line); line.length(); std::getline(file, line)) {
+		char c;
+		unsigned rot;
+		char *tile = nullptr;
+
+		if (std::sscanf(line.c_str(), "%c %u %ms", &c, &rot, &tile) != 3) {
+			std::free(tile);
+			throw std::invalid_argument("invalid map file");
+		}
+
+		tileset.emplace(c, n++);
+		map->tileset.emplace_back(tile, rot);
+		std::free(tile);
+	}
+
+	for (size_t i = 0; i < h; i++) {
+		std::getline(file, line);
+		if (line.length() != w)
+			throw std::invalid_argument("invalid map file");
+
+		for (size_t j = 0; j < w; j++) {
+			if (line[j] == '1')
+				map->setCollisionAt(Position<int>{int(j), int(i)}, CollisionType::EMPTY);
+			else if (line[j] != '0')
+				throw std::invalid_argument("invalid map file");
 		}
 	}
 
-	map->addEntity("square", Model::Position<int>{6, 6});
+	for (size_t layer = 0; layer < layers; layer++) {
+		std::getline(file, line);
+		if (line.length())
+			throw std::invalid_argument("invalid map file");
+
+		for (size_t i = 0; i < h; i++) {
+			std::getline(file, line);
+			if (line.length() != w)
+				throw std::invalid_argument("invalid map file");
+
+			for (size_t j = 0; j < w; j++) {
+				auto it = tileset.find(line[j]);
+				if (it != tileset.end())
+					map->setTileAt(layer, Position<int>{int(j), int(i)}, it->second);
+			}
+		}
+	}
 
 	return map;
 }