From 1bdc52ff5dd05a4a89aac175af6582f437ba7447 Mon Sep 17 00:00:00 2001
From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Fri, 5 Apr 2013 03:36:16 +0000
Subject: [PATCH] added 3.0 todo list and call for help

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1592 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/web-src/help.php     | 25 +++++++++++-------
 freeglut/web-src/index.php    | 16 +++++++++++-
 freeglut/web-src/progress.php | 48 +++++++++++++++++++++++++++++++++--
 3 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/freeglut/web-src/help.php b/freeglut/web-src/help.php
index 89cc020..4998438 100644
--- a/freeglut/web-src/help.php
+++ b/freeglut/web-src/help.php
@@ -7,26 +7,25 @@ setPageTitle("How You Can Help");
 # Make the header.
 generateHeader($_SERVER['PHP_SELF']);
 ?>
-
-<p></p>
-
 <div class="img-right">
 <img src="images/OGL.png" alt="OpenGL" /><br/>
 This is OpenGL at its finest.
 </div>
 
 <div class="textheader">This is better than GLUT.</div>
-<p>freeglut started as a GLUT clone, but now it's something much better than that. It's a GLUT replacement. Here are the features you have wanted -- and if you have ideas for more, share them!</p> 
+<p>FreeGLUT started out as a GLUT clone, but now it's something much
+better than that. It's a GLUT replacement. Here are the features you
+have wanted -- and if you have ideas for more, share them! FreeGLUT is
+under continuous development. Currently, work on 3.0 is in full swing.
+See below for the list of work that is still to be done.</p> 
 
 <div class="textheader">Everyone can help</div>
 <p>
 Free software projects depend on the community around them for their growth. 
 It's by contributions that truly wonderful pieces of open and free software come to be.
-</p> 
+Contributions can be nearly anything.  The point is involvement!</p>
 
-<p>Contributions can be nearly anything.  The point is involvement!</p>
-
-<p>Examples:</p>
+<p>Examples:
 <ul>
 	<li>Use freeglut in your projects!</li>
 	<li>Tell us what you like.</li>
@@ -36,13 +35,21 @@ It's by contributions that truly wonderful pieces of open and free software come
 	<li>Spread the word about the project.</li>
 	<li><a href="http://lists.sourceforge.net/lists/listinfo/freeglut-developer">Join</a> our development mailing list.</li>
 	<li>If you changed a feature, send us a patch -- others might benefit from your work!</li>
-</ul>
+</ul></p>
 
 <p>
 But simply, become involved!
 The project is not just software, it's the people that contribute, too.
 </p>
 
+<div class="textheader">FreeGLUT 3.0</div>
+<p>
+<a href=progress.php>Click here</a> for an overview of the major work,
+its status and planned milestone for FreeGLUT 3.0 and beyond. Help one
+any of these plans, as well as suggestions and/or patches for anything
+else are very welcome!
+</p>
+
 <div class="textheader">Go to SourceForge and...</div>
 
 <ul>
diff --git a/freeglut/web-src/index.php b/freeglut/web-src/index.php
index f63d57a..709da9d 100644
--- a/freeglut/web-src/index.php
+++ b/freeglut/web-src/index.php
@@ -30,8 +30,22 @@ generateHeader($_SERVER['PHP_SELF']);
 <p>Pawel started freeglut development on December 1st, 1999. The project is now virtually a 100% replacement for the original GLUT with only a few departures (such as the abandonment of SGI-specific features such as the Dials&amp;Buttons box and Dynamic Video Resolution) and a shrinking set of bugs.</p>
 <p>There are some additional features such as a larger set of predefined shapes for use in applications.</p>
 
+<div class="textheader"><a name="download"></a>Help out!</div>
+<p>FreeGLUT 3.0 is in active development, and will feature a port to
+Android as well as a host of other enhancements. We are looking for
+developers to help out with further work on the Android port.
+Furthermore, ports to Cocoa/Carbon on OSX, and maybe even Wayland are
+planned. For more information, see the <a href="help.php">Help Out
+page</a> and <a
+href="http://lists.sourceforge.net/lists/listinfo/freeglut-developer">join</a>
+the <a
+href="mailto:freeglut-developer@lists.sourceforge.net">freeglut-developer</a>
+mailing list.<br>Note that the FreeGLUT 3.0 enhancements are already in
+the API docs on the website, some of these will not work with the
+currently available 2.8.1 release.</p>
+
 <div class="textheader"><a name="download"></a>Downloads...</div>
-<p>Below are file links for the freeglut project. README files are included. You can also check the install documentation. The not-quite <a href="http://freeglut.svn.sourceforge.net/viewvc/freeglut/trunk/freeglut/freeglut/ChangeLog?view=log">up-to-date freeglut ChangeLog is available here</a>. Have fun!</p>
+<p>Below are file links for the freeglut project. README files are included. Have fun!</p>
 
 <div class="indent">
 	<div class="textheader">Testing Releases</div>
diff --git a/freeglut/web-src/progress.php b/freeglut/web-src/progress.php
index db18bf2..8355f59 100644
--- a/freeglut/web-src/progress.php
+++ b/freeglut/web-src/progress.php
@@ -8,7 +8,51 @@ setPageTitle("A Look At Progress");
 generateHeader($_SERVER['PHP_SELF']);
 ?>
 
-<div class="textheader">Future Goals</div>
-<p>This still needs filling in, but be assured it will contain something like, "become an even better library."</p>
+<div class="textheader">FreeGLUT 3.0</div>
+<p>
+Major work, its status and planned milestone. <a
+href="help.php">Help</a> on any of these plans is very welcome!</p>
+<table>
+<tr>
+<th>Feature</th><th>Status</th><th>Milestone</th></tr>
+<tr><td>Andriod port</td><td>Basic but complete functionality by Sylvain
+Beucler, but there are <a href=docs/android.php#roadmap>todo
+points</a></td><td>Basic functionality as is now done: 3.0. Future
+enhancements: 3.0 or later.</td></tr>
+
+<tr><td>GL2+ and GLES 1/2 clean API for geometry</td><td>Done for all (geometry like
+cube, cone, etc, as well as the teapot and other parts of the
+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
+here really. Menus will continue to work fine with OpenGL 3+ exclusive
+applications as long as the platform provides legacy contexts, as menus
+have their own rendering context. For text rendering, its probably best if the
+user looks at freetype and the like and avoids the use of FreeGLUT's
+text API</td><td>Probably impossible to do anything here</td></tr>
+
+<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
+of these three the library will be compiled against. No work has been
+done on moving this to an at-runtime API.</td><td>Having this in 3.0
+would be nice, but not essential.</td></tr>
+
+<tr><td>Code reorganized such that platform and display server specific code
+are decoupled</td><td>Done, thanks John Fay! This already lead to a port
+to Android and support for GLES 2 on X11 (thanks Sylvain for both!), and
+paves the way for implementing native OSX and Wayland
+support</td><td>3.0</td></tr>
+
+<tr><td>Position callback</td><td>Done: we now have a position callback
+notifying when position of the window changed.</td><td>3.0</td></tr>
+<tr><td>
+
+<tr><td>Carbon/Cocoa port</td><td>Not started. As Carbon is legacy, one
+might one to port to Cocoa first or even forget about Carbon all
+together.</td><td>Undecided</td></tr>
+
+<tr><td>Wayland port</td><td>Not started.</td><td>Undecided</td></tr>
+</table>
+</p>
 
 <?php generateFooter(); ?>