Skip to content

Commit 79320e2

Browse files
committed
Last minute addition of World.getMaps() and doc update.
Untested, but can be useful. The loadMaps() functionality was forgotten during the development...
1 parent 772de8b commit 79320e2

File tree

121 files changed

+735
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+735
-655
lines changed

docs/html/ProjectFolder_8hpp_source.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@
178178
<div class="ttc" id="aclasstson_1_1ProjectFolder_html_acef6c7123ab5fb3727a314a36fb18125"><div class="ttname"><a href="classtson_1_1ProjectFolder.html#acef6c7123ab5fb3727a314a36fb18125">tson::ProjectFolder::getSubFolders</a></div><div class="ttdeci">const std::vector&lt; ProjectFolder &gt; &amp; getSubFolders() const</div><div class="ttdef"><b>Definition:</b> ProjectFolder.hpp:85</div></div>
179179
<div class="ttc" id="aclasstson_1_1ProjectFolder_html_afc85dd3da183785565750233c9aac1d6"><div class="ttname"><a href="classtson_1_1ProjectFolder.html#afc85dd3da183785565750233c9aac1d6">tson::ProjectFolder::getFiles</a></div><div class="ttdeci">const std::vector&lt; fs::path &gt; &amp; getFiles() const</div><div class="ttdef"><b>Definition:</b> ProjectFolder.hpp:90</div></div>
180180
<div class="ttc" id="aclasstson_1_1ProjectFolder_html_ae813e2a28195bda9e38ea9250b6c3576"><div class="ttname"><a href="classtson_1_1ProjectFolder.html#ae813e2a28195bda9e38ea9250b6c3576">tson::ProjectFolder::hasWorldFile</a></div><div class="ttdeci">bool hasWorldFile() const</div><div class="ttdef"><b>Definition:</b> ProjectFolder.hpp:80</div></div>
181-
<div class="ttc" id="aclasstson_1_1World_html_af033e67675297e37a8804240e52f126a"><div class="ttname"><a href="classtson_1_1World.html#af033e67675297e37a8804240e52f126a">tson::World::contains</a></div><div class="ttdeci">bool contains(std::string_view filename)</div><div class="ttdef"><b>Definition:</b> World.hpp:110</div></div>
181+
<div class="ttc" id="aclasstson_1_1World_html_af033e67675297e37a8804240e52f126a"><div class="ttname"><a href="classtson_1_1World.html#af033e67675297e37a8804240e52f126a">tson::World::contains</a></div><div class="ttdeci">bool contains(std::string_view filename)</div><div class="ttdef"><b>Definition:</b> World.hpp:111</div></div>
182182
<div class="ttc" id="aclasstson_1_1ProjectFolder_html_a9ee7ecb9fb863b5ad3579a7f045e355a"><div class="ttname"><a href="classtson_1_1ProjectFolder.html#a9ee7ecb9fb863b5ad3579a7f045e355a">tson::ProjectFolder::getWorld</a></div><div class="ttdeci">const World &amp; getWorld() const</div><div class="ttdef"><b>Definition:</b> ProjectFolder.hpp:99</div></div>
183183
<div class="ttc" id="aclasstson_1_1ProjectFolder_html_ad9e28124a99c2ef02950cbe92a0be827"><div class="ttname"><a href="classtson_1_1ProjectFolder.html#ad9e28124a99c2ef02950cbe92a0be827">tson::ProjectFolder::ProjectFolder</a></div><div class="ttdeci">ProjectFolder(const fs::path &amp;path)</div><div class="ttdef"><b>Definition:</b> ProjectFolder.hpp:33</div></div>
184184
<div class="ttc" id="aclasstson_1_1ProjectFolder_html"><div class="ttname"><a href="classtson_1_1ProjectFolder.html">tson::ProjectFolder</a></div><div class="ttdef"><b>Definition:</b> ProjectFolder.hpp:13</div></div>
185185
<div class="ttc" id="aclasstson_1_1World_html"><div class="ttname"><a href="classtson_1_1World.html">tson::World</a></div><div class="ttdef"><b>Definition:</b> World.hpp:16</div></div>
186186
<div class="ttc" id="aclasstson_1_1ProjectFolder_html_a1040c9d6ce615a225f1db5605a70e07b"><div class="ttname"><a href="classtson_1_1ProjectFolder.html#a1040c9d6ce615a225f1db5605a70e07b">tson::ProjectFolder::getPath</a></div><div class="ttdeci">const fs::path &amp; getPath() const</div><div class="ttdef"><b>Definition:</b> ProjectFolder.hpp:75</div></div>
187187
<div class="ttc" id="anamespacetson_html"><div class="ttname"><a href="namespacetson.html">tson</a></div><div class="ttdef"><b>Definition:</b> Base64.hpp:12</div></div>
188-
<div class="ttc" id="aclasstson_1_1World_html_a7c5fb1727d4814c925c7187a71aa9175"><div class="ttname"><a href="classtson_1_1World.html#a7c5fb1727d4814c925c7187a71aa9175">tson::World::parse</a></div><div class="ttdeci">bool parse(const fs::path &amp;path)</div><div class="ttdef"><b>Definition:</b> World.hpp:47</div></div>
188+
<div class="ttc" id="aclasstson_1_1World_html_a7c5fb1727d4814c925c7187a71aa9175"><div class="ttname"><a href="classtson_1_1World.html#a7c5fb1727d4814c925c7187a71aa9175">tson::World::parse</a></div><div class="ttdeci">bool parse(const fs::path &amp;path)</div><div class="ttdef"><b>Definition:</b> World.hpp:48</div></div>
189189
<!-- start footer part -->
190190
<hr class="footer"/><address class="footer"><small>
191191
Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20

docs/html/World_8hpp_source.html

Lines changed: 106 additions & 99 deletions
Large diffs are not rendered by default.

docs/html/classtson_1_1World-members.html

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,14 @@
7878
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a101acc9c8cd09c5ba0bde73f8a16368d">get</a>(std::string_view filename) const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
7979
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#aae6b409693f51f76fb9bd57145a29180">getFolder</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
8080
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#adad4d1e5457194160df3b1ba78ff7793">getMapData</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
81-
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#a19f4166a5379af3b4190fef6f5bc7b4b">getPath</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
82-
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a49b367236f68573cc17697d92c633cc7">getType</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
83-
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#a013ba94da8ae973705365456abee9dfa">loadMaps</a>(tson::Tileson *parser)</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
84-
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a11323f68497548bfe1eb29ed5d2f05c9">onlyShowAdjacentMaps</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
85-
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#a7c5fb1727d4814c925c7187a71aa9175">parse</a>(const fs::path &amp;path)</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
86-
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a4366d0218ca27808ea941d40f9f1643a">World</a>()=default</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
87-
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#a868579f20ce57696238578c4cef6ab56">World</a>(const fs::path &amp;path)</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">explicit</span></td></tr>
81+
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#ab640b7f04f0c3f8f3b38cf3cdec174ca">getMaps</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
82+
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a19f4166a5379af3b4190fef6f5bc7b4b">getPath</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
83+
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#a49b367236f68573cc17697d92c633cc7">getType</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
84+
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a013ba94da8ae973705365456abee9dfa">loadMaps</a>(tson::Tileson *parser)</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
85+
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#a11323f68497548bfe1eb29ed5d2f05c9">onlyShowAdjacentMaps</a>() const</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
86+
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a7c5fb1727d4814c925c7187a71aa9175">parse</a>(const fs::path &amp;path)</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
87+
<tr class="even"><td class="entry"><a class="el" href="classtson_1_1World.html#a4366d0218ca27808ea941d40f9f1643a">World</a>()=default</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
88+
<tr><td class="entry"><a class="el" href="classtson_1_1World.html#a868579f20ce57696238578c4cef6ab56">World</a>(const fs::path &amp;path)</td><td class="entry"><a class="el" href="classtson_1_1World.html">tson::World</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">explicit</span></td></tr>
8889
</table></div><!-- contents -->
8990
<!-- start footer part -->
9091
<hr class="footer"/><address class="footer"><small>

docs/html/classtson_1_1World.html

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
<tr class="separator:a11323f68497548bfe1eb29ed5d2f05c9"><td class="memSeparator" colspan="2">&#160;</td></tr>
102102
<tr class="memitem:a49b367236f68573cc17697d92c633cc7"><td class="memItemLeft" align="right" valign="top">const std::string &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classtson_1_1World.html#a49b367236f68573cc17697d92c633cc7">getType</a> () const</td></tr>
103103
<tr class="separator:a49b367236f68573cc17697d92c633cc7"><td class="memSeparator" colspan="2">&#160;</td></tr>
104+
<tr class="memitem:ab640b7f04f0c3f8f3b38cf3cdec174ca"><td class="memItemLeft" align="right" valign="top">const std::vector&lt; std::unique_ptr&lt; <a class="el" href="classtson_1_1Map.html">tson::Map</a> &gt; &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classtson_1_1World.html#ab640b7f04f0c3f8f3b38cf3cdec174ca">getMaps</a> () const</td></tr>
105+
<tr class="separator:ab640b7f04f0c3f8f3b38cf3cdec174ca"><td class="memSeparator" colspan="2">&#160;</td></tr>
104106
</table>
105107
<h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
106108
<a id="a4366d0218ca27808ea941d40f9f1643a"></a>
@@ -269,6 +271,32 @@ <h2 class="memtitle"><span class="permalink"><a href="#adad4d1e5457194160df3b1ba
269271
</table>
270272
</div><div class="memdoc">
271273

274+
</div>
275+
</div>
276+
<a id="ab640b7f04f0c3f8f3b38cf3cdec174ca"></a>
277+
<h2 class="memtitle"><span class="permalink"><a href="#ab640b7f04f0c3f8f3b38cf3cdec174ca">&#9670;&nbsp;</a></span>getMaps()</h2>
278+
279+
<div class="memitem">
280+
<div class="memproto">
281+
<table class="mlabels">
282+
<tr>
283+
<td class="mlabels-left">
284+
<table class="memname">
285+
<tr>
286+
<td class="memname">const std::vector&lt; std::unique_ptr&lt; <a class="el" href="classtson_1_1Map.html">tson::Map</a> &gt; &gt; &amp; tson::World::getMaps </td>
287+
<td>(</td>
288+
<td class="paramname"></td><td>)</td>
289+
<td> const</td>
290+
</tr>
291+
</table>
292+
</td>
293+
<td class="mlabels-right">
294+
<span class="mlabels"><span class="mlabel">inline</span></span> </td>
295+
</tr>
296+
</table>
297+
</div><div class="memdoc">
298+
<p>Get all maps that have been loaded by <a class="el" href="classtson_1_1World.html#a013ba94da8ae973705365456abee9dfa">loadMaps()</a>. NOTE: This is untested, and was a last second addition to <a class="el" href="classtson_1_1Tileson.html">Tileson</a> 1.2.0, as I had forgot about the <a class="el" href="classtson_1_1World.html#a013ba94da8ae973705365456abee9dfa">loadMaps()</a> functionality (also untested) If you find anything malfunctioning - please report. </p><dl class="section return"><dt>Returns</dt><dd>All maps loaded by <a class="el" href="classtson_1_1World.html#a013ba94da8ae973705365456abee9dfa">loadMaps()</a> </dd></dl>
299+
272300
</div>
273301
</div>
274302
<a id="a19f4166a5379af3b4190fef6f5bc7b4b"></a>

docs/html/functions_func_g.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ <h3><a id="index_g"></a>- g -</h3><ul>
189189
<li>getMapData()
190190
: <a class="el" href="classtson_1_1World.html#adad4d1e5457194160df3b1ba78ff7793">tson::World</a>
191191
</li>
192+
<li>getMaps()
193+
: <a class="el" href="classtson_1_1World.html#ab640b7f04f0c3f8f3b38cf3cdec174ca">tson::World</a>
194+
</li>
192195
<li>getMargin()
193196
: <a class="el" href="classtson_1_1Tileset.html#a61e4fbc904b65159f38bcab4ab02a332">tson::Tileset</a>
194197
</li>
@@ -406,7 +409,7 @@ <h3><a id="index_g"></a>- g -</h3><ul>
406409
: <a class="el" href="classtson_1_1Layer.html#a83b0999989afa4997809a2e1b3fbfa03">tson::Layer</a>
407410
</li>
408411
<li>getValue()
409-
: <a class="el" href="classtson_1_1Property.html#af5edbee1fe8e95b6428474890476f8a0">tson::Property</a>
412+
: <a class="el" href="classtson_1_1Property.html#a91e1d6d644f1089026a02a5bbe2eeaf2">tson::Property</a>
410413
, <a class="el" href="classtson_1_1PropertyCollection.html#a472bfac4acd23991bc4ee85f5905a200">tson::PropertyCollection</a>
411414
</li>
412415
<li>getValueType()
@@ -437,7 +440,7 @@ <h3><a id="index_g"></a>- g -</h3><ul>
437440
: <a class="el" href="classtson_1_1Layer.html#af68877b9894e9ee9a4fecaa0081737e4">tson::Layer</a>
438441
</li>
439442
<li>Grid()
440-
: <a class="el" href="classtson_1_1Grid.html#a9bdee44fd73ea5815bbe591e7d0e9d96">tson::Grid</a>
443+
: <a class="el" href="classtson_1_1Grid.html#a6fab3db871cef5a0cfe10e51ad70a7df">tson::Grid</a>
441444
</li>
442445
</ul>
443446
</div><!-- contents -->

docs/html/functions_g.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ <h3><a id="index_g"></a>- g -</h3><ul>
192192
<li>getMapData()
193193
: <a class="el" href="classtson_1_1World.html#adad4d1e5457194160df3b1ba78ff7793">tson::World</a>
194194
</li>
195+
<li>getMaps()
196+
: <a class="el" href="classtson_1_1World.html#ab640b7f04f0c3f8f3b38cf3cdec174ca">tson::World</a>
197+
</li>
195198
<li>getMargin()
196199
: <a class="el" href="classtson_1_1Tileset.html#a61e4fbc904b65159f38bcab4ab02a332">tson::Tileset</a>
197200
</li>
@@ -343,7 +346,7 @@ <h3><a id="index_g"></a>- g -</h3><ul>
343346
: <a class="el" href="classtson_1_1Tileset.html#aa2e4e0b79014829b9cf9738179255f37">tson::Tileset</a>
344347
</li>
345348
<li>getTileData()
346-
: <a class="el" href="classtson_1_1Layer.html#a0bc443cd1c272a6f6fbf4cca77121ab6">tson::Layer</a>
349+
: <a class="el" href="classtson_1_1Layer.html#a635667a7a59e06bac9613f9e675d2cbf">tson::Layer</a>
347350
</li>
348351
<li>getTiledVersion()
349352
: <a class="el" href="classtson_1_1Map.html#acab042e9e2c7aad6470068f5c687aae0">tson::Map</a>

0 commit comments

Comments
 (0)