Commit Graph

1838 Commits

Author SHA1 Message Date
dcnieho
6e7e3375a3 strip out GLUT_DISPLAY_CALLBACK from worklist _before_ calling display callback. Any postredisplay in the display callback will then be honored, but no unnecessary redisplay work will be called due to redisplays queued during resize, visibility and other such processing
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1617 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-20 14:04:06 +00:00
dcnieho
42dc7ef4bf should not strip out GLUT_DISPLAY_CALLBACK at the end of processing work. It kills the glutPostRedisplay inside the display callback method of getting your window continuously redrawn...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1616 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-18 01:53:21 +00:00
dcnieho
8d979f3c7e part of dealing with work is platform independent, so moved it to platform independent part of code
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1615 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-07 12:21:03 +00:00
dcnieho
5658b01337 redisplay is now also on the work list instead of handled separately
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1614 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-07 08:04:46 +00:00
dcnieho
28539c8e95 doc that timers are sorted by endtime + don't call fgElapsedTime() if no timers to check, its a waste
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1613 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-07 08:03:48 +00:00
dcnieho
02bb655c5c Menu's work again in gamemode too now. We have to do a normal ShowWindow in gamemode, or the menu won't pop up over the gamemode window.
Also now using fgState.ActiveMenus instead of enumerating to see if there is an active menu

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1612 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-06 14:08:59 +00:00
dcnieho
60e65375c1 cleanup a debug statement
show flag should be SW_SHOWNA, not SW_SHOWNOACTIVATE according to docs

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1611 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-06 10:20:42 +00:00
dcnieho
123c48b2ae clicking in another window also no longer closed the menu unless focus was changed. Fixed in click checker in general menu code, so it'll improve menus on X11 as well. Our Windows part now only needed for when losing focus because switching to a non-FreeGLUT window
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1610 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-06 10:17:04 +00:00
dcnieho
7ae2b6eee1 now that menu's no longer take focus from their parent, clicking the non-client area of the parent no longer closed the menu. fixed.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1609 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-06 10:16:27 +00:00
dcnieho
c16016e9fa added a function to translate WM_ messages to text, for debugging
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1608 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-06 10:15:53 +00:00
dcnieho
9e4fc43b36 now handling WM_MOUSEACTIVATE so that menus don't get activated upon mouseclick
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1607 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-06 10:15:19 +00:00
dcnieho
23e0e585ef fix in fgUpdateMenuHighlight: clicked entry is always the active entry already, so no while loop. also, ignore clicks on a submenu's parent entry
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1606 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-06 10:14:41 +00:00
dcnieho
4c1b2f7f71 small updates to API doc, some cleanup
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1605 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 13:40:32 +00:00
dcnieho
ab06e7c64a more typos in progress page
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1604 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 12:28:54 +00:00
dcnieho
417f965466 added API docs for teacup and teaspoon
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1603 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 11:58:32 +00:00
dcnieho
3109425b80 no idea where this folder came from, think its an error of my git-svn
client. anyway, removing...


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1602 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 11:39:14 +00:00
dcnieho
d319d6d489 add glutSetMenuFont to API docs
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1601 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 11:34:06 +00:00
dcnieho
78385ffca4 document glutInitErrorFunc, glutInitWarningFunc, as well as
FREEGLUT_PRINT_ERRORS and FREEGLUT_PRINT_WARNINGS


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1600 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 11:03:47 +00:00
dcnieho
467a9d3995 Change FREEGLUT_WARNINGS and *_ERRORS to FREEGLUT_PRINT_WARNINGS and *_ERRORS
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1599 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 10:51:07 +00:00
dcnieho
b11381ff15 website: fixed errors in 3.0 roadmap (thank Ines Almeida!)
Moved up the help out item in the left-side menu
improved several texts i wrote earlier today.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1598 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 10:34:28 +00:00
dcnieho
1bb4fa9988 implemented WM_DISPLAYCHANGE message handler per patch in very old bug report (1212167). This for us only helps make sure that glutGet(GLUT_SCREEN_WIDTH) and glutGet(GLUT_SCREEN_HEIGHT) return the correct values, and help make sure menu placement is clipped against the correct window extents. Thanks Dan!
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1597 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 09:13:48 +00:00
dcnieho
3aaad918c1 noted incompleteness of glutInitDisplayString implementation and added
call to help out


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1596 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 09:00:40 +00:00
dcnieho
066d495c81 fixed docs for glut*Torus, per suggestion of Chris Marshall. much more
understandable now indeed.
Also changed GLdouble params of geometry functions to normal doubles to
match code in trunk


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1595 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 08:48:33 +00:00
dcnieho
892fafec03 docs: glutPauseFunc/glutResumeFunc -> glutAppStatusFunc
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1594 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 03:52:59 +00:00
dcnieho
ad30a17ccd user should include freeglut.h, not freeglut_ext.h
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1593 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 03:43:43 +00:00
dcnieho
1bdc52ff5d 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
2013-04-05 03:36:16 +00:00
dcnieho
a78fe5852e forgot to add teapot to sourcelist for gles1 and gles2 builds
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1591 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 02:55:45 +00:00
dcnieho
06355842a6 finish up release announcement
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1590 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 02:14:17 +00:00
dcnieho
c35fd2e601 first start at preparing 2.8.1 release on website
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1589 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-05 01:53:20 +00:00
dcnieho
0bb2219049 menu fonts API improved
No more glutSetOption, casting void* to int and back is not safe
glutSetMenuFont now takes menuID as param

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1588 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 14:32:29 +00:00
dcnieho
afb16d74ea added cursor changing to resizer demo, for testing
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1587 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 11:04:17 +00:00
dcnieho
a66dc9389e instead of separate Pause and Resume CBs, we now have a AppStatus CB which passes flags to indicate which state was entered. more extensible
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1586 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 10:54:44 +00:00
dcnieho
753f2f1163 some cleanup
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1585 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 10:36:44 +00:00
dcnieho
c387bfee98 and with 0xFF to indicate to runtime that we want to strip out higher bits - otherwise we get a runtime error when "Smaller Type Checks" is enabled
Thanks Jason Wilkins!

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1584 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 10:20:43 +00:00
dcnieho
e024949098 menu changes based on patch by Jason Wilkins:
- when menu window is shown, the menu's window no longer becomes the active window on windows (we thus don't steal focus from the active window).
- when menu is active and mouse is pressed outside the active menu and if the pressed button is bound to a menu, the old menu is now closed while a new one immediately appears
- menus now hide before their callback is executed, so they don't linger around if callback execution takes a while

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1583 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 10:13:45 +00:00
dcnieho
75dcd74677 can now set the font used for a menu
set default font using glutSetOption(GLUT_MENU_FONT,...) and set font of current menu using glutSetMenuFont()

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1582 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 10:13:04 +00:00
dcnieho
58a343f2e3 error in checking if mouse is in window when opening menu...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1581 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 10:12:02 +00:00
dcnieho
2f172a9cb0 dont wait till window visible when creating menu, as menu won't be shown until first use...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1580 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 04:49:13 +00:00
dcnieho
62b5dadbe3 don't show window when creating menu (better fix then making it very small and hiding it asap...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1579 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 04:28:53 +00:00
dcnieho
9495df62ee variable declaration in wrong place
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1578 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 02:08:55 +00:00
dcnieho
0685ee4d0d - moving to a new way of handling window changes (position, size, visibility)
- we now use a work list and all actions queued up in that list get executed in the main loop, just before redraws are called
- simplified redrawing on windows, now no longer doing so in response to WM_PAINT message. This allows us to full control over when we draw
- now simplified use of state variables in X11 and andriod
- resize, reposition etc callback now processed thru notify checkers that call callback only if needed
- worklist also has an init work type which is executed once for every window, just before the window receives its first draw. This gets rid of hacks to call the reshape function once (that only worked for windows that are created before mainloop is entered)
- in init work processor we also check for presence of draw callback as not having one is an error following GLUT.
- some cleanup in general

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1577 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 01:56:39 +00:00
dcnieho
52bd423f58 using FREE_GLUT_BUILD_STATIC_LIBS and FREEGLUT_BUILD_SHARED_LIBS instead of their unprefixed counterparts to avoid these defs leaking into build settings for other projects.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1576 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 01:29:17 +00:00
dcnieho
dde06cbe5c change CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR as requested on tracker ( Jim ( d3x0r ) - 2013-03-18 11:36:51 PDT )
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1575 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-04 01:23:27 +00:00
dcnieho
b0d3a86555 to check for menu opening/closing upon button press, should pass cursor position in the window, not in the root window
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1574 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-03 11:20:56 +00:00
dcnieho
2811836c94 cleaned up a bunch of warnings
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1573 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-01 15:40:51 +00:00
dcnieho
b7bbf6277e bit more cleanup
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1572 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-01 15:12:49 +00:00
dcnieho
86a5d3fc91 note about glutSetVertexAttribTexCoord2 in shapes demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1571 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-01 12:25:53 +00:00
dcnieho
67cd64fd7a implement setter for texture coord 2 (u,v) vertex attribute so it can be used by FreeGLUT
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1570 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-01 12:01:17 +00:00
dcnieho
1af0007c38 further worked on the teapot drawing code:
cleaned up some debug stuff, and generalized the code
now added teacup and teaspoon too, so we have Newell's set complete
As source attribution, i copied in the whole original email message that the data was taken from, and where i downloaded that email message
fixed z offset as well, so all three objects now drawn centered

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1569 7f0cb862-5218-0410-a997-914c9d46530a
2013-04-01 11:46:20 +00:00
dcnieho
78b4e988c4 same as for all other geometry functions, teapot takes double, not GLdouble now.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1568 7f0cb862-5218-0410-a997-914c9d46530a
2013-03-31 09:46:27 +00:00