9585336ff3Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8)
beuc
2012-04-21 15:02:00 +00:00
b66ef56d4bsolid sphere now done with only triangle strips. All shapes should be doable with only triangle strips, so this allows code reuse later ...
dcnieho
2012-04-20 11:25:42 +00:00
6a17bac02aconverted all tabs to spaces, hate if they are mixed...
dcnieho
2012-04-20 10:55:00 +00:00
86545861dcUse different names for GLES1 and GLES2 libraries, to allow parallel install
beuc
2012-04-02 22:22:33 +00:00
53c5a0c8c6Start webpage about GLES
beuc
2012-04-02 22:08:06 +00:00
c85f5937ddRemoving the build errors and a build warning that crept in for MSVC 6.0. There remain the undefined functions "sinf" and "cosf".
fayjf
2012-04-01 20:09:51 +00:00
3123ddca88README.android status section points to new android.php webpage
beuc
2012-04-01 20:00:08 +00:00
83ef66f398Start page about Android
beuc
2012-04-01 19:59:28 +00:00
2707583c09A few more stubs for Android
beuc
2012-04-01 15:42:47 +00:00
a0643b8c0cREADME.android: use separate build dirs + minor fixes
beuc
2012-04-01 15:40:23 +00:00
4349a9ec2dGLsizei: ptrdiff_t -> int (like GLEW); add missing FGH_ prefix for OpenGL 2.0 prototype typedef's
beuc
2012-04-01 13:39:12 +00:00
6b02c619e7Fix OpenGL 2.0 declarations so code builds on Windows & Android
beuc
2012-04-01 12:55:39 +00:00
3da140426fFix previous commit, I made a confusion when merging my changes with the trunk
beuc
2012-03-31 21:43:06 +00:00
6d98aacd0dfg_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.
beuc
2012-03-31 21:24:45 +00:00
ba5e48ebcbOpenGL 2.0: add 2 user-defined, per-context vertex attributes for coordinates and normals (e.g. for use in fg_geometry)
beuc
2012-03-31 20:52:48 +00:00
63ca031e62Declare OpenGL 2.0 dynamically-loaded functions for internal use
beuc
2012-03-31 20:21:16 +00:00
1dae162bb0fg_geometry: sphere: GL_UNSIGNED_INT->GL_UNSIGNED_SHORT for OpenGL ES 1.0 support
beuc
2012-03-31 20:03:01 +00:00
4c7a212acbadded an option (GLUT_SKIP_STALE_MOTION_EVENTS) to ignore all but the last MotionNotify event in the queue.
jtsiomb
2012-03-31 13:34:32 +00:00
207411c39badded todo
dcnieho
2012-03-30 00:55:51 +00:00
afdd121473cleanup up make up of geometry function docs a bit added glutCylinder (description TODO)
dcnieho
2012-03-26 16:14:27 +00:00
c7016dc648added not about wrong winding of teapot vertices, as is in the original glut manpages
dcnieho
2012-03-26 13:51:15 +00:00
0f713eaababit 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)
dcnieho
2012-03-25 14:53:41 +00:00
f39a3f055eRestore non-corrupted images from website
beuc
2012-03-25 13:56:00 +00:00
bb5cc62fcfFix content-type for images (otherwise they are corrupt due to EOL conversion)
beuc
2012-03-25 13:49:37 +00:00
92f52b5f41ported 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)
dcnieho
2012-03-25 10:13:52 +00:00
9de1264e80correcting a few typos i made earlier in the comments
dcnieho
2012-03-25 06:13:47 +00:00
375d4f7e66fg_geometry: test indices presence with vertIdxs!=NULL rather than numEdgePerFace==3
beuc
2012-03-24 21:26:54 +00:00
f0754e0273fg_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
beuc
2012-03-24 19:57:54 +00:00
972da1fe62fg_geometry: add a couple comments
beuc
2012-03-24 11:47:10 +00:00
2c61e8cd17Keep fg_geometry in normal builds\!
beuc
2012-03-23 19:03:56 +00:00
6fa04424feRemove glutWireTeapot/glutSolidTeapot from gles_stubs because these are conditionaly compiled already
beuc
2012-03-23 19:01:05 +00:00
2e4ec574ffDon't alter glutWireTeapot and glutSolidTeapot prototypes, since we didn't modify these functions yet (thanks Diederick)
beuc
2012-03-23 01:07:48 +00:00
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
beuc
2012-03-23 01:02:57 +00:00
45a5e59f94Geometry: Use 'double' instead of 'GLdouble' in include/GL/*.h, fixing temporary GLES work-around and getting consistent with latest changes in fg_geometry.c
beuc
2012-03-22 23:25:13 +00:00
940bc0ac45internally in fg_geometry, GLfloat used everywhere external facing functions now take double instead of GLdouble, which isn't defined on GLES platforms
dcnieho
2012-03-21 05:09:19 +00:00
1d91d09834simplified check for whether opengl 2.1+ context is requested. Flags or profile set are now ignored unless opengl 2.1+ context is requested
dcnieho
2012-03-19 00:31:00 +00:00
468a43416dAdd missing new _glx files
beuc
2012-03-18 14:54:33 +00:00
5d6c1b44f4Add 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
beuc
2012-03-18 12:38:07 +00:00
76e2c3ed3fpkg-config: add -lm to static libraries
beuc
2012-03-18 10:25:19 +00:00
265e1cc378Define PKG_CONFIG_PATH in client instructions
beuc
2012-03-18 10:24:21 +00:00
c00c3d67a0All 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
dcnieho
2012-03-18 10:02:54 +00:00
3e21108d4fteapot header not in list of files (so doesn't show up in IDE)
dcnieho
2012-03-18 09:59:50 +00:00
b171a73282per 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);
dcnieho
2012-03-18 07:37:08 +00:00
8ab33e935fadded a message when new context creation was silently ignored due to wglCreateContextAttribsARB not available, similar as is done for x11 with glxCreateContextAttribsARB
dcnieho
2012-03-18 05:13:16 +00:00
95d74d15c0Identify more precisly where GLdouble->GLfloat is needed in freeglut header
beuc
2012-03-17 22:13:58 +00:00
ef9c4e1361Rename fghChooseConfigEGL -> fghChooseConfig (not a specialization of an existing function)
beuc
2012-03-17 19:29:49 +00:00
7a42e4527eFix library for GLES1
beuc
2012-03-17 16:26:00 +00:00
b42288155eRemoved fgPlatformGlutLayerGet to match other ports (thanks Diederick)
beuc
2012-03-17 16:12:31 +00:00
70046e0145got 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!
dcnieho
2012-03-17 16:11:06 +00:00
604018bc92Implement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet
beuc
2012-03-17 15:36:25 +00:00
2a3295e970Add 2 more temporary stubs
beuc
2012-03-17 14:18:33 +00:00
6bc5a5c401Remove Android-specific code (logging) in fg_display_egl
beuc
2012-03-17 14:14:01 +00:00
af95cbdafeContext can be used for a menu rather than the current window
beuc
2012-03-17 13:29:51 +00:00
3ce776e21eEGL: more code reusability
beuc
2012-03-17 12:34:22 +00:00
b4115920d4fghChooseConfigEGL returns 1/0 if found/not found
beuc
2012-03-17 11:39:45 +00:00
6a05cd0a10Move tagSFG_PlatformWindowState from EGL to Android
beuc
2012-03-17 11:21:56 +00:00
04e3e33ad7Move OpenGL ES stubs out of Android
beuc
2012-03-17 10:33:28 +00:00
5149d43941EGL: make more code reusable - less Android-specific
beuc
2012-03-17 10:30:31 +00:00
40db28bb94EGL: separate config and context code
beuc
2012-03-17 10:09:19 +00:00
8b779d66ddCopy documentation about FREEGLUT_GLES2 and FREEGLUT_GLES1 from CMakefile.txt to freeglut_std.h (a.k.a. don't use them)
beuc
2012-03-17 07:05:25 +00:00
b38c9bc3eethat definition is FREEGLUT_GLES1, not FREEGLUT_GLES
dcnieho
2012-03-17 04:00:13 +00:00
da52865ab3little bit of cleanup added code for GLES1 (though only tested on OpenGL 2, non-ES context)
dcnieho
2012-03-17 03:58:26 +00:00
99cd253ea3oops, that was a bit sloppy. Also added a missing free
dcnieho
2012-03-17 02:23:03 +00:00
1b5b24155dcheck for every malloc call if memory was allocated successfully
dcnieho
2012-03-17 02:21:19 +00:00
5818920c5cNeed to also set glDisable(GL_CULL_FACE) when drawing wireframe to match what was produced before
dcnieho
2012-03-17 02:11:49 +00:00
445fd29338Done dodecahedron. Nice, this just worked!
dcnieho
2012-03-17 02:06:21 +00:00
c4e7f30faeremoving some debug code
dcnieho
2012-03-17 01:36:08 +00:00
b043205853was still trying to draw RhombicDodecahedron as GL_QUAD, of course it doesn't work Made internal draw macro for case with edge flags
dcnieho
2012-03-17 01:35:11 +00:00
41ce6d6860implemented 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)
dcnieho
2012-03-17 00:32:08 +00:00
9f437ed383corrected data type (its a demo after all, better be precise)
dcnieho
2012-03-17 00:21:40 +00:00
31e0027e09Move EGL fields to a separate structure for reusability (e.g. upcoming Mesa X11 EGL support)
beuc
2012-03-16 23:23:19 +00:00
cb3dea2183CMake: Declare OPTIONS higher in the file so they can be used to conditionaly include source files
beuc
2012-03-16 21:39:37 +00:00
f6111f49acGLES1 and GLES2 versions are now compiled with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly bootstrap headers inclusion
beuc
2012-03-16 21:30:26 +00:00
ea875680a5CMake: use same test for referencing and generating freeglutdll.def
beuc
2012-03-16 20:43:29 +00:00
977a9f1e6bcube now done with triangles, internal edges on each face hidden with edge flag
dcnieho
2012-03-16 11:06:23 +00:00
b95ed51118RhombicDodecahedron moved to glVertexPointer
dcnieho
2012-03-16 08:46:13 +00:00