Skip to content

Commit 1195889

Browse files
olilarkinolilarkin
committed
1 parent 671236a commit 1195889

27 files changed

Lines changed: 4499 additions & 4141 deletions

‎_i_graphics__include__in__plug__hdr_8h_source.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@
104104
<div class="line"><a id="l00023" name="l00023"></a><span class="lineno"> 23</span> </div>
105105
<div class="line"><a id="l00024" name="l00024"></a><span class="lineno"> 24</span><span class="preprocessor">#if defined IGRAPHICS_GLES2</span></div>
106106
<div class="line"><a id="l00025" name="l00025"></a><span class="lineno"> 25</span><span class="preprocessor"> #if defined OS_IOS</span></div>
107-
<div class="line"><a id="l00026" name="l00026"></a><span class="lineno"> 26</span><span class="preprocessor"> #include &lt;OpenGLES/ES2/gl.h&gt;</span></div>
107+
<div class="line"><a id="l00026" name="l00026"></a><span class="lineno"> 26</span><span class="preprocessor"> #include &lt;libGLESv2/angle_gl.h&gt;</span></div>
108108
<div class="line"><a id="l00027" name="l00027"></a><span class="lineno"> 27</span><span class="preprocessor"> #elif defined OS_WEB</span></div>
109109
<div class="line"><a id="l00028" name="l00028"></a><span class="lineno"> 28</span><span class="preprocessor"> #include &lt;GLES2/gl2.h&gt;</span></div>
110110
<div class="line"><a id="l00029" name="l00029"></a><span class="lineno"> 29</span><span class="preprocessor"> #endif</span></div>
111111
<div class="line"><a id="l00030" name="l00030"></a><span class="lineno"> 30</span><span class="preprocessor">#elif defined IGRAPHICS_GLES3</span></div>
112112
<div class="line"><a id="l00031" name="l00031"></a><span class="lineno"> 31</span><span class="preprocessor"> #if defined OS_IOS</span></div>
113-
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span><span class="preprocessor"> #include &lt;OpenGLES/ES3/gl.h&gt;</span></div>
113+
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span><span class="preprocessor"> #include &lt;libGLESv2/angle_gl.h&gt;</span></div>
114114
<div class="line"><a id="l00033" name="l00033"></a><span class="lineno"> 33</span><span class="preprocessor"> #elif defined OS_WEB</span></div>
115115
<div class="line"><a id="l00034" name="l00034"></a><span class="lineno"> 34</span><span class="preprocessor"> #include &lt;GLES3/gl3.h&gt;</span></div>
116116
<div class="line"><a id="l00035" name="l00035"></a><span class="lineno"> 35</span><span class="preprocessor"> #endif</span></div>

‎_i_graphics__select_8h_source.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@
102102
<div class="line"><a id="l00020" name="l00020"></a><span class="lineno"> 20</span><span class="preprocessor"> #if defined IGRAPHICS_GLES2</span></div>
103103
<div class="line"><a id="l00021" name="l00021"></a><span class="lineno"> 21</span><span class="preprocessor"> #define IGRAPHICS_GL</span></div>
104104
<div class="line"><a id="l00022" name="l00022"></a><span class="lineno"> 22</span><span class="preprocessor"> #if defined OS_IOS</span></div>
105-
<div class="line"><a id="l00023" name="l00023"></a><span class="lineno"> 23</span><span class="preprocessor"> #include &lt;OpenGLES/ES2/gl.h&gt;</span></div>
105+
<div class="line"><a id="l00023" name="l00023"></a><span class="lineno"> 23</span><span class="preprocessor"> #include &lt;libGLESv2/angle_gl.h&gt;</span></div>
106106
<div class="line"><a id="l00024" name="l00024"></a><span class="lineno"> 24</span><span class="preprocessor"> #elif defined OS_WEB</span></div>
107107
<div class="line"><a id="l00025" name="l00025"></a><span class="lineno"> 25</span><span class="preprocessor"> #include &lt;GLES2/gl2.h&gt;</span></div>
108108
<div class="line"><a id="l00026" name="l00026"></a><span class="lineno"> 26</span><span class="preprocessor"> #endif</span></div>
109109
<div class="line"><a id="l00027" name="l00027"></a><span class="lineno"> 27</span><span class="preprocessor"> #elif defined IGRAPHICS_GLES3</span></div>
110110
<div class="line"><a id="l00028" name="l00028"></a><span class="lineno"> 28</span><span class="preprocessor"> #define IGRAPHICS_GL</span></div>
111111
<div class="line"><a id="l00029" name="l00029"></a><span class="lineno"> 29</span><span class="preprocessor"> #if defined OS_IOS</span></div>
112-
<div class="line"><a id="l00030" name="l00030"></a><span class="lineno"> 30</span><span class="preprocessor"> #include &lt;OpenGLES/ES3/gl.h&gt;</span></div>
112+
<div class="line"><a id="l00030" name="l00030"></a><span class="lineno"> 30</span><span class="preprocessor"> #include &lt;libGLESv2/angle_gl.h&gt;</span></div>
113113
<div class="line"><a id="l00031" name="l00031"></a><span class="lineno"> 31</span><span class="preprocessor"> #elif defined OS_WEB</span></div>
114114
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span><span class="preprocessor"> #include &lt;GLES3/gl3.h&gt;</span></div>
115115
<div class="line"><a id="l00033" name="l00033"></a><span class="lineno"> 33</span><span class="preprocessor"> #endif</span></div>

‎_i_graphics_i_o_s_8h_source.html‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -159,23 +159,25 @@
159159
<div class="line"><a id="l00074" name="l00074"></a><span class="lineno"> 74</span> </div>
160160
<div class="line"><a id="l00075" name="l00075"></a><span class="lineno"> 75</span> EUIAppearance GetUIAppearance() <span class="keyword">const override</span>;</div>
161161
<div class="line"><a id="l00076" name="l00076"></a><span class="lineno"> 76</span> </div>
162-
<div class="line"><a id="l00077" name="l00077"></a><span class="lineno"> 77</span><span class="keyword">protected</span>:</div>
163-
<div class="line"><a id="l00078" name="l00078"></a><span class="lineno"> 78</span> PlatformFontPtr LoadPlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keyword">const</span> <span class="keywordtype">char</span>* fileNameOrResID) <span class="keyword">override</span>;</div>
164-
<div class="line"><a id="l00079" name="l00079"></a><span class="lineno"> 79</span> PlatformFontPtr LoadPlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keyword">const</span> <span class="keywordtype">char</span>* fontName, ETextStyle style) <span class="keyword">override</span>;</div>
165-
<div class="line"><a id="l00080" name="l00080"></a><span class="lineno"> 80</span> PlatformFontPtr LoadPlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keywordtype">void</span>* pData, <span class="keywordtype">int</span> dataSize) <span class="keyword">override</span>;</div>
166-
<div class="line"><a id="l00081" name="l00081"></a><span class="lineno"> 81</span> <span class="keywordtype">void</span> CachePlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keyword">const</span> PlatformFontPtr&amp; font) <span class="keyword">override</span>;</div>
167-
<div class="line"><a id="l00082" name="l00082"></a><span class="lineno"> 82</span> </div>
168-
<div class="line"><a id="l00083" name="l00083"></a><span class="lineno"> 83</span> <a class="code hl_class" href="class_i_popup_menu.html">IPopupMenu</a>* CreatePlatformPopupMenu(<a class="code hl_class" href="class_i_popup_menu.html">IPopupMenu</a>&amp; menu, <span class="keyword">const</span> <a class="code hl_struct" href="struct_i_r_e_c_t.html">IRECT</a> bounds, <span class="keywordtype">bool</span>&amp; isAsync) <span class="keyword">override</span>;</div>
169-
<div class="line"><a id="l00084" name="l00084"></a><span class="lineno"> 84</span> <span class="keywordtype">void</span> CreatePlatformTextEntry(<span class="keywordtype">int</span> paramIdx, <span class="keyword">const</span> <a class="code hl_struct" href="struct_i_text.html">IText</a>&amp; text, <span class="keyword">const</span> <a class="code hl_struct" href="struct_i_r_e_c_t.html">IRECT</a>&amp; bounds, <span class="keywordtype">int</span> length, <span class="keyword">const</span> <span class="keywordtype">char</span>* str) <span class="keyword">override</span>;</div>
170-
<div class="line"><a id="l00085" name="l00085"></a><span class="lineno"> 85</span> </div>
171-
<div class="line"><a id="l00086" name="l00086"></a><span class="lineno"> 86</span><span class="keyword">private</span>:</div>
172-
<div class="line"><a id="l00087" name="l00087"></a><span class="lineno"> 87</span> <span class="keywordtype">void</span>* mView = <span class="keyword">nullptr</span>;</div>
173-
<div class="line"><a id="l00088" name="l00088"></a><span class="lineno"> 88</span> WDL_String mBundleID;</div>
174-
<div class="line"><a id="l00089" name="l00089"></a><span class="lineno"> 89</span> WDL_String mAppGroupID;</div>
175-
<div class="line"><a id="l00090" name="l00090"></a><span class="lineno"> 90</span>};</div>
176-
<div class="line"><a id="l00091" name="l00091"></a><span class="lineno"> 91</span> </div>
177-
<div class="line"><a id="l00092" name="l00092"></a><span class="lineno"> 92</span>END_IGRAPHICS_NAMESPACE</div>
178-
<div class="line"><a id="l00093" name="l00093"></a><span class="lineno"> 93</span>END_IPLUG_NAMESPACE</div>
162+
<div class="line"><a id="l00077" name="l00077"></a><span class="lineno"> 77</span> <span class="keywordtype">void</span> ActivateGLContext() <span class="keyword">override</span>;</div>
163+
<div class="line"><a id="l00078" name="l00078"></a><span class="lineno"> 78</span> <span class="keywordtype">void</span> DeactivateGLContext() <span class="keyword">override</span>;</div>
164+
<div class="line"><a id="l00079" name="l00079"></a><span class="lineno"> 79</span><span class="keyword">protected</span>:</div>
165+
<div class="line"><a id="l00080" name="l00080"></a><span class="lineno"> 80</span> PlatformFontPtr LoadPlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keyword">const</span> <span class="keywordtype">char</span>* fileNameOrResID) <span class="keyword">override</span>;</div>
166+
<div class="line"><a id="l00081" name="l00081"></a><span class="lineno"> 81</span> PlatformFontPtr LoadPlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keyword">const</span> <span class="keywordtype">char</span>* fontName, ETextStyle style) <span class="keyword">override</span>;</div>
167+
<div class="line"><a id="l00082" name="l00082"></a><span class="lineno"> 82</span> PlatformFontPtr LoadPlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keywordtype">void</span>* pData, <span class="keywordtype">int</span> dataSize) <span class="keyword">override</span>;</div>
168+
<div class="line"><a id="l00083" name="l00083"></a><span class="lineno"> 83</span> <span class="keywordtype">void</span> CachePlatformFont(<span class="keyword">const</span> <span class="keywordtype">char</span>* fontID, <span class="keyword">const</span> PlatformFontPtr&amp; font) <span class="keyword">override</span>;</div>
169+
<div class="line"><a id="l00084" name="l00084"></a><span class="lineno"> 84</span> </div>
170+
<div class="line"><a id="l00085" name="l00085"></a><span class="lineno"> 85</span> <a class="code hl_class" href="class_i_popup_menu.html">IPopupMenu</a>* CreatePlatformPopupMenu(<a class="code hl_class" href="class_i_popup_menu.html">IPopupMenu</a>&amp; menu, <span class="keyword">const</span> <a class="code hl_struct" href="struct_i_r_e_c_t.html">IRECT</a> bounds, <span class="keywordtype">bool</span>&amp; isAsync) <span class="keyword">override</span>;</div>
171+
<div class="line"><a id="l00086" name="l00086"></a><span class="lineno"> 86</span> <span class="keywordtype">void</span> CreatePlatformTextEntry(<span class="keywordtype">int</span> paramIdx, <span class="keyword">const</span> <a class="code hl_struct" href="struct_i_text.html">IText</a>&amp; text, <span class="keyword">const</span> <a class="code hl_struct" href="struct_i_r_e_c_t.html">IRECT</a>&amp; bounds, <span class="keywordtype">int</span> length, <span class="keyword">const</span> <span class="keywordtype">char</span>* str) <span class="keyword">override</span>;</div>
172+
<div class="line"><a id="l00087" name="l00087"></a><span class="lineno"> 87</span> </div>
173+
<div class="line"><a id="l00088" name="l00088"></a><span class="lineno"> 88</span><span class="keyword">private</span>:</div>
174+
<div class="line"><a id="l00089" name="l00089"></a><span class="lineno"> 89</span> <span class="keywordtype">void</span>* mView = <span class="keyword">nullptr</span>;</div>
175+
<div class="line"><a id="l00090" name="l00090"></a><span class="lineno"> 90</span> WDL_String mBundleID;</div>
176+
<div class="line"><a id="l00091" name="l00091"></a><span class="lineno"> 91</span> WDL_String mAppGroupID;</div>
177+
<div class="line"><a id="l00092" name="l00092"></a><span class="lineno"> 92</span>};</div>
178+
<div class="line"><a id="l00093" name="l00093"></a><span class="lineno"> 93</span> </div>
179+
<div class="line"><a id="l00094" name="l00094"></a><span class="lineno"> 94</span>END_IGRAPHICS_NAMESPACE</div>
180+
<div class="line"><a id="l00095" name="l00095"></a><span class="lineno"> 95</span>END_IPLUG_NAMESPACE</div>
179181
<div class="ttc" id="a_i_graphics__select_8h_html"><div class="ttname"><a href="_i_graphics__select_8h.html">IGraphics_select.h</a></div><div class="ttdoc">Used for choosing a drawing backend.</div></div>
180182
<div class="ttc" id="aclass_i_g_editor_delegate_html"><div class="ttname"><a href="class_i_g_editor_delegate.html">IGEditorDelegate</a></div><div class="ttdoc">An editor delegate base class that uses IGraphics for the UI.</div><div class="ttdef"><b>Definition:</b> <a href="_i_graphics_editor_delegate_8h_source.html#l00030">IGraphicsEditorDelegate.h:31</a></div></div>
181183
<div class="ttc" id="aclass_i_graphics_i_o_s_html"><div class="ttname"><a href="class_i_graphics_i_o_s.html">IGraphicsIOS</a></div><div class="ttdoc">IGraphics platform class for IOS.</div><div class="ttdef"><b>Definition:</b> <a href="_i_graphics_i_o_s_8h_source.html#l00024">IGraphicsIOS.h:25</a></div></div>

‎_i_graphics_i_o_s_8mm_source.html‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<div class="line"><a id="l00110" name="l00110"></a><span class="lineno"> 110</span> mView = (<span class="keywordtype">void</span>*) view;</div>
198198
<div class="line"><a id="l00111" name="l00111"></a><span class="lineno"> 111</span> </div>
199199
<div class="line"><a id="l00112" name="l00112"></a><span class="lineno"> 112</span> <a class="code hl_class" href="class_i_graphics_1_1_scoped_g_l_context.html">IGraphics::ScopedGLContext</a> scopedGLContext{<span class="keyword">this</span>};</div>
200-
<div class="line"><a id="l00113" name="l00113"></a><span class="lineno"> 113</span> OnViewInitialized((<span class="keywordtype">void</span>*) [view metalLayer]);</div>
200+
<div class="line"><a id="l00113" name="l00113"></a><span class="lineno"> 113</span> OnViewInitialized((<span class="keywordtype">void</span>*) [view layer]);</div>
201201
<div class="line"><a id="l00114" name="l00114"></a><span class="lineno"> 114</span> </div>
202202
<div class="line"><a id="l00115" name="l00115"></a><span class="lineno"> 115</span><span class="preprocessor">#if !TARGET_OS_VISION</span></div>
203203
<div class="line"><a id="l00116" name="l00116"></a><span class="lineno"> 116</span> CGFloat scale = [UIScreen mainScreen].scale;</div>
@@ -466,13 +466,26 @@
466466
<div class="line"><a id="l00379" name="l00379"></a><span class="lineno"> 379</span> }</div>
467467
<div class="line"><a id="l00380" name="l00380"></a><span class="lineno"> 380</span>}</div>
468468
<div class="line"><a id="l00381" name="l00381"></a><span class="lineno"> 381</span> </div>
469-
<div class="line"><a id="l00382" name="l00382"></a><span class="lineno"> 382</span><span class="preprocessor">#if defined IGRAPHICS_NANOVG</span></div>
470-
<div class="line"><a id="l00383" name="l00383"></a><span class="lineno"> 383</span><span class="preprocessor"> #include &quot;IGraphicsNanoVG.cpp&quot;</span></div>
471-
<div class="line"><a id="l00384" name="l00384"></a><span class="lineno"> 384</span><span class="preprocessor">#elif defined IGRAPHICS_SKIA</span></div>
472-
<div class="line"><a id="l00385" name="l00385"></a><span class="lineno"> 385</span><span class="preprocessor"> #include &quot;IGraphicsSkia.cpp&quot;</span></div>
473-
<div class="line"><a id="l00386" name="l00386"></a><span class="lineno"> 386</span><span class="preprocessor">#else</span></div>
474-
<div class="line"><a id="l00387" name="l00387"></a><span class="lineno"> 387</span><span class="preprocessor"> #error Either NO_IGRAPHICS or one and only one choice of graphics library must be defined!</span></div>
475-
<div class="line"><a id="l00388" name="l00388"></a><span class="lineno"> 388</span><span class="preprocessor">#endif</span></div>
469+
<div class="line"><a id="l00382" name="l00382"></a><span class="lineno"> 382</span><span class="keywordtype">void</span> IGraphicsIOS::ActivateGLContext()</div>
470+
<div class="line"><a id="l00383" name="l00383"></a><span class="lineno"> 383</span>{</div>
471+
<div class="line"><a id="l00384" name="l00384"></a><span class="lineno"> 384</span> IGRAPHICS_VIEW* pView = (IGRAPHICS_VIEW*) mView;</div>
472+
<div class="line"><a id="l00385" name="l00385"></a><span class="lineno"> 385</span> [pView activateGLContext];</div>
473+
<div class="line"><a id="l00386" name="l00386"></a><span class="lineno"> 386</span>}</div>
474+
<div class="line"><a id="l00387" name="l00387"></a><span class="lineno"> 387</span> </div>
475+
<div class="line"><a id="l00388" name="l00388"></a><span class="lineno"> 388</span><span class="keywordtype">void</span> IGraphicsIOS::DeactivateGLContext()</div>
476+
<div class="line"><a id="l00389" name="l00389"></a><span class="lineno"> 389</span>{</div>
477+
<div class="line"><a id="l00390" name="l00390"></a><span class="lineno"> 390</span> IGRAPHICS_VIEW* pView = (IGRAPHICS_VIEW*) mView;</div>
478+
<div class="line"><a id="l00391" name="l00391"></a><span class="lineno"> 391</span> [pView deactivateGLContext];</div>
479+
<div class="line"><a id="l00392" name="l00392"></a><span class="lineno"> 392</span>}</div>
480+
<div class="line"><a id="l00393" name="l00393"></a><span class="lineno"> 393</span> </div>
481+
<div class="line"><a id="l00394" name="l00394"></a><span class="lineno"> 394</span> </div>
482+
<div class="line"><a id="l00395" name="l00395"></a><span class="lineno"> 395</span><span class="preprocessor">#if defined IGRAPHICS_NANOVG</span></div>
483+
<div class="line"><a id="l00396" name="l00396"></a><span class="lineno"> 396</span><span class="preprocessor"> #include &quot;IGraphicsNanoVG.cpp&quot;</span></div>
484+
<div class="line"><a id="l00397" name="l00397"></a><span class="lineno"> 397</span><span class="preprocessor">#elif defined IGRAPHICS_SKIA</span></div>
485+
<div class="line"><a id="l00398" name="l00398"></a><span class="lineno"> 398</span><span class="preprocessor"> #include &quot;IGraphicsSkia.cpp&quot;</span></div>
486+
<div class="line"><a id="l00399" name="l00399"></a><span class="lineno"> 399</span><span class="preprocessor">#else</span></div>
487+
<div class="line"><a id="l00400" name="l00400"></a><span class="lineno"> 400</span><span class="preprocessor"> #error Either NO_IGRAPHICS or one and only one choice of graphics library must be defined!</span></div>
488+
<div class="line"><a id="l00401" name="l00401"></a><span class="lineno"> 401</span><span class="preprocessor">#endif</span></div>
476489
<div class="ttc" id="aclass_i_g_editor_delegate_html"><div class="ttname"><a href="class_i_g_editor_delegate.html">IGEditorDelegate</a></div><div class="ttdoc">An editor delegate base class that uses IGraphics for the UI.</div><div class="ttdef"><b>Definition:</b> <a href="_i_graphics_editor_delegate_8h_source.html#l00030">IGraphicsEditorDelegate.h:31</a></div></div>
477490
<div class="ttc" id="aclass_i_graphics_1_1_scoped_g_l_context_html"><div class="ttname"><a href="class_i_graphics_1_1_scoped_g_l_context.html">IGraphics::ScopedGLContext</a></div><div class="ttdef"><b>Definition:</b> <a href="_i_graphics_8h_source.html#l00974">IGraphics.h:975</a></div></div>
478491
<div class="ttc" id="aclass_i_graphics_html_a50390d533f1478ce1373ff601479cb80"><div class="ttname"><a href="class_i_graphics.html#a50390d533f1478ce1373ff601479cb80">IGraphics::AttachGestureRecognizer</a></div><div class="ttdeci">virtual void AttachGestureRecognizer(EGestureType type)</div><div class="ttdoc">Registers a gesture recognizer with the graphics context.</div><div class="ttdef"><b>Definition:</b> <a href="_i_graphics_8cpp_source.html#l02396">IGraphics.cpp:2396</a></div></div>

0 commit comments

Comments
 (0)