Diederick Niehorster
368e7efe81
Merge remote-tracking branch 'svn/trunk' into git_master
2014-05-31 19:29:38 +08:00
beuc
c4d5ab086d
Update GLES2 status and instructions
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1684 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-31 10:38:44 +00:00
Diederick Niehorster
2ac0974cf6
Merge branch 'svn/trunk'
2014-05-15 06:02:59 +08:00
dcnieho
98d0182357
KEY_EVENT macro exists in windows 8.1 API: renamed it. Also renamed KEY macro to be safe.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1683 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 22:02:41 +00:00
jtsiomb
bca59c67ef
Using the -pedantic flag with gcc uncovered a series of warnings about
...
non-standard C constructs in the code. This commit fixes them.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1682 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 18:31:58 +00:00
jtsiomb
ff6255810d
Compiling with -ansi makes a lot of important POSIX (standard UNIX) facilities
...
unavailable. This was masked until recently by an incorrect conditional in the
CMakeLists.txt file, that looked like it would use -ansi on anything other than
android, but it didn't actually use it anywhere. As soon as that was fixed, and
-ansi started being used, build broke on linux.
The intention of the -ansi flag was to help catch portability-reducing mistakes
in the code, so instead of removing it completely I used -pedantic in its place,
which produces a lot of warnings for not strictly ISO/ANSI compliant code that
relies on compiler-specific features.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1681 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 18:28:53 +00:00
Diederick Niehorster
79b0981875
Merge branch 'svn/trunk'
2014-04-11 21:42:02 +08:00
dcnieho
18718163db
XPutBackEvent copies an XEvent internally, so the pointer passed in must
...
point to an actual XEvent object, not an XConfigureEvent, which is
smaller. This avoids an invalid stack read.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1680 7f0cb862-5218-0410-a997-914c9d46530a
2014-04-11 13:41:49 +00:00
Diederick C. Niehorster
8a906a7525
Merge pull request #11 from LindleyF/git_master
...
Avoid invalid stack read
2014-04-11 21:40:38 +08:00
Lindley French
94ee505f8a
XPutBackEvent copies an XEvent internally, so the pointer passed in must
...
point to an actual XEvent object, not an XConfigureEvent, which is
smaller. This avoids an invalid stack read.
2014-04-10 16:07:03 -07:00
Diederick Niehorster
ed10f72c86
Merge branch 'svn/trunk'
2014-03-09 11:50:29 +08:00
dcnieho
d0c5d990d7
Docs update related to BlackBerry 10
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1679 7f0cb862-5218-0410-a997-914c9d46530a
2014-03-09 03:49:43 +00:00
Diederick C. Niehorster
a360185861
Merge pull request #10 from rcmaniac25/blackberry
...
Docs update related to BlackBerry 10
2014-03-09 11:48:51 +08:00
Rcmaniac25
48aaf2d0d5
Docs update related to BlackBerry 10
2014-03-08 20:58:10 -05:00
Diederick Niehorster
58fa5fa87e
Merge branch 'svn/trunk'
2014-03-05 09:41:19 +08:00
dcnieho
2c025ce66d
Fix issues with context lost on Android
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1678 7f0cb862-5218-0410-a997-914c9d46530a
2014-03-05 01:40:18 +00:00
Diederick C. Niehorster
0c669616e2
Merge pull request #9 from nazgee/fix_android_context
...
Fix issues with context lost on Android
2014-03-05 09:38:08 +08:00
Michal Stawinski
98e866547a
Fix issues with context lost on Android
2014-03-04 18:02:25 +01:00
Diederick Niehorster
b94b82249d
Merge branch 'svn/trunk'
2014-01-24 18:41:04 +08:00
dcnieho
aff8412f26
Added comments about GLES 3.0 support with 2.0 references.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1677 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:48 +00:00
dcnieho
8c6c71d29d
BlackBerry and Android -Added ability for developer to choose OpenGL ES version (2.0 or 3.0) via glutInitContextVersion (only the major version is used)
...
BlackBerry specific
-Added better documentation on required window bit depth for BlackBerry.
-Modified screen format picking so it will choose either RGBA8888 or RGB565 instead of always using RGBA8888
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1676 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:35 +00:00
dcnieho
47945e4119
Updated toolchain so that it does a more exact check if this is for PlayBook or BlackBerry 10 Fixed bug with keyboard on PlayBook where keyboard heights only occurred on rotation, and resize would occur twice because of it and resize wouldn't happen for keyboard
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1675 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:22 +00:00
dcnieho
4c37b66f1e
Added BlackBerry PlayBook support Bug memleak when getting the number of mouse buttons on a non-PlayBook where an appropriate device is found and the value is returned
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1674 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:05 +00:00
dcnieho
e8cc20621f
Info logging only shows in debug compilation Added support for UseCurrentContext flag Updated fghPlatformCloseWindowEGL for performance so that eglMakeCurrent isn't invoked unless it's the current window and that the EGL context isn't destroyed unless no other windows uses
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1673 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:34:49 +00:00
dcnieho
c5201e73ef
Hardcoded the RGB bitdepths for EGL surface creation.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1672 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:34:32 +00:00
dcnieho
d8f19f2481
Made glutGet, for window width and height, return width and height determined by device rotation Now handles keyboard open/close (along wit device rotation while the keyboard is open) and resize The "back" operation now returns an ESCAPE key
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1671 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:34:17 +00:00
dcnieho
eb835cc833
Added support for rotation so an app can be rotated and FG will resize and manage the window in the background Additional documentation explaining why certain functions are implemented in the manner they are Changed QNX macro to a non deprecated one
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1670 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:33:57 +00:00
dcnieho
b817a1d976
Added (though commented out) support for setting window position
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1669 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:33:38 +00:00
dcnieho
f3f7e54713
Placeholder for window sizes Prevent navigator event 0x0 to show as unknown (though it is unknown... it's not defined in navigator.h)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1668 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:33:23 +00:00
dcnieho
2f2185d930
Added full support for WindowStatus App status is now based on actual app status instead of window visibility
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1667 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:33:07 +00:00
dcnieho
318f0d5ad9
Fixed bug where if statement didn't have parenthesis, causing it to just exit
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1666 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:32:52 +00:00
dcnieho
52db42d186
Implemented a small work around for no current window being set while executing the event handler
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1665 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:32:39 +00:00
dcnieho
54bc3439c4
Added support for the scroll wheel when using the simulator
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1664 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:29:59 +00:00
dcnieho
8fbcdd5aa9
Forgot to reset modifiers once done with modifiers.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1663 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:29:44 +00:00
dcnieho
2de675c752
Added support for key modifiers
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1662 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:29:30 +00:00
dcnieho
0d49bc62ac
Added ability to get mouse button count or touch ID count.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1661 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:29:17 +00:00
dcnieho
b6cc0103c8
Added ability to get screen size of display
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1660 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:29:03 +00:00
dcnieho
8d50a81c9e
Restructuring of when screen context and events are started stopped, created and destroyed
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1659 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:28:48 +00:00
dcnieho
4a08e95c50
Added keyboard states for BlackBerry
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1658 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:28:29 +00:00
dcnieho
c41c6b60de
Added two more navigator states (that might be implemented) for BlackBerry
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1657 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:28:14 +00:00
dcnieho
887d9f033e
Prevented case where no window was set when waiting for events.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1656 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:27:59 +00:00
dcnieho
fd1435ccb7
Converted the odd double spaces into 4 space tabs
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1655 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:27:43 +00:00
dcnieho
80d9609256
Minor order change in Android/BlackBerry CMake, one comment for BlackBerry window
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1654 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:27:24 +00:00
dcnieho
9c4f07fcd3
Added a couple event cases for BlackBerry that are common to prevent them being listed as unknown events.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1653 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:27:08 +00:00
dcnieho
ee3500875c
Removed fg_main_blackberry.h. It wasn't needed
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1652 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:26:52 +00:00
dcnieho
5f5513a01e
Made sure that windows created on BlackBerry are registered as fullscreen, for now. Added more logging in fgPlatformProcessSingleEvent on BlackBerry. Better handling of key repeats on BlackBerry by taking into account global and window settings.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1651 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:26:37 +00:00
dcnieho
9999328177
Can use input devices from x11 (serial input... unlikely to ever be used, but you never know) Fixed bug in fg_window_egl:fgPlatformSetWindow where a NULL window may be passed and cause a segfault Fixed bug where navigator events were never started Take into account DisplayMode when creating window buffers Proper fgPlatformSystemTime implementation (from fg_main_x11) Added support for mutlitouch (from fg_main_windows)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1650 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:26:20 +00:00
dcnieho
6d5f2582ee
Minor change so that OpenGL ES 1.x can be used for BlackBerry
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1649 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:26:00 +00:00
dcnieho
7b34b7be39
Implemented BlackBerry main (initial version)
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1648 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:25:47 +00:00
dcnieho
1357eb9fcf
Final commit before implementing main loop. All other code is implemented to the same level as Android.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1647 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:25:29 +00:00