FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,944 Commits 1 Branch 0 Tags 6.8 MiB
2dd5aa4aa1
Commit Graph

1595 Commits

Author SHA1 Message Date
dcnieho
eccb722d20 demo glutSetCursor 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1519 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 07:07:55 +00:00
dcnieho
9652d57d4f Simplified fghWindowUnderCursor, cleane dup code 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1518 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 07:01:43 +00:00
dcnieho
363c2c363a Only check for child window when needed, some cleanup 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1517 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 06:18:20 +00:00
dcnieho
8363fa9507 WM_SETFOCUS should not change focus to child instead, then all input goes to child even if it should go to parent. Mousewheel needed to check if actually in child, other mouse action (move, press) are automatically passed to child 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1516 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 06:11:51 +00:00
dcnieho
6f9152c92e Use GetMessagePos, not GetCursorPos to make sure we get the right mouse position. Also, no need to get mouse position at time of keypress, every mouse movement before the keypress is processed in an earlier WM_MOUSE message already, so mouse position in the window state is all we need. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1515 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 05:58:56 +00:00
dcnieho
00260311f3 clean up glutSetKeyRepeat function body 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1513 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 04:44:14 +00:00
dcnieho
e9318d4e55 Added subwindows to CallbackMaker demo, for testing and demonstration. Also figured out how key repeat's global and per-window flags are supposed to interact, documented and demonstrated it. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1512 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 04:36:48 +00:00
dcnieho
71c6054fe0 added modifier key status to callbackmaker output, also added entryfunc 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1511 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-27 03:58:05 +00:00
dcnieho
ddda931bac reworked fullscreen code based on implementation of Chromium. can now handle/restore windows in maximized state and no longer uses WS_POPUP. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1510 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-26 16:49:19 +00:00
dcnieho
5fa61c0c64 subwin demo now has a grandchild (subwin in subwin) for testing 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1509 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-26 16:14:41 +00:00
dcnieho
3b5f3573a1 some msgs only sent to parent window, find child under cursor. This before only search for childs of the parent, not grandchilds or more derived. Fixed 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1508 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-26 16:13:09 +00:00
dcnieho
fdbb8086ed better name for key up/down function 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1507 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-26 15:21:34 +00:00
dcnieho
a6e021db4a win API docs say that defWndProc must be called for system keydown/keyup 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1506 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-26 15:20:18 +00:00
dcnieho
cf6e2a419c win32: updating keyboard down/up handling. Split off to own function that deals with both down and up to reduce code duplication. Also only get async keystate to see if left or right alt, control, shift is pressed/released when a press on one of these is detected in the first place, not with every message that comes in. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1505 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-26 15:05:41 +00:00
dcnieho
813addede1 moving fgPlatformReshapeWindow and fgPlatformDisplayWindow from fg_main_x to fg_window_x. Hope this didn't break anything for X11 or andriod 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1504 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-13 10:28:26 +00:00
dcnieho
dae7120ed5 now have 64bit internal time on Windows, as we deal with wrap of timeGetTime manually 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1502 7f0cb862-5218-0410-a997-914c9d46530a
 2013-02-09 11:59:32 +00:00
dcnieho
17a8372217 can now configure build such that runtime warnings and/or errors occuring in lib are not printed to stderr (thanks Nigel Steward) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1501 7f0cb862-5218-0410-a997-914c9d46530a
 2013-01-27 12:38:28 +00:00
dcnieho
f79dae9865 smoothgl3 and shapes demos, now checking if glutGetProcAddress calls give us valid function pointers 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1500 7f0cb862-5218-0410-a997-914c9d46530a
 2013-01-27 11:56:32 +00:00
dcnieho
05a9a7c907 Make CTRL and SHIFT arrive properly in single (as opposed to MultiButton) mouse events, thanks Philipp! 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1496 7f0cb862-5218-0410-a997-914c9d46530a
 2013-01-17 14:53:30 +00:00
dcnieho
d657a564e5 fixed closing window crash, thanks Philipp! 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1495 7f0cb862-5218-0410-a997-914c9d46530a
 2013-01-17 14:51:25 +00:00
dcnieho
242d359f5b oops, debug code that shouldn't have been committed got in there... 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1494 7f0cb862-5218-0410-a997-914c9d46530a
 2013-01-17 14:46:22 +00:00
dcnieho
14276cac9e Updating last edit time and FreeGLUT version for API document 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1493 7f0cb862-5218-0410-a997-914c9d46530a
 2013-01-17 14:33:54 +00:00
dcnieho
bbefe8aee0 avoid crash on null temp_window, thanks Phillip Kutin! 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1490 7f0cb862-5218-0410-a997-914c9d46530a
 2012-12-18 05:19:21 +00:00
dcnieho
ff0366185f removed unnecessary token pasting (##) preprocessor directives that blew 
up some builds. thanks Phillip Kutin!



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1489 7f0cb862-5218-0410-a997-914c9d46530a
 2012-12-18 05:13:42 +00:00
dcnieho
afdc54e910 kicking out the FGCBSelect function prototype that has been here since 
the beginning of times (r3), but is not used anywhere and has no
equivalent in GLUT


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1488 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-24 01:18:34 +00:00
dcnieho
809dad066b argh! commit 1485 was cut and paste instead of copy paste... 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1487 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 10:35:24 +00:00
dcnieho
231f05cf2c tiny cosmetics in resizer demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1486 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 09:43:18 +00:00
dcnieho
0715a20796 that was too quick, fgStructure.CurrentWindow can be NULL when glutGetting window 
width or height


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1485 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 09:42:54 +00:00
dcnieho
1917f56dce GLUT_WINDOW_WIDTH and GLUT_WINDOW_HEIGHT can simply be gotten from the 
window's state. This also simplifies GLUT_WINDOW_X and GLUT_WINDOW_Y a
lot


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1484 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 09:31:52 +00:00
dcnieho
0eb960d0a1 prevent resize callback (and indeed the whole resizing logic) from getting 
called twice


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1483 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 09:30:57 +00:00
dcnieho
9d51152ba6 timer func now changes two colors alternatingly, using multiple active 
timers


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1482 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 08:40:13 +00:00
dcnieho
95b2935ce9 nicer output to terminal in Position callback 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1481 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 08:22:28 +00:00
dcnieho
409ca5b133 now providing new position of child relative to parent in the position 
callback
also need to set position func for the child window in the resizer demo


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1480 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 08:21:24 +00:00
dcnieho
9db85cd9b3 resizer demo now uses timer to display window information 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1479 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 08:03:20 +00:00
dcnieho
6badc4e20a removed unnecessary calls to SetWindowPos when entering and leaving 
fullscreen mode. This caused the Position callback to fire more than
necessary


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1478 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 07:51:10 +00:00
dcnieho
aa38dc56b4 implemented position callback on windows and some other minor edits 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1477 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 07:41:39 +00:00
dcnieho
a0b41213a5 prepared callbackmaker for testing position callback 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1476 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 07:06:57 +00:00
dcnieho
4f66100b51 used a macro to remove all the code repetition in fg_callbacks.c 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1475 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 06:55:52 +00:00
dcnieho
d1efa5eb48 added glutPositionFunc callback, now just need to implement so it does 
something
For all callbacks now using function type definitions from
fg_internal.h.
Reorganized and cleaned up fg_callbacks.c so that there are no wrong
comments in there (timers are global, not per window) and so that all
global, per menu, and per window callbacks are grouped together


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1474 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 06:40:06 +00:00
dcnieho
13a5f957f7 added WCB_Position callback in callback table (only so far), code for 
zeroing callbacks upon window creation continues to work correctly


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1471 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-23 05:26:36 +00:00
dcnieho
419e4793b0 more cleanup in callbackmaker demo, now showing best practice for 
various callback. also added menustate/menustatus callbacks


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1468 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-22 05:52:02 +00:00
dcnieho
d07f4255be cleaned up callback registering code in One demo, now its best practice 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1467 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-22 05:49:53 +00:00
dcnieho
79f3a0d64d some callback naming cosmetics as suggested in an old comment 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1466 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-22 05:27:19 +00:00
dcnieho
eb968382e8 extensive changes in callbackmaker: each of the two windows now has its 
own events registered and displayed separately


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1465 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-22 04:38:03 +00:00
dcnieho
a85eaf5632 nicely lining up the two windows for the callbackmaker demo, small other 
edit


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1464 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-21 08:30:47 +00:00
dcnieho
74b361d347 now using WHEEL_DELTA for mouse wheel processing, instead of a magic 
number


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1463 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-21 05:15:31 +00:00
dcnieho
2359c3cc11 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: https://svn.code.sf.net/p/freeglut/code/trunk@1460 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-21 04:18:32 +00:00
dcnieho
507338a816 small enhancement to Callbackmaker demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1459 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-20 08:57:18 +00:00
dcnieho
26a07b9ef3 small updates to one demo, so windowed windows display after the 
gamemode window is closed


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1456 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-20 05:25:14 +00:00
dcnieho
cd50f5fd92 forgot docs for last change 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1454 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-20 02:23:47 +00:00
dcnieho
d01664a8bf when entering game mode, now avoiding call to ChangeDisplaySettingsEx 
when not necessary. Avoids flashing of the screen



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1453 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-20 02:17:31 +00:00
dcnieho
2de980d6b4 some comments missing in shapes demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1452 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-20 02:15:43 +00:00
dcnieho
5fb529348a cosmetics in one demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1448 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-19 13:32:44 +00:00
dcnieho
0517f0e543 pulling in cleanup from r1442 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1443 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-19 13:16:17 +00:00
dcnieho
1759c0ef92 shapes demo: now only draw necessary size info, and calling that info by 
the right name.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1409 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-19 02:46:34 +00:00
dcnieho
eec680a34b 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: https://svn.code.sf.net/p/freeglut/code/trunk@1408 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-19 02:26:07 +00:00
dcnieho
7e1599594c GLUT_GEOMETRY_VISUALIZE_NORMALS is a better name than GLUT_OBJECTS_VISUALIZE_NORMALS 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1407 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-19 02:01:52 +00:00
dcnieho
bc89db3fb9 can now visualize normals of GLUT geometry in GL2 mode as well 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1406 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-19 01:54:28 +00:00
dcnieho
6b77283fc1 size of cuboctahedron in shapes demo now in line with other shapes. and 
resizes along with the other shapes


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1405 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-18 15:55:55 +00:00
dcnieho
b6f1526f6e 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: https://svn.code.sf.net/p/freeglut/code/trunk@1404 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-18 15:49:27 +00:00
dcnieho
465ff5d0d1 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: https://svn.code.sf.net/p/freeglut/code/trunk@1403 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-18 15:41:03 +00:00
dcnieho
5a0d107a9c wrote out the ipow function so its easier to mentally parse 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1401 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-18 03:31:47 +00:00
dcnieho
82cfc20eac 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: https://svn.code.sf.net/p/freeglut/code/trunk@1400 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-18 03:30:54 +00:00
dcnieho
a1daa9fc77 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: https://svn.code.sf.net/p/freeglut/code/trunk@1399 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-17 02:20:20 +00:00
dcnieho
a7771ab4b2 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: https://svn.code.sf.net/p/freeglut/code/trunk@1398 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-17 01:02:30 +00:00
dcnieho
de8853e675 minor cosmetics 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1397 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-17 00:07:30 +00:00
dcnieho
610b006221 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: https://svn.code.sf.net/p/freeglut/code/trunk@1396 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-17 00:03:10 +00:00
dcnieho
dec5717f1e 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: https://svn.code.sf.net/p/freeglut/code/trunk@1395 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-16 15:07:33 +00:00
dcnieho
0500cfdf4c 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: https://svn.code.sf.net/p/freeglut/code/trunk@1394 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-16 11:02:06 +00:00
dcnieho
9241bedc2f including OpenGL/gl.h and OpenGL/glu.h when on apple platform 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1393 7f0cb862-5218-0410-a997-914c9d46530a
 2012-11-16 00:14:55 +00:00
dcnieho
45f45042c2 fixing conflicts with opengl headers on some systems, same solution as 
by John in r1385


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1390 7f0cb862-5218-0410-a997-914c9d46530a
 2012-09-25 07:46:25 +00:00
dcnieho
767cf1bcbe GLUT_WINDOW_HEADER_HEIGHT should always have been GLUT_WINDOW_BORDER_HEIGHT. 
Adding the second, keeping the first for backward compatibility


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1389 7f0cb862-5218-0410-a997-914c9d46530a
 2012-09-25 07:39:13 +00:00
dcnieho
eae233fe6e 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: https://svn.code.sf.net/p/freeglut/code/trunk@1388 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-13 04:59:48 +00:00
dcnieho
b76e745afc 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: https://svn.code.sf.net/p/freeglut/code/trunk@1387 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-13 02:57:30 +00:00
jtsiomb
b8ea74d51e The mapping from XInput button mask to the standard X event button mask is not 1-1, fixed. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1386 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-09 01:36:31 +00:00
jtsiomb
03fea19290 - trying to fix bug 2781865 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1385 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-07 11:15:01 +00:00
dcnieho
d598173a25 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: https://svn.code.sf.net/p/freeglut/code/trunk@1384 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-06 15:05:10 +00:00
dcnieho
80ed4c02f9 better to put code to check if menu should be deactivated in 
fg_menu_mswin.c


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1383 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-06 15:03:20 +00:00
dcnieho
c1492ab1ef some doc on why not using GetClientRect for getting the position of the 
client rect on the screen


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1382 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-06 03:10:33 +00:00
dcnieho
19c5ab0140 calling glutExit in the erro callback is a really bad example... 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1381 7f0cb862-5218-0410-a997-914c9d46530a
 2012-08-05 04:28:57 +00:00
jtsiomb
4c740e0f35 gamemode-x11: fixed the conditions checking for XR&R >= 1.1, as it where they would match 1.0 too 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1380 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-31 14:33:26 +00:00
dcnieho
01d00ef0d0 forgot to set use to true (not that its useful, but avoid confusion that 
could arise when returning false)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1379 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-29 05:33:07 +00:00
dcnieho
3173417248 attempt to implement fghPlatformGetCursorPos on X11 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1378 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-29 05:28:10 +00:00
dcnieho
89df7d96ed fg_cursor is a much better place for code reading the mouse position 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1377 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-29 05:18:36 +00:00
dcnieho
faf732bda6 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: https://svn.code.sf.net/p/freeglut/code/trunk@1376 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-29 05:11:53 +00:00
jtsiomb
3162c53c9f 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: https://svn.code.sf.net/p/freeglut/code/trunk@1375 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-29 04:11:01 +00:00
dcnieho
8c81fedaa0 little bit of cleanup and extra comments 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1374 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-26 15:11:37 +00:00
dcnieho
fc4d999897 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: https://svn.code.sf.net/p/freeglut/code/trunk@1373 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-24 17:43:12 +00:00
dcnieho
1b92446cdd adding option (on windows) to also install .pdb files 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1372 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-24 17:38:58 +00:00
dcnieho
2a1ed68305 fix to smooth demo to work with GL 3.3 and higher, thanks Neil Mannall 
(bug tracker ID 3496257)!


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1371 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-24 15:37:28 +00:00
dcnieho
75bc716354 update to README.win32 from José Caetano A. C. Silva (bug tracker 
#3505577). Thanks!


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1370 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-24 15:30:35 +00:00
dcnieho
fc3aa8f406 added warning and error callbacks to demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1369 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-24 15:03:53 +00:00
dcnieho
0e41b344b8 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: https://svn.code.sf.net/p/freeglut/code/trunk@1368 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-24 14:37:42 +00:00
dcnieho
8fb0c5d924 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: https://svn.code.sf.net/p/freeglut/code/trunk@1367 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 13:52:55 +00:00
dcnieho
b5664b39e7 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: https://svn.code.sf.net/p/freeglut/code/trunk@1366 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 10:37:40 +00:00
dcnieho
c2266aa027 now added fix suggested by Ioannis to make menus work when an entryfunc 
is defined for the window


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1365 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 09:51:34 +00:00
dcnieho
fe05157a34 Should only do check if mouse is outside client area when not opening a 
submenu as well...


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1364 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 09:50:14 +00:00
dcnieho
985693f528 child window now only used for keyboard callbacks and setting focus in 
windowproc, was a bit overeager before


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1363 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 08:52:50 +00:00
dcnieho
dba5bb070e now also closing menus when non-client area is pressed (thanks for 
suggestions Ioannis!)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1362 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 07:04:06 +00:00
dcnieho
fc2ee24b1b 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: https://svn.code.sf.net/p/freeglut/code/trunk@1361 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 07:00:14 +00:00
dcnieho
77ae3c4f4c added one more child window (child-of-child) to one demo for testing 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1360 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-23 06:55:45 +00:00
dcnieho
4c8096c90c 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: https://svn.code.sf.net/p/freeglut/code/trunk@1359 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-22 10:54:39 +00:00
dcnieho
7cdcd49c93 added entry callback to one demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1358 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-22 10:03:36 +00:00
dcnieho
662a168536 argh, some debug code made it in (don't commit and then make changes to 
the file before its fully transmitted...)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1357 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-21 14:19:38 +00:00
dcnieho
2be86de619 some clean up in WM_KILLFOCUS handler 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1356 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-21 14:18:13 +00:00
dcnieho
4a14f60a4e 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: https://svn.code.sf.net/p/freeglut/code/trunk@1355 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-21 14:15:39 +00:00
dcnieho
233d93d550 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: https://svn.code.sf.net/p/freeglut/code/trunk@1354 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-21 04:04:45 +00:00
dcnieho
e32b8f09fb better test of menus: one window now has right and left click menus 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1353 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-21 03:58:04 +00:00
dcnieho
ec9b01736e 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: https://svn.code.sf.net/p/freeglut/code/trunk@1352 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-21 03:11:57 +00:00
dcnieho
622479f8b4 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: https://svn.code.sf.net/p/freeglut/code/trunk@1351 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-21 02:32:58 +00:00
dcnieho
2f1b14fb21 small addition to debug msg handy for testing 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1350 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-20 08:07:52 +00:00
dcnieho
a8ab2ae562 need to check for NULL as well.... 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1349 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-20 06:48:05 +00:00
dcnieho
dd8e935408 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: https://svn.code.sf.net/p/freeglut/code/trunk@1348 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-20 06:35:38 +00:00
dcnieho
8e6d6e4f5c 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: https://svn.code.sf.net/p/freeglut/code/trunk@1347 7f0cb862-5218-0410-a997-914c9d46530a
 2012-07-20 05:44:05 +00:00
dcnieho
f910836158 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: https://svn.code.sf.net/p/freeglut/code/trunk@1346 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-18 06:14:32 +00:00
dcnieho
afbdd37121 added bunch of error checks to shapes demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1345 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-15 05:54:44 +00:00
dcnieho
1bca835536 as per Ioannis Petikas' suggestion on the mailing list, set NeedToResize 
to false before calling fghReshapeWindow


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1344 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-15 05:47:32 +00:00
dcnieho
ad98f1af5f bit of documentation 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1343 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-12 09:33:25 +00:00
fayjf
9641fb9d0d Fixing mouse wheel bug in Windows per e-mail from Ioannis Petikas dated 5/9/12 at 1:02 PM. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1341 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-10 20:41:45 +00:00
fayjf
9165411c7a Fixing the situation in which the special-key-up callback is called twice when Ctrl, Alt, or Shift is released. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1340 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-10 19:35:13 +00:00
beuc
6a9df93b5f Reference myself in AUTHORS 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1339 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-10 09:06:45 +00:00
fayjf
79911c4228 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: https://svn.code.sf.net/p/freeglut/code/trunk@1338 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 19:43:44 +00:00
beuc
807d5b9e49 Call Pause/Resume callbacks from Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1336 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 18:02:33 +00:00
beuc
6ea4bc321e Make glutInitContextFunc/glutPauseFunc/glutResumeFunc names definitive (+ reference them in the .def) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1335 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 17:49:27 +00:00
beuc
4d5e90860d Fix compilation of demos/shapes 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1334 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 17:38:24 +00:00
beuc
21409fddf2 Add pointers to discussion on multi-touch 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1332 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 17:29:10 +00:00
beuc
e05409ce5a 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: https://svn.code.sf.net/p/freeglut/code/trunk@1330 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 17:25:34 +00:00
beuc
45daf31758 README.mingw_cross: Clarify + remove autotools instructions since autotools support was removed 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1329 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 17:23:07 +00:00
dcnieho
ef625ea1a3 shapes demo can now test shader based drawing as well, added glmatrix 
helpers mostly written by John T.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1328 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-09 14:56:58 +00:00
dcnieho
9f5bdabbbd fixed warnings 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1327 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-08 01:03:12 +00:00
dcnieho
f0278c8e7a added d suffix for debug builds of demos as well, MSVC only 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1326 7f0cb862-5218-0410-a997-914c9d46530a
 2012-06-07 13:52:23 +00:00
beuc
299a491ae2 Clarify why check for XInput 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1325 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-29 18:33:22 +00:00
beuc
5f34ac1c5a Precision about Unix installation (XInput) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1324 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-29 18:32:51 +00:00
dcnieho
c8f74743db spaceball demo is only meaningful on unix, don't build on other 
platforms


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1323 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-25 01:35:06 +00:00
dcnieho
ce8d4a2137 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: https://svn.code.sf.net/p/freeglut/code/trunk@1322 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-25 01:31:25 +00:00
dcnieho
0065de7ac6 note about teapot rendering, front facing polygons have clockwise 
winding


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1321 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-24 15:05:34 +00:00
dcnieho
5f3a0d5411 fixed C++ code in multi-touch demo (thanks Geoff McLane!) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1320 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-21 10:17:55 +00:00
dcnieho
6afd5d5a83 no longer using sinf/cosfsqrtf in fg_geometry, no need for all this 
extra boilerplate


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1319 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-21 09:36:23 +00:00
beuc
352ff3e7ec multi-touch sample: use FG2.8 (reversed) prototype for now 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1317 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-13 09:14:27 +00:00
beuc
88512756e5 Fix extra CRLF 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1316 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-13 09:13:46 +00:00
beuc
fae6135480 Multi-touch: fix CMake: Xi and XInput2.h detection wasn't ported from autoconf, effectively disabling multi-touch 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1315 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-13 09:08:35 +00:00
beuc
4f3b46e046 Android: warn on resume if no callback for InitContext is defined 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1314 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-13 09:05:55 +00:00
jtsiomb
6c8a620bd5 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: https://svn.code.sf.net/p/freeglut/code/trunk@1313 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-10 18:50:52 +00:00
beuc
57532197dd Multi-touch test program 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1311 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-08 17:09:38 +00:00
beuc
f36e176d61 CMake: add note about library versioning 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1310 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-05 19:11:41 +00:00
jtsiomb
3a8112fd78 removed the useless and unmaintained .spec and .lsm files 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1307 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-05 06:06:09 +00:00
dcnieho
c9c45b04a1 docs and cosmetics in fg_geometry, should be a finished product now, 
except for more testing of the OGL2+ path


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1306 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-05 03:12:43 +00:00
dcnieho
edd278df3c slight formatting in CMake file, just cosmetic 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1305 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-05 00:52:45 +00:00
beuc
e85d2865b2 Add new callback to reload context, pending propername 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1304 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-04 22:18:54 +00:00
beuc
5807ec617c android: add code to display multi-touch events 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1303 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-04 19:59:36 +00:00
beuc
1659102712 typo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1302 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-04 14:57:02 +00:00
beuc
7e1671c700 Add documentation for geometry (ML rip-off) and Android corner-cases 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1300 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-04 14:52:52 +00:00
beuc
4edd05c782 Move Android docs to the website 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1298 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-04 11:19:00 +00:00
beuc
8aac2a48ce Android: unify toolchain and module builds 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1296 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-04 11:17:43 +00:00
beuc
85b0410084 android: handle pause/unpause of application + recreate EGL window and OpenGL context accordingly 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1293 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-04 07:37:39 +00:00
beuc
a0df79a2ee Document android app lifecycle; kill app when window is closed, until pausing/restoring windows is possible 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1292 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-03 16:40:20 +00:00
beuc
1d008232f5 android: make code 're-entrant' - i.e. NativeActivity can restart the program without unloading it 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1291 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-03 14:12:35 +00:00
beuc
d807511ff9 android: better clean-up on exit 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1290 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-03 13:32:06 +00:00
beuc
d7eef58fb4 Fix warnings 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1289 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-03 08:01:27 +00:00
beuc
c930677a27 Android: implement fgPlatformDeinitialiseInputDevices 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1288 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-03 07:58:00 +00:00
beuc
6ba33936f9 GLUT_WINDOW_BORDER_* is about borders, not inner size (thanks again Dee) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1287 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-03 07:55:19 +00:00
beuc
750e6d3aea GLUT_HAS_DIAL_AND_BUTTON_BOX officially not implemented on Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1286 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-03 07:54:12 +00:00
beuc
6c78dcab37 Fix misleading comment 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1285 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-02 18:27:57 +00:00
beuc
528e867587 Implement a few missing enums in fgPlatformGlutDeviceGet/fgPlatformGlutGet 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1284 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-02 17:28:52 +00:00
beuc
ff0a894fdc Use fgWarning for android joystick stubs 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1283 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-02 16:47:45 +00:00
beuc
df8fe9c476 Explain why fgPlatformSleepForEvents is no-op under Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1282 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-02 16:45:21 +00:00
beuc
7f845a72dc CHECK_FUNCTION_EXISTS for sinf/cosf/sqrtf actually fails not because of missing math.h, but because of missing -lm. Fixed. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1281 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-02 16:44:40 +00:00
beuc
488823afc3 Remove debugging left-over -_-' (thanks Dee) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1280 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-02 16:42:55 +00:00
beuc
260c71b27e android: implement fgPlatformSetCursor/fgPlatformWarpPointer 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1279 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-02 14:49:15 +00:00
beuc
ae35d72efd fg_geometry: GL2 fixed: glDrawElements' indices is byte offset, not element offset 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1278 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-01 22:16:33 +00:00
beuc
9b1a6ab1dd 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: https://svn.code.sf.net/p/freeglut/code/trunk@1277 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-01 21:28:28 +00:00
beuc
628d9b7a7e Detect sinf/cosf/sqrtf presence with CMake (instead of relying on __cpluscplus) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1276 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-01 14:14:54 +00:00
beuc
0629737fa2 Initialize OpenGL 2.0 after OpenGL context is created (otherwise initialization fails under mswin) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1275 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-01 13:13:14 +00:00
beuc
104a238a57 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: https://svn.code.sf.net/p/freeglut/code/trunk@1274 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-01 10:37:06 +00:00
beuc
dad750d1df Android: reference android library dependencies, needed for shared libs builds 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1273 7f0cb862-5218-0410-a997-914c9d46530a
 2012-05-01 09:33:05 +00:00
dcnieho
45b71f41a9 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: https://svn.code.sf.net/p/freeglut/code/trunk@1272 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-30 15:19:59 +00:00
dcnieho
c04a82ac47 drawing code for solid and wired now shared for all objects 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1271 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-29 04:16:07 +00:00
dcnieho
b739e1a281 cleanup 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1270 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-28 17:03:29 +00:00
dcnieho
a01a0426e7 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: https://svn.code.sf.net/p/freeglut/code/trunk@1269 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-28 17:01:44 +00:00
dcnieho
93e05f42de less repetition of vertices for triangle strip 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1268 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-28 16:35:39 +00:00
dcnieho
21268d0831 Wire Torus now ported 
solid torus now as triangle strips, but still need to finish port


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1267 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-28 13:29:49 +00:00
dcnieho
fe89b94fc4 porting torus: split off vertex generation 
fixed drawing to work with this



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1266 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-28 10:57:40 +00:00
dcnieho
8bd75d7761 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: https://svn.code.sf.net/p/freeglut/code/trunk@1264 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-22 16:39:47 +00:00
dcnieho
b5cfa418b6 one more small cleanup 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1263 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-22 16:32:29 +00:00
dcnieho
98ca02122b 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: https://svn.code.sf.net/p/freeglut/code/trunk@1262 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-22 16:30:19 +00:00
beuc
97a9318a81 Eventually tracked down nasty Android bug 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1260 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 20:19:31 +00:00
beuc
d554cb9ab1 Fix a few more compiler warnings 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1259 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 19:04:02 +00:00
beuc
46fd1bbdf5 Fix more compiler warnings 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1258 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 18:22:24 +00:00
dcnieho
49922f9a8a glutCones now refreshed too 
little edits on glutSphere too, nothign affecting functionality


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1257 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 18:05:56 +00:00
beuc
c0fceb37bb Fix compiler warnings 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1256 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 17:40:25 +00:00
beuc
e2f3f6181e Add more compiler checks for GCC 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1255 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 16:53:57 +00:00
beuc
5c09863775 README.android: typo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1254 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 16:50:38 +00:00
beuc
77d621e304 fg_gl2: Use GLES2 functions directly 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1253 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 16:45:46 +00:00
beuc
41c8a0c66b fg_geometry: really uninitialized variables 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1252 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 16:20:19 +00:00
beuc
2da5cd2a9a Really fix tabs->space 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1251 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 15:49:46 +00:00
beuc
9585336ff3 Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1250 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-21 15:02:00 +00:00
dcnieho
b66ef56d4b 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: https://svn.code.sf.net/p/freeglut/code/trunk@1249 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-20 11:25:42 +00:00
dcnieho
6a17bac02a converted all tabs to spaces, hate if they are mixed... 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1248 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-20 10:55:00 +00:00
beuc
716701e477 Add 'shapes' test for GLES1 (Android and Mesa EGL), as an independent CMake sample app 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1246 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-19 21:10:59 +00:00
beuc
54961248f7 README.android: suggest Debug build + tidy CMake build directories naming 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1244 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-19 20:53:47 +00:00
beuc
f8979fafb9 EGL: Declare fgPlatformSetWindow earlier to fix C warning 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1243 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-19 20:52:55 +00:00
beuc
b954aa8212 Fix regressions from previous commits 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1242 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 19:08:26 +00:00
beuc
69d4dabb9b Android: fix/upgrade paths in README 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1241 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 18:47:07 +00:00
beuc
c49fb151da Remove a couple printf's 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1240 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 18:46:38 +00:00
beuc
aef742b7c3 EGL: reuse fgPlatformSetWindow for calling eglMakeCurrent 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1239 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 18:45:54 +00:00
beuc
782974c8cf Fix eglInitialize check 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1238 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 18:44:17 +00:00
beuc
56742b2bbd __ANDROID__ is defined in the Android build environment; no need for an extra -DANDROID 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1237 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-09 18:35:25 +00:00
fayjf
9d024e63ab Removing the build errors from MSVC 6.0 version 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1236 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-07 02:28:55 +00:00
beuc
b33e1bbffe Fix return values for stubs 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1235 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-02 22:58:07 +00:00
beuc
7e5af9b5b5 fg_gl2: Fix typo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1234 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-02 22:43:23 +00:00
beuc
86545861dc Use different names for GLES1 and GLES2 libraries, to allow parallel install 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1233 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-02 22:22:33 +00:00
fayjf
c85f5937dd Removing the build errors and a build warning that crept in for MSVC 6.0. There remain the undefined functions "sinf" and "cosf". 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1231 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-01 20:09:51 +00:00
beuc
3123ddca88 README.android status section points to new android.php webpage 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1230 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-01 20:00:08 +00:00
beuc
2707583c09 A few more stubs for Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1228 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-01 15:42:47 +00:00
beuc
a0643b8c0c README.android: use separate build dirs + minor fixes 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1227 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-01 15:40:23 +00:00
beuc
4349a9ec2d GLsizei: ptrdiff_t -> int (like GLEW); add missing FGH_ prefix for OpenGL 2.0 prototype typedef's 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1226 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-01 13:39:12 +00:00
beuc
6b02c619e7 Fix OpenGL 2.0 declarations so code builds on Windows & Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1225 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-01 12:55:39 +00:00
beuc
40c07d20e5 fg_geometry: Enable supported geometry functions for GLES2 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1224 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-31 21:50:55 +00:00
beuc
3da140426f Fix previous commit, I made a confusion when merging my changes with the trunk 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1223 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-31 21:43:06 +00:00
beuc
6d98aacd0d fg_geometry: add OpenGL 2.0 version fghDrawGeometryWire/fghDrawGeometrySolid, and a wrapper to go choose 1.1 or 2.0 version. Common code (glDrawElements) is very small and is copy/pasted in both functions. 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1222 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-31 21:24:45 +00:00
beuc
ba5e48ebcb OpenGL 2.0: add 2 user-defined, per-context vertex attributes for coordinates and normals (e.g. for use in fg_geometry) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1221 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-31 20:52:48 +00:00
beuc
63ca031e62 Declare OpenGL 2.0 dynamically-loaded functions for internal use 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1220 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-31 20:21:16 +00:00
beuc
1dae162bb0 fg_geometry: sphere: GL_UNSIGNED_INT->GL_UNSIGNED_SHORT for OpenGL ES 1.0 support 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1219 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-31 20:03:01 +00:00
jtsiomb
4c7a212acb added an option (GLUT_SKIP_STALE_MOTION_EVENTS) to ignore all but the last 
MotionNotify event in the queue.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1218 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-31 13:34:32 +00:00
dcnieho
207411c39b added todo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1217 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-30 00:55:51 +00:00
beuc
299390347d EGL: implement fgPlatformGetProcAddress 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1214 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-25 17:13:14 +00:00
beuc
6e8d6a3f36 Indentation fix 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1213 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-25 17:09:42 +00:00
dcnieho
0f713eaaba bit of preparation for porting cone and cylinder: yes, both can be done 
with triangle strips (and then special treatment of cone tip isn't
needed)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1212 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-25 14:53:41 +00:00
dcnieho
92f52b5f41 ported sphere. Drawing code is still in the sphere function, that and 
the vertex index generating code can hopefully be abstracted away. But
first need to port the other shapes so I have a better idea of the
overlap. (sorry Sylvain! Just don't touch the sphere for now)



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1209 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-25 10:13:52 +00:00
dcnieho
9de1264e80 correcting a few typos i made earlier in the comments 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1208 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-25 06:13:47 +00:00
beuc
375d4f7e66 fg_geometry: test indices presence with vertIdxs!=NULL rather than numEdgePerFace==3 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1207 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-24 21:26:54 +00:00
beuc
f0754e0273 fg_geometry: 
- added a comment insisting on vertex+normal unicity,
- added 'GLsizei numVertIdxs' as a parameter,
- called 'fghDrawGeometrySolid' with:
  numVertices,numVertIdxs => nameCaps##_VERT_PER_OBJ,nameCaps##_VERT_PER_OBJ_TRI



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1206 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-24 19:57:54 +00:00
beuc
972da1fe62 fg_geometry: add a couple comments 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1205 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-24 11:47:10 +00:00
beuc
2c61e8cd17 Keep fg_geometry in normal builds\! 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1204 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-23 19:03:56 +00:00
beuc
6fa04424fe Remove glutWireTeapot/glutSolidTeapot from gles_stubs because these are conditionaly compiled already 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1203 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-23 19:01:05 +00:00
beuc
2e4ec574ff Don't alter glutWireTeapot and glutSolidTeapot prototypes, since we didn't modify these functions yet (thanks Diederick) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1202 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-23 01:07:48 +00:00
beuc
0d92390463 - Document what works with GLES1 and GLES2 as of now 
- Conditionaly disable what doesn't work
  so that libfreeglut can be compiled as-is for GLES1 and GLES2
  (Android and Mesa EGL)
- These #ifdef's are meant to disappear as more functions are implemented for GLES



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1201 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-23 01:02:57 +00:00
beuc
45a5e59f94 Geometry: Use 'double' instead of 'GLdouble' in include/GL/*.h, fixing temporary GLES work-around and getting consistent with latest changes in fg_geometry.c 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1200 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-22 23:25:13 +00:00
dcnieho
940bc0ac45 internally in fg_geometry, GLfloat used everywhere 
external facing functions now take double instead of GLdouble, which
isn't defined on GLES platforms


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1199 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-21 05:09:19 +00:00
dcnieho
1d91d09834 simplified check for whether opengl 2.1+ context is requested. 
Flags or profile set are now ignored unless opengl 2.1+ context is
requested


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1198 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-19 00:31:00 +00:00
beuc
468a43416d Add missing new _glx files 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1197 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 14:54:33 +00:00
beuc
5d6c1b44f4 Add support for X11+EGL. 
The changes are made with minimalism and clarity in mind:
- Either the functions are common and are kept in _x11.c files
- Either the functions have small differences and dealt with #ifdef
- Either the functions are largely different, and split in:
  - Specialized portable code in egl/
  - Specialized GLX code in _x11_glx.c files

Using EGL or GLX is decided at compile time
(CMake FREEGLUT_GLES1 or FREEGLUT_GLES2 option enabled)..



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1196 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 12:38:07 +00:00
beuc
8c0ae8bfb6 Remove left-over printf 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1195 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 12:25:29 +00:00
beuc
76e2c3ed3f pkg-config: add -lm to static libraries 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1194 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 10:25:19 +00:00
beuc
265e1cc378 Define PKG_CONFIG_PATH in client instructions 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1193 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 10:24:21 +00:00
dcnieho
c00c3d67a0 All doubles now GLdoubles (important for GLES later) 
Other general cleanup in prep for porting geometry code involving
circles.
no longer computing a larger circle table when only need half of it


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1192 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 10:02:54 +00:00
dcnieho
3e21108d4f teapot header not in list of files (so doesn't show up in IDE) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1191 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 09:59:50 +00:00
dcnieho
b171a73282 per old glut manpages, glutTeapot calls generate clockwise frontfacing 
polygons. Following recommendations in these manpages, updated the
shapes demo by surrounding calls with glFrontFace(GL_CW); and
glFrontFace(GL_CCW);


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1190 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 07:37:08 +00:00
dcnieho
8ab33e935f added a message when new context creation was silently ignored due to 
wglCreateContextAttribsARB not available, similar as is done for x11
with glxCreateContextAttribsARB


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1189 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 05:13:16 +00:00
beuc
95d74d15c0 Identify more precisly where GLdouble->GLfloat is needed in freeglut header 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1188 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 22:13:58 +00:00
beuc
ef9c4e1361 Rename fghChooseConfigEGL -> fghChooseConfig (not a specialization of an existing function) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1187 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 19:29:49 +00:00
beuc
7a42e4527e Fix library for GLES1 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1186 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 16:26:00 +00:00
beuc
b42288155e Removed fgPlatformGlutLayerGet to match other ports (thanks Diederick) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1185 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 16:12:31 +00:00
dcnieho
70046e0145 got rid of edgeflags as I now draw all wire frames face-by-face using 
line loops. Split wire and solid drawing in two separate functions
Now doing polygon to triangle decomposition using vertex indices that
are passed to glDrawElements, saves on memory, executes more efficient,
and makes wireframe drawing a piece of cake.
This should be GLES1 compatible too, hope so!


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1184 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 16:11:06 +00:00
beuc
604018bc92 Implement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1183 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 15:36:25 +00:00
beuc
a729bc608f EGL: implement fgPlatformSetWindow 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1182 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 14:24:42 +00:00
beuc
2a3295e970 Add 2 more temporary stubs 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1181 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 14:18:33 +00:00
beuc
6bc5a5c401 Remove Android-specific code (logging) in fg_display_egl 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1180 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 14:14:01 +00:00
beuc
af95cbdafe Context can be used for a menu rather than the current window 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1179 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 13:29:51 +00:00
beuc
3ce776e21e EGL: more code reusability 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1178 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 12:34:22 +00:00
beuc
b4115920d4 fghChooseConfigEGL returns 1/0 if found/not found 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1177 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 11:39:45 +00:00
beuc
6a05cd0a10 Move tagSFG_PlatformWindowState from EGL to Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1176 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 11:21:56 +00:00
beuc
04e3e33ad7 Move OpenGL ES stubs out of Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1175 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 10:33:28 +00:00
beuc
5149d43941 EGL: make more code reusable - less Android-specific 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1174 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 10:30:31 +00:00
beuc
40db28bb94 EGL: separate config and context code 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1173 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 10:09:19 +00:00
beuc
8b779d66dd Copy documentation about FREEGLUT_GLES2 and FREEGLUT_GLES1 from CMakefile.txt to freeglut_std.h (a.k.a. don't use them) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1172 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 07:05:25 +00:00
dcnieho
b38c9bc3ee that definition is FREEGLUT_GLES1, not FREEGLUT_GLES 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1171 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 04:00:13 +00:00
dcnieho
da52865ab3 little bit of cleanup 
added code for GLES1 (though only tested on OpenGL 2, non-ES context)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1170 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 03:58:26 +00:00
dcnieho
99cd253ea3 oops, that was a bit sloppy. Also added a missing free 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1169 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:23:03 +00:00
dcnieho
1b5b24155d check for every malloc call if memory was allocated successfully 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1168 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:21:19 +00:00
dcnieho
5818920c5c Need to also set glDisable(GL_CULL_FACE) when drawing wireframe to match what was 
produced before


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1167 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:11:49 +00:00
dcnieho
445fd29338 Done dodecahedron. Nice, this just worked! 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1166 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:06:21 +00:00
dcnieho
c4e7f30fae removing some debug code 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1165 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 01:36:08 +00:00
dcnieho
b043205853 was still trying to draw RhombicDodecahedron as GL_QUAD, of course it 
doesn't work
Made internal draw macro for case with edge flags


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1164 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 01:35:11 +00:00
dcnieho
41ce6d6860 implemented scheme for automatic square and pentagon decomposition and 
edgeflag generation
Works for cube, RhombicDodecahedron temporarily broken (probably due to
incorrect vertex order for decomposition method)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1163 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 00:32:08 +00:00
dcnieho
9f437ed383 corrected data type (its a demo after all, better be precise) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1162 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 00:21:40 +00:00
beuc
31e0027e09 Move EGL fields to a separate structure for reusability (e.g. upcoming Mesa X11 EGL support) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1161 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 23:23:19 +00:00
beuc
cb3dea2183 CMake: Declare OPTIONS higher in the file so they can be used to conditionaly include source files 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1160 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 21:39:37 +00:00
beuc
f6111f49ac GLES1 and GLES2 versions are now compiled with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly bootstrap headers inclusion 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1159 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 21:30:26 +00:00
beuc
ea875680a5 CMake: use same test for referencing and generating freeglutdll.def 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1158 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 20:43:29 +00:00
dcnieho
977a9f1e6b cube now done with triangles, internal edges on each face hidden with 
edge flag


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1157 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 11:06:23 +00:00
dcnieho
b95ed51118 RhombicDodecahedron moved to glVertexPointer 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1156 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 08:46:13 +00:00
dcnieho
ade8e6e8ef icosahedron also done 
wrote for easy declaring of interface functions


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1155 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 08:36:48 +00:00
dcnieho
b6f616f685 made some macros to reduce code duplication 
made naming completely consistent now


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1154 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 07:55:12 +00:00
dcnieho
4f9c00faa7 octahedron also done 
another pass at making all variable types consistent
added some direct mode drawing code for debugging


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1153 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 07:24:34 +00:00
dcnieho
5bb67c1c82 now a toggle for perspective/orthogonal projection in shapes demo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1152 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 06:05:33 +00:00
dcnieho
f692084300 outer radius parameter in shapes demo now doubles as size for all the 
other objects that support a size (luckily many don't, just glScale!)
moved text a bit more to corner of screen so its more out of the way



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1151 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 05:08:39 +00:00
dcnieho
92b1d69dd4 dSize parameter of Cube now works correctly again 
Fixed some inconsistent Macro naming and variable types


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1150 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 05:06:31 +00:00
dcnieho
0eb4534962 now using one function to generate geometry from the lists of vertices, 
normals and vertex indices
Geometry lists now stored in 1D arrays


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1149 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 04:49:17 +00:00
dcnieho
fe5c7db449 got one fo the cube's normals wrong 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1148 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 04:23:48 +00:00
dcnieho
eb95f57fa6 array size second dim is simply 3... 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1147 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 04:22:34 +00:00
dcnieho
40e7dfa35c I have these nice variables indicating whether the geometry cache for a 
certain object was already filled, but i never set them to true...


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1146 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 03:17:37 +00:00
dcnieho
833166240f Cube also moved to glDrawElements 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1145 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 03:14:23 +00:00
dcnieho
d3550b00d9 also did Sierpinski sponge 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1144 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 02:01:59 +00:00
dcnieho
19a3927adc initial start at rewrite of fg_geometry functions, using glDrawArrays. 
Tetrahedon done as example (seems to work well, but further comments
pending)
Done restructuring of the file as well


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1143 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 00:40:15 +00:00
beuc
bae0c12952 Add pkg-config script (cmake changes added by mistake in previous commit) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1142 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 20:51:24 +00:00
beuc
02880439ed CMake: Move -DANDROID in the toolchain script, to ease reuse of this file 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1141 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 20:48:32 +00:00
beuc
41c6d2ada6 A few fixes in cygwin docs 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1140 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 20:37:41 +00:00
beuc
e74cb052f0 Error handling for eglSwapBuffers 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1139 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 19:52:16 +00:00
dcnieho
792977034a no need for a message on MSVC that we hide insecure CRT warnings 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1138 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 03:07:57 +00:00