Stefanos A. [Wed, 8 Jan 2014 21:29:22 +0000 (22:29 +0100)]
[Win] Fix issue #33; fix issue #34
This patch adds a workaround for WM_STYLECHANGED messages that are not
delivered when running on Mono/Windows. If we detect Mono, then we call
HandleStyleChanged() directly in order to update the internal state of
our WinGLNative instance.
Stefanos A. [Wed, 8 Jan 2014 18:22:03 +0000 (19:22 +0100)]
[Win] Do not overload internal SetWindowLong
The internal function is now appended with "Internal".
Stefanos A. [Wed, 8 Jan 2014 18:21:29 +0000 (19:21 +0100)]
[Win] Do not unregister class twice
Only the parent window would register a class, but both the parent and
the child window would unregister it. This is now fixed.
Stefanos A. [Tue, 7 Jan 2014 23:45:42 +0000 (00:45 +0100)]
[Win] Remove unnecessary #if clauses
Stefanos A. [Tue, 7 Jan 2014 23:02:27 +0000 (00:02 +0100)]
[Win] Refactor huge wndproc into functions
thefiddler [Tue, 7 Jan 2014 21:19:22 +0000 (22:19 +0100)]
Merge branch 'timing' into develop
Stefanos A. [Tue, 7 Jan 2014 21:09:52 +0000 (22:09 +0100)]
[Examples] Added keys to modify timing
Use [ and ] to decrease and increase the UpdateFrame frequency.
Use < and > to decrease and increase the RenderFrame frequency.
Stefanos A. [Tue, 7 Jan 2014 21:09:02 +0000 (22:09 +0100)]
[OpenTK] Improved timing stability
OpenTK now directly calculates the elapsed time between UpdateFrame
(RenderFrame) events and compares that directly to TargetUpdatePeriod
(TargetRenderPeriod). This significantly simplifies the implementation
and improves timing stability.
Stefanos A. [Tue, 7 Jan 2014 14:55:11 +0000 (15:55 +0100)]
[OpenTK] Fixed Update/RenderTime calculation
These values should only be re-calculated when an Update/RenderFrame
event is raised. Otherwise, they should retain their previous values.
thefiddler [Tue, 7 Jan 2014 08:12:35 +0000 (09:12 +0100)]
[Examples] Improve timing information; add vsync toggle
thefiddler [Tue, 7 Jan 2014 08:11:55 +0000 (09:11 +0100)]
[OpenTK] Corrected GameWindow.Update/RenderFrequency information
thefiddler [Tue, 7 Jan 2014 08:09:43 +0000 (09:09 +0100)]
[OpenTK] Implemented GameWindow.UpdateTime and RenderTime properties
thefiddler [Tue, 7 Jan 2014 07:52:02 +0000 (08:52 +0100)]
[OpenTK] More robust timing for UpdateFrame and RenderFrame
FrameEventArgs.Time should no longer drift from clock time measured
outside GameWindow.
thefiddler [Tue, 7 Jan 2014 00:01:00 +0000 (01:01 +0100)]
[Examples] Calculate timing information in GameWindowStates
thefiddler [Mon, 6 Jan 2014 23:48:09 +0000 (00:48 +0100)]
[Examples] Cleaned up input device printing in GameWindowStates
Stefanos A. [Mon, 6 Jan 2014 00:57:54 +0000 (01:57 +0100)]
[OpenTK] Simplify and improve timing calculations
This patch modifies GameWindow.Run() to use a single stopwatch instead
of two separate stopwatches for timing UpdateFrame and RenderFrame
events.
It improves timing accuracy for issue #20 (FrameEventArgs.Time
Inconsistencies)
Stefanos A. [Mon, 6 Jan 2014 00:52:08 +0000 (01:52 +0100)]
[Math] Added MathHelper.Clamp
thefiddler [Sun, 5 Jan 2014 22:58:05 +0000 (23:58 +0100)]
[Mac] Do not store *State structs directly
Storing Mouse/KeyboardState structs directly makes updates more
difficult than they should be. It is simpler to create simple classes
instead.
thefiddler [Sun, 5 Jan 2014 22:50:17 +0000 (23:50 +0100)]
[Input] Added Keyboard/MouseState.SetIsConnected to mirror JoystickState
thefiddler [Sun, 5 Jan 2014 21:50:27 +0000 (22:50 +0100)]
Merge branch 'mac_joystick' into develop
thefiddler [Sun, 5 Jan 2014 21:44:58 +0000 (22:44 +0100)]
[Mac] Map GamePads, MultiAxisControllers and Wheels to joysticks
thefiddler [Sun, 5 Jan 2014 21:38:26 +0000 (22:38 +0100)]
[Mac] Call DeviceRemoved() in Dispose() event
The necessary cleanup code already exists in DeviceRemoved(). No need
to duplicate this in the Dispose() event.
thefiddler [Sun, 5 Jan 2014 21:36:01 +0000 (22:36 +0100)]
[Mac] Avoid IOHIDDeviceConformsTo call in DeviceRemoved handler
DeviceAdded already checks that devices conform to the desired usage
pages. Checking again in DeviceRemoved is unnecessary - if a device
exists, then it has already passed muster.
thefiddler [Sun, 5 Jan 2014 21:15:55 +0000 (22:15 +0100)]
[Mac] Implement Joystick.GetGuid()
thefiddler [Sun, 5 Jan 2014 21:06:19 +0000 (22:06 +0100)]
[Mac] Calculate joystick Guid for USB devices
thefiddler [Sun, 5 Jan 2014 21:05:54 +0000 (22:05 +0100)]
[Mac] Use out/ref parameters instead of unsafe pointers in bindings
thefiddler [Sun, 5 Jan 2014 20:53:28 +0000 (21:53 +0100)]
[Mac] Connect devices to first available index
thefiddler [Sun, 5 Jan 2014 20:32:24 +0000 (21:32 +0100)]
[Examples] Draw device index for Joysticks and GamePads
thefiddler [Sun, 5 Jan 2014 20:27:34 +0000 (21:27 +0100)]
[Mac] Do not call CFRelease on HID properties
HID properties are callee-owned and should not be released by the
caller. Fixes crash (memory corruption) on device hot plugging.
thefiddler [Sun, 5 Jan 2014 20:18:20 +0000 (21:18 +0100)]
[Mac] DllImport must be marked as extern
thefiddler [Sun, 5 Jan 2014 19:17:03 +0000 (20:17 +0100)]
[Mac] Correctly unschedule HIDManager from run loop
thefiddler [Sun, 5 Jan 2014 03:20:51 +0000 (04:20 +0100)]
[Mac] Don't let exceptions escape to unmanaged code
thefiddler [Sun, 5 Jan 2014 03:15:30 +0000 (04:15 +0100)]
[Mac] Fixed DllEntryPointNotFound crash on device unplugging
thefiddler [Sun, 5 Jan 2014 03:11:11 +0000 (04:11 +0100)]
[Mac] Implemented joystick buttons
thefiddler [Sun, 5 Jan 2014 02:54:53 +0000 (03:54 +0100)]
[Mac] Implemented joystick axis movement
thefiddler [Sun, 5 Jan 2014 02:54:34 +0000 (03:54 +0100)]
[Input] Added JoystickAxis/Button.Last; added JoystickAxis.Axis10.
JoystickAxis/Button.Last is used internally to allocate the correct
amount of storage for joystick axes and buttons. JoystickAxis.Axis10 is
required to support the maximum number of axes available on Mac OS X.
thefiddler [Sun, 5 Jan 2014 02:03:46 +0000 (03:03 +0100)]
[Mac] Implemented joystick device detection
thefiddler [Sun, 5 Jan 2014 01:42:47 +0000 (02:42 +0100)]
[Mac] Retrieve HID joystick name
thefiddler [Sun, 5 Jan 2014 01:42:33 +0000 (02:42 +0100)]
[Mac] Implemented necessary CFString methods
thefiddler [Sat, 4 Jan 2014 23:47:40 +0000 (00:47 +0100)]
[Mac] Construct JoystickDevice when joysticks are connected
thefiddler [Sat, 4 Jan 2014 23:46:59 +0000 (00:46 +0100)]
[Input] Allow extending JoystickDevice<>
thefiddler [Sat, 4 Jan 2014 23:00:49 +0000 (00:00 +0100)]
[Mac] Only add callbacks for recognized USB HID devices
thefiddler [Sat, 4 Jan 2014 22:58:59 +0000 (23:58 +0100)]
[Mac] Implement device added/removed events for joysticks
thefiddler [Sat, 4 Jan 2014 22:55:38 +0000 (23:55 +0100)]
[Mac] Add skeleton HID input implementation for joysticks
thefiddler [Fri, 3 Jan 2014 01:23:02 +0000 (02:23 +0100)]
Merge branch 'gamepad' into develop
Conflicts:
Source/OpenTK/OpenTK.csproj
thefiddler [Fri, 3 Jan 2014 01:18:28 +0000 (02:18 +0100)]
[Graphics] Added missing documentation comment
thefiddler [Fri, 3 Jan 2014 01:17:42 +0000 (02:17 +0100)]
[Input] Corrected malformed documentation comments
thefiddler [Fri, 3 Jan 2014 00:58:16 +0000 (01:58 +0100)]
[Input] Documented all public members
thefiddler [Fri, 3 Jan 2014 00:58:08 +0000 (01:58 +0100)]
[Input] Removed JoystickState.GetAxis(int) overload
thefiddler [Thu, 2 Jan 2014 18:52:00 +0000 (19:52 +0100)]
[Input] Added SetVibration() API skeleton
thefiddler [Thu, 2 Jan 2014 18:27:04 +0000 (19:27 +0100)]
[Input] GamePad and Joystick classes should be sealed
thefiddler [Thu, 2 Jan 2014 18:24:38 +0000 (19:24 +0100)]
[SDL2] Implemented PacketNumber property
thefiddler [Thu, 2 Jan 2014 18:24:15 +0000 (19:24 +0100)]
[Input] Added PacketNumber property
thefiddler [Thu, 2 Jan 2014 17:37:53 +0000 (18:37 +0100)]
[Input] Implemented GetState() and simplified GetCapabilities()
thefiddler [Thu, 2 Jan 2014 17:37:20 +0000 (18:37 +0100)]
[Input] Simplified configuration parser and added GetEnumerator()
thefiddler [Thu, 2 Jan 2014 17:36:27 +0000 (18:36 +0100)]
[Input] Added internal Joystick.GetAxisRaw() method
thefiddler [Thu, 2 Jan 2014 17:36:09 +0000 (18:36 +0100)]
[Input] Added Source and Target to GamePadConfigurationItem
thefiddler [Thu, 2 Jan 2014 01:42:51 +0000 (02:42 +0100)]
[Input] Made configuration database non-static
thefiddler [Thu, 2 Jan 2014 01:20:51 +0000 (02:20 +0100)]
[SDL2] Fixed SDL_JoystickGetGUID capitalization
thefiddler [Thu, 2 Jan 2014 01:20:25 +0000 (02:20 +0100)]
[Input] Initialize JoystickDevice.Details in constructor
thefiddler [Thu, 2 Jan 2014 00:38:12 +0000 (01:38 +0100)]
[Input] Renamed GamePadMap to GamePadConfiguration
thefiddler [Thu, 2 Jan 2014 00:34:21 +0000 (01:34 +0100)]
[Input] Implemented IGamePadDriver.GetName()
thefiddler [Thu, 2 Jan 2014 00:33:57 +0000 (01:33 +0100)]
[Input] Made the Name property public
We can use the name property to implement a hypothetical
GamePad.GetName() method in the future.
thefiddler [Thu, 2 Jan 2014 00:33:08 +0000 (01:33 +0100)]
[Input] Added xml documentation for GamePadCapabilities
thefiddler [Thu, 2 Jan 2014 00:13:20 +0000 (01:13 +0100)]
[Input] Implemented MappedGamePadDriver.GetCapabilities()
thefiddler [Thu, 2 Jan 2014 00:07:21 +0000 (01:07 +0100)]
[Input] Added ability to parse SDL configuration db strings
thefiddler [Thu, 2 Jan 2014 00:06:47 +0000 (01:06 +0100)]
[Input] Added configuration db for GamePads
The database is based on the SDL bindings found at
https://hg.libsdl.org/SDL/file/
b744b3f8754b/src/joystick/SDL_gamecontrol
lerdb.h
thefiddler [Tue, 31 Dec 2013 13:09:17 +0000 (14:09 +0100)]
[Input] Added IJoystickDriver2.GetGuid() API
thefiddler [Tue, 31 Dec 2013 13:08:28 +0000 (14:08 +0100)]
[SDL2] Added JoystickGetGUID method
thefiddler [Tue, 31 Dec 2013 10:46:40 +0000 (11:46 +0100)]
[SDL2] Add compile-time check for SDL2 GameController vs MappedGamePadDriver
thefiddler [Tue, 31 Dec 2013 00:02:07 +0000 (01:02 +0100)]
[Input] Removed unnecessary #region
thefiddler [Tue, 31 Dec 2013 00:01:52 +0000 (01:01 +0100)]
[Input] Renamed GamePadMapping to GamePadMap
thefiddler [Mon, 30 Dec 2013 16:22:45 +0000 (17:22 +0100)]
[SDL2] Fixed joystick/controller hotplugging support
thefiddler [Mon, 30 Dec 2013 16:15:49 +0000 (17:15 +0100)]
[SDL2] Fixed GameControllerButton to Buttons translation
thefiddler [Mon, 30 Dec 2013 16:09:20 +0000 (17:09 +0100)]
[SDL2] Fix issue where changes to mutable struct were lost
thefiddler [Mon, 30 Dec 2013 16:08:42 +0000 (17:08 +0100)]
[SDL2] Explicitly enable joystick and gamepad events
thefiddler [Mon, 30 Dec 2013 15:07:06 +0000 (16:07 +0100)]
[Input] Buttons should have [Flags] attribute
Stefanos A. [Mon, 30 Dec 2013 14:24:48 +0000 (15:24 +0100)]
[SDL2] Fixed joystick hotplugging
SDL2 uses a weird system of device ids and instance ids to report
joystick events, where the ADDED event uses a device id and the rest use
instance ids.
The SDL2 joystick driver is now fixed to correctly distinguish between
the two, which fixes hotplugging support for joystick devices.
thefiddler [Mon, 30 Dec 2013 13:57:28 +0000 (14:57 +0100)]
[SDL2] Fixed mapping of instance ids to device ids
thefiddler [Mon, 30 Dec 2013 13:56:22 +0000 (14:56 +0100)]
[Input] Added missing closing brace in ToString() message
thefiddler [Mon, 30 Dec 2013 12:49:26 +0000 (13:49 +0100)]
[Input] Fixed incorrect variable name
thefiddler [Mon, 30 Dec 2013 12:42:37 +0000 (13:42 +0100)]
[SDL] Use TranslateAxis() to decode ControllerAxisEvent
SDL GameControllerAxis and GamePadAxes are not interchangeable. The
driver will now correctly interpret incoming SDL messages and update
the GamePadState for the relevant axis.
thefiddler [Mon, 30 Dec 2013 12:39:43 +0000 (13:39 +0100)]
[Input] Fixed GamePadState.SetAxis() implementation
GamePadState.SetAxis() receives a GamePadAxes enumeration, which is a
bitmask of the axes we wish to set. SetAxis now correctly decodes the
bitmask to apply the values we are interested in.
thefiddler [Mon, 30 Dec 2013 09:25:17 +0000 (10:25 +0100)]
[X11] Removed unused variable
thefiddler [Mon, 30 Dec 2013 08:23:33 +0000 (09:23 +0100)]
[X11] Fixed current resolution detection.
thefiddler [Sat, 28 Dec 2013 00:27:49 +0000 (01:27 +0100)]
Merge branch 'external' into develop
thefiddler [Sat, 28 Dec 2013 00:23:39 +0000 (01:23 +0100)]
[Build] Added new files to the relevant csproj scripts
thefiddler [Sat, 28 Dec 2013 00:17:56 +0000 (01:17 +0100)]
[Examples] Added ExternalContext test
This test uses SDL2 to create a window and an OpenGL context. It then
uses OpenTK to render into the external SDL2 context. If everything is
working correctly, a black window should appear and gradually turn
white before disappearing.
thefiddler [Sat, 28 Dec 2013 00:14:59 +0000 (01:14 +0100)]
[Graphics] Improved support for external OpenGL contexts
When combining OpenTK with a third-party OpenGL toolkit, it is now
possible to implement a suitable GetAddress() and GetCurrentContext()
implementation in terms of the third-party toolkit. If no
implementation is specified, then OpenTK will try to guess the most
suitable implementation within its own platform backends.
If no custom implementation is defined, and if no suitable
implementation can be found, then OpenTK will throw a
PlatformNotSupportedException. If a suitable implementation is found or
defined, then OpenTK will attempt to load OpenGL entry points using
that implementation.
In this case third-party toolkit remains solely responsible for
managing its context via its MakeCurrent(), SwapBuffers(), etc
implementations.
thefiddler [Sat, 28 Dec 2013 00:09:59 +0000 (01:09 +0100)]
[Dummy] Improved thread-safety; added entry-point loader
DummyGLContext will now attempt to load OpenGL and OpenGL ES entry
points when a suitable OpenGL context is current on the calling thread.
This allows OpenTK to be used on contexts created through third-party
toolkits.
thefiddler [Sat, 28 Dec 2013 00:08:24 +0000 (01:08 +0100)]
[Platform] Added internal CreateGetAddress() function
CreateGetAddress() constructs a GraphicsContext.GetAddressDelegate that
is suitable for the current platform. This can be used when combining
OpenTK with an OpenGL context created through a third-party toolkit.
thefiddler [Sat, 28 Dec 2013 00:06:33 +0000 (01:06 +0100)]
[Mac] Moved GetAddress implementation to its own class
The functions defined in libdl.dylib are useful in more places than
just AglContext. Moving them to their own class ensures we can access
these from wherever we might need them.
thefiddler [Sat, 28 Dec 2013 00:04:46 +0000 (01:04 +0100)]
[SDL2] Added missing [SuppressUnamangedCodeSecurity] attribute
thefiddler [Sat, 28 Dec 2013 00:04:22 +0000 (01:04 +0100)]
[Mac] Use Cgl.GetCurrentContext instead of Agl
CGL appears to work with both AGL and NSOpenGL contexts, whereas AGL is
limited to AGL contexts. This allows us to be more flexible in terms of
implementation (i.e. we can use Cgl.GetCurrentContext to retrieve a
handle to a context created through SDL, which uses NSOpenGL
internally.)
thefiddler [Fri, 27 Dec 2013 12:01:21 +0000 (14:01 +0200)]
[X11] Improve GraphicsMode fallback (fixes issue #23)
When the user requests a GraphicsMode that is not directly supported
by the GPU/drivers, we should relax the requested parameters until
we find a supported mode. An exception should only be thrown when
there is no usable mode.
This makes the X11 backend match the behavior of Windows. The SDL/X11
backend works a little bit differently, in that it falls back to the
a default mode directly if the requested mode is not available. There
is nothing we can do about that.
thefiddler [Fri, 27 Dec 2013 11:31:51 +0000 (13:31 +0200)]
[X11] Fixed border size on Gnome 3
The _NET_FRAME_EXTENTS atom is implemented differently by
different window managers, when window decorations are hidden
with Motif. Unity returns a 0 size, while Gnome 3 returns the
previous size.
This patch removes that ambiguity: when decorations are hidden,
border size becomes zero. This should work everywhere, unless
some window manager decides to troll us by decorating the window
when we explicitly request no decorations. Sigh...
thefiddler [Fri, 27 Dec 2013 10:10:41 +0000 (11:10 +0100)]
[Input] Do not crash with scancodes > 255
thefiddler [Fri, 27 Dec 2013 10:07:38 +0000 (11:07 +0100)]
[X11] Allow resizing with fixed borders
Windows can now be resized programmatically, even when they have
WindowBorder.Fixed. All resizing logic is now consolidated in the
Bounds property, and ConfigureNotify messages are now handled
correctly depending on their source (StructureNotify or
SubStructureNotify.)
thefiddler [Wed, 25 Dec 2013 10:46:02 +0000 (11:46 +0100)]
Implemented X11 KeyDown/KeyUp events and reduced code duplication
thefiddler [Wed, 25 Dec 2013 10:14:30 +0000 (11:14 +0100)]
Do not raise KeyPress for control characters