Sylvain Beucler [Sun, 13 May 2012 09:13:46 +0000 (09:13 +0000)]
Fix extra CRLF
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1316
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 13 May 2012 09:08:35 +0000 (09:08 +0000)]
Multi-touch: fix CMake: Xi and XInput2.h detection wasn't ported from autoconf, effectively disabling multi-touch
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1315
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 13 May 2012 09:05:55 +0000 (09:05 +0000)]
Android: warn on resume if no callback for InitContext is defined
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1314
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Thu, 10 May 2012 18:50:52 +0000 (18:50 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1313
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Tue, 8 May 2012 17:09:38 +0000 (17:09 +0000)]
Multi-touch test program
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1311
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 5 May 2012 19:11:41 +0000 (19:11 +0000)]
CMake: add note about library versioning
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1310
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 5 May 2012 06:06:09 +0000 (06:06 +0000)]
removed the useless and unmaintained .spec and .lsm files
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1307
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 5 May 2012 03:12:43 +0000 (03:12 +0000)]
docs and cosmetics in fg_geometry, should be a finished product now,
except for more testing of the OGL2+ path
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1306
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 5 May 2012 00:52:45 +0000 (00:52 +0000)]
slight formatting in CMake file, just cosmetic
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1305
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 4 May 2012 22:18:54 +0000 (22:18 +0000)]
Add new callback to reload context, pending propername
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1304
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 4 May 2012 19:59:36 +0000 (19:59 +0000)]
android: add code to display multi-touch events
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1303
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 4 May 2012 14:57:02 +0000 (14:57 +0000)]
typo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1302
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 4 May 2012 14:52:52 +0000 (14:52 +0000)]
Add documentation for geometry (ML rip-off) and Android corner-cases
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1300
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 4 May 2012 11:19:00 +0000 (11:19 +0000)]
Move Android docs to the website
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1298
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 4 May 2012 11:17:43 +0000 (11:17 +0000)]
Android: unify toolchain and module builds
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1296
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 4 May 2012 07:37:39 +0000 (07:37 +0000)]
android: handle pause/unpause of application + recreate EGL window and OpenGL context accordingly
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1293
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 3 May 2012 16:40:20 +0000 (16:40 +0000)]
Document android app lifecycle; kill app when window is closed, until pausing/restoring windows is possible
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1292
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 3 May 2012 14:12:35 +0000 (14:12 +0000)]
android: make code 're-entrant' - i.e. NativeActivity can restart the program without unloading it
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1291
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 3 May 2012 13:32:06 +0000 (13:32 +0000)]
android: better clean-up on exit
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1290
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 3 May 2012 08:01:27 +0000 (08:01 +0000)]
Fix warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1289
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 3 May 2012 07:58:00 +0000 (07:58 +0000)]
Android: implement fgPlatformDeinitialiseInputDevices
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1288
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 3 May 2012 07:55:19 +0000 (07:55 +0000)]
GLUT_WINDOW_BORDER_* is about borders, not inner size (thanks again Dee)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1287
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 3 May 2012 07:54:12 +0000 (07:54 +0000)]
GLUT_HAS_DIAL_AND_BUTTON_BOX officially not implemented on Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1286
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Wed, 2 May 2012 18:27:57 +0000 (18:27 +0000)]
Fix misleading comment
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1285
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Wed, 2 May 2012 17:28:52 +0000 (17:28 +0000)]
Implement a few missing enums in fgPlatformGlutDeviceGet/fgPlatformGlutGet
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1284
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Wed, 2 May 2012 16:47:45 +0000 (16:47 +0000)]
Use fgWarning for android joystick stubs
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1283
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Wed, 2 May 2012 16:45:21 +0000 (16:45 +0000)]
Explain why fgPlatformSleepForEvents is no-op under Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1282
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Wed, 2 May 2012 16:44:40 +0000 (16:44 +0000)]
CHECK_FUNCTION_EXISTS for sinf/cosf/sqrtf actually fails not because of missing math.h, but because of missing -lm. Fixed.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1281
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Wed, 2 May 2012 16:42:55 +0000 (16:42 +0000)]
Remove debugging left-over -_-' (thanks Dee)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1280
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Wed, 2 May 2012 14:49:15 +0000 (14:49 +0000)]
android: implement fgPlatformSetCursor/fgPlatformWarpPointer
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1279
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Tue, 1 May 2012 22:16:33 +0000 (22:16 +0000)]
fg_geometry: GL2 fixed: glDrawElements' indices is byte offset, not element offset
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1278
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Tue, 1 May 2012 21:28:28 +0000 (21:28 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1277
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Tue, 1 May 2012 14:14:54 +0000 (14:14 +0000)]
Detect sinf/cosf/sqrtf presence with CMake (instead of relying on __cpluscplus)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1276
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Tue, 1 May 2012 13:13:14 +0000 (13:13 +0000)]
Initialize OpenGL 2.0 after OpenGL context is created (otherwise initialization fails under mswin)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1275
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Tue, 1 May 2012 10:37:06 +0000 (10:37 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1274
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Tue, 1 May 2012 09:33:05 +0000 (09:33 +0000)]
Android: reference android library dependencies, needed for shared libs builds
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1273
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 30 Apr 2012 15:19:59 +0000 (15:19 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1272
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 29 Apr 2012 04:16:07 +0000 (04:16 +0000)]
drawing code for solid and wired now shared for all objects
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1271
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 28 Apr 2012 17:03:29 +0000 (17:03 +0000)]
cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1270
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 28 Apr 2012 17:01:44 +0000 (17:01 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1269
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 28 Apr 2012 16:35:39 +0000 (16:35 +0000)]
less repetition of vertices for triangle strip
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1268
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 28 Apr 2012 13:29:49 +0000 (13:29 +0000)]
Wire Torus now ported
solid torus now as triangle strips, but still need to finish port
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1267
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 28 Apr 2012 10:57:40 +0000 (10:57 +0000)]
porting torus: split off vertex generation
fixed drawing to work with this
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1266
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 22 Apr 2012 16:39:47 +0000 (16:39 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1264
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 22 Apr 2012 16:32:29 +0000 (16:32 +0000)]
one more small cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1263
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 22 Apr 2012 16:30:19 +0000 (16:30 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1262
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 20:21:16 +0000 (20:21 +0000)]
typo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1261
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 20:19:31 +0000 (20:19 +0000)]
Eventually tracked down nasty Android bug
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1260
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 19:04:02 +0000 (19:04 +0000)]
Fix a few more compiler warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1259
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 18:22:24 +0000 (18:22 +0000)]
Fix more compiler warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1258
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 21 Apr 2012 18:05:56 +0000 (18:05 +0000)]
glutCones now refreshed too
little edits on glutSphere too, nothign affecting functionality
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1257
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 17:40:25 +0000 (17:40 +0000)]
Fix compiler warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1256
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 16:53:57 +0000 (16:53 +0000)]
Add more compiler checks for GCC
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1255
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 16:50:38 +0000 (16:50 +0000)]
README.android: typo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1254
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 16:45:46 +0000 (16:45 +0000)]
fg_gl2: Use GLES2 functions directly
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1253
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 16:20:19 +0000 (16:20 +0000)]
fg_geometry: really uninitialized variables
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1252
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 15:49:46 +0000 (15:49 +0000)]
Really fix tabs->space
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1251
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 21 Apr 2012 15:02:00 +0000 (15:02 +0000)]
Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1250
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 20 Apr 2012 11:25:42 +0000 (11:25 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1249
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 20 Apr 2012 10:55:00 +0000 (10:55 +0000)]
converted all tabs to spaces, hate if they are mixed...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1248
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 19 Apr 2012 21:10:59 +0000 (21:10 +0000)]
Add 'shapes' test for GLES1 (Android and Mesa EGL), as an independent CMake sample app
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1246
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 19 Apr 2012 20:56:48 +0000 (20:56 +0000)]
Add some CMake build directories to svn:ignore
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1245
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 19 Apr 2012 20:53:47 +0000 (20:53 +0000)]
README.android: suggest Debug build + tidy CMake build directories naming
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1244
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 19 Apr 2012 20:52:55 +0000 (20:52 +0000)]
EGL: Declare fgPlatformSetWindow earlier to fix C warning
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1243
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 15 Apr 2012 19:08:26 +0000 (19:08 +0000)]
Fix regressions from previous commits
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1242
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 15 Apr 2012 18:47:07 +0000 (18:47 +0000)]
Android: fix/upgrade paths in README
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1241
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 15 Apr 2012 18:46:38 +0000 (18:46 +0000)]
Remove a couple printf's
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1240
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 15 Apr 2012 18:45:54 +0000 (18:45 +0000)]
EGL: reuse fgPlatformSetWindow for calling eglMakeCurrent
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1239
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 15 Apr 2012 18:44:17 +0000 (18:44 +0000)]
Fix eglInitialize check
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1238
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Mon, 9 Apr 2012 18:35:25 +0000 (18:35 +0000)]
__ANDROID__ is defined in the Android build environment; no need for an extra -DANDROID
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1237
7f0cb862-5218-0410-a997-
914c9d46530a
John F. Fay [Sat, 7 Apr 2012 02:28:55 +0000 (02:28 +0000)]
Removing the build errors from MSVC 6.0 version
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1236
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Mon, 2 Apr 2012 22:58:07 +0000 (22:58 +0000)]
Fix return values for stubs
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1235
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Mon, 2 Apr 2012 22:43:23 +0000 (22:43 +0000)]
fg_gl2: Fix typo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1234
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Mon, 2 Apr 2012 22:22:33 +0000 (22:22 +0000)]
Use different names for GLES1 and GLES2 libraries, to allow parallel install
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1233
7f0cb862-5218-0410-a997-
914c9d46530a
John F. Fay [Sun, 1 Apr 2012 20:09:51 +0000 (20:09 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1231
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Apr 2012 20:00:08 +0000 (20:00 +0000)]
README.android status section points to new android.php webpage
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1230
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Apr 2012 15:42:47 +0000 (15:42 +0000)]
A few more stubs for Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1228
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Apr 2012 15:40:23 +0000 (15:40 +0000)]
README.android: use separate build dirs + minor fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1227
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Apr 2012 13:39:12 +0000 (13:39 +0000)]
GLsizei: ptrdiff_t -> int (like GLEW); add missing FGH_ prefix for OpenGL 2.0 prototype typedef's
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1226
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Apr 2012 12:55:39 +0000 (12:55 +0000)]
Fix OpenGL 2.0 declarations so code builds on Windows & Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1225
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 31 Mar 2012 21:50:55 +0000 (21:50 +0000)]
fg_geometry: Enable supported geometry functions for GLES2
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1224
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 31 Mar 2012 21:43:06 +0000 (21:43 +0000)]
Fix previous commit, I made a confusion when merging my changes with the trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1223
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 31 Mar 2012 21:24:45 +0000 (21:24 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1222
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 31 Mar 2012 20:52:48 +0000 (20:52 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1221
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 31 Mar 2012 20:21:16 +0000 (20:21 +0000)]
Declare OpenGL 2.0 dynamically-loaded functions for internal use
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1220
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 31 Mar 2012 20:03:01 +0000 (20:03 +0000)]
fg_geometry: sphere: GL_UNSIGNED_INT->GL_UNSIGNED_SHORT for OpenGL ES 1.0 support
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1219
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 31 Mar 2012 13:34:32 +0000 (13:34 +0000)]
added an option (GLUT_SKIP_STALE_MOTION_EVENTS) to ignore all but the last
MotionNotify event in the queue.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1218
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 30 Mar 2012 00:55:51 +0000 (00:55 +0000)]
added todo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1217
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 25 Mar 2012 17:13:14 +0000 (17:13 +0000)]
EGL: implement fgPlatformGetProcAddress
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1214
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 25 Mar 2012 17:09:42 +0000 (17:09 +0000)]
Indentation fix
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1213
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 25 Mar 2012 14:53:41 +0000 (14:53 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1212
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 25 Mar 2012 10:13:52 +0000 (10:13 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1209
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 25 Mar 2012 06:13:47 +0000 (06:13 +0000)]
correcting a few typos i made earlier in the comments
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1208
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 24 Mar 2012 21:26:54 +0000 (21:26 +0000)]
fg_geometry: test indices presence with vertIdxs!=NULL rather than numEdgePerFace==3
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1207
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 24 Mar 2012 19:57:54 +0000 (19:57 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1206
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 24 Mar 2012 11:47:10 +0000 (11:47 +0000)]
fg_geometry: add a couple comments
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1205
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 23 Mar 2012 19:03:56 +0000 (19:03 +0000)]
Keep fg_geometry in normal builds\!
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1204
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 23 Mar 2012 19:01:05 +0000 (19:01 +0000)]
Remove glutWireTeapot/glutSolidTeapot from gles_stubs because these are conditionaly compiled already
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1203
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 23 Mar 2012 01:07:48 +0000 (01:07 +0000)]
Don't alter glutWireTeapot and glutSolidTeapot prototypes, since we didn't modify these functions yet (thanks Diederick)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1202
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 23 Mar 2012 01:02:57 +0000 (01:02 +0000)]
- 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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1201
7f0cb862-5218-0410-a997-
914c9d46530a
projects / freeglut / log