Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Probert committed May 24, 2018
2 parents 6676ee3 + e9a9d09 commit 899d2ca
Show file tree
Hide file tree
Showing 151 changed files with 2,319 additions and 1,308 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/build/
/_build/
/src/flat.h
/.vs/
*.swp
Expand Down
2 changes: 2 additions & 0 deletions .vimrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
nnoremap <F1> :Make<cr>
nnoremap <F2> :Make clean<cr>
nnoremap <F3> :Make check lint<cr>
let g:syntastic_c_include_dirs = [ 'build', '/usr/include/SDL2' ]
4 changes: 2 additions & 2 deletions docs/_animation_8h_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
<div class="title">Animation.h</div> </div>
</div><!--header-->
<div class="contents">
<a href="_animation_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="preprocessor">#ifndef ANIMATION_H_</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="preprocessor">#define ANIMATION_H_</span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="preprocessor">#include &lt;SDL.h&gt;</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="_timer_8h.html">Timer.h</a>&quot;</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;</div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceflat2d.html">flat2d</a></div><div class="line"><a name="l00010"></a><span class="lineno"> 10</span>&#160;{</div><div class="line"><a name="l00011"></a><span class="lineno"><a class="line" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668"> 11</a></span>&#160; <span class="keyword">typedef</span> std::vector&lt;SDL_Rect&gt; <a class="code" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668">Clips</a>;</div><div class="line"><a name="l00012"></a><span class="lineno"> 12</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno"><a class="line" href="classflat2d_1_1_animation.html"> 19</a></span>&#160; <span class="keyword">class </span><a class="code" href="classflat2d_1_1_animation.html">Animation</a></div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; {</div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160; <span class="keyword">private</span>:</div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160; <a class="code" href="classflat2d_1_1_timer.html">Timer</a> animationTimer;</div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160;</div><div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160; <a class="code" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668">Clips</a> clips;</div><div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160; uint32_t timestep;</div><div class="line"><a name="l00026"></a><span class="lineno"> 26</span>&#160; <span class="keywordtype">int</span> clipIndex = 0;</div><div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160;</div><div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160; <span class="keyword">public</span>:</div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="classflat2d_1_1_animation.html#a41a8d2ea5cdb2b2d8cb981f1c3e0d8c7"> 29</a></span>&#160; <a class="code" href="classflat2d_1_1_animation.html#a41a8d2ea5cdb2b2d8cb981f1c3e0d8c7">Animation</a>(<a class="code" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668">Clips</a> c, uint32_t t) : clips(c), timestep(t) { }</div><div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160;</div><div class="line"><a name="l00035"></a><span class="lineno"> 35</span>&#160; <span class="keyword">const</span> SDL_Rect* <a class="code" href="classflat2d_1_1_animation.html#aa7a4ddd05548d887096e6491885da416">run</a>();</div><div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160;</div><div class="line"><a name="l00040"></a><span class="lineno"> 40</span>&#160; <span class="keywordtype">void</span> <a class="code" href="classflat2d_1_1_animation.html#ae1dc01a98de4648dc373e7ac64cdf0b7">start</a>();</div><div class="line"><a name="l00041"></a><span class="lineno"> 41</span>&#160;</div><div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160; <span class="keywordtype">void</span> <a class="code" href="classflat2d_1_1_animation.html#a8507c1f60d6d32a1751b983727266f76">stop</a>();</div><div class="line"><a name="l00046"></a><span class="lineno"> 46</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno"> 51</span>&#160; <span class="keywordtype">bool</span> <a class="code" href="classflat2d_1_1_animation.html#a44aa6331ac7a928101ec6f5bd92e56fa">isRunning</a>() <span class="keyword">const</span>;</div><div class="line"><a name="l00052"></a><span class="lineno"> 52</span>&#160; };</div><div class="line"><a name="l00053"></a><span class="lineno"> 53</span>&#160;} <span class="comment">// namespace flat2d</span></div><div class="line"><a name="l00054"></a><span class="lineno"> 54</span>&#160;</div><div class="line"><a name="l00055"></a><span class="lineno"> 55</span>&#160;<span class="preprocessor">#endif // ANIMATION_H_</span></div><div class="ttc" id="classflat2d_1_1_animation_html_aa7a4ddd05548d887096e6491885da416"><div class="ttname"><a href="classflat2d_1_1_animation.html#aa7a4ddd05548d887096e6491885da416">flat2d::Animation::run</a></div><div class="ttdeci">const SDL_Rect * run()</div><div class="ttdef"><b>Definition:</b> <a href="_animation_8cpp_source.html#l00021">Animation.cpp:21</a></div></div>
<a href="_animation_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="preprocessor">#ifndef ANIMATION_H_</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="preprocessor">#define ANIMATION_H_</span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="preprocessor">#include &lt;SDL.h&gt;</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="_timer_8h.html">Timer.h</a>&quot;</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;</div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceflat2d.html">flat2d</a></div><div class="line"><a name="l00010"></a><span class="lineno"> 10</span>&#160;{</div><div class="line"><a name="l00011"></a><span class="lineno"><a class="line" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668"> 11</a></span>&#160; <span class="keyword">typedef</span> std::vector&lt;SDL_Rect&gt; <a class="code" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668">Clips</a>;</div><div class="line"><a name="l00012"></a><span class="lineno"> 12</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno"><a class="line" href="classflat2d_1_1_animation.html"> 19</a></span>&#160; <span class="keyword">class </span><a class="code" href="classflat2d_1_1_animation.html">Animation</a></div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; {</div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160; <span class="keyword">private</span>:</div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160; <a class="code" href="classflat2d_1_1_timer.html">Timer</a> animationTimer;</div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160;</div><div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160; <a class="code" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668">Clips</a> clips;</div><div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160; uint32_t timestep;</div><div class="line"><a name="l00026"></a><span class="lineno"> 26</span>&#160; <span class="keywordtype">int</span> clipIndex = 0;</div><div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160;</div><div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160; <span class="keyword">public</span>:</div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="classflat2d_1_1_animation.html#a97de94735c7378ca8935f1ee7041e177"> 29</a></span>&#160; <a class="code" href="classflat2d_1_1_animation.html#a97de94735c7378ca8935f1ee7041e177">Animation</a>(<a class="code" href="namespaceflat2d.html#ac965f90d5dd7f318e36046b1ad284668">Clips</a> &amp;c, uint32_t t) : clips(c), timestep(t) { }</div><div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160;</div><div class="line"><a name="l00035"></a><span class="lineno"> 35</span>&#160; <span class="keyword">const</span> SDL_Rect* <a class="code" href="classflat2d_1_1_animation.html#aa7a4ddd05548d887096e6491885da416">run</a>();</div><div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160;</div><div class="line"><a name="l00040"></a><span class="lineno"> 40</span>&#160; <span class="keywordtype">void</span> <a class="code" href="classflat2d_1_1_animation.html#ae1dc01a98de4648dc373e7ac64cdf0b7">start</a>();</div><div class="line"><a name="l00041"></a><span class="lineno"> 41</span>&#160;</div><div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160; <span class="keywordtype">void</span> <a class="code" href="classflat2d_1_1_animation.html#a8507c1f60d6d32a1751b983727266f76">stop</a>();</div><div class="line"><a name="l00046"></a><span class="lineno"> 46</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno"> 51</span>&#160; <span class="keywordtype">bool</span> <a class="code" href="classflat2d_1_1_animation.html#a44aa6331ac7a928101ec6f5bd92e56fa">isRunning</a>() <span class="keyword">const</span>;</div><div class="line"><a name="l00052"></a><span class="lineno"> 52</span>&#160; };</div><div class="line"><a name="l00053"></a><span class="lineno"> 53</span>&#160;} <span class="comment">// namespace flat2d</span></div><div class="line"><a name="l00054"></a><span class="lineno"> 54</span>&#160;</div><div class="line"><a name="l00055"></a><span class="lineno"> 55</span>&#160;<span class="preprocessor">#endif // ANIMATION_H_</span></div><div class="ttc" id="classflat2d_1_1_animation_html_a97de94735c7378ca8935f1ee7041e177"><div class="ttname"><a href="classflat2d_1_1_animation.html#a97de94735c7378ca8935f1ee7041e177">flat2d::Animation::Animation</a></div><div class="ttdeci">Animation(Clips &amp;c, uint32_t t)</div><div class="ttdef"><b>Definition:</b> <a href="_animation_8h_source.html#l00029">Animation.h:29</a></div></div>
<div class="ttc" id="classflat2d_1_1_animation_html_aa7a4ddd05548d887096e6491885da416"><div class="ttname"><a href="classflat2d_1_1_animation.html#aa7a4ddd05548d887096e6491885da416">flat2d::Animation::run</a></div><div class="ttdeci">const SDL_Rect * run()</div><div class="ttdef"><b>Definition:</b> <a href="_animation_8cpp_source.html#l00021">Animation.cpp:21</a></div></div>
<div class="ttc" id="classflat2d_1_1_animation_html_a44aa6331ac7a928101ec6f5bd92e56fa"><div class="ttname"><a href="classflat2d_1_1_animation.html#a44aa6331ac7a928101ec6f5bd92e56fa">flat2d::Animation::isRunning</a></div><div class="ttdeci">bool isRunning() const</div><div class="ttdef"><b>Definition:</b> <a href="_animation_8cpp_source.html#l00016">Animation.cpp:16</a></div></div>
<div class="ttc" id="_timer_8h_html"><div class="ttname"><a href="_timer_8h.html">Timer.h</a></div></div>
<div class="ttc" id="classflat2d_1_1_animation_html"><div class="ttname"><a href="classflat2d_1_1_animation.html">flat2d::Animation</a></div><div class="ttdef"><b>Definition:</b> <a href="_animation_8h_source.html#l00019">Animation.h:19</a></div></div>
Expand All @@ -80,7 +81,6 @@
<div class="ttc" id="classflat2d_1_1_animation_html_ae1dc01a98de4648dc373e7ac64cdf0b7"><div class="ttname"><a href="classflat2d_1_1_animation.html#ae1dc01a98de4648dc373e7ac64cdf0b7">flat2d::Animation::start</a></div><div class="ttdeci">void start()</div><div class="ttdef"><b>Definition:</b> <a href="_animation_8cpp_source.html#l00006">Animation.cpp:6</a></div></div>
<div class="ttc" id="classflat2d_1_1_animation_html_a8507c1f60d6d32a1751b983727266f76"><div class="ttname"><a href="classflat2d_1_1_animation.html#a8507c1f60d6d32a1751b983727266f76">flat2d::Animation::stop</a></div><div class="ttdeci">void stop()</div><div class="ttdef"><b>Definition:</b> <a href="_animation_8cpp_source.html#l00011">Animation.cpp:11</a></div></div>
<div class="ttc" id="classflat2d_1_1_timer_html"><div class="ttname"><a href="classflat2d_1_1_timer.html">flat2d::Timer</a></div><div class="ttdef"><b>Definition:</b> <a href="_timer_8h_source.html#l00012">Timer.h:12</a></div></div>
<div class="ttc" id="classflat2d_1_1_animation_html_a41a8d2ea5cdb2b2d8cb981f1c3e0d8c7"><div class="ttname"><a href="classflat2d_1_1_animation.html#a41a8d2ea5cdb2b2d8cb981f1c3e0d8c7">flat2d::Animation::Animation</a></div><div class="ttdeci">Animation(Clips c, uint32_t t)</div><div class="ttdef"><b>Definition:</b> <a href="_animation_8h_source.html#l00029">Animation.h:29</a></div></div>
</div><!-- fragment --></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
Loading

0 comments on commit 899d2ca

Please sign in to comment.