FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate and reference Android documentation

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1342 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-06-11 21:46:43 +00:00
parent 9641fb9d0d
commit 7b5697d690
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freeglut/web-src/docs/android.php
View File

@ -195,15 +195,7 @@ Possibly implemented later:
<a name="api"></a> <a name="api"></a>
<h1>New API</h1> <h1>New API</h1>
These new callbacks were added : New callbacks were added : see <a href="api.php#Android">API page</a>.
<ul>
<li><code>glutInitContextFunc <- void</code> : called when the context
is initialized or re-initialized (e.g. after a pause)</li>
<li><code>glutPauseFunc <- void</code> : called when the application
goes on a pause (or a stop)</li>
<li><code>glutResumeFunc <- void</code> : called when the application
comes back from a pause (after <code>glutInitContextFunc</code>)</li>
</ul>
New functions will be necessary to : New functions will be necessary to :
<ul> <ul>

38
freeglut/web-src/docs/api.php
View File

@ -211,10 +211,17 @@ contained herein.
</li> </li>
<li><a href="#MultiTouch">MultiTouch Functions</a> <li><a href="#MultiTouch">MultiTouch Functions</a>
<ol> <ol>
<li>glutMultiEntryFunc(id, GLUT_ENTERED|GLUT_LEFT)</li> <li>glutMultiEntryFunc &larr; id, GLUT_ENTERED|GLUT_LEFT</li>
<li>glutMultiButtonFunc(id, x, y, button, GLUT_DOWN|GLUT_UP)</li> <li>glutMultiButtonFunc &larr; id, x, y, button, GLUT_DOWN|GLUT_UP</li>
<li>glutMultiMotionFunc(id, x, y)</li> <li>glutMultiMotionFunc &larr; id, x, y</li>
<li>glutMultiPassiveFunc(id, x, y)</li> <li>glutMultiPassiveFunc &larr; id, x, y</li>
</ol>
</li>
<li><a href="#Android">Android functions</a>
<ol>
<li>glutInitContextFunc &larr; void</li>
<li>glutPauseFunc &larr; void</li>
<li>glutResumeFunc &larr; void</li>
</ol> </ol>
</li> </li>
<li><a href="#Miscellaneous">Miscellaneous Functions</a> <li><a href="#Miscellaneous">Miscellaneous Functions</a>
@ -2148,10 +2155,10 @@ MultiTouch callbacks are used to handle environments with multiple
inputs, such as a multi-touch screen, multi-touch touchpad, or inputs, such as a multi-touch screen, multi-touch touchpad, or
multiple mouses.<br /> multiple mouses.<br />
<h2>glutMultiEntryFunc(id, GLUT_ENTERED|GLUT_LEFT)</h2> <h2>glutMultiEntryFunc &larr; id, GLUT_ENTERED|GLUT_LEFT</h2>
<h2>glutMultiButtonFunc(id, x, y, button, GLUT_DOWN|GLUT_UP)</h2> <h2>glutMultiButtonFunc &larr; id, x, y, button, GLUT_DOWN|GLUT_UP</h2>
<h2>glutMultiMotionFunc(id, x, y)</h2> <h2>glutMultiMotionFunc &larr; id, x, y</h2>
<h2>glutMultiPassiveFunc(id, x, y)</h2> <h2>glutMultiPassiveFunc &larr; id, x, y</h2>
These functions work like their non-multi variants, with an additional These functions work like their non-multi variants, with an additional
'deviceid' parameter describing the current input device (mouse or 'deviceid' parameter describing the current input device (mouse or
@ -2189,6 +2196,21 @@ Since this extra support comes at the cost of extra complexity, we're
<a href="http://sourceforge.net/mailarchive/forum.php?thread_name=20120518071314.GA28061%40perso.beuc.net&forum_name=freeglut-developer">considering</a> <a href="http://sourceforge.net/mailarchive/forum.php?thread_name=20120518071314.GA28061%40perso.beuc.net&forum_name=freeglut-developer">considering</a>
whether/how to implement it. whether/how to implement it.
<h1><a name="Android"></a>Android Functions</h1>
<p>These new callbacks were added:</p>
<ul>
<li><code>glutInitContextFunc &larr; void</code> : called when the context
is initialized or re-initialized (e.g. after a pause)</li>
<li><code>glutPauseFunc &larr; void</code> : called when the application
goes on a pause (or a stop)</li>
<li><code>glutResumeFunc &larr; void</code> : called when the application
comes back from a pause (after <code>glutInitContextFunc</code>)</li>
</ul>
<p>Android support is further described at
the <a href="android.php">Android page</a>.</p>
<h1>19. <a name="Miscellaneous"></a>Miscellaneous Functions</h1> <h1>19. <a name="Miscellaneous"></a>Miscellaneous Functions</h1>

5
freeglut/web-src/docs/install.php
View File

@ -46,4 +46,9 @@ make install
<p>This will install the libraries, headers, and symlinks to replace GLUT.</p> <p>This will install the libraries, headers, and symlinks to replace GLUT.</p>
<p>For Android, please see the dedicated <a href="android.php">Android page</a>.</p>
<p>For OpenGL ES support (1.x and 2.x), please see the
dedicated <a href="gles.php">GLES page</a>.</p>
<?php generateFooter(); ?> <?php generateFooter(); ?>