141 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
jtsiomb
03dc75a452 Removed autotools build files (I think I got all of them, did I?)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1127 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 19:24:01 +00:00
dcnieho
01f323da92 removed VC6 files
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1125 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 11:13:06 +00:00
dcnieho
b6e8aa6776 moved glutTimerFunc in timer demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1121 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 16:33:46 +00:00
jtsiomb
cf7613066d added the timer demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1100 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-10 14:55:50 +00:00
fayjf
be2e5e2ff9 Undoing changeset 949 as it breaks the Linux build, per e-mail from John Tsiombikas dated 12/13/11 6:41 PM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@953 7f0cb862-5218-0410-a997-914c9d46530a
2011-12-14 03:35:07 +00:00
fayjf
7225768c0b Adding an error message code to the "smooth_opengl3" demo per e-mail from Diederick Niehorster dated 12/9/2011 as 12:22 AM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@949 7f0cb862-5218-0410-a997-914c9d46530a
2011-12-13 03:48:26 +00:00
fayjf
9b77f45700 Addressing Ubuntu bug 686312 reported as freeglut bug 3407093 -- adding '-lm' to the Lorenz and Spaceball demos
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@940 7f0cb862-5218-0410-a997-914c9d46530a
2011-09-28 01:06:39 +00:00
fayjf
cdde1ea3d4 Addressing Ubuntu bug 686315 reported as freeglut bug 3407093 -- rearranging the 'Makefile.am' loader flags
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@939 7f0cb862-5218-0410-a997-914c9d46530a
2011-09-28 01:04:17 +00:00
fayjf
57039867b7 Final patch on full screen fix per e-mail from Diederick Niehorster dated 10/4/11 at 10:19 PM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@932 7f0cb862-5218-0410-a997-914c9d46530a
2011-09-05 03:35:35 +00:00
fayjf
440b6ad83b Adding the "patch_demo" patch per e-mail from Diederick Niehorster vintage 6/9/11 at 11:57 PM. Please check that I got them right; they are quite confusing.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@931 7f0cb862-5218-0410-a997-914c9d46530a
2011-09-04 20:30:48 +00:00
fayjf
d6a686cad3 Adding the "subwin" demo to the MSVC 6.0 workspace, in both static and dynamic configurations
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@915 7f0cb862-5218-0410-a997-914c9d46530a
2011-03-26 18:10:27 +00:00
fayjf
81fdcb4328 Fixing the build on *nix per e-mail from John Tsiombikas dated 3/22/11 at 2:26 PM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@914 7f0cb862-5218-0410-a997-914c9d46530a
2011-03-25 02:50:57 +00:00
fayjf
e627bb8e41 Making some constants in the 'subwin' demo floating-point to silence compiler warnings per e-mail from Diederick Niehorster dated 3/22/11 at 8:58 AM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@910 7f0cb862-5218-0410-a997-914c9d46530a
2011-03-23 03:38:25 +00:00
fayjf
eb247de77f Adding the 'subwinfix.patch' patch to set the focus in the Windows code. Includes a demo program. See e-mail from Evan Felix dated 3/17/11 4:22 PM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@906 7f0cb862-5218-0410-a997-914c9d46530a
2011-03-18 03:21:56 +00:00
fayjf
4a2f0ca602 Adding more examples to 'one.c' to test the game mode string per e-mail from Diedrick Niehorster dated 3/16/11 11:06 PM.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@904 7f0cb862-5218-0410-a997-914c9d46530a
2011-03-17 04:22:55 +00:00
fayjf
ca1a3d45cc Implementing John Tsiombikas' missing error demo patch per e-mail dated 3/15/11 8:04 PM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@898 7f0cb862-5218-0410-a997-914c9d46530a
2011-03-16 03:24:21 +00:00
fayjf
5bdbf8739d Removing a bunch of Windows line endings -- see bug report 3077828
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@882 7f0cb862-5218-0410-a997-914c9d46530a
2011-01-23 14:18:25 +00:00
fayjf
e5e5aebedf Addressing feature request 2116152 -- adding an fgError exit callback routine -- patch from Chris Marshall in e-mail dated 10/30/2010 2:06 PM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@877 7f0cb862-5218-0410-a997-914c9d46530a
2010-11-01 04:13:54 +00:00
fayjf
ff2ef131b4 Making the "smooth_opengl3" typedefs to be Windows only per a discussion on the developers' list over the last several days.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@851 7f0cb862-5218-0410-a997-914c9d46530a
2009-11-19 12:51:58 +00:00