Commit Graph

1367 Commits

Author SHA1 Message Date
beuc
0b0d17fa8e Add link to OpenGL wikibook, as discussed on the list
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1318 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-14 17:41:15 +00:00
beuc
352ff3e7ec multi-touch sample: use FG2.8 (reversed) prototype for now
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1317 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-13 09:14:27 +00:00
beuc
88512756e5 Fix extra CRLF
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1316 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-13 09:13:46 +00:00
beuc
fae6135480 Multi-touch: fix CMake: Xi and XInput2.h detection wasn't ported from autoconf, effectively disabling multi-touch
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1315 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-13 09:08:35 +00:00
beuc
4f3b46e046 Android: warn on resume if no callback for InitContext is defined
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1314 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-13 09:05:55 +00:00
jtsiomb
6c8a620bd5 Applied Thomas Bastiani's patch fixing the behaviour of freeglut under X11 when
operating without a window manager. Adds a fake ConfigureNotify event to make
sure reshape callbacks are called at least once as specified.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1313 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-10 18:50:52 +00:00
beuc
eadc9b790a Multi-touch precisions
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1312 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-08 17:28:38 +00:00
beuc
57532197dd Multi-touch test program
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1311 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-08 17:09:38 +00:00
beuc
f36e176d61 CMake: add note about library versioning
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1310 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 19:11:41 +00:00
beuc
66fb02ae56 More documentation on MultiTouch
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1309 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 12:49:32 +00:00
beuc
d696dabdaa Update documentation on MultiTouch
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1308 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 11:32:05 +00:00
jtsiomb
3a8112fd78 removed the useless and unmaintained .spec and .lsm files
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1307 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 06:06:09 +00:00
dcnieho
c9c45b04a1 docs and cosmetics in fg_geometry, should be a finished product now,
except for more testing of the OGL2+ path


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1306 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 03:12:43 +00:00
dcnieho
edd278df3c slight formatting in CMake file, just cosmetic
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1305 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-05 00:52:45 +00:00
beuc
e85d2865b2 Add new callback to reload context, pending propername
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1304 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 22:18:54 +00:00
beuc
5807ec617c android: add code to display multi-touch events
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1303 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 19:59:36 +00:00
beuc
1659102712 typo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1302 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 14:57:02 +00:00
beuc
054d81e512 Add notes about Android tricky situations
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1301 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 14:56:55 +00:00
beuc
7e1671c700 Add documentation for geometry (ML rip-off) and Android corner-cases
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1300 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 14:52:52 +00:00
beuc
c95a18eaa0 Move intro before TOC
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1299 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 11:21:47 +00:00
beuc
4edd05c782 Move Android docs to the website
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1298 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 11:19:00 +00:00
beuc
66664337e7 Move Android docs to the website
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1297 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 11:18:43 +00:00
beuc
8aac2a48ce Android: unify toolchain and module builds
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1296 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 11:17:43 +00:00
beuc
bdfe2f03f4 Update android status
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1295 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 10:36:46 +00:00
beuc
0bff1dd42e Update documentation about spaceballs and dials&buttons callbacks
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1294 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 10:30:58 +00:00
beuc
85b0410084 android: handle pause/unpause of application + recreate EGL window and OpenGL context accordingly
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1293 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-04 07:37:39 +00:00
beuc
a0df79a2ee Document android app lifecycle; kill app when window is closed, until pausing/restoring windows is possible
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1292 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-03 16:40:20 +00:00
beuc
1d008232f5 android: make code 're-entrant' - i.e. NativeActivity can restart the program without unloading it
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1291 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-03 14:12:35 +00:00
beuc
d807511ff9 android: better clean-up on exit
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1290 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-03 13:32:06 +00:00
beuc
d7eef58fb4 Fix warnings
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1289 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-03 08:01:27 +00:00
beuc
c930677a27 Android: implement fgPlatformDeinitialiseInputDevices
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1288 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-03 07:58:00 +00:00
beuc
6ba33936f9 GLUT_WINDOW_BORDER_* is about borders, not inner size (thanks again Dee)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1287 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-03 07:55:19 +00:00
beuc
750e6d3aea GLUT_HAS_DIAL_AND_BUTTON_BOX officially not implemented on Android
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1286 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-03 07:54:12 +00:00
beuc
6c78dcab37 Fix misleading comment
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1285 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 18:27:57 +00:00
beuc
528e867587 Implement a few missing enums in fgPlatformGlutDeviceGet/fgPlatformGlutGet
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1284 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 17:28:52 +00:00
beuc
ff0a894fdc Use fgWarning for android joystick stubs
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1283 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 16:47:45 +00:00
beuc
df8fe9c476 Explain why fgPlatformSleepForEvents is no-op under Android
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1282 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 16:45:21 +00:00
beuc
7f845a72dc CHECK_FUNCTION_EXISTS for sinf/cosf/sqrtf actually fails not because of missing math.h, but because of missing -lm. Fixed.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1281 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 16:44:40 +00:00
beuc
488823afc3 Remove debugging left-over -_-' (thanks Dee)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1280 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 16:42:55 +00:00
beuc
260c71b27e android: implement fgPlatformSetCursor/fgPlatformWarpPointer
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1279 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-02 14:49:15 +00:00
beuc
ae35d72efd fg_geometry: GL2 fixed: glDrawElements' indices is byte offset, not element offset
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1278 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 22:16:33 +00:00
beuc
9b1a6ab1dd fg_geometry: pass number of vertices to fgDrawWire*; start adapting GL2 code to recent GL1 changes (GL2 code doesn't produce proper results yet)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1277 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 21:28:28 +00:00
beuc
628d9b7a7e Detect sinf/cosf/sqrtf presence with CMake (instead of relying on __cpluscplus)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1276 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 14:14:54 +00:00
beuc
0629737fa2 Initialize OpenGL 2.0 after OpenGL context is created (otherwise initialization fails under mswin)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1275 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 13:13:14 +00:00
beuc
104a238a57 fg_geometry: remove GLES-specific #ifdefs (in code and headers), update Android test-case. GL2 code compiles but does not work yet.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1274 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 10:37:06 +00:00
beuc
dad750d1df Android: reference android library dependencies, needed for shared libs builds
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1273 7f0cb862-5218-0410-a997-914c9d46530a
2012-05-01 09:33:05 +00:00
dcnieho
45b71f41a9 now using the Koch Snowflake (from fractals.dat) instead of Cantor dust
for fractals and fractals_random demo (changed built-in data).
Looks better
Also removed copying of fractals.dat to build dir from CMake file


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1272 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-30 15:19:59 +00:00
dcnieho
c04a82ac47 drawing code for solid and wired now shared for all objects
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1271 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-29 04:16:07 +00:00
dcnieho
b739e1a281 cleanup
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1270 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-28 17:03:29 +00:00
dcnieho
a01a0426e7 torus ported. All shapes drawn with glDrawArrays and glDrawElements now.
Next is to use the same drawing functions for all shapes, all those with
circles still have their own now


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1269 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-28 17:01:44 +00:00
dcnieho
93e05f42de less repetition of vertices for triangle strip
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1268 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-28 16:35:39 +00:00
dcnieho
21268d0831 Wire Torus now ported
solid torus now as triangle strips, but still need to finish port


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1267 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-28 13:29:49 +00:00
dcnieho
fe89b94fc4 porting torus: split off vertex generation
fixed drawing to work with this



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1266 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-28 10:57:40 +00:00
beuc
5fbbc35cb5 Mention we can have a look at Pygame Subset for Android
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1265 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-22 17:35:14 +00:00
dcnieho
8bd75d7761 added 'r' toggle to shapes demo to also animate rotation around object
x-axis, to get a better view of the model



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1264 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-22 16:39:47 +00:00
dcnieho
b5cfa418b6 one more small cleanup
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1263 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-22 16:32:29 +00:00
dcnieho
98ca02122b cylinder also ported
little bit of cleanup in Cone and Sphere code (fixed normals of top of
cone, no longer generating too many indices for wire frame)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1262 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-22 16:30:19 +00:00
beuc
97a9318a81 Eventually tracked down nasty Android bug
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1260 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 20:19:31 +00:00
beuc
d554cb9ab1 Fix a few more compiler warnings
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1259 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 19:04:02 +00:00
beuc
46fd1bbdf5 Fix more compiler warnings
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1258 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 18:22:24 +00:00
dcnieho
49922f9a8a glutCones now refreshed too
little edits on glutSphere too, nothign affecting functionality


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1257 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 18:05:56 +00:00
beuc
c0fceb37bb Fix compiler warnings
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1256 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 17:40:25 +00:00
beuc
e2f3f6181e Add more compiler checks for GCC
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1255 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 16:53:57 +00:00
beuc
5c09863775 README.android: typo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1254 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 16:50:38 +00:00
beuc
77d621e304 fg_gl2: Use GLES2 functions directly
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1253 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 16:45:46 +00:00
beuc
41c8a0c66b fg_geometry: really uninitialized variables
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1252 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 16:20:19 +00:00
beuc
2da5cd2a9a Really fix tabs->space
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1251 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 15:49:46 +00:00
beuc
9585336ff3 Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1250 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 15:02:00 +00:00
dcnieho
b66ef56d4b 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: https://svn.code.sf.net/p/freeglut/code/trunk@1249 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-20 11:25:42 +00:00
dcnieho
6a17bac02a converted all tabs to spaces, hate if they are mixed...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1248 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-20 10:55:00 +00:00
beuc
9cd6041e4c More GLES documentation
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1247 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-19 21:12:32 +00:00
beuc
716701e477 Add 'shapes' test for GLES1 (Android and Mesa EGL), as an independent CMake sample app
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1246 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-19 21:10:59 +00:00
beuc
54961248f7 README.android: suggest Debug build + tidy CMake build directories naming
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1244 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-19 20:53:47 +00:00
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