FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,317 Commits 1 Branch 0 Tags 6.8 MiB
afbdd37121
Commit Graph

1294 Commits

Author SHA1 Message Date
beuc
f8979fafb9 EGL: Declare fgPlatformSetWindow earlier to fix C warning 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1243 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-19 20:52:55 +00:00
beuc
b954aa8212 Fix regressions from previous commits 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1242 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 19:08:26 +00:00
beuc
69d4dabb9b Android: fix/upgrade paths in README 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1241 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 18:47:07 +00:00
beuc
c49fb151da Remove a couple printf's 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1240 7f0cb862-5218-0410-a997-914c9d46530a
 2012-04-15 18:46:38 +00:00
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
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
dcnieho
8ab33e935f 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: https://svn.code.sf.net/p/freeglut/code/trunk@1189 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-18 05:13:16 +00:00
beuc
95d74d15c0 Identify more precisly where GLdouble->GLfloat is needed in freeglut header 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1188 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 22:13:58 +00:00
beuc
ef9c4e1361 Rename fghChooseConfigEGL -> fghChooseConfig (not a specialization of an existing function) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1187 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 19:29:49 +00:00
beuc
7a42e4527e Fix library for GLES1 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1186 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 16:26:00 +00:00
beuc
b42288155e Removed fgPlatformGlutLayerGet to match other ports (thanks Diederick) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1185 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 16:12:31 +00:00
dcnieho
70046e0145 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: https://svn.code.sf.net/p/freeglut/code/trunk@1184 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 16:11:06 +00:00
beuc
604018bc92 Implement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1183 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 15:36:25 +00:00
beuc
a729bc608f EGL: implement fgPlatformSetWindow 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1182 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 14:24:42 +00:00
beuc
2a3295e970 Add 2 more temporary stubs 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1181 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 14:18:33 +00:00
beuc
6bc5a5c401 Remove Android-specific code (logging) in fg_display_egl 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1180 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 14:14:01 +00:00
beuc
af95cbdafe Context can be used for a menu rather than the current window 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1179 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 13:29:51 +00:00
beuc
3ce776e21e EGL: more code reusability 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1178 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 12:34:22 +00:00
beuc
b4115920d4 fghChooseConfigEGL returns 1/0 if found/not found 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1177 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 11:39:45 +00:00
beuc
6a05cd0a10 Move tagSFG_PlatformWindowState from EGL to Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1176 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 11:21:56 +00:00
beuc
04e3e33ad7 Move OpenGL ES stubs out of Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1175 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 10:33:28 +00:00
beuc
5149d43941 EGL: make more code reusable - less Android-specific 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1174 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 10:30:31 +00:00
beuc
40db28bb94 EGL: separate config and context code 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1173 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 10:09:19 +00:00
beuc
8b779d66dd 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: https://svn.code.sf.net/p/freeglut/code/trunk@1172 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 07:05:25 +00:00
dcnieho
b38c9bc3ee that definition is FREEGLUT_GLES1, not FREEGLUT_GLES 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1171 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 04:00:13 +00:00
dcnieho
da52865ab3 little bit of cleanup 
added code for GLES1 (though only tested on OpenGL 2, non-ES context)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1170 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 03:58:26 +00:00
dcnieho
99cd253ea3 oops, that was a bit sloppy. Also added a missing free 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1169 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:23:03 +00:00
dcnieho
1b5b24155d check for every malloc call if memory was allocated successfully 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1168 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:21:19 +00:00
dcnieho
5818920c5c Need to also set glDisable(GL_CULL_FACE) when drawing wireframe to match what was 
produced before


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1167 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:11:49 +00:00
dcnieho
445fd29338 Done dodecahedron. Nice, this just worked! 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1166 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 02:06:21 +00:00
dcnieho
c4e7f30fae removing some debug code 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1165 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 01:36:08 +00:00
dcnieho
b043205853 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: https://svn.code.sf.net/p/freeglut/code/trunk@1164 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 01:35:11 +00:00
dcnieho
41ce6d6860 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: https://svn.code.sf.net/p/freeglut/code/trunk@1163 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-17 00:32: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
beuc
31e0027e09 Move EGL fields to a separate structure for reusability (e.g. upcoming Mesa X11 EGL support) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1161 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 23:23:19 +00:00
beuc
cb3dea2183 CMake: Declare OPTIONS higher in the file so they can be used to conditionaly include source files 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1160 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 21:39:37 +00:00
beuc
f6111f49ac GLES1 and GLES2 versions are now compiled with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly bootstrap headers inclusion 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1159 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 21:30:26 +00:00
beuc
ea875680a5 CMake: use same test for referencing and generating freeglutdll.def 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1158 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 20:43:29 +00:00
dcnieho
977a9f1e6b cube now done with triangles, internal edges on each face hidden with 
edge flag


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1157 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 11:06:23 +00:00
dcnieho
b95ed51118 RhombicDodecahedron moved to glVertexPointer 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1156 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 08:46:13 +00:00
dcnieho
ade8e6e8ef icosahedron also done 
wrote for easy declaring of interface functions


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1155 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 08:36:48 +00:00
dcnieho
b6f616f685 made some macros to reduce code duplication 
made naming completely consistent now


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1154 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 07:55:12 +00:00
dcnieho
4f9c00faa7 octahedron also done 
another pass at making all variable types consistent
added some direct mode drawing code for debugging


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1153 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 07:24:34 +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
dcnieho
92b1d69dd4 dSize parameter of Cube now works correctly again 
Fixed some inconsistent Macro naming and variable types


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1150 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 05:06:31 +00:00
dcnieho
0eb4534962 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: https://svn.code.sf.net/p/freeglut/code/trunk@1149 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 04:49:17 +00:00
dcnieho
fe5c7db449 got one fo the cube's normals wrong 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1148 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 04:23:48 +00:00
dcnieho
eb95f57fa6 array size second dim is simply 3... 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1147 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 04:22:34 +00:00
dcnieho
40e7dfa35c 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: https://svn.code.sf.net/p/freeglut/code/trunk@1146 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 03:17:37 +00:00
dcnieho
833166240f Cube also moved to glDrawElements 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1145 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 03:14:23 +00:00
dcnieho
d3550b00d9 also did Sierpinski sponge 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1144 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 02:01:59 +00:00
dcnieho
19a3927adc 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: https://svn.code.sf.net/p/freeglut/code/trunk@1143 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-16 00:40:15 +00:00
beuc
bae0c12952 Add pkg-config script (cmake changes added by mistake in previous commit) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1142 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 20:51:24 +00:00
beuc
02880439ed CMake: Move -DANDROID in the toolchain script, to ease reuse of this file 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1141 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 20:48:32 +00:00
beuc
41c6d2ada6 A few fixes in cygwin docs 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1140 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 20:37:41 +00:00
beuc
e74cb052f0 Error handling for eglSwapBuffers 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1139 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 19:52:16 +00:00
dcnieho
792977034a no need for a message on MSVC that we hide insecure CRT warnings 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1138 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 03:07:57 +00:00
dcnieho
cb228b70f0 oops, generating freeglutdll.def was not specific to MSVC 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1137 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 03:06:42 +00:00
dcnieho
0cfd678fda converted all tabs to spaces for CMake file, eases editing and indenting 
in diffs looks right


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1136 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 02:34:33 +00:00
dcnieho
7bd8533032 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: https://svn.code.sf.net/p/freeglut/code/trunk@1135 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 02:30:50 +00:00
dcnieho
005fa934ae and again some more documentation of what kind of version is referred to 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1134 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 02:24:06 +00:00
dcnieho
4d7086a873 added a bit more doc 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1133 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 02:15:54 +00:00
dcnieho
394f2c0538 just a typo 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1132 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-15 01:50:44 +00:00
jtsiomb
39b2e08b7f removed the obsolete GPL copyright statement templates 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1131 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-14 14:57:05 +00:00
dcnieho
b83545263c 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: https://svn.code.sf.net/p/freeglut/code/trunk@1130 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-14 03:50:59 +00:00
jtsiomb
e5c97b977a - 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: https://svn.code.sf.net/p/freeglut/code/trunk@1128 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-13 19:36:28 +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
jtsiomb
15e9bb8752 Added a few more details to README.cmake 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1126 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-13 19:05:32 +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
64fb938163 Removed VS2008 and VS2010 files 
set ignore for my /build directory, removed ignore for config.h.in


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1124 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-13 11:08:26 +00:00
dcnieho
ed02f5da91 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: https://svn.code.sf.net/p/freeglut/code/trunk@1123 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-13 11:03:23 +00:00
dcnieho
41283a36c5 added a quick tut for using cmake, adapted from http://mash-project.eu/wiki/index.php/CMake:_Quick_Start_Guide 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1122 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-13 08:24:20 +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
dcnieho
19095d15bf 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: https://svn.code.sf.net/p/freeglut/code/trunk@1120 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-12 15:41:39 +00:00
dcnieho
b16eb164ca 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: https://svn.code.sf.net/p/freeglut/code/trunk@1119 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-12 07:26:37 +00:00
dcnieho
b2159329f2 .def and .rc file were appended to source list AFTER target was defined, 
so moved them up in the file
now setting target machine for linker, or we get in trouble at least
with static libs on x64


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1118 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-12 05:07:35 +00:00
dcnieho
d3496a2968 now only setting FREEGLUT_EXPORTS and FREEGLUT_STATIC for the shared and 
static dll/lib respectively, instead of globally defining those for all
targets
That revealed the static build of the demos is broken, needed to add the
FREEGLUT_STATIC definition there too
Not including .def file on windows if 64 bit build.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1117 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-12 04:24:40 +00:00
dcnieho
fe9b63c890 now use unsigned __int64 for time type when on MSVC, that is supported 
down to at least MSVC6 (thanks Sisyphus!)
Also, type present checks are not done if stdint or inttypes headers are
found, no need for them then.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1116 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-12 03:32:53 +00:00
dcnieho
83672b987c HAVE_ULONG_LONG now only defined when unsigned long long is available 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1115 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 23:35:11 +00:00
beuc
2930d1d941 Rename Android and EGL files 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1114 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 16:01:29 +00:00
dcnieho
2549248d0c Need for our XParseGeometry implementation now detected by CMake 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1113 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 15:26:01 +00:00
dcnieho
b66e4bfa9d and some more renames 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1112 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 15:14:33 +00:00
dcnieho
ed993a1882 moved common files back to src root 
renamed (a bunch of) the freeglut_ prefixes to fg_
did the necessary edits of the source files (I hope)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1111 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 14:59:56 +00:00
dcnieho
e78202b0af timers internally now use 64bit unsigned int, if available 
External timer info (glutGet) unchanged.
Some work to do to improve Windows timers beyond what it is now...


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1110 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 13:03:14 +00:00
beuc
49bfb6bd84 CMake: add precision about version-info / soname 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1109 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 09:53:22 +00:00
beuc
5280ea4f52 Add development progress status for Android 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1108 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 09:45:20 +00:00
beuc
8b09e1ff0d autotools: Android port 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1106 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 09:34:30 +00:00
beuc
5ed946ec5d CMake: Android port 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1105 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 09:31:44 +00:00
beuc
402c9871eb Support GLES headers 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1104 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 09:30:51 +00:00
beuc
eb37483010 Android documentation 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1103 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 09:18:53 +00:00
beuc
70e2afb9cc CMake: option to build with OpenGL ES 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1102 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 09:18:15 +00:00
beuc
c8a8d03fc5 Add base Android and EGL code 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1101 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-11 08:55:24 +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
dcnieho
0c5025cc85 added not about soversion for those not knowledgable (like me). Thanks 
Sylvain!


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1099 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-10 12:53:50 +00:00
dcnieho
5cc61b4c30 CMake updates: 
- no longer trying to link with m.lib (tht maths for linux)
- now building demos for static and for shared library, depending on
  which libraries are created
- TARGET_LINK_LIBRARIES statement conditional on whether the relevant
  shared/static library is built


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1098 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-10 11:08:44 +00:00
dcnieho
429507ee23 in freeglut_init set gamemode defaults to -1 (no change from current 
display mode) so that it is not attempted to change the display mode
to some arbitrary default when entering gamemode (only applies if
glutGameModeString is never called)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1097 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-10 03:17:55 +00:00
dcnieho
ec322806c9 moved some windows only code from common to windows specific 
got rid of fgPlatformGlutLayerGet as we'll never implement layer support
(added some notes too)
added note about implementability of glutGetModeValues
Moved joystick function from misc to Joystick code file



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1096 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-10 03:07:13 +00:00
dcnieho
8197972757 XParseGeometry include now compiles with windows (VS2010, didn't touch 
cmake)
Various typos in comments
Some other cleanup and formatting
glutInitDisplayString now understands "borderless"


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1095 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-10 02:03:32 +00:00
beuc
4ce337a008 Include xparsegeometry_repl.h header on non-X11 targets 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1094 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-09 21:02:20 +00:00
beuc
d06a04e27e Make XParseGeometry reusable by several ports (3) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1093 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-09 20:54:03 +00:00
beuc
3ab598b0fb Make XParseGeometry reusable by several ports (2) 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1092 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-09 20:48:03 +00:00
beuc
426ce85a73 Make XParseGeometry reusable by several ports 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1091 7f0cb862-5218-0410-a997-914c9d46530a
 2012-03-09 20:46:15 +00:00