freeglut
12 years agofg_geometry: add OpenGL 2.0 version fghDrawGeometryWire/fghDrawGeometrySolid, and...
Sylvain Beucler [Sat, 31 Mar 2012 21:24:45 +0000 (21:24 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1222 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoOpenGL 2.0: add 2 user-defined, per-context vertex attributes for coordinates and...
Sylvain Beucler [Sat, 31 Mar 2012 20:52:48 +0000 (20:52 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1221 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoDeclare OpenGL 2.0 dynamically-loaded functions for internal use
Sylvain Beucler [Sat, 31 Mar 2012 20:21:16 +0000 (20:21 +0000)]
Declare OpenGL 2.0 dynamically-loaded functions for internal use

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

12 years agofg_geometry: sphere: GL_UNSIGNED_INT->GL_UNSIGNED_SHORT for OpenGL ES 1.0 support
Sylvain Beucler [Sat, 31 Mar 2012 20:03:01 +0000 (20:03 +0000)]
fg_geometry: sphere: GL_UNSIGNED_INT->GL_UNSIGNED_SHORT for OpenGL ES 1.0 support

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

12 years agoadded an option (GLUT_SKIP_STALE_MOTION_EVENTS) to ignore all but the last
John Tsiombikas [Sat, 31 Mar 2012 13:34:32 +0000 (13:34 +0000)]
added an option (GLUT_SKIP_STALE_MOTION_EVENTS) to ignore all but the last
MotionNotify event in the queue.

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

12 years agoadded todo
Diederick Niehorster [Fri, 30 Mar 2012 00:55:51 +0000 (00:55 +0000)]
added todo

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

12 years agoEGL: implement fgPlatformGetProcAddress
Sylvain Beucler [Sun, 25 Mar 2012 17:13:14 +0000 (17:13 +0000)]
EGL: implement fgPlatformGetProcAddress

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

12 years agoIndentation fix
Sylvain Beucler [Sun, 25 Mar 2012 17:09:42 +0000 (17:09 +0000)]
Indentation fix

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

12 years agobit of preparation for porting cone and cylinder: yes, both can be done
Diederick Niehorster [Sun, 25 Mar 2012 14:53:41 +0000 (14:53 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1212 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoported sphere. Drawing code is still in the sphere function, that and
Diederick Niehorster [Sun, 25 Mar 2012 10:13:52 +0000 (10:13 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1209 7f0cb862-5218-0410-a997-914c9d46530a

12 years agocorrecting a few typos i made earlier in the comments
Diederick Niehorster [Sun, 25 Mar 2012 06:13:47 +0000 (06:13 +0000)]
correcting a few typos i made earlier in the comments

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

12 years agofg_geometry: test indices presence with vertIdxs!=NULL rather than numEdgePerFace==3
Sylvain Beucler [Sat, 24 Mar 2012 21:26:54 +0000 (21:26 +0000)]
fg_geometry: test indices presence with vertIdxs!=NULL rather than numEdgePerFace==3

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

12 years agofg_geometry:
Sylvain Beucler [Sat, 24 Mar 2012 19:57:54 +0000 (19:57 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1206 7f0cb862-5218-0410-a997-914c9d46530a

12 years agofg_geometry: add a couple comments
Sylvain Beucler [Sat, 24 Mar 2012 11:47:10 +0000 (11:47 +0000)]
fg_geometry: add a couple comments

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

12 years agoKeep fg_geometry in normal builds\!
Sylvain Beucler [Fri, 23 Mar 2012 19:03:56 +0000 (19:03 +0000)]
Keep fg_geometry in normal builds\!

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

12 years agoRemove glutWireTeapot/glutSolidTeapot from gles_stubs because these are conditionaly...
Sylvain Beucler [Fri, 23 Mar 2012 19:01:05 +0000 (19:01 +0000)]
Remove glutWireTeapot/glutSolidTeapot from gles_stubs because these are conditionaly compiled already

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

12 years agoDon't alter glutWireTeapot and glutSolidTeapot prototypes, since we didn't modify...
Sylvain Beucler [Fri, 23 Mar 2012 01:07:48 +0000 (01:07 +0000)]
Don't alter glutWireTeapot and glutSolidTeapot prototypes, since we didn't modify these functions yet (thanks Diederick)

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

12 years ago- Document what works with GLES1 and GLES2 as of now
Sylvain Beucler [Fri, 23 Mar 2012 01:02:57 +0000 (01:02 +0000)]
- 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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1201 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoGeometry: Use 'double' instead of 'GLdouble' in include/GL/*.h, fixing temporary...
Sylvain Beucler [Thu, 22 Mar 2012 23:25:13 +0000 (23:25 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1200 7f0cb862-5218-0410-a997-914c9d46530a

12 years agointernally in fg_geometry, GLfloat used everywhere
Diederick Niehorster [Wed, 21 Mar 2012 05:09:19 +0000 (05:09 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1199 7f0cb862-5218-0410-a997-914c9d46530a

12 years agosimplified check for whether opengl 2.1+ context is requested.
Diederick Niehorster [Mon, 19 Mar 2012 00:31:00 +0000 (00:31 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1198 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAdd missing new _glx files
Sylvain Beucler [Sun, 18 Mar 2012 14:54:33 +0000 (14:54 +0000)]
Add missing new _glx files

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

12 years agoAdd support for X11+EGL.
Sylvain Beucler [Sun, 18 Mar 2012 12:38:07 +0000 (12:38 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1196 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoRemove left-over printf
Sylvain Beucler [Sun, 18 Mar 2012 12:25:29 +0000 (12:25 +0000)]
Remove left-over printf

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

12 years agopkg-config: add -lm to static libraries
Sylvain Beucler [Sun, 18 Mar 2012 10:25:19 +0000 (10:25 +0000)]
pkg-config: add -lm to static libraries

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

12 years agoDefine PKG_CONFIG_PATH in client instructions
Sylvain Beucler [Sun, 18 Mar 2012 10:24:21 +0000 (10:24 +0000)]
Define PKG_CONFIG_PATH in client instructions

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

12 years agoAll doubles now GLdoubles (important for GLES later)
Diederick Niehorster [Sun, 18 Mar 2012 10:02:54 +0000 (10:02 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1192 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoteapot header not in list of files (so doesn't show up in IDE)
Diederick Niehorster [Sun, 18 Mar 2012 09:59:50 +0000 (09:59 +0000)]
teapot header not in list of files (so doesn't show up in IDE)

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

12 years agoper old glut manpages, glutTeapot calls generate clockwise frontfacing
Diederick Niehorster [Sun, 18 Mar 2012 07:37:08 +0000 (07:37 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1190 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoadded a message when new context creation was silently ignored due to
Diederick Niehorster [Sun, 18 Mar 2012 05:13:16 +0000 (05:13 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1189 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoIdentify more precisly where GLdouble->GLfloat is needed in freeglut header
Sylvain Beucler [Sat, 17 Mar 2012 22:13:58 +0000 (22:13 +0000)]
Identify more precisly where GLdouble->GLfloat is needed in freeglut header

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

12 years agoRename fghChooseConfigEGL -> fghChooseConfig (not a specialization of an existing...
Sylvain Beucler [Sat, 17 Mar 2012 19:29:49 +0000 (19:29 +0000)]
Rename fghChooseConfigEGL -> fghChooseConfig (not a specialization of an existing function)

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

12 years agoFix library for GLES1
Sylvain Beucler [Sat, 17 Mar 2012 16:26:00 +0000 (16:26 +0000)]
Fix library for GLES1

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

12 years agoRemoved fgPlatformGlutLayerGet to match other ports (thanks Diederick)
Sylvain Beucler [Sat, 17 Mar 2012 16:12:31 +0000 (16:12 +0000)]
Removed fgPlatformGlutLayerGet to match other ports (thanks Diederick)

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

12 years agogot rid of edgeflags as I now draw all wire frames face-by-face using
Diederick Niehorster [Sat, 17 Mar 2012 16:11:06 +0000 (16:11 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1184 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoImplement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet
Sylvain Beucler [Sat, 17 Mar 2012 15:36:25 +0000 (15:36 +0000)]
Implement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet

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

12 years agoEGL: implement fgPlatformSetWindow
Sylvain Beucler [Sat, 17 Mar 2012 14:24:42 +0000 (14:24 +0000)]
EGL: implement fgPlatformSetWindow

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

12 years agoAdd 2 more temporary stubs
Sylvain Beucler [Sat, 17 Mar 2012 14:18:33 +0000 (14:18 +0000)]
Add 2 more temporary stubs

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

12 years agoRemove Android-specific code (logging) in fg_display_egl
Sylvain Beucler [Sat, 17 Mar 2012 14:14:01 +0000 (14:14 +0000)]
Remove Android-specific code (logging) in fg_display_egl

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

12 years agoContext can be used for a menu rather than the current window
Sylvain Beucler [Sat, 17 Mar 2012 13:29:51 +0000 (13:29 +0000)]
Context can be used for a menu rather than the current window

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

12 years agoEGL: more code reusability
Sylvain Beucler [Sat, 17 Mar 2012 12:34:22 +0000 (12:34 +0000)]
EGL: more code reusability

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

12 years agofghChooseConfigEGL returns 1/0 if found/not found
Sylvain Beucler [Sat, 17 Mar 2012 11:39:45 +0000 (11:39 +0000)]
fghChooseConfigEGL returns 1/0 if found/not found

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

12 years agoMove tagSFG_PlatformWindowState from EGL to Android
Sylvain Beucler [Sat, 17 Mar 2012 11:21:56 +0000 (11:21 +0000)]
Move tagSFG_PlatformWindowState from EGL to Android

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

12 years agoMove OpenGL ES stubs out of Android
Sylvain Beucler [Sat, 17 Mar 2012 10:33:28 +0000 (10:33 +0000)]
Move OpenGL ES stubs out of Android

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

12 years agoEGL: make more code reusable - less Android-specific
Sylvain Beucler [Sat, 17 Mar 2012 10:30:31 +0000 (10:30 +0000)]
EGL: make more code reusable - less Android-specific

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

12 years agoEGL: separate config and context code
Sylvain Beucler [Sat, 17 Mar 2012 10:09:19 +0000 (10:09 +0000)]
EGL: separate config and context code

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

12 years agoCopy documentation about FREEGLUT_GLES2 and FREEGLUT_GLES1 from CMakefile.txt to...
Sylvain Beucler [Sat, 17 Mar 2012 07:05:25 +0000 (07:05 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1172 7f0cb862-5218-0410-a997-914c9d46530a

12 years agothat definition is FREEGLUT_GLES1, not FREEGLUT_GLES
Diederick Niehorster [Sat, 17 Mar 2012 04:00:13 +0000 (04:00 +0000)]
that definition is FREEGLUT_GLES1, not FREEGLUT_GLES

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

12 years agolittle bit of cleanup
Diederick Niehorster [Sat, 17 Mar 2012 03:58:26 +0000 (03:58 +0000)]
little bit of cleanup
added code for GLES1 (though only tested on OpenGL 2, non-ES context)

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

12 years agooops, that was a bit sloppy. Also added a missing free
Diederick Niehorster [Sat, 17 Mar 2012 02:23:03 +0000 (02:23 +0000)]
oops, that was a bit sloppy. Also added a missing free

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

12 years agocheck for every malloc call if memory was allocated successfully
Diederick Niehorster [Sat, 17 Mar 2012 02:21:19 +0000 (02:21 +0000)]
check for every malloc call if memory was allocated successfully

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

12 years agoNeed to also set glDisable(GL_CULL_FACE) when drawing wireframe to match what was
Diederick Niehorster [Sat, 17 Mar 2012 02:11:49 +0000 (02:11 +0000)]
Need to also set glDisable(GL_CULL_FACE) when drawing wireframe to match what was
produced before

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

12 years agoDone dodecahedron. Nice, this just worked!
Diederick Niehorster [Sat, 17 Mar 2012 02:06:21 +0000 (02:06 +0000)]
Done dodecahedron. Nice, this just worked!

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

12 years agoremoving some debug code
Diederick Niehorster [Sat, 17 Mar 2012 01:36:08 +0000 (01:36 +0000)]
removing some debug code

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

12 years agowas still trying to draw RhombicDodecahedron as GL_QUAD, of course it
Diederick Niehorster [Sat, 17 Mar 2012 01:35:11 +0000 (01:35 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1164 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoimplemented scheme for automatic square and pentagon decomposition and
Diederick Niehorster [Sat, 17 Mar 2012 00:32:08 +0000 (00:32 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1163 7f0cb862-5218-0410-a997-914c9d46530a

12 years agocorrected data type (its a demo after all, better be precise)
Diederick Niehorster [Sat, 17 Mar 2012 00:21:40 +0000 (00:21 +0000)]
corrected data type (its a demo after all, better be precise)

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

12 years agoMove EGL fields to a separate structure for reusability (e.g. upcoming Mesa X11 EGL...
Sylvain Beucler [Fri, 16 Mar 2012 23:23:19 +0000 (23:23 +0000)]
Move EGL fields to a separate structure for reusability (e.g. upcoming Mesa X11 EGL support)

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

12 years agoCMake: Declare OPTIONS higher in the file so they can be used to conditionaly include...
Sylvain Beucler [Fri, 16 Mar 2012 21:39:37 +0000 (21:39 +0000)]
CMake: Declare OPTIONS higher in the file so they can be used to conditionaly include source files

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

12 years agoGLES1 and GLES2 versions are now compiled with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2...
Sylvain Beucler [Fri, 16 Mar 2012 21:30:26 +0000 (21:30 +0000)]
GLES1 and GLES2 versions are now compiled with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly bootstrap headers inclusion

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

12 years agoCMake: use same test for referencing and generating freeglutdll.def
Sylvain Beucler [Fri, 16 Mar 2012 20:43:29 +0000 (20:43 +0000)]
CMake: use same test for referencing and generating freeglutdll.def

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

12 years agocube now done with triangles, internal edges on each face hidden with
Diederick Niehorster [Fri, 16 Mar 2012 11:06:23 +0000 (11:06 +0000)]
cube now done with triangles, internal edges on each face hidden with
edge flag

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

12 years agoRhombicDodecahedron moved to glVertexPointer
Diederick Niehorster [Fri, 16 Mar 2012 08:46:13 +0000 (08:46 +0000)]
RhombicDodecahedron moved to glVertexPointer

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

12 years agoicosahedron also done
Diederick Niehorster [Fri, 16 Mar 2012 08:36:48 +0000 (08:36 +0000)]
icosahedron also done
wrote for easy declaring of interface functions

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

12 years agomade some macros to reduce code duplication
Diederick Niehorster [Fri, 16 Mar 2012 07:55:12 +0000 (07:55 +0000)]
made some macros to reduce code duplication
made naming completely consistent now

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

12 years agooctahedron also done
Diederick Niehorster [Fri, 16 Mar 2012 07:24:34 +0000 (07:24 +0000)]
octahedron also done
another pass at making all variable types consistent
added some direct mode drawing code for debugging

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

12 years agonow a toggle for perspective/orthogonal projection in shapes demo
Diederick Niehorster [Fri, 16 Mar 2012 06:05:33 +0000 (06:05 +0000)]
now a toggle for perspective/orthogonal projection in shapes demo

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

12 years agoouter radius parameter in shapes demo now doubles as size for all the
Diederick Niehorster [Fri, 16 Mar 2012 05:08:39 +0000 (05:08 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1151 7f0cb862-5218-0410-a997-914c9d46530a

12 years agodSize parameter of Cube now works correctly again
Diederick Niehorster [Fri, 16 Mar 2012 05:06:31 +0000 (05:06 +0000)]
dSize parameter of Cube now works correctly again
Fixed some inconsistent Macro naming and variable types

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

12 years agonow using one function to generate geometry from the lists of vertices,
Diederick Niehorster [Fri, 16 Mar 2012 04:49:17 +0000 (04:49 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1149 7f0cb862-5218-0410-a997-914c9d46530a

12 years agogot one fo the cube's normals wrong
Diederick Niehorster [Fri, 16 Mar 2012 04:23:48 +0000 (04:23 +0000)]
got one fo the cube's normals wrong

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

12 years agoarray size second dim is simply 3...
Diederick Niehorster [Fri, 16 Mar 2012 04:22:34 +0000 (04:22 +0000)]
array size second dim is simply 3...

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

12 years agoI have these nice variables indicating whether the geometry cache for a
Diederick Niehorster [Fri, 16 Mar 2012 03:17:37 +0000 (03:17 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1146 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoCube also moved to glDrawElements
Diederick Niehorster [Fri, 16 Mar 2012 03:14:23 +0000 (03:14 +0000)]
Cube also moved to glDrawElements

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

12 years agoalso did Sierpinski sponge
Diederick Niehorster [Fri, 16 Mar 2012 02:01:59 +0000 (02:01 +0000)]
also did Sierpinski sponge

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

12 years agoinitial start at rewrite of fg_geometry functions, using glDrawArrays.
Diederick Niehorster [Fri, 16 Mar 2012 00:40:15 +0000 (00:40 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1143 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoAdd pkg-config script (cmake changes added by mistake in previous commit)
Sylvain Beucler [Thu, 15 Mar 2012 20:51:24 +0000 (20:51 +0000)]
Add pkg-config script (cmake changes added by mistake in previous commit)

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

12 years agoCMake: Move -DANDROID in the toolchain script, to ease reuse of this file
Sylvain Beucler [Thu, 15 Mar 2012 20:48:32 +0000 (20:48 +0000)]
CMake: Move -DANDROID in the toolchain script, to ease reuse of this file

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

12 years agoA few fixes in cygwin docs
Sylvain Beucler [Thu, 15 Mar 2012 20:37:41 +0000 (20:37 +0000)]
A few fixes in cygwin docs

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

12 years agoError handling for eglSwapBuffers
Sylvain Beucler [Thu, 15 Mar 2012 19:52:16 +0000 (19:52 +0000)]
Error handling for eglSwapBuffers

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

12 years agono need for a message on MSVC that we hide insecure CRT warnings
Diederick Niehorster [Thu, 15 Mar 2012 03:07:57 +0000 (03:07 +0000)]
no need for a message on MSVC that we hide insecure CRT warnings

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

12 years agooops, generating freeglutdll.def was not specific to MSVC
Diederick Niehorster [Thu, 15 Mar 2012 03:06:42 +0000 (03:06 +0000)]
oops, generating freeglutdll.def was not specific to MSVC

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

12 years agoconverted all tabs to spaces for CMake file, eases editing and indenting
Diederick Niehorster [Thu, 15 Mar 2012 02:34:33 +0000 (02:34 +0000)]
converted all tabs to spaces for CMake file, eases editing and indenting
in diffs looks right

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

12 years agoFreeGLUT version number is now only defined in CMake file. All other
Diederick Niehorster [Thu, 15 Mar 2012 02:30:50 +0000 (02:30 +0000)]
FreeGLUT version number is now only defined in CMake file. All other
files containing a version number are now automatically generated upon
configure

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

12 years agoand again some more documentation of what kind of version is referred to
Diederick Niehorster [Thu, 15 Mar 2012 02:24:06 +0000 (02:24 +0000)]
and again some more documentation of what kind of version is referred to

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

12 years agoadded a bit more doc
Diederick Niehorster [Thu, 15 Mar 2012 02:15:54 +0000 (02:15 +0000)]
added a bit more doc

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

12 years agojust a typo
Diederick Niehorster [Thu, 15 Mar 2012 01:50:44 +0000 (01:50 +0000)]
just a typo

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

12 years agoremoved the obsolete GPL copyright statement templates
John Tsiombikas [Wed, 14 Mar 2012 14:57:05 +0000 (14:57 +0000)]
removed the obsolete GPL copyright statement templates

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

12 years agoremoved parts from readme that are definately outdated. The rest is
Diederick Niehorster [Wed, 14 Mar 2012 03:50:59 +0000 (03:50 +0000)]
removed parts from readme that are definately outdated. The rest is
useful and will need to be massaged into a helpful text before 3.0
release

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

12 years agoalso added build64 to list of ignores
Diederick Niehorster [Wed, 14 Mar 2012 03:38:47 +0000 (03:38 +0000)]
also added build64 to list of ignores

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

12 years ago- forgot to remove autogen.sh previously along with the rest of the autotools
John Tsiombikas [Tue, 13 Mar 2012 19:36:28 +0000 (19:36 +0000)]
- forgot to remove autogen.sh previously along with the rest of the autotools
stuff
- removed other random build files that have accumulated over time. Kdevelop
project files, microsoft nmake files, etc.

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

12 years agoRemoved autotools build files (I think I got all of them, did I?)
John Tsiombikas [Tue, 13 Mar 2012 19:24:01 +0000 (19:24 +0000)]
Removed autotools build files (I think I got all of them, did I?)

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

12 years agoAdded a few more details to README.cmake
John Tsiombikas [Tue, 13 Mar 2012 19:05:32 +0000 (19:05 +0000)]
Added a few more details to README.cmake

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

12 years agoremoved VC6 files
Diederick Niehorster [Tue, 13 Mar 2012 11:13:06 +0000 (11:13 +0000)]
removed VC6 files

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

12 years agoRemoved VS2008 and VS2010 files
Diederick Niehorster [Tue, 13 Mar 2012 11:08:26 +0000 (11:08 +0000)]
Removed VS2008 and VS2010 files
set ignore for my /build directory, removed ignore for config.h.in

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

12 years agofound both SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
Diederick Niehorster [Tue, 13 Mar 2012 11:03:23 +0000 (11:03 +0000)]
found both SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
and SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) were used,
removed the second (deprecated) commands
This results in shared libraries being build in /bin on windows, but not
other platforms, obviating the need to copy dlls to /bin. Documented
this
the copy of fractals.dat should now work on all platforms (hopefully)

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

12 years agoadded a quick tut for using cmake, adapted from http://mash-project.eu/wiki/index...
Diederick Niehorster [Tue, 13 Mar 2012 08:24:20 +0000 (08:24 +0000)]
added a quick tut for using cmake, adapted from mash-project.eu/wiki/index.php/CMake:_Quick_Start_Guide

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

12 years agomoved glutTimerFunc in timer demo
Diederick Niehorster [Mon, 12 Mar 2012 16:33:46 +0000 (16:33 +0000)]
moved glutTimerFunc in timer demo

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

12 years agoadded to CMake a setup to copy shared lib (MSVC only right now) and
Diederick Niehorster [Mon, 12 Mar 2012 15:41:39 +0000 (15:41 +0000)]
added to CMake a setup to copy shared lib (MSVC only right now) and
fractals.dat to demo binary folder if demos are built

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

12 years agocleaneup \machine setting for MSVC, now only for 64bit static libs, only
Diederick Niehorster [Mon, 12 Mar 2012 07:26:37 +0000 (07:26 +0000)]
cleaneup \machine setting for MSVC, now only for 64bit static libs, only
onwe for which needed. Added a comment showing why its needed

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