Merge branch 'trunk' into git_master

This commit is contained in:
Diederick Niehorster 2014-10-07 00:40:57 +08:00
commit d84c96a10a

View File

@ -38,12 +38,14 @@ or later.</td></tr>
cube, cone, etc, as well as the teapot and other parts of the cube, cone, etc, as well as the teapot and other parts of the
teaset)</td><td>3.0</td></tr> teaset)</td><td>3.0</td></tr>
<tr><td>GL2+ and GLES 1/2 clean API for fonts and menus</td><td>Not sure what can be done <tr><td>GL2+ and GLES 1/2 clean API for fonts and menus</td><td>For
here really. Menus will continue to work fine with OpenGL 3+ exclusive stroke fonts, we can use a similar approach as for the shapes, should
applications as long as the platform provides legacy contexts, as menus thus be straightforward. For the bitmap fonts, this is more complex.
have their own rendering context. For text rendering, its probably best if the John T suggested "using a glyph atlas texture with GL_STREAM_DRAW VBOs",
user looks at freetype and the like and avoids the use of FreeGLUT's which would get us somewhere. Code could be ripped from his </a
text API</td><td>Probably impossible to do anything here</td></tr> href="http://nuclear.mutantstargoat.com/sw/libdrawtext/">libdrawtext
library</a></td><td>The sooner the better, but will have to wait for
asap after 3.0.</td></tr>
<tr><td>At runtime loading of OpenGL, OpenGL ES1 or OpenGL ES2 libraries, <tr><td>At runtime loading of OpenGL, OpenGL ES1 or OpenGL ES2 libraries,
like SDL.</td><td>Currently CMake variables define at compile time which like SDL.</td><td>Currently CMake variables define at compile time which
@ -68,6 +70,10 @@ together.</td><td>Undecided</td></tr>
<tr><td>Wayland port</td><td>Not started.</td><td>Undecided</td></tr> <tr><td>Wayland port</td><td>Not started.</td><td>Undecided</td></tr>
<tr><td>Unicode support</td><td>Not started, we'd need to discuss this
carefully on the mailing list first to minimize impact on the
API.</td><td>Undecided</td></tr>
<tr><td>Complete glutInitDisplayString support</td><td>FreeGLUT now only <tr><td>Complete glutInitDisplayString support</td><td>FreeGLUT now only
partially supports glutInitDisplayString, any spec (comparator and partially supports glutInitDisplayString, any spec (comparator and
value) after each token are ignored. This is a significant way in which value) after each token are ignored. This is a significant way in which