Erthia · snugglejuice · Dec 17, 2018 · Dec 17, 2018 · Dec 17, 2018 · Dec 17, 2018
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 CC = g++
 CFLAGS = -Wall -O2 -g
-LDFLAGS = -lSDL -lSDL2 -lGLU -lglut -lGL -lGLEW -lm -lSDL_mixer
+LDFLAGS = -lSDL -lSDL2 -lGLU -lglut -lGL -lGLEW -lm -lSDL_mixer -lSDL_image -lSDL_ttf
 
 APP_BIN = glrunner
 SRC_PATH = src

diff --git a/README.md b/README.md
@@ -1,2 +1,7 @@
 # GL_runner
 OpenGL project - IMAC-2
+
+PLEASE COMPILE FROM THE MARION BRANCH /!\
+
+Compile with make
+Execute with ./bin/glrunner
diff --git a/bin/EXECUTABLES.txt b/bin/EXECUTABLES.txt
diff --git a/bin/glrunner b/bin/glrunner
diff --git a/doc/html/_app_manager_8hpp_source.html b/doc/html/_app_manager_8hpp_source.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.13"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>SpacImac Runner: include/AppManager.hpp Source File</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">SpacImac Runner
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.13 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+<script type="text/javascript" src="menudata.js"></script>
+<script type="text/javascript" src="menu.js"></script>
+<script type="text/javascript">
+$(function() {
+  initMenu('',true,false,'search.php','Search');
+  $(document).ready(function() { init_search(); });
+});
+</script>
+<div id="main-nav"></div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('_app_manager_8hpp_source.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">AppManager.hpp</div>  </div>
+</div><!--header-->
+<div class="contents">
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#include &lt;GL/glew.h&gt;</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#include &lt;iostream&gt;</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="preprocessor">#include &lt;glimac/common.hpp&gt;</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="preprocessor">#include &lt;glimac/SDLWindowManager.hpp&gt;</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div><div class="line"><a name="l00009"></a><span class="lineno"><a class="line" href="class_app_manager.html">    9</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_app_manager.html">AppManager</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">   11</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;  <a class="code" href="class_app_manager.html#a6221fc1ede71f2ac539c052bbe0c7f6a">AppManager</a>();</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div><div class="line"><a name="l00017"></a><span class="lineno"><a class="line" href="class_app_manager.html#a2de910deb66a72a84ba7e489d6762a04">   17</a></span>&#160;  <span class="keyword">inline</span> <span class="keyword">const</span> std::string <a class="code" href="class_app_manager.html#a2de910deb66a72a84ba7e489d6762a04">getWindowName</a>()<span class="keyword"> const </span>{</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;    <span class="keywordflow">return</span> m_window_name;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;  }</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno"><a class="line" href="class_app_manager.html#ac44f43240b8165fee3ef7732677db5ce">   22</a></span>&#160;    <span class="keyword">inline</span> <span class="keyword">const</span> <span class="keywordtype">int</span> <a class="code" href="class_app_manager.html#ac44f43240b8165fee3ef7732677db5ce">getAppWidth</a>()<span class="keyword"> const </span>{</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    <span class="keywordflow">return</span> m_width;</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  }</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="class_app_manager.html#affae46e05f7c0832fce71c97a628a1a2">   27</a></span>&#160;      <span class="keyword">inline</span> <span class="keyword">const</span> <span class="keywordtype">int</span> <a class="code" href="class_app_manager.html#affae46e05f7c0832fce71c97a628a1a2">getAppHeight</a>()<span class="keyword"> const </span>{</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    <span class="keywordflow">return</span> m_height;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  }</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordtype">int</span> <a class="code" href="class_app_manager.html#a3326c2410ec8a898f828e8051c414e96">start</a>(<span class="keywordtype">char</span>** argv);</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  std::string m_window_name = <span class="stringliteral">&quot;SpacImac Runner&quot;</span>;</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordtype">int</span> m_width = 800;</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">int</span> m_height = 600;</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keywordtype">int</span> m_score = 0;</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;};</div><div class="ttc" id="class_app_manager_html_a2de910deb66a72a84ba7e489d6762a04"><div class="ttname"><a href="class_app_manager.html#a2de910deb66a72a84ba7e489d6762a04">AppManager::getWindowName</a></div><div class="ttdeci">const std::string getWindowName() const</div><div class="ttdoc">Getter for the window name. </div><div class="ttdef"><b>Definition:</b> AppManager.hpp:17</div></div>
+<div class="ttc" id="class_app_manager_html_affae46e05f7c0832fce71c97a628a1a2"><div class="ttname"><a href="class_app_manager.html#affae46e05f7c0832fce71c97a628a1a2">AppManager::getAppHeight</a></div><div class="ttdeci">const int getAppHeight() const</div><div class="ttdoc">Getter for the window&amp;#39;s height. </div><div class="ttdef"><b>Definition:</b> AppManager.hpp:27</div></div>
+<div class="ttc" id="class_app_manager_html_a6221fc1ede71f2ac539c052bbe0c7f6a"><div class="ttname"><a href="class_app_manager.html#a6221fc1ede71f2ac539c052bbe0c7f6a">AppManager::AppManager</a></div><div class="ttdeci">AppManager()</div><div class="ttdoc">Default Constructor of class AppManager. </div><div class="ttdef"><b>Definition:</b> AppManager.cpp:59</div></div>
+<div class="ttc" id="class_app_manager_html_ac44f43240b8165fee3ef7732677db5ce"><div class="ttname"><a href="class_app_manager.html#ac44f43240b8165fee3ef7732677db5ce">AppManager::getAppWidth</a></div><div class="ttdeci">const int getAppWidth() const</div><div class="ttdoc">Getter for the window&amp;#39;s width. </div><div class="ttdef"><b>Definition:</b> AppManager.hpp:22</div></div>
+<div class="ttc" id="class_app_manager_html"><div class="ttname"><a href="class_app_manager.html">AppManager</a></div><div class="ttdef"><b>Definition:</b> AppManager.hpp:9</div></div>
+<div class="ttc" id="class_app_manager_html_a3326c2410ec8a898f828e8051c414e96"><div class="ttname"><a href="class_app_manager.html#a3326c2410ec8a898f828e8051c414e96">AppManager::start</a></div><div class="ttdeci">int start(char **argv)</div><div class="ttdoc">method which launch the application </div><div class="ttdef"><b>Definition:</b> AppManager.cpp:62</div></div>
+</div><!-- fragment --></div><!-- contents -->
+</div><!-- doc-content -->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><b>AppManager.hpp</b></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.13 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/_b_box_8hpp_source.html b/doc/html/_b_box_8hpp_source.html