Commit Graph

1211 Commits

Author SHA1 Message Date
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
beuc
53c5a0c8c6 Start webpage about GLES
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1232 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-02 22:08:06 +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
83ef66f398 Start page about Android
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1229 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-01 19:59:28 +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
dcnieho
afdd121473 cleanup up make up of geometry function docs a bit
added glutCylinder (description TODO)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1216 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-26 16:14:27 +00:00
dcnieho
c7016dc648 added not about wrong winding of teapot vertices, as is in the original
glut manpages


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1215 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-26 13:51:15 +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
beuc
f39a3f055e Restore non-corrupted images from website
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1211 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-25 13:56:00 +00:00
beuc
bb5cc62fcf Fix content-type for images (otherwise they are corrupt due to EOL conversion)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1210 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-25 13:49:37 +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