freeglut
12 years agoFix more compiler warnings
Sylvain Beucler [Sat, 21 Apr 2012 18:22:24 +0000 (18:22 +0000)]
Fix more compiler warnings

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

12 years agoglutCones now refreshed too
Diederick Niehorster [Sat, 21 Apr 2012 18:05:56 +0000 (18:05 +0000)]
glutCones now refreshed too
little edits on glutSphere too, nothign affecting functionality

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

12 years agoFix compiler warnings
Sylvain Beucler [Sat, 21 Apr 2012 17:40:25 +0000 (17:40 +0000)]
Fix compiler warnings

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

12 years agoAdd more compiler checks for GCC
Sylvain Beucler [Sat, 21 Apr 2012 16:53:57 +0000 (16:53 +0000)]
Add more compiler checks for GCC

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

12 years agoREADME.android: typo
Sylvain Beucler [Sat, 21 Apr 2012 16:50:38 +0000 (16:50 +0000)]
README.android: typo

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

12 years agofg_gl2: Use GLES2 functions directly
Sylvain Beucler [Sat, 21 Apr 2012 16:45:46 +0000 (16:45 +0000)]
fg_gl2: Use GLES2 functions directly

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

12 years agofg_geometry: really uninitialized variables
Sylvain Beucler [Sat, 21 Apr 2012 16:20:19 +0000 (16:20 +0000)]
fg_geometry: really uninitialized variables

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

12 years agoReally fix tabs->space
Sylvain Beucler [Sat, 21 Apr 2012 15:49:46 +0000 (15:49 +0000)]
Really fix tabs->space

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

12 years agoReally fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8)
Sylvain Beucler [Sat, 21 Apr 2012 15:02:00 +0000 (15:02 +0000)]
Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8)

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

12 years agosolid sphere now done with only triangle strips.
Diederick Niehorster [Fri, 20 Apr 2012 11:25:42 +0000 (11:25 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1249 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoconverted all tabs to spaces, hate if they are mixed...
Diederick Niehorster [Fri, 20 Apr 2012 10:55:00 +0000 (10:55 +0000)]
converted all tabs to spaces, hate if they are mixed...

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

12 years agoAdd 'shapes' test for GLES1 (Android and Mesa EGL), as an independent CMake sample app
Sylvain Beucler [Thu, 19 Apr 2012 21:10:59 +0000 (21:10 +0000)]
Add 'shapes' test for GLES1 (Android and Mesa EGL), as an independent CMake sample app

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

12 years agoAdd some CMake build directories to svn:ignore
Sylvain Beucler [Thu, 19 Apr 2012 20:56:48 +0000 (20:56 +0000)]
Add some CMake build directories to svn:ignore

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

12 years agoREADME.android: suggest Debug build + tidy CMake build directories naming
Sylvain Beucler [Thu, 19 Apr 2012 20:53:47 +0000 (20:53 +0000)]
README.android: suggest Debug build + tidy CMake build directories naming

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

12 years agoEGL: Declare fgPlatformSetWindow earlier to fix C warning
Sylvain Beucler [Thu, 19 Apr 2012 20:52:55 +0000 (20:52 +0000)]
EGL: Declare fgPlatformSetWindow earlier to fix C warning

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

12 years agoFix regressions from previous commits
Sylvain Beucler [Sun, 15 Apr 2012 19:08:26 +0000 (19:08 +0000)]
Fix regressions from previous commits

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

12 years agoAndroid: fix/upgrade paths in README
Sylvain Beucler [Sun, 15 Apr 2012 18:47:07 +0000 (18:47 +0000)]
Android: fix/upgrade paths in README

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

12 years agoRemove a couple printf's
Sylvain Beucler [Sun, 15 Apr 2012 18:46:38 +0000 (18:46 +0000)]
Remove a couple printf's

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

12 years agoEGL: reuse fgPlatformSetWindow for calling eglMakeCurrent
Sylvain Beucler [Sun, 15 Apr 2012 18:45:54 +0000 (18:45 +0000)]
EGL: reuse fgPlatformSetWindow for calling eglMakeCurrent

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

12 years agoFix eglInitialize check
Sylvain Beucler [Sun, 15 Apr 2012 18:44:17 +0000 (18:44 +0000)]
Fix eglInitialize check

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

12 years ago__ANDROID__ is defined in the Android build environment; no need for an extra -DANDROID
Sylvain Beucler [Mon, 9 Apr 2012 18:35:25 +0000 (18:35 +0000)]
__ANDROID__ is defined in the Android build environment; no need for an extra -DANDROID

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

12 years agoRemoving the build errors from MSVC 6.0 version
John F. Fay [Sat, 7 Apr 2012 02:28:55 +0000 (02:28 +0000)]
Removing the build errors from MSVC 6.0 version

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

12 years agoFix return values for stubs
Sylvain Beucler [Mon, 2 Apr 2012 22:58:07 +0000 (22:58 +0000)]
Fix return values for stubs

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

12 years agofg_gl2: Fix typo
Sylvain Beucler [Mon, 2 Apr 2012 22:43:23 +0000 (22:43 +0000)]
fg_gl2: Fix typo

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

12 years agoUse different names for GLES1 and GLES2 libraries, to allow parallel install
Sylvain Beucler [Mon, 2 Apr 2012 22:22:33 +0000 (22:22 +0000)]
Use different names for GLES1 and GLES2 libraries, to allow parallel install

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

12 years agoRemoving the build errors and a build warning that crept in for MSVC 6.0. There...
John F. Fay [Sun, 1 Apr 2012 20:09:51 +0000 (20:09 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1231 7f0cb862-5218-0410-a997-914c9d46530a

12 years agoREADME.android status section points to new android.php webpage
Sylvain Beucler [Sun, 1 Apr 2012 20:00:08 +0000 (20:00 +0000)]
README.android status section points to new android.php webpage

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

12 years agoA few more stubs for Android
Sylvain Beucler [Sun, 1 Apr 2012 15:42:47 +0000 (15:42 +0000)]
A few more stubs for Android

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

12 years agoREADME.android: use separate build dirs + minor fixes
Sylvain Beucler [Sun, 1 Apr 2012 15:40:23 +0000 (15:40 +0000)]
README.android: use separate build dirs + minor fixes

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

12 years agoGLsizei: ptrdiff_t -> int (like GLEW); add missing FGH_ prefix for OpenGL 2.0 prototy...
Sylvain Beucler [Sun, 1 Apr 2012 13:39:12 +0000 (13:39 +0000)]
GLsizei: ptrdiff_t -> int (like GLEW); add missing FGH_ prefix for OpenGL 2.0 prototype typedef's

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

12 years agoFix OpenGL 2.0 declarations so code builds on Windows & Android
Sylvain Beucler [Sun, 1 Apr 2012 12:55:39 +0000 (12:55 +0000)]
Fix OpenGL 2.0 declarations so code builds on Windows & Android

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

12 years agofg_geometry: Enable supported geometry functions for GLES2
Sylvain Beucler [Sat, 31 Mar 2012 21:50:55 +0000 (21:50 +0000)]
fg_geometry: Enable supported geometry functions for GLES2

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

12 years agoFix previous commit, I made a confusion when merging my changes with the trunk
Sylvain Beucler [Sat, 31 Mar 2012 21:43:06 +0000 (21:43 +0000)]
Fix previous commit, I made a confusion when merging my changes with the trunk

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

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