dcnieho
714b3d2246
documenting glutStrokeWidthf and glutStrokeLengthf
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1719 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-17 16:38:40 +00:00
Diederick Niehorster
c9c27c8f88
Merge branch 'trunk' into git_master
2014-10-18 00:38:16 +08:00
dcnieho
3b634a941a
adding glutStrokeWidthf and glutStrokeLengthf from GLUT 3.8
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1718 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-17 16:28:24 +00:00
dcnieho
9af2382e14
renamed all references to freeglut_xxx files (their old names) to fg_xxx
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1717 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-17 16:09:00 +00:00
Diederick Niehorster
3ff4c1e72b
Merge branch 'trunk' into git_master
2014-10-17 01:45:59 +08:00
dcnieho
3bd2a31b9a
be more careful about closing menus when focus changes. Only do so when new focus window is not ANY of the open menus and when it is not the menu's parent window (all open menus are guaranteed to have the same parent in my reading of the code)
...
Also simplified situation in which menus are SW_SHOWed... if a gamemode window is open, it must the parent of any active windows as there can be no other windows open on top of the gamemode window.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1716 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-16 17:43:22 +00:00
Diederick Niehorster
22511a7757
Merge remote-tracking branch 'svn/trunk' into git_master
2014-10-13 22:18:16 +08:00
dcnieho
f16d04cfd1
forgot to document GLUT_ACTION_GLUTMAINLOOP_RETURNS when discussing glutLeaveMainLoop in api docs
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1715 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-13 14:17:01 +00:00
dcnieho
adce03d8ab
more cleanup: config.h include never needed in demo
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1714 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-13 13:54:44 +00:00
dcnieho
ee1de6feda
Tidy-up: config.h included via fg_internal.h no deep to duplicate.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1713 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-13 13:54:27 +00:00
Diederick Niehorster
fd18cd47ad
Merge remote-tracking branch 'svn/trunk' into git_master
2014-10-13 21:53:57 +08:00
Diederick Niehorster
af0216f48e
more cleanup: config.h include never needed in demo
2014-10-13 21:52:40 +08:00
Diederick C. Niehorster
33fd3273ab
Merge pull request #20 from nigels-com/merge-config_h_tidy
...
Tidy-up: Include config.h via fg_internal.h only
2014-10-13 21:49:26 +08:00
Nigel Stewart
873b276ba6
Tidy-up: config.h included via fg_internal.h no deep to duplicate.
2014-10-13 21:18:50 +10:00
dcnieho
c23c2e827e
some cleanup, correctness in naming, correctness in type (those ATOM should be BOOL)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1712 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 09:50:19 +00:00
Diederick Niehorster
9e3fad3576
Merge remote-tracking branch 'svn/trunk' into git_master
2014-10-12 14:39:53 +08:00
dcnieho
977d52522c
change some initializer use that some compilers choke on (even that technically may a bug in the compiler, I think)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1711 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 06:37:00 +00:00
dcnieho
2e45756a33
Fixed bug identified by Kevin. If pollrate is larger than elapsedtime, we'd wrap, and joystick would never get polled
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1710 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 06:21:32 +00:00
dcnieho
635ca451cb
removed debug code I forgot to clean up
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1709 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-12 04:49:22 +00:00
Diederick Niehorster
04390fdd5c
Merge remote-tracking branch 'svn/trunk' into git_master
2014-10-12 12:49:03 +08:00
jtsiomb
ff3e93d95c
fixed a printf format specifier (was %i instead of %lu while printing an unsigned long)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1708 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-11 17:20:19 +00:00
jtsiomb
c1e80f3ddf
fixed build on MSVC6
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1707 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-11 17:15:33 +00:00
Diederick Niehorster
d84c96a10a
Merge branch 'trunk' into git_master
2014-10-07 00:40:57 +08:00
dcnieho
1d3212b883
progress page on website:
...
updated discussion of making font rendering GL2+ and GLES 1/2 clean
added unicode support as todo note (its frequently requested)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1706 7f0cb862-5218-0410-a997-914c9d46530a
2014-10-06 16:32:46 +00:00
Diederick Niehorster
eaab7fa509
Merge branch 'trunk' into git_master
2014-09-28 12:04:21 +08:00
dcnieho
f1df2e76d1
drawing join dots on stroke fonts is now optional (and default off)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1705 7f0cb862-5218-0410-a997-914c9d46530a
2014-09-28 04:04:08 +00:00
Diederick Niehorster
06adf958bd
Merge branch 'trunk' into git_master
2014-08-29 08:42:23 +08:00
dcnieho
804a62ab58
now using _NET_FRAME_EXTENTS if available to get size of window decorations
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1704 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-29 00:41:03 +00:00
Diederick Niehorster
5e82985a07
Merge branch 'trunk' into git_master
2014-08-28 00:14:10 +08:00
dcnieho
b0288518d1
X11: implemented borderless and captionless window style using motif hints
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1703 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 16:02:03 +00:00
Diederick Niehorster
1fb598b52d
Merge branch 'trunk' into git_master
2014-08-27 21:43:20 +08:00
dcnieho
80c07e8b65
note on what GLUT_WINDOW_BORDER_HEIGHT is
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1702 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 13:42:59 +00:00
Diederick Niehorster
105c4eb685
Merge remote-tracking branch 'svn/trunk' into git_master
2014-08-27 19:46:30 +08:00
dcnieho
9141845a49
glutGet window position should be relative to parent
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1701 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 11:45:58 +00:00
dcnieho
b0811138cc
caption height should include the width of the border atop the window
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1700 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 10:14:44 +00:00
Diederick Niehorster
07a7dbd8ca
Merge remote-tracking branch 'svn/trunk' into git_master
2014-08-27 13:47:24 +08:00
dcnieho
f57980927a
resizer demo:
...
some breaks missing in keyboard switch
added instruction text for which buttons can be pressed
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1699 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 05:47:05 +00:00
dcnieho
a894e63bdd
For builds not using cmake, generate fg_version.h to match cmake-specified version number.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1696 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 02:00:40 +00:00
Diederick Niehorster
2204e280c8
Merge remote-tracking branch 'svn/trunk' into git_master
2014-08-18 10:00:34 +08:00
Diederick C. Niehorster
eefd4bc619
Merge pull request #18 from nigels-com/merge-version2
...
For builds not using cmake, generate fg_version.h
2014-08-18 09:59:22 +08:00
jtsiomb
2ed4ed5b52
changed the X11 gamemode code policy. Falling back to xf86vm when xrandr fails
...
was problematic when passing invalid modes. Now instead, if xrandr is
available, we use that, and only that. XF86VM is now only used when XR&R is not
supported at all.
I also added a set of env vars to artificially disable one or the other, or
both. If FREEGLUT_NO_XRANDR is set we completely ignore XR&R, and if
FREEGLUT_NO_XF86VM is set, we completely ignore XF86VidMode. Obviously if both
are defined or missing, game mode can't switch resolutions at all any more, but
that's a nice debugging aid, and may be useful to allow the user to pick which
extension he'd rather use for mode switching.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1695 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 00:52:53 +00:00
Nigel Stewart
274af23a3c
For builds not using cmake, generate fg_version.h to match cmake-specified version number.
2014-08-16 13:05:12 +10:00
Nigel Stewart
55e4430113
XParseGeometry will always be needed for Windows, no need for cmake to figure this out.
2014-07-24 16:47:25 +10:00
Rcmaniac25
ef1643ae63
Added support for minimizing window.
...
Fixed issue where reshape callback would be called multiple times due to conflicting window size messages on keyboard closure.
Fixed issue where changing orientation with the keyboard open would cause multiple reshape events.
2014-07-05 23:03:52 -04:00
Diederick C. Niehorster
6a3b4e4771
Merge remote-tracking branch 'svn/trunk' into git_master
2014-06-24 09:03:30 +02:00
dcnieho
c12f6173db
Updated BlackBerry references to make note of the change from FREEGLUT_GLES2/1 to FREEGLUT_GLES.
...
Updated BlackBerry toolchain to support building with Dinkum and to support OS 10.3 and GCC 4.8.2
Updated BlackBerry fg_window_blackberry so that window usages aren't hardcoded based on compile information, since it is now controlled by glutInitContextVersion.
EGL window setup now supports EGL 1.5, Renderable type for ES3, and using the minor version from glutInitContextVersion to have more exact control over which version of OpenGL ES is used (requires EGL 1.5)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1694 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-24 07:03:16 +00:00
Diederick C. Niehorster
3ae17e42da
Merge pull request #14 from rcmaniac25/GLES31
...
Futureproof: EGL 1.5 support, OpenGL ES 3.1 support
2014-06-24 09:01:56 +02:00
Rcmaniac25
2dab5a32a6
Updated BlackBerry references to make note of the change from FREEGLUT_GLES2/1 to FREEGLUT_GLES.
...
Updated BlackBerry toolchain to support building with Dinkum and to support OS 10.3 and GCC 4.8.2
Updated BlackBerry fg_window_blackberry so that window usages aren't hardcoded based on compile information, since it is now controlled by glutInitContextVersion.
EGL window setup now supports EGL 1.5, Renderable type for ES3, and using the minor version from glutInitContextVersion to have more exact control over which version of OpenGL ES is used (requires EGL 1.5)
2014-06-09 22:39:03 -04:00
Diederick Niehorster
d11c062c72
Merge remote-tracking branch 'svn/trunk' into git_master
2014-06-02 21:25:37 +08:00
dcnieho
89cfab41fc
updated api doc
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1693 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-02 13:25:25 +00:00