freeglut
12 years agoWhen receiving WM_SETFOCUS, check if its child window that should
Diederick Niehorster [Mon, 23 Jul 2012 07:00:14 +0000 (07:00 +0000)]
When receiving WM_SETFOCUS, check if its child window that should
actually get focus
That fixes corner case issue with menus in main and child windows being
open at the same time

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1361 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoadded one more child window (child-of-child) to one demo for testing
Diederick Niehorster [Mon, 23 Jul 2012 06:55:45 +0000 (06:55 +0000)]
added one more child window (child-of-child) to one demo for testing

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1360 7f0cb862-5218-0410-a997-914c9d46530a

12 years agonow checking for NULL window in fgDeactivateMenu (thanks for Ioannis to
Diederick Niehorster [Sun, 22 Jul 2012 10:54:39 +0000 (10:54 +0000)]
now checking for NULL window in fgDeactivateMenu (thanks for Ioannis to
point out this occurs)
now dealing with the aftermath of the corner case bugs of different
menus in main and child windows both being open at the same time (which
is a bug in itself, but can't figure out a fix). No more crash at least!

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1359 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoadded entry callback to one demo
Diederick Niehorster [Sun, 22 Jul 2012 10:03:36 +0000 (10:03 +0000)]
added entry callback to one demo

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1358 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoargh, some debug code made it in (don't commit and then make changes to
Diederick Niehorster [Sat, 21 Jul 2012 14:19:38 +0000 (14:19 +0000)]
argh, some debug code made it in (don't commit and then make changes to
the file before its fully transmitted...)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1357 7f0cb862-5218-0410-a997-914c9d46530a

12 years agosome clean up in WM_KILLFOCUS handler
Diederick Niehorster [Sat, 21 Jul 2012 14:18:13 +0000 (14:18 +0000)]
some clean up in WM_KILLFOCUS handler

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1356 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoadded a child window to one demo, added different menus attached to
Diederick Niehorster [Sat, 21 Jul 2012 14:15:39 +0000 (14:15 +0000)]
added a child window to one demo, added different menus attached to
different mouse buttons, for testing
Also added missing post redisplay to keep animation going

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1355 7f0cb862-5218-0410-a997-914c9d46530a

12 years agocan now also handle the case where menus is opened, client area of
Diederick Niehorster [Sat, 21 Jul 2012 04:04:45 +0000 (04:04 +0000)]
can now also handle the case where menus is opened, client area of
window with menu is clicked and then user switches to another window.

Implemented menu enumerator and a function for getting currently active
menu, if any

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1354 7f0cb862-5218-0410-a997-914c9d46530a

12 years agobetter test of menus: one window now has right and left click menus
Diederick Niehorster [Sat, 21 Jul 2012 03:58:04 +0000 (03:58 +0000)]
better test of menus: one window now has right and left click menus

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1353 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofixes two cases of menu's not closing when they should:
Diederick Niehorster [Sat, 21 Jul 2012 03:11:57 +0000 (03:11 +0000)]
fixes two cases of menu's not closing when they should:
1. open a menu in one of the freeglut windows, then activate another app
(or the console window) by clicking on that. The freeglut menu doesn't
close, and as it is topmost, it shines through everything.
2. open a menu in one of the freeglut windows, then click on the
non-client area of another freeglut window (e.g. the title bar): menu
doesn't close

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1352 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoWhen having submenu open in one window and activating its root menu in
Diederick Niehorster [Sat, 21 Jul 2012 02:32:58 +0000 (02:32 +0000)]
When having submenu open in one window and activating its root menu in
another window, submenu didn't close and root menu's activate state
wasn't reset. Fixed.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1351 7f0cb862-5218-0410-a997-914c9d46530a

12 years agosmall addition to debug msg handy for testing
Diederick Niehorster [Fri, 20 Jul 2012 08:07:52 +0000 (08:07 +0000)]
small addition to debug msg handy for testing

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1350 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoneed to check for NULL as well....
Diederick Niehorster [Fri, 20 Jul 2012 06:48:05 +0000 (06:48 +0000)]
need to check for NULL as well....

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1349 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoremoved SetFocus that was added to WM_MOUSEMOVE to handle keyboard focus
Diederick Niehorster [Fri, 20 Jul 2012 06:35:38 +0000 (06:35 +0000)]
removed SetFocus that was added to WM_MOUSEMOVE to handle keyboard focus
with subwindows
Now using a solution similar to GLUT's, when receiving input, check if
mouse is actually on a child of the window passed in by the event, and
process as if event was on that window instead

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1348 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoit was in 2003 that his compiler didn't recognize this symbol, lets
Diederick Niehorster [Fri, 20 Jul 2012 05:44:05 +0000 (05:44 +0000)]
it was in 2003 that his compiler didn't recognize this symbol, lets
assume its fine by now on anything we support

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1347 7f0cb862-5218-0410-a997-914c9d46530a

12 years agocannot use //-style comments in shader source, doesn't work on nVidia
Diederick Niehorster [Mon, 18 Jun 2012 06:14:32 +0000 (06:14 +0000)]
cannot use //-style comments in shader source, doesn't work on nVidia
cards (it seems, samples size is only one nVidia and one AMD card)

also removed //-style comments from C source

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1346 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoadded bunch of error checks to shapes demo
Diederick Niehorster [Fri, 15 Jun 2012 05:54:44 +0000 (05:54 +0000)]
added bunch of error checks to shapes demo

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1345 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoas per Ioannis Petikas' suggestion on the mailing list, set NeedToResize
Diederick Niehorster [Fri, 15 Jun 2012 05:47:32 +0000 (05:47 +0000)]
as per Ioannis Petikas' suggestion on the mailing list, set NeedToResize
to false before calling fghReshapeWindow

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1344 7f0cb862-5218-0410-a997-914c9d46530a

12 years agobit of documentation
Diederick Niehorster [Tue, 12 Jun 2012 09:33:25 +0000 (09:33 +0000)]
bit of documentation

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1343 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFixing mouse wheel bug in Windows per e-mail from Ioannis Petikas dated 5/9/12 at...
John F. Fay [Sun, 10 Jun 2012 20:41:45 +0000 (20:41 +0000)]
Fixing mouse wheel bug in Windows per e-mail from Ioannis Petikas dated 5/9/12 at 1:02 PM.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1341 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFixing the situation in which the special-key-up callback is called twice when Ctrl...
John F. Fay [Sun, 10 Jun 2012 19:35:13 +0000 (19:35 +0000)]
Fixing the situation in which the special-key-up callback is called twice when Ctrl, Alt, or Shift is released.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1340 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoReference myself in AUTHORS
Sylvain Beucler [Sun, 10 Jun 2012 09:06:45 +0000 (09:06 +0000)]
Reference myself in AUTHORS

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1339 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFixing the warning message when "glutGetModifiers" is called from within the special...
John F. Fay [Sat, 9 Jun 2012 19:43:44 +0000 (19:43 +0000)]
Fixing the warning message when "glutGetModifiers" is called from within the special key callback; also removing some unused key codes in the special key processing code.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1338 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoCall Pause/Resume callbacks from Android
Sylvain Beucler [Sat, 9 Jun 2012 18:02:33 +0000 (18:02 +0000)]
Call Pause/Resume callbacks from Android

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1336 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoMake glutInitContextFunc/glutPauseFunc/glutResumeFunc names definitive (+ reference...
Sylvain Beucler [Sat, 9 Jun 2012 17:49:27 +0000 (17:49 +0000)]
Make glutInitContextFunc/glutPauseFunc/glutResumeFunc names definitive (+ reference them in the .def)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1335 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFix compilation of demos/shapes
Sylvain Beucler [Sat, 9 Jun 2012 17:38:24 +0000 (17:38 +0000)]
Fix compilation of demos/shapes

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1334 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAdd pointers to discussion on multi-touch
Sylvain Beucler [Sat, 9 Jun 2012 17:29:10 +0000 (17:29 +0000)]
Add pointers to discussion on multi-touch

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1332 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoMark FREEGLUT_VERSION_2_0 as deprecated as per ML discussion 'FREEGLUT_VERSION_2_0...
Sylvain Beucler [Sat, 9 Jun 2012 17:25:34 +0000 (17:25 +0000)]
Mark FREEGLUT_VERSION_2_0 as deprecated as per ML discussion 'FREEGLUT_VERSION_2_0' on 2012-03-15 (see website documentation)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1330 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoREADME.mingw_cross: Clarify + remove autotools instructions since autotools support...
Sylvain Beucler [Sat, 9 Jun 2012 17:23:07 +0000 (17:23 +0000)]
README.mingw_cross: Clarify + remove autotools instructions since autotools support was removed

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1329 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoshapes demo can now test shader based drawing as well, added glmatrix
Diederick Niehorster [Sat, 9 Jun 2012 14:56:58 +0000 (14:56 +0000)]
shapes demo can now test shader based drawing as well, added glmatrix
helpers mostly written by John T.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1328 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofixed warnings
Diederick Niehorster [Fri, 8 Jun 2012 01:03:12 +0000 (01:03 +0000)]
fixed warnings

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1327 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoadded d suffix for debug builds of demos as well, MSVC only
Diederick Niehorster [Thu, 7 Jun 2012 13:52:23 +0000 (13:52 +0000)]
added d suffix for debug builds of demos as well, MSVC only

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1326 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoClarify why check for XInput
Sylvain Beucler [Tue, 29 May 2012 18:33:22 +0000 (18:33 +0000)]
Clarify why check for XInput

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1325 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoPrecision about Unix installation (XInput)
Sylvain Beucler [Tue, 29 May 2012 18:32:51 +0000 (18:32 +0000)]
Precision about Unix installation (XInput)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1324 7f0cb862-5218-0410-a997-914c9d46530a

12 years agospaceball demo is only meaningful on unix, don't build on other
Diederick Niehorster [Fri, 25 May 2012 01:35:06 +0000 (01:35 +0000)]
spaceball demo is only meaningful on unix, don't build on other
platforms

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1323 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoon windows+MSVC, debug builds of the library now have a 'd' suffix.
Diederick Niehorster [Fri, 25 May 2012 01:31:25 +0000 (01:31 +0000)]
on windows+MSVC, debug builds of the library now have a 'd' suffix.
freeglutdll.def was edited to no longer include the name of teh library
that would clash with this
and freeglut_std.h was edited to specify linking to the right library
when building in debug mode

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1322 7f0cb862-5218-0410-a997-914c9d46530a

12 years agonote about teapot rendering, front facing polygons have clockwise
Diederick Niehorster [Thu, 24 May 2012 15:05:34 +0000 (15:05 +0000)]
note about teapot rendering, front facing polygons have clockwise
winding

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1321 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofixed C++ code in multi-touch demo (thanks Geoff McLane!)
Diederick Niehorster [Mon, 21 May 2012 10:17:55 +0000 (10:17 +0000)]
fixed C++ code in multi-touch demo (thanks Geoff McLane!)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1320 7f0cb862-5218-0410-a997-914c9d46530a

12 years agono longer using sinf/cosfsqrtf in fg_geometry, no need for all this
Diederick Niehorster [Mon, 21 May 2012 09:36:23 +0000 (09:36 +0000)]
no longer using sinf/cosfsqrtf in fg_geometry, no need for all this
extra boilerplate

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1319 7f0cb862-5218-0410-a997-914c9d46530a

12 years agomulti-touch sample: use FG2.8 (reversed) prototype for now
Sylvain Beucler [Sun, 13 May 2012 09:14:27 +0000 (09:14 +0000)]
multi-touch sample: use FG2.8 (reversed) prototype for now

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1317 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFix extra CRLF
Sylvain Beucler [Sun, 13 May 2012 09:13:46 +0000 (09:13 +0000)]
Fix extra CRLF

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1316 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoMulti-touch: fix CMake: Xi and XInput2.h detection wasn't ported from autoconf, effec...
Sylvain Beucler [Sun, 13 May 2012 09:08:35 +0000 (09:08 +0000)]
Multi-touch: fix CMake: Xi and XInput2.h detection wasn't ported from autoconf, effectively disabling multi-touch

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1315 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAndroid: warn on resume if no callback for InitContext is defined
Sylvain Beucler [Sun, 13 May 2012 09:05:55 +0000 (09:05 +0000)]
Android: warn on resume if no callback for InitContext is defined

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1314 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoApplied Thomas Bastiani's patch fixing the behaviour of freeglut under X11 when
John Tsiombikas [Thu, 10 May 2012 18:50:52 +0000 (18:50 +0000)]
Applied Thomas Bastiani's patch fixing the behaviour of freeglut under X11 when
operating without a window manager. Adds a fake ConfigureNotify event to make
sure reshape callbacks are called at least once as specified.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1313 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoMulti-touch test program
Sylvain Beucler [Tue, 8 May 2012 17:09:38 +0000 (17:09 +0000)]
Multi-touch test program

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1311 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoCMake: add note about library versioning
Sylvain Beucler [Sat, 5 May 2012 19:11:41 +0000 (19:11 +0000)]
CMake: add note about library versioning

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1310 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoremoved the useless and unmaintained .spec and .lsm files
John Tsiombikas [Sat, 5 May 2012 06:06:09 +0000 (06:06 +0000)]
removed the useless and unmaintained .spec and .lsm files

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1307 7f0cb862-5218-0410-a997-914c9d46530a

12 years agodocs and cosmetics in fg_geometry, should be a finished product now,
Diederick Niehorster [Sat, 5 May 2012 03:12:43 +0000 (03:12 +0000)]
docs and cosmetics in fg_geometry, should be a finished product now,
except for more testing of the OGL2+ path

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1306 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoslight formatting in CMake file, just cosmetic
Diederick Niehorster [Sat, 5 May 2012 00:52:45 +0000 (00:52 +0000)]
slight formatting in CMake file, just cosmetic

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1305 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAdd new callback to reload context, pending propername
Sylvain Beucler [Fri, 4 May 2012 22:18:54 +0000 (22:18 +0000)]
Add new callback to reload context, pending propername

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1304 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoandroid: add code to display multi-touch events
Sylvain Beucler [Fri, 4 May 2012 19:59:36 +0000 (19:59 +0000)]
android: add code to display multi-touch events

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1303 7f0cb862-5218-0410-a997-914c9d46530a

12 years agotypo
Sylvain Beucler [Fri, 4 May 2012 14:57:02 +0000 (14:57 +0000)]
typo

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1302 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAdd documentation for geometry (ML rip-off) and Android corner-cases
Sylvain Beucler [Fri, 4 May 2012 14:52:52 +0000 (14:52 +0000)]
Add documentation for geometry (ML rip-off) and Android corner-cases

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1300 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoMove Android docs to the website
Sylvain Beucler [Fri, 4 May 2012 11:19:00 +0000 (11:19 +0000)]
Move Android docs to the website

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1298 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAndroid: unify toolchain and module builds
Sylvain Beucler [Fri, 4 May 2012 11:17:43 +0000 (11:17 +0000)]
Android: unify toolchain and module builds

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1296 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoandroid: handle pause/unpause of application + recreate EGL window and OpenGL context...
Sylvain Beucler [Fri, 4 May 2012 07:37:39 +0000 (07:37 +0000)]
android: handle pause/unpause of application + recreate EGL window and OpenGL context accordingly

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1293 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoDocument android app lifecycle; kill app when window is closed, until pausing/restori...
Sylvain Beucler [Thu, 3 May 2012 16:40:20 +0000 (16:40 +0000)]
Document android app lifecycle; kill app when window is closed, until pausing/restoring windows is possible

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1292 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoandroid: make code 're-entrant' - i.e. NativeActivity can restart the program without...
Sylvain Beucler [Thu, 3 May 2012 14:12:35 +0000 (14:12 +0000)]
android: make code 're-entrant' - i.e. NativeActivity can restart the program without unloading it

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1291 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoandroid: better clean-up on exit
Sylvain Beucler [Thu, 3 May 2012 13:32:06 +0000 (13:32 +0000)]
android: better clean-up on exit

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1290 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFix warnings
Sylvain Beucler [Thu, 3 May 2012 08:01:27 +0000 (08:01 +0000)]
Fix warnings

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1289 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAndroid: implement fgPlatformDeinitialiseInputDevices
Sylvain Beucler [Thu, 3 May 2012 07:58:00 +0000 (07:58 +0000)]
Android: implement fgPlatformDeinitialiseInputDevices

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1288 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoGLUT_WINDOW_BORDER_* is about borders, not inner size (thanks again Dee)
Sylvain Beucler [Thu, 3 May 2012 07:55:19 +0000 (07:55 +0000)]
GLUT_WINDOW_BORDER_* is about borders, not inner size (thanks again Dee)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1287 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoGLUT_HAS_DIAL_AND_BUTTON_BOX officially not implemented on Android
Sylvain Beucler [Thu, 3 May 2012 07:54:12 +0000 (07:54 +0000)]
GLUT_HAS_DIAL_AND_BUTTON_BOX officially not implemented on Android

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1286 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFix misleading comment
Sylvain Beucler [Wed, 2 May 2012 18:27:57 +0000 (18:27 +0000)]
Fix misleading comment

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1285 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoImplement a few missing enums in fgPlatformGlutDeviceGet/fgPlatformGlutGet
Sylvain Beucler [Wed, 2 May 2012 17:28:52 +0000 (17:28 +0000)]
Implement a few missing enums in fgPlatformGlutDeviceGet/fgPlatformGlutGet

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1284 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoUse fgWarning for android joystick stubs
Sylvain Beucler [Wed, 2 May 2012 16:47:45 +0000 (16:47 +0000)]
Use fgWarning for android joystick stubs

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1283 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoExplain why fgPlatformSleepForEvents is no-op under Android
Sylvain Beucler [Wed, 2 May 2012 16:45:21 +0000 (16:45 +0000)]
Explain why fgPlatformSleepForEvents is no-op under Android

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1282 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoCHECK_FUNCTION_EXISTS for sinf/cosf/sqrtf actually fails not because of missing math...
Sylvain Beucler [Wed, 2 May 2012 16:44:40 +0000 (16:44 +0000)]
CHECK_FUNCTION_EXISTS for sinf/cosf/sqrtf actually fails not because of missing math.h, but because of missing -lm. Fixed.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1281 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoRemove debugging left-over -_-' (thanks Dee)
Sylvain Beucler [Wed, 2 May 2012 16:42:55 +0000 (16:42 +0000)]
Remove debugging left-over -_-' (thanks Dee)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1280 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoandroid: implement fgPlatformSetCursor/fgPlatformWarpPointer
Sylvain Beucler [Wed, 2 May 2012 14:49:15 +0000 (14:49 +0000)]
android: implement fgPlatformSetCursor/fgPlatformWarpPointer

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1279 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofg_geometry: GL2 fixed: glDrawElements' indices is byte offset, not element offset
Sylvain Beucler [Tue, 1 May 2012 22:16:33 +0000 (22:16 +0000)]
fg_geometry: GL2 fixed: glDrawElements' indices is byte offset, not element offset

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1278 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofg_geometry: pass number of vertices to fgDrawWire*; start adapting GL2 code to recen...
Sylvain Beucler [Tue, 1 May 2012 21:28:28 +0000 (21:28 +0000)]
fg_geometry: pass number of vertices to fgDrawWire*; start adapting GL2 code to recent GL1 changes (GL2 code doesn't produce proper results yet)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1277 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoDetect sinf/cosf/sqrtf presence with CMake (instead of relying on __cpluscplus)
Sylvain Beucler [Tue, 1 May 2012 14:14:54 +0000 (14:14 +0000)]
Detect sinf/cosf/sqrtf presence with CMake (instead of relying on __cpluscplus)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1276 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoInitialize OpenGL 2.0 after OpenGL context is created (otherwise initialization fails...
Sylvain Beucler [Tue, 1 May 2012 13:13:14 +0000 (13:13 +0000)]
Initialize OpenGL 2.0 after OpenGL context is created (otherwise initialization fails under mswin)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1275 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofg_geometry: remove GLES-specific #ifdefs (in code and headers), update Android test...
Sylvain Beucler [Tue, 1 May 2012 10:37:06 +0000 (10:37 +0000)]
fg_geometry: remove GLES-specific #ifdefs (in code and headers), update Android test-case. GL2 code compiles but does not work yet.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1274 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAndroid: reference android library dependencies, needed for shared libs builds
Sylvain Beucler [Tue, 1 May 2012 09:33:05 +0000 (09:33 +0000)]
Android: reference android library dependencies, needed for shared libs builds

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1273 7f0cb862-5218-0410-a997-914c9d46530a

12 years agonow using the Koch Snowflake (from fractals.dat) instead of Cantor dust
Diederick Niehorster [Mon, 30 Apr 2012 15:19:59 +0000 (15:19 +0000)]
now using the Koch Snowflake (from fractals.dat) instead of Cantor dust
for fractals and fractals_random demo (changed built-in data).
Looks better
Also removed copying of fractals.dat to build dir from CMake file

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1272 7f0cb862-5218-0410-a997-914c9d46530a

12 years agodrawing code for solid and wired now shared for all objects
Diederick Niehorster [Sun, 29 Apr 2012 04:16:07 +0000 (04:16 +0000)]
drawing code for solid and wired now shared for all objects

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1271 7f0cb862-5218-0410-a997-914c9d46530a

12 years agocleanup
Diederick Niehorster [Sat, 28 Apr 2012 17:03:29 +0000 (17:03 +0000)]
cleanup

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1270 7f0cb862-5218-0410-a997-914c9d46530a

12 years agotorus ported. All shapes drawn with glDrawArrays and glDrawElements now.
Diederick Niehorster [Sat, 28 Apr 2012 17:01:44 +0000 (17:01 +0000)]
torus ported. All shapes drawn with glDrawArrays and glDrawElements now.
Next is to use the same drawing functions for all shapes, all those with
circles still have their own now

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1269 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoless repetition of vertices for triangle strip
Diederick Niehorster [Sat, 28 Apr 2012 16:35:39 +0000 (16:35 +0000)]
less repetition of vertices for triangle strip

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1268 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoWire Torus now ported
Diederick Niehorster [Sat, 28 Apr 2012 13:29:49 +0000 (13:29 +0000)]
Wire Torus now ported
solid torus now as triangle strips, but still need to finish port

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1267 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoporting torus: split off vertex generation
Diederick Niehorster [Sat, 28 Apr 2012 10:57:40 +0000 (10:57 +0000)]
porting torus: split off vertex generation
fixed drawing to work with this

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1266 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoadded 'r' toggle to shapes demo to also animate rotation around object
Diederick Niehorster [Sun, 22 Apr 2012 16:39:47 +0000 (16:39 +0000)]
added 'r' toggle to shapes demo to also animate rotation around object
x-axis, to get a better view of the model

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1264 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoone more small cleanup
Diederick Niehorster [Sun, 22 Apr 2012 16:32:29 +0000 (16:32 +0000)]
one more small cleanup

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1263 7f0cb862-5218-0410-a997-914c9d46530a

12 years agocylinder also ported
Diederick Niehorster [Sun, 22 Apr 2012 16:30:19 +0000 (16:30 +0000)]
cylinder also ported
little bit of cleanup in Cone and Sphere code (fixed normals of top of
cone, no longer generating too many indices for wire frame)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1262 7f0cb862-5218-0410-a997-914c9d46530a

12 years agotypo
Sylvain Beucler [Sat, 21 Apr 2012 20:21:16 +0000 (20:21 +0000)]
typo

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1261 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoEventually tracked down nasty Android bug
Sylvain Beucler [Sat, 21 Apr 2012 20:19:31 +0000 (20:19 +0000)]
Eventually tracked down nasty Android bug

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1260 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFix a few more compiler warnings
Sylvain Beucler [Sat, 21 Apr 2012 19:04:02 +0000 (19:04 +0000)]
Fix a few more compiler warnings

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1259 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFix more compiler warnings
Sylvain Beucler [Sat, 21 Apr 2012 18:22:24 +0000 (18:22 +0000)]
Fix more compiler warnings

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1258 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoglutCones now refreshed too
Diederick Niehorster [Sat, 21 Apr 2012 18:05:56 +0000 (18:05 +0000)]
glutCones now refreshed too
little edits on glutSphere too, nothign affecting functionality

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1257 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoFix compiler warnings
Sylvain Beucler [Sat, 21 Apr 2012 17:40:25 +0000 (17:40 +0000)]
Fix compiler warnings

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1256 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAdd more compiler checks for GCC
Sylvain Beucler [Sat, 21 Apr 2012 16:53:57 +0000 (16:53 +0000)]
Add more compiler checks for GCC

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1255 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoREADME.android: typo
Sylvain Beucler [Sat, 21 Apr 2012 16:50:38 +0000 (16:50 +0000)]
README.android: typo

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1254 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofg_gl2: Use GLES2 functions directly
Sylvain Beucler [Sat, 21 Apr 2012 16:45:46 +0000 (16:45 +0000)]
fg_gl2: Use GLES2 functions directly

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1253 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofg_geometry: really uninitialized variables
Sylvain Beucler [Sat, 21 Apr 2012 16:20:19 +0000 (16:20 +0000)]
fg_geometry: really uninitialized variables

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1252 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoReally fix tabs->space
Sylvain Beucler [Sat, 21 Apr 2012 15:49:46 +0000 (15:49 +0000)]
Really fix tabs->space

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1251 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoReally fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8)
Sylvain Beucler [Sat, 21 Apr 2012 15:02:00 +0000 (15:02 +0000)]
Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1250 7f0cb862-5218-0410-a997-914c9d46530a

12 years agosolid sphere now done with only triangle strips.
Diederick Niehorster [Fri, 20 Apr 2012 11:25:42 +0000 (11:25 +0000)]
solid sphere now done with only triangle strips.
All shapes should be doable with only triangle strips, so this allows
code reuse later ...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1249 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoconverted all tabs to spaces, hate if they are mixed...
Diederick Niehorster [Fri, 20 Apr 2012 10:55:00 +0000 (10:55 +0000)]
converted all tabs to spaces, hate if they are mixed...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1248 7f0cb862-5218-0410-a997-914c9d46530a