Release 3.1.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release notes
 
+## v3.1.1
+
+* Added a shader compile check to make GLSL ES shaders compatible with macOS.
+
 ## v3.1.0
 
 * Use extra stack space when building for WASM.

abcg/abcgApplication.hpp

@@ -15,7 +15,7 @@
 
 #define ABCG_VERSION_MAJOR 3
 #define ABCG_VERSION_MINOR 1
-#define ABCG_VERSION_PATCH 0
+#define ABCG_VERSION_PATCH 1
 
 /**
  * @brief Root namespace.

abcg/abcgOpenGLShader.cpp

@@ -16,6 +16,7 @@
 
 #include <filesystem>
 #include <fstream>
+#include <regex>
 #include <sstream>
 #include <vector>
 
@@ -99,9 +100,20 @@ void printProgramInfoLog(GLuint const program) {
 // Returns the shader ID of the compiled shader.
 [[nodiscard]] abcg::OpenGLShader compileHelper(std::string_view shaderSource,
  GLuint shaderStage) {
+ std::string source{shaderSource};
+#if !defined(__EMSCRIPTEN__) && defined(__APPLE__)
+ // Remove version header, if any
+ source = std::regex_replace(source, std::regex(R"(^\s*#\s*version\s+\d+\s+es\s*)"), "");
+ if (source != shaderSource)
+ {
+ // Add new header
+ source = "#version 410\n" + source;
+ }
+#endif
+
  auto shaderID{glCreateShader(shaderStage)};
- auto const *source{shaderSource.data()};
- glShaderSource(shaderID, 1, &source, nullptr);
+ auto const *sourceCStr{source.c_str()};
+ glShaderSource(shaderID, 1, &sourceCStr, nullptr);
  glCompileShader(shaderID);
  return {shaderID, shaderStage};
 }

abcg/doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME = "ABCg"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "v3.1.0"
+PROJECT_NUMBER = "v3.1.1"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

abcg/doc/html/CHANGELOG_8md.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>

abcg/doc/html/README_8md.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>

abcg/doc/html/abcgApplication_8cpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -115,8 +115,7 @@
 </div><div class="textblock"><div class="dynheader">
 Include dependency graph for abcgApplication.cpp:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgApplication_8cpp__incl.svg" width="930" height="276"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgApplication_8cpp__incl.svg" width="930" height="276"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div><a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Definition of <a class="el" href="classabcg_1_1Application.html" title="Manages the application&#39;s control flow.">abcg::Application</a> members. </p>

abcg/doc/html/abcgApplication_8hpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -114,14 +114,12 @@
 </div><div class="textblock"><div class="dynheader">
 Include dependency graph for abcgApplication.hpp:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgApplication_8hpp__incl.svg" width="204" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgApplication_8hpp__incl.svg" width="204" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div><div class="textblock"><div class="dynheader">
 This graph shows which files directly or indirectly include this file:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgApplication_8hpp__dep__incl.svg" width="643" height="320"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgApplication_8hpp__dep__incl.svg" width="643" height="320"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div>
 <p><a href="abcgApplication_8hpp_source.html">Go to the source code of this file.</a></p>
@@ -144,7 +142,7 @@
 <tr class="separator:a07fc63a5e20c2f33f9ca0dd915ce491f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7396b0333e58c89fbafa65e76af72183"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="abcgApplication_8hpp.html#a7396b0333e58c89fbafa65e76af72183">ABCG_VERSION_MINOR</a>&#160;&#160;&#160;1</td></tr>
 <tr class="separator:a7396b0333e58c89fbafa65e76af72183"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af521d4146de1ade55008a4d5f0ddd768"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="abcgApplication_8hpp.html#af521d4146de1ade55008a4d5f0ddd768">ABCG_VERSION_PATCH</a>&#160;&#160;&#160;0</td></tr>
+<tr class="memitem:af521d4146de1ade55008a4d5f0ddd768"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="abcgApplication_8hpp.html#af521d4146de1ade55008a4d5f0ddd768">ABCG_VERSION_PATCH</a>&#160;&#160;&#160;1</td></tr>
 <tr class="separator:af521d4146de1ade55008a4d5f0ddd768"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
@@ -187,7 +185,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#af521d4146de1ade55008a4d5
 <div class="memproto">
  <table class="memname">
  <tr>
- <td class="memname">#define ABCG_VERSION_PATCH&#160;&#160;&#160;0</td>
+ <td class="memname">#define ABCG_VERSION_PATCH&#160;&#160;&#160;1</td>
  </tr>
  </table>
 </div><div class="memdoc">

abcg/doc/html/abcgApplication_8hpp_source.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -111,7 +111,7 @@
 <div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160; </div>
 <div class="line"><a name="l00016"></a><span class="lineno"><a class="line" href="abcgApplication_8hpp.html#a07fc63a5e20c2f33f9ca0dd915ce491f"> 16</a></span>&#160;<span class="preprocessor">#define ABCG_VERSION_MAJOR 3</span></div>
 <div class="line"><a name="l00017"></a><span class="lineno"><a class="line" href="abcgApplication_8hpp.html#a7396b0333e58c89fbafa65e76af72183"> 17</a></span>&#160;<span class="preprocessor">#define ABCG_VERSION_MINOR 1</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno"><a class="line" href="abcgApplication_8hpp.html#af521d4146de1ade55008a4d5f0ddd768"> 18</a></span>&#160;<span class="preprocessor">#define ABCG_VERSION_PATCH 0</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno"><a class="line" href="abcgApplication_8hpp.html#af521d4146de1ade55008a4d5f0ddd768"> 18</a></span>&#160;<span class="preprocessor">#define ABCG_VERSION_PATCH 1</span></div>
 <div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160; </div>
 <div class="line"><a name="l00023"></a><span class="lineno"><a class="line" href="namespaceabcg.html"> 23</a></span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceabcg.html">abcg</a> {</div>
 <div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160;<span class="keyword">class </span><a class="code" href="classabcg_1_1Application.html">Application</a>;</div>

abcg/doc/html/abcgEmbeddedFonts_8hpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -107,14 +107,12 @@
 </div><div class="textblock"><div class="dynheader">
 Include dependency graph for abcgEmbeddedFonts.hpp:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgEmbeddedFonts_8hpp__incl.svg" width="235" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgEmbeddedFonts_8hpp__incl.svg" width="235" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div><div class="textblock"><div class="dynheader">
 This graph shows which files directly or indirectly include this file:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgEmbeddedFonts_8hpp__dep__incl.svg" width="470" height="142"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgEmbeddedFonts_8hpp__dep__incl.svg" width="470" height="142"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div>
 <p><a href="abcgEmbeddedFonts_8hpp_source.html">Go to the source code of this file.</a></p>

abcg/doc/html/abcgEmbeddedFonts_8hpp_source.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>

abcg/doc/html/abcgException_8cpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -112,8 +112,7 @@
 </div><div class="textblock"><div class="dynheader">
 Include dependency graph for abcgException.cpp:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgException_8cpp__incl.svg" width="535" height="202"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgException_8cpp__incl.svg" width="535" height="202"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div><a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Definition of <a class="el" href="classabcg_1_1Exception.html" title="Base class for ABCg exception objects.">abcg::Exception</a> members. </p>

abcg/doc/html/abcgException_8hpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -115,14 +115,12 @@
 </div><div class="textblock"><div class="dynheader">
 Include dependency graph for abcgException.hpp:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgException_8hpp__incl.svg" width="330" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgException_8hpp__incl.svg" width="330" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div><div class="textblock"><div class="dynheader">
 This graph shows which files directly or indirectly include this file:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgException_8hpp__dep__incl.svg" width="3288" height="320"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgException_8hpp__dep__incl.svg" width="3288" height="320"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div>
 <p><a href="abcgException_8hpp_source.html">Go to the source code of this file.</a></p>

abcg/doc/html/abcgException_8hpp_source.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>

abcg/doc/html/abcgExternal_8hpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -109,8 +109,7 @@
 <div class="textblock"><div class="dynheader">
 This graph shows which files directly or indirectly include this file:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgExternal_8hpp__dep__incl.svg" width="1407" height="410"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgExternal_8hpp__dep__incl.svg" width="1407" height="410"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div>
 <p><a href="abcgExternal_8hpp_source.html">Go to the source code of this file.</a></p>

abcg/doc/html/abcgExternal_8hpp_source.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>

abcg/doc/html/abcgImage_8cpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -114,8 +114,7 @@
 </div><div class="textblock"><div class="dynheader">
 Include dependency graph for abcgImage.cpp:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgImage_8cpp__incl.svg" width="598" height="202"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgImage_8cpp__incl.svg" width="598" height="202"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div><a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Definition of image manipulation helper functions. </p>

abcg/doc/html/abcgImage_8hpp.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>
@@ -113,14 +113,12 @@
 </div><div class="textblock"><div class="dynheader">
 Include dependency graph for abcgImage.hpp:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgImage_8hpp__incl.svg" width="182" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgImage_8hpp__incl.svg" width="182" height="127"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div><div class="textblock"><div class="dynheader">
 This graph shows which files directly or indirectly include this file:</div>
 <div class="dyncontent">
-<div class="center"><iframe scrolling="no" frameborder="0" src="abcgImage_8hpp__dep__incl.svg" width="416" height="142"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe>
-</div>
+<div class="center"><iframe scrolling="no" frameborder="0" src="abcgImage_8hpp__dep__incl.svg" width="416" height="142"><p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p></iframe></div>
 </div>
 </div>
 <p><a href="abcgImage_8hpp_source.html">Go to the source code of this file.</a></p>

abcg/doc/html/abcgImage_8hpp_source.html

@@ -43,7 +43,7 @@
  <tr style="height: 56px;">
  <td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">ABCg
- &#160;<span id="projectnumber">v3.1.0</span>
+ &#160;<span id="projectnumber">v3.1.1</span>
  </div>
  <div id="projectbrief">Development framework for MCTA008-17</div>
  </td>