Commit Graph

1857 Commits

Author SHA1 Message Date
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
f0f4e33556 typo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1261 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-21 20:21:16 +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
abfe42bc9b Add some CMake build directories to svn:ignore
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1245 7f0cb862-5218-0410-a997-914c9d46530a
2012-04-19 20:56:48 +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