Commit Graph

3237 Commits

Author SHA1 Message Date
kappaOne c53e957833 Remove dependency on Java Native Foundation framework, remove non
working JAWT manually loading, change to use headers from
JavaVM.framework when compiling due to JDK7 bug
2013-03-24 20:49:23 +00:00
kappaOne 14de6c518d Fix crash on close of the Display when using Java 7 on OS X 2013-03-24 17:39:39 +00:00
Ioannis Tsakpinis 7b955ee86b Merge branch 'master' of https://github.com/LWJGL/lwjgl 2013-03-22 21:31:33 +02:00
Ioannis Tsakpinis ead1abc2b8 Made glBitmap buffer parameter nullable. 2013-03-22 21:31:22 +02:00
kappaOne 58932fcdbf tweak how glViewport is set when using Display.setParent/AWTGLCanvas 2013-03-15 01:17:24 +00:00
kappaOne 5738477a7b Merge pull request #19 from LWJGL/osx-java7
LWJGL OS X Java 7 Branch is Ready!
2013-03-14 04:49:43 -07:00
kappaOne d8297e7583 set correct size on glViewport when using CALayer 2013-03-14 02:58:14 +00:00
kappaOne d462208c4c Implement AWTGLCanvas, fix initial glViewport size when using
Display.setParent
2013-03-13 00:51:32 +00:00
Ioannis Tsakpinis 3509384629 clCreateImage fixes:
- Corrected image_desc byte-size calculation on x64.
- Allow null host_ptr.
2013-03-09 21:41:40 +02:00
Ioannis Tsakpinis 8faf5f4f35 Reverted commit b333b029 that affected GLX extension detection. Fixes #16.
We now only query glXQueryExtensionsString instead of the server & client
GLX_EXTENSIONS strings.
2013-02-22 18:22:22 +02:00
kappaOne 0cbe94d9e3 Tweak to fix a crash on exit, attempt to fix missing jawt error on
Java 7
2013-02-20 22:20:23 +00:00
kappaOne 6cd860525f fix potential crash on exit when closing the Display window 2013-02-19 22:28:14 +00:00
kappaOne f381eb1f35 Simplify code in AWTSurfaceLock for CALayer support 2013-02-17 16:50:56 +00:00
kappaOne af1ae935d8 fix CALayer/Display.setParent driver crash on resize 2013-02-17 15:09:31 +00:00
kappaOne 6663ee037c Attempt fix for no JAWT on OS X Java 7 issue 2013-02-16 14:07:16 +00:00
kappaOne d28381e1cd minor tweak to comments 2013-02-16 00:31:10 +00:00
kappaOne e67d717c4e simplify mouse code a little 2013-02-15 21:49:19 +00:00
kappaOne 10b8d633d0 push 2013-02-15 21:40:33 +00:00
kappaOne 1b48b704bc Move entire Display nCreate and nDestroy onto the Main Thread 0 2013-02-15 21:35:12 +00:00
kappaOne 817cada066 move nswindow close to main thread 0 to fix a potential crash on exit 2013-02-12 22:00:11 +00:00
kappaOne ed9ab95419 fix crash on startup when creating a second window Display after a
destroy in the same app
2013-02-12 21:53:49 +00:00
kappaOne e725ca7d34 further tweak to pbuffer support 2013-02-12 21:41:47 +00:00
kappaOne e28f8554f9 tweak to pbuffer support 2013-02-12 21:40:48 +00:00
kappaOne e0a52b20c3 fix and reimplement pbuffer support 2013-02-10 21:33:28 +00:00
kappaOne 9929d0fac9 release mouse grab when destroying the Mouse or Display 2013-02-10 20:32:07 +00:00
kappaOne 93bfa246c6 reduce use of window specific code in the context implementation code 2013-02-10 17:57:52 +00:00
kappaOne f6c0f17c79 Fix freeze/hang when calling AL.create() before Display.create() 2013-02-09 00:59:11 +00:00
kappaOne 4e0c593644 Tweak native cursor behaviour 2013-02-08 23:55:45 +00:00
kappaOne db4eb9c5c8 Replace AWT code for getAvailableDisplayMode and other DisplayModes
stuff to use pure native Cococa code.
2013-02-08 23:29:15 +00:00
kappaOne 409b3fea6d Correctly catch quit events instead of manually catching OS X hotkeys 2013-02-07 21:55:53 +00:00
kappaOne 93a169b27b Catch Command+Q shortcut and get it to call Display.isCloseRequested() 2013-02-05 21:28:08 +00:00
kappaOne e15d172087 report Mouse.getX()/getY() values correctly on initial display creation. 2013-02-03 20:55:33 +00:00
kappaOne c57c27abaf remove nsview on main thread to avoid thread issues 2013-02-03 20:54:27 +00:00
kappaOne f6a2bc8327 Detect correctly if mouse is inside or outside the Display on
creation and resize.
2013-02-03 18:58:00 +00:00
kappaOne c328463776 Implement Cursor.destroy and release memory used by native cursors 2013-02-03 17:47:09 +00:00
kappaOne bf13ed9cc3 Restore default mouse cursor on mouse destroy 2013-02-03 16:52:45 +00:00
kappaOne 65beebb379 fix crash related to mouse being dragging whilst Display is destroyed. 2013-02-03 16:39:02 +00:00
kappaOne 2d43265d10 Fix Display.getWidth()/getHeight() to return size of NSView instead of
NSWindow, fix a crash on exit
2013-02-02 20:30:12 +00:00
kappaOne a5c7ec0017 Return correct OS X Cursor.getCapabilities() value 2013-02-02 19:58:18 +00:00
kappaOne 4e1d539095 Further fix Native Mouse Cursor behaviour 2013-02-02 01:15:41 +00:00
kappaOne abeb9f389c Fix Mouse.isInsideWindow() when starting in fullscreen mode 2013-02-01 22:28:10 +00:00
kappaOne 549f07fd28 Release NSView object on Display.destroy() 2013-01-31 23:47:50 +00:00
kappaOne b27754089a Fix Display.setParent() on Java 7 by forcing CALayer usage as
classic NSView method is no long available.
2013-01-31 23:01:19 +00:00
kappaOne 0d25914029 Fix colors on OS X native cursors 2013-01-31 22:44:43 +00:00
Ioannis Tsakpinis 1c671598aa Reverted warning level to 2, until we modify the generator to emit explicit casts. 2013-01-30 02:07:40 +02:00
kappaOne 4e023eec16 Implement animated cursor support on OS X 2013-01-29 22:59:40 +00:00
Ioannis Tsakpinis 5400bb27db Misc fixes and improvements on Windows:
- Cleaned up cl flags and enabled parallel compilation. Native compilation
  is now multiple times faster.
- Fixed all /W3 compilation warnings.
- Changed window flag from WS_CHILDWINDOW to WS_POPUP when Display.setParent
  is used, in an attempt to fix focus-related issues.
2013-01-29 22:53:11 +02:00
kappaOne 27cfdf646e Improve native cursor behaviour 2013-01-27 23:45:08 +00:00
kappaOne 6c090f1f61 Implement Mouse.isInsideWindow() on OS X 2013-01-27 23:01:21 +00:00
kappaOne f0219aed1a Fix native cursor global handle passing 2013-01-26 22:47:36 +00:00
Ioannis Tsakpinis 62b8d36002 Changed Get(Async)KeyState return type to short. 2013-01-25 15:28:17 +02:00
Ioannis Tsakpinis 6b68ff17b8 Added missing null-termination checks. 2013-01-25 15:26:55 +02:00
kappaOne fc2889cc27 Fix ARGB order on Native Cursors 2013-01-25 01:03:13 +00:00
kappaOne 486ff0edea Added initial work towards getting native cursors working, not
implemented yet
2013-01-25 00:28:26 +00:00
kappaOne 4735a6040f Fix crash when dragging mouse and switching from fullscreen to windowed
mode
2013-01-16 22:37:50 +00:00
kappaOne fbb490bb3a Reenable the AWT Robot for CALayer mode 2013-01-16 19:02:09 +00:00
kappaOne b8ba6ee6e5 Fix a small memory leak when using CALayer mode 2013-01-16 18:39:19 +00:00
kappaOne fc9e4f4bda Tweak CALayer mode to active correctly 2013-01-15 23:09:03 +00:00
kappaOne 02c0e80fb6 fix crash when switching to/from fullscreen when using CALayer mode. 2013-01-15 22:34:50 +00:00
Ioannis Tsakpinis d721194cf3 Corrected JavaDoc param order. 2013-01-15 22:59:46 +02:00
Ioannis Tsakpinis 074f6f2d63 Fixed typos. 2013-01-15 17:51:19 +02:00
kappaOne fe2f06f36e Implement Keyboard and Mouse input when using CALayer mode 2013-01-14 23:35:46 +00:00
kappaOne f2ad9f470d Tweak CALayer resizing behavior 2013-01-13 18:37:20 +00:00
kappaOne 03b669fb4d Fix garbage being displayed when resizing in CALayer mode 2013-01-13 16:13:13 +00:00
kappaOne 0dda33cd2d Implement CALayer rendering, no input yet 2013-01-13 15:34:24 +00:00
Ioannis Tsakpinis d1c1fcb01e Fixed DrawIndirect buffer size checks and removed null-termination checks (ARB_base_instance changes the reservedMustBeZero field to the baseInstance offset). 2013-01-12 20:49:26 +02:00
kappaOne 790f895220 Set CALayer OpenGL Context to be shared with the current LWJGL context.
Make code OS X 10.5 compatible (change from NSOpenGLLayer to
CAOpenGLLayer)
2013-01-04 00:11:12 +00:00
Ioannis Tsakpinis 517d6cfb3b Properly escape '_' in native method stubs. 2013-01-01 18:12:53 +02:00
Ioannis Tsakpinis 76ba12ad38 Fixed depth_buffer_float tokens to use the ARB values instead of the NV ones. 2012-12-30 16:15:22 +02:00
Ioannis Tsakpinis 683f488444 Template fixes. 2012-12-28 18:17:28 +02:00
kappaOne f13f35d250 Add further work to the CALayer to prepare it for allowing an FBO to be
blit to its internal FBO
2012-12-28 01:11:12 +00:00
Ioannis Tsakpinis a59964ccae Fixed function dependency typos.
Added GL error check in VersionTest, for drivers that expose the deprecated function addresses and throw GL errors when used.
2012-12-26 22:20:43 +02:00
kappaOne d0759e9c12 remove unneeded code in MacOSXDisplay.getPbufferCapabilities() 2012-12-25 14:14:05 +00:00
kappaOne a4c5be3781 fix OS X Mouse.setCursorPosition to use
CGDisplayMoveCursorToPoint instead of CGWarpMouseCursorPosition to allow
working on multiple monitor setups, also obtain correct window screen
instead of screen with keyboard focus
2012-12-25 14:00:09 +00:00
kappaOne fffa870418 correct behavior on OS X Display.getY() by using the screen the
window is on rather than the screen with keyboard focus
2012-12-25 13:51:24 +00:00
kappaOne 0d6eac80f7 Implement initial work for enabling CALayer rendering 2012-12-23 22:09:57 +00:00
kappaOne 284f6135f3 Refactoring to prepare for implementing OS X CALayer based
Display.setParent, temporarily breaks Display.setParent on Java 7 and
Java 6 Applets.
2012-12-22 20:20:48 +00:00
kappaOne f7c64c89dc Don't use Display.setParent when fullscreen set, some refactoring 2012-12-18 22:10:44 +00:00
Ioannis Tsakpinis 8437f28abd Fixed BackgroundLoadTest to work on NV/Intel and improved context synchronization. 2012-12-18 13:21:15 +02:00
Ioannis Tsakpinis 5dea782de8 Fixed pbuffer + MSAA pixel format config on NV drivers. 2012-12-17 13:57:14 +02:00
kappaOne d235ae5bf0 Fix crash on exit when using Display.setParent() on OS X 2012-12-16 17:50:48 +00:00
kappaOne 21f994a039 remove unused code 2012-12-16 16:24:33 +00:00
kappaOne 45992fc378 Implement Display.isActive() on OS X 2012-12-16 16:19:44 +00:00
kappaOne 70842b92aa Implement Display.getX() and Display.getY() for OS X 2012-12-16 16:02:40 +00:00
Ioannis Tsakpinis 778765c6de Now generates @Deprecated annotation for deprecated methods. 2012-12-12 19:18:35 +02:00
Ioannis Tsakpinis ce4153e883 Fixed put on external ByteBuffer. 2012-12-12 19:17:50 +02:00
kappaOne 970fc2d7d9 Implement OS X Mouse.setCursorPosition() for windowed mode 2012-12-11 22:59:30 +00:00
kappaOne a576c3fb0f fix mouse scroll wheel direction 2012-12-11 21:30:04 +00:00
kappaOne 93d1d3ea03 fix 'invalid drawable' error message 2012-12-11 21:24:04 +00:00
kappaOne ccf738dfaf Implement OS X Mouse.setCursorPosition() when in fullscreen mode 2012-12-09 22:12:02 +00:00
kappaOne 2a820ed94f remove unused variable 2012-12-09 21:22:45 +00:00
kappaOne 07499c30dd fix default viewport size when switching to fullscreen mode 2012-12-09 16:27:19 +00:00
kappaOne 2cc6affcd1 Use correct back buffer size when creating a new context and going
straight into fullscreen
2012-12-09 15:39:26 +00:00
kappaOne c2081c5c1a Remove old/redundant code for OS X 10.4 or lower. 2012-12-05 23:08:53 +00:00
kappaOne 8c4aeef4f4 remove use of depreciated CGTableCount 2012-12-04 22:45:47 +00:00
kappaOne 11d6db5f35 remove use of the now depreciated CGTableCount 2012-12-04 22:28:35 +00:00
kappaOne 83aeba5910 remove use of depreciated CGTableCount 2012-12-04 22:22:42 +00:00
kappaOne 76238f038c remove unneeded call to release memory on close of window 2012-12-04 22:11:16 +00:00
kappaOne 804f09da47 Fixed resizing when using Display.setParent 2012-12-03 23:04:30 +00:00
kappaOne 415f25bf97 Do Context clean up on proper thread, remove hacks, enable memory
clean up on Mac Display.destroy()
2012-12-03 21:39:54 +00:00