freeglut
12 years agocleaned up callback registering code in One demo, now its best practice
Diederick Niehorster [Thu, 22 Nov 2012 05:49:53 +0000 (05:49 +0000)]
cleaned up callback registering code in One demo, now its best practice

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

12 years agosome callback naming cosmetics as suggested in an old comment
Diederick Niehorster [Thu, 22 Nov 2012 05:27:19 +0000 (05:27 +0000)]
some callback naming cosmetics as suggested in an old comment

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

12 years agoextensive changes in callbackmaker: each of the two windows now has its
Diederick Niehorster [Thu, 22 Nov 2012 04:38:03 +0000 (04:38 +0000)]
extensive changes in callbackmaker: each of the two windows now has its
own events registered and displayed separately

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

12 years agonicely lining up the two windows for the callbackmaker demo, small other
Diederick Niehorster [Wed, 21 Nov 2012 08:30:47 +0000 (08:30 +0000)]
nicely lining up the two windows for the callbackmaker demo, small other
edit

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

12 years agonow using WHEEL_DELTA for mouse wheel processing, instead of a magic
Diederick Niehorster [Wed, 21 Nov 2012 05:15:31 +0000 (05:15 +0000)]
now using WHEEL_DELTA for mouse wheel processing, instead of a magic
number

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

12 years agowrote macro for the special key checks (shift, alt, ctrl) to
Diederick Niehorster [Wed, 21 Nov 2012 04:18:32 +0000 (04:18 +0000)]
wrote macro for the special key checks (shift, alt, ctrl) to
significantly reduce code length (and it was copy-paste code anyway)

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

12 years agosmall enhancement to Callbackmaker demo
Diederick Niehorster [Tue, 20 Nov 2012 08:57:18 +0000 (08:57 +0000)]
small enhancement to Callbackmaker demo

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

12 years agosmall updates to one demo, so windowed windows display after the
Diederick Niehorster [Tue, 20 Nov 2012 05:25:14 +0000 (05:25 +0000)]
small updates to one demo, so windowed windows display after the
gamemode window is closed

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

12 years agoforgot docs for last change
Diederick Niehorster [Tue, 20 Nov 2012 02:23:47 +0000 (02:23 +0000)]
forgot docs for last change

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

12 years agowhen entering game mode, now avoiding call to ChangeDisplaySettingsEx
Diederick Niehorster [Tue, 20 Nov 2012 02:17:31 +0000 (02:17 +0000)]
when entering game mode, now avoiding call to ChangeDisplaySettingsEx
when not necessary. Avoids flashing of the screen

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

12 years agosome comments missing in shapes demo
Diederick Niehorster [Tue, 20 Nov 2012 02:15:43 +0000 (02:15 +0000)]
some comments missing in shapes demo

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

12 years agocosmetics in one demo
Diederick Niehorster [Mon, 19 Nov 2012 13:32:44 +0000 (13:32 +0000)]
cosmetics in one demo

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

12 years agopulling in cleanup from r1442
Diederick Niehorster [Mon, 19 Nov 2012 13:16:17 +0000 (13:16 +0000)]
pulling in cleanup from r1442

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

12 years agoshapes demo: now only draw necessary size info, and calling that info by
Diederick Niehorster [Mon, 19 Nov 2012 02:46:34 +0000 (02:46 +0000)]
shapes demo: now only draw necessary size info, and calling that info by
the right name.

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

12 years agofixed normals of glutCone, thanks Ioannis!
Diederick Niehorster [Mon, 19 Nov 2012 02:26:07 +0000 (02:26 +0000)]
fixed normals of glutCone, thanks Ioannis!
Also now using irad as base input for cone and cylinder, while using
orad as height. Without that the problem can't be seen in our demo

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

12 years agoGLUT_GEOMETRY_VISUALIZE_NORMALS is a better name than GLUT_OBJECTS_VISUALIZE_NORMALS
Diederick Niehorster [Mon, 19 Nov 2012 02:01:52 +0000 (02:01 +0000)]
GLUT_GEOMETRY_VISUALIZE_NORMALS is a better name than GLUT_OBJECTS_VISUALIZE_NORMALS

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

12 years agocan now visualize normals of GLUT geometry in GL2 mode as well
Diederick Niehorster [Mon, 19 Nov 2012 01:54:28 +0000 (01:54 +0000)]
can now visualize normals of GLUT geometry in GL2 mode as well

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

12 years agosize of cuboctahedron in shapes demo now in line with other shapes. and
Diederick Niehorster [Sun, 18 Nov 2012 15:55:55 +0000 (15:55 +0000)]
size of cuboctahedron in shapes demo now in line with other shapes. and
resizes along with the other shapes

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

12 years agoshapes demo: cuboctahedron is from the demo itself and not from FreeGLUT
Diederick Niehorster [Sun, 18 Nov 2012 15:49:27 +0000 (15:49 +0000)]
shapes demo: cuboctahedron is from the demo itself and not from FreeGLUT
geometry. Hence not supported in shader drawing mode. Now skipping it

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

12 years agocan now also draw the normal vectors (seems very useful for instructive
Diederick Niehorster [Sun, 18 Nov 2012 15:41:03 +0000 (15:41 +0000)]
can now also draw the normal vectors (seems very useful for instructive
programs, something which FreeGLUT often gets used for). use the 'n' key
in the shapes demo

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

12 years agowrote out the ipow function so its easier to mentally parse
Diederick Niehorster [Sun, 18 Nov 2012 03:31:47 +0000 (03:31 +0000)]
wrote out the ipow function so its easier to mentally parse

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

12 years agosmall enhancements to shapes demo:
Diederick Niehorster [Sun, 18 Nov 2012 03:30:54 +0000 (03:30 +0000)]
small enhancements to shapes demo:
- pitch and yaw rotation speeds are now prime numbers so we don't have a
  repeating cycle
- made window slightly larger so we have more space for the info printed
- added info for 2D rotation vs 1D rotation
- added keys to info where they were missing

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

12 years agofixed install target:
Diederick Niehorster [Sat, 17 Nov 2012 02:20:20 +0000 (02:20 +0000)]
fixed install target:
- freeglut shared library now in /bin dir, as is its pdb file
- its import library, the static library and the static lib's debug info
  are installed in /lib

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

12 years agomenus attached to child windows did not appear in the right place.
Diederick Niehorster [Sat, 17 Nov 2012 01:02:30 +0000 (01:02 +0000)]
menus attached to child windows did not appear in the right place.
Fixed in fghActivateMenu, whose logic is now simpler and commented as
well

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

12 years agominor cosmetics
Diederick Niehorster [Sat, 17 Nov 2012 00:07:30 +0000 (00:07 +0000)]
minor cosmetics

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

12 years agonow have function to get window style based on FreeGLUT's stateflag
Diederick Niehorster [Sat, 17 Nov 2012 00:03:10 +0000 (00:03 +0000)]
now have function to get window style based on FreeGLUT's stateflag
(fgState.DisplayMode) so that window decoration specification is only in
one place in the code. Also, glutGet(GLUT_WINDOW_BORDER_WIDTH); and
glutGet(GLUT_WINDOW_HEADER_HEIGHT); now return the right sizes, i.e.,
taking the display mode into account, for the border and caption when no
window is created yet

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

12 years agoadded note about maximizing behavior on Windows (when the maximize
Diederick Niehorster [Fri, 16 Nov 2012 15:07:33 +0000 (15:07 +0000)]
added note about maximizing behavior on Windows (when the maximize
window tool is pressed by the user) -- resize borders are by default of
the screen to maximize the client area. Lets not change this as FreeGLUT
has stuck with this default for a long time.

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

12 years agoreimplemented the client-area/window-area conversion code. It should now
Diederick Niehorster [Fri, 16 Nov 2012 11:02:06 +0000 (11:02 +0000)]
reimplemented the client-area/window-area conversion code. It should now
be robust across Windows and Visual Studio versions. Bugs in window
size with VS2012 fixed!

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

12 years agoincluding OpenGL/gl.h and OpenGL/glu.h when on apple platform
Diederick Niehorster [Fri, 16 Nov 2012 00:14:55 +0000 (00:14 +0000)]
including OpenGL/gl.h and OpenGL/glu.h when on apple platform

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

12 years agofixing conflicts with opengl headers on some systems, same solution as
Diederick Niehorster [Tue, 25 Sep 2012 07:46:25 +0000 (07:46 +0000)]
fixing conflicts with opengl headers on some systems, same solution as
by John in r1385

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

12 years agoGLUT_WINDOW_HEADER_HEIGHT should always have been GLUT_WINDOW_BORDER_HEIGHT.
Diederick Niehorster [Tue, 25 Sep 2012 07:39:13 +0000 (07:39 +0000)]
GLUT_WINDOW_HEADER_HEIGHT should always have been GLUT_WINDOW_BORDER_HEIGHT.
Adding the second, keeping the first for backward compatibility

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

12 years agofixed shader route in shapes demo:
Diederick Niehorster [Mon, 13 Aug 2012 04:59:48 +0000 (04:59 +0000)]
fixed shader route in shapes demo:
- small bug in gl_frustum implementation in matrix lib, element (4,4)
  should be 0
- default OpenGL ambient color is (.2, .2, .2, 1.), not black
little bit of formatting

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

12 years agoshapes demo: material color now set to red in shader, ambient light off again. looks
Diederick Niehorster [Mon, 13 Aug 2012 02:57:30 +0000 (02:57 +0000)]
shapes demo: material color now set to red in shader, ambient light off again. looks
better now that i understand light a bit better

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

12 years agoThe mapping from XInput button mask to the standard X event button mask is not 1...
John Tsiombikas [Thu, 9 Aug 2012 01:36:31 +0000 (01:36 +0000)]
The mapping from XInput button mask to the standard X event button mask is not 1-1, fixed.

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

12 years ago- trying to fix bug 2781865
John Tsiombikas [Tue, 7 Aug 2012 11:15:01 +0000 (11:15 +0000)]
- trying to fix bug 2781865

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

12 years agoalso add an InvalidateRect call before the BeginPaint in WM_PAINT
Diederick Niehorster [Mon, 6 Aug 2012 15:05:10 +0000 (15:05 +0000)]
also add an InvalidateRect call before the BeginPaint in WM_PAINT
handler.this ensures the whole window is repainted, and hopefully fixes
some bug reports.

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

12 years agobetter to put code to check if menu should be deactivated in
Diederick Niehorster [Mon, 6 Aug 2012 15:03:20 +0000 (15:03 +0000)]
better to put code to check if menu should be deactivated in
fg_menu_mswin.c

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

12 years agosome doc on why not using GetClientRect for getting the position of the
Diederick Niehorster [Mon, 6 Aug 2012 03:10:33 +0000 (03:10 +0000)]
some doc on why not using GetClientRect for getting the position of the
client rect on the screen

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

12 years agocalling glutExit in the erro callback is a really bad example...
Diederick Niehorster [Sun, 5 Aug 2012 04:28:57 +0000 (04:28 +0000)]
calling glutExit in the erro callback is a really bad example...

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

12 years agogamemode-x11: fixed the conditions checking for XR&R >= 1.1, as it where they would...
John Tsiombikas [Tue, 31 Jul 2012 14:33:26 +0000 (14:33 +0000)]
gamemode-x11: fixed the conditions checking for XR&R >= 1.1, as it where they would match 1.0 too

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

12 years agoforgot to set use to true (not that its useful, but avoid confusion that
Diederick Niehorster [Sun, 29 Jul 2012 05:33:07 +0000 (05:33 +0000)]
forgot to set use to true (not that its useful, but avoid confusion that
could arise when returning false)

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

12 years agoattempt to implement fghPlatformGetCursorPos on X11
Diederick Niehorster [Sun, 29 Jul 2012 05:28:10 +0000 (05:28 +0000)]
attempt to implement fghPlatformGetCursorPos on X11

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

12 years agofg_cursor is a much better place for code reading the mouse position
Diederick Niehorster [Sun, 29 Jul 2012 05:18:36 +0000 (05:18 +0000)]
fg_cursor is a much better place for code reading the mouse position

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

12 years agosome cleanup
Diederick Niehorster [Sun, 29 Jul 2012 05:11:53 +0000 (05:11 +0000)]
some cleanup
now have function fghPlatformGetMousePos to get current mouse position
in screen coordinates
Using this in fg_menu as all that code should be platform independent

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

12 years agoFixed broken X11 menus. The MPX patch would naively just call the
John Tsiombikas [Sun, 29 Jul 2012 04:11:01 +0000 (04:11 +0000)]
Fixed broken X11 menus. The MPX patch would naively just call the
standard (non-multi) callbacks directly, overriding all the
menu-handling logic in the standard X event processing loop.

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

12 years agolittle bit of cleanup and extra comments
Diederick Niehorster [Thu, 26 Jul 2012 15:11:37 +0000 (15:11 +0000)]
little bit of cleanup and extra comments

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

12 years agothe Callbackmaker demo, with its window close callback, is a nice place
Diederick Niehorster [Tue, 24 Jul 2012 17:43:12 +0000 (17:43 +0000)]
the Callbackmaker demo, with its window close callback, is a nice place
to test glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_CONTINUE_EXECUTION)
working fine :)

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

12 years agoadding option (on windows) to also install .pdb files
Diederick Niehorster [Tue, 24 Jul 2012 17:38:58 +0000 (17:38 +0000)]
adding option (on windows) to also install .pdb files

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

12 years agofix to smooth demo to work with GL 3.3 and higher, thanks Neil Mannall
Diederick Niehorster [Tue, 24 Jul 2012 15:37:28 +0000 (15:37 +0000)]
fix to smooth demo to work with GL 3.3 and higher, thanks Neil Mannall
(bug tracker ID 3496257)!

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

12 years agoupdate to README.win32 from José Caetano A. C. Silva (bug tracker
Diederick Niehorster [Tue, 24 Jul 2012 15:30:35 +0000 (15:30 +0000)]
update to README.win32 from José Caetano A. C. Silva (bug tracker
#3505577). Thanks!

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

12 years agoadded warning and error callbacks to demo
Diederick Niehorster [Tue, 24 Jul 2012 15:03:53 +0000 (15:03 +0000)]
added warning and error callbacks to demo

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

12 years agoimplementing menu status callback
Diederick Niehorster [Tue, 24 Jul 2012 14:37:42 +0000 (14:37 +0000)]
implementing menu status callback
Now erroring out when trying to modify menu when a menu is currently
active
small fix to callbackmaker: glutMenuDestroyFunc is per defined menu

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

12 years agoglutGet(GLUT_WINDOW_X) and glutGet(GLUT_WINDOW_Y) on a child window now
Diederick Niehorster [Mon, 23 Jul 2012 13:52:55 +0000 (13:52 +0000)]
glutGet(GLUT_WINDOW_X) and glutGet(GLUT_WINDOW_Y) on a child window now
return top-left of child w.r.t. parent's client area
resizer demo now also has child window button 'c'. doesn't work with
fullscreen for some reason....

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

12 years agosome cleanup of one demo. added menu back in gamemode
Diederick Niehorster [Mon, 23 Jul 2012 10:37:40 +0000 (10:37 +0000)]
some cleanup of one demo. added menu back in gamemode
Now proper animation whose speed does not depend on the number of
windows currently open
Got some flicker in gamemode when other windows (that weren't visible)
were also updated (only occurs when child windows present). Simply no
drawing to these windows fixes things - one shouldn't draw anyway as
they aren't visible.

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

12 years agonow added fix suggested by Ioannis to make menus work when an entryfunc
Diederick Niehorster [Mon, 23 Jul 2012 09:51:34 +0000 (09:51 +0000)]
now added fix suggested by Ioannis to make menus work when an entryfunc
is defined for the window

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

12 years agoShould only do check if mouse is outside client area when not opening a
Diederick Niehorster [Mon, 23 Jul 2012 09:50:14 +0000 (09:50 +0000)]
Should only do check if mouse is outside client area when not opening a
submenu as well...

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

12 years agochild window now only used for keyboard callbacks and setting focus in
Diederick Niehorster [Mon, 23 Jul 2012 08:52:50 +0000 (08:52 +0000)]
child window now only used for keyboard callbacks and setting focus in
windowproc, was a bit overeager before

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

12 years agonow also closing menus when non-client area is pressed (thanks for
Diederick Niehorster [Mon, 23 Jul 2012 07:04:06 +0000 (07:04 +0000)]
now also closing menus when non-client area is pressed (thanks for
suggestions Ioannis!)

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

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