Commit graph

5805 commits

Author SHA1 Message Date
Paul Kratt
ba0180ed77 Fix potential exception that I was ignoring.
This can happen, so we should handle it
2014-02-25 18:46:07 -06:00
Paul Kratt
794d45fdeb Make GLControl work on OS X
This isn’t the greatest solution, but at least it doesn’t require us to
reference WinForms in OpenTK and it works perfectly for what I’m using.
2014-02-25 18:46:06 -06:00
Fraser Waters
b80bb86c5b Remove unused fields and variables. 2014-02-25 10:31:17 +00:00
Fraser Waters
ab0751e7ec ModalLoopCallback is never assigned.
ModalLoopCallback is never assigned, so always has it's default value
null. Replace all uses of ModalLoopCallback with null.
2014-02-25 10:31:17 +00:00
Fraser Waters
95bd094404 Disable Obsolete warning.
IGraphicsContext.VSync property is obsolete, but we have to call it in
the GraphicsContext.VSync implementation, so disable the obsolete
warning for this one use.
2014-02-25 10:31:17 +00:00
Fraser Waters
b89f79266b Fix XML documentation. 2014-02-25 10:31:17 +00:00
Fraser Waters
366eb921a7 Fix compile warnings in Converter. 2014-02-25 10:31:17 +00:00
Fraser Waters
54f1e575d0 Fix compile warnings in Examples.
This commit fixes every current warning in the Example code bar two.
Both due to the use of the OpenTK.GameWindow.Joysticks.
2014-02-25 10:31:17 +00:00
thefiddler
172462d4ea Merge branch 'keymod' into develop 2014-02-25 01:15:06 +01:00
thefiddler
2f4161108d [X11] Fixed KeyUp event arguments
KeyUp event was incorrectly fired with KeyDownEventArgs instead of KeyUpEventArgs. This is now fixed.
2014-02-25 01:13:46 +01:00
thefiddler
d985362058 [Examples] Display modifier key information 2014-02-25 01:13:46 +01:00
thefiddler
ee1fb2a917 [X11] Implemented modifier keys 2014-02-25 01:13:46 +01:00
thefiddler
9ba21d6017 [Win] Implemented modifier keys 2014-02-25 01:13:45 +01:00
thefiddler
c92aabd807 [Input] Implemented GetModifiers() method 2014-02-25 01:13:45 +01:00
thefiddler
09f9bb3a17 [SDL2] Implemented modifier keys
Additionally, removed event watch callback in favor of calling
PollEvent() directly in ProcessEvents, which should be more efficient.
2014-02-25 01:13:45 +01:00
thefiddler
221d4661d4 [Input] Added modifier keys to KeyboardKeyEventArgs 2014-02-25 01:13:45 +01:00
thefiddler
0c262cd5b2 [SDL2] Added PeepEvents/PollEvent functions 2014-02-25 01:13:45 +01:00
thefiddler
14d53010b0 [SDL2] Corrected win/alt key mapping (was swapped previously) 2014-02-25 01:13:45 +01:00
thefiddler
56e4b3cc85 [Mac] Implemented modifier keys 2014-02-25 01:13:45 +01:00
thefiddler
4066ba8355 [Input] Added KeyModifiers enumeration
KeyModifiers are represented as a bitwise combination of the Alt,
Control and Shift keys.
2014-02-25 01:13:45 +01:00
thefiddler
a0bc14ad58 Merge branch 'calli' into develop 2014-02-25 01:09:31 +01:00
thefiddler
346921981d [Build] Added -debug to Rewrite commandline parameters 2014-02-25 01:08:53 +01:00
thefiddler
18ef634610 [Build] Fixed ErrorHelper local variable
We need to emit a ldloca instruction before constructing the
ErrorHelper instance, in order to reference it in the finally
block below.
2014-02-25 01:08:53 +01:00
thefiddler
2f3e7a9493 [Rewrite] Fixed exit from try-finally block 2014-02-25 01:08:53 +01:00
Fraser
10ca14ac6d Add ErrorHelper to bindings.
Wrap new generated binding calls with using ErrorHelper. Sets up a try
to call the method in and a finally block to call Dispose on the
ErrorHelper. Currently hardcoded to only work for the graphics modules.
2014-02-25 01:08:53 +01:00
thefiddler
efc59fa97a Squashed commit of the following:
commit db75670cb94a61b78e4e096f995fab6d5349978a
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 23:26:49 2014 +0100

    [Build] Build both debug and release configurations

commit 2a4a1dbc19d7ef2e12d3f4bb63b0e29b108e5050
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 23:20:51 2014 +0100

    [Build] Invoke xbuild once now that build order is fixed

commit 63b724d70e6b969dee11a740e5ac50e343cdcc48
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 23:19:23 2014 +0100

    [Build] Maintain support for VS2012

commit d9aed1173373625d583b462bd8e0cad373246412
Author: Stefanos A <stapostol@gmail.com>
Date:   Mon Feb 24 23:16:57 2014 +0100

    [Build] Attempt to fix xbuild build order
2014-02-24 23:27:49 +01:00
thefiddler
a944318f27 [Build] Test build OpenTK with mono 3.2.6 and 2.10.11
Squashed commit of the following:

commit 15ec03cd3f5f09ed88c51b62393fd6fa3476b03a
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 15:53:18 2014 +0100

    [Build] Fixed missing '' typo

commit 9e3dcad6124db52ec9035a8e6126244d9c856bfd
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 15:27:07 2014 +0100

    [Build] Install mono either from pwd or from mounted /Volume

commit b7303b68eaf3f4867e73a89fd22bd11caecf4f38
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 15:21:40 2014 +0100

    [Build] Do not stop build when wget fails

    The build stops iff no valid mono framework can be installed

commit 875c23294e6adc5061589576c6eabd43894ae9dd
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 15:13:08 2014 +0100

    [Build] Fix 3.2.x and 2.10.x mono download urls

commit 7bcbc789ce89cd16e06d5a62b05dd249432fcba0
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 11:58:57 2014 +0100

    [Build] Use .pkg file for mono installation on Travis

commit 60fef5aa7db9929c99ef22a778c87f634bcba266
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 11:43:12 2014 +0100

    [Build] Detect *.yml as text files

commit 7fb42856f187cb0503494523d2e524df8bda1cbc
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 11:40:07 2014 +0100

    [Build] Move first xbuild run to pre-build scripts

commit e1cfcf76202ba82d196cc6dceabb25c93c24ef87
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 11:38:19 2014 +0100

    [Build] Fixed mono 3.2.6 download url

commit c6941844353b53a7e8fb614565243ffbc31679d7
Author: thefiddler <stapostol@gmail.com>
Date:   Mon Feb 24 11:32:16 2014 +0100

    [Build] Run xbuild twice for GlobalAssemblyInfo.cs

    This works around an issue in xbuild, where pre-build events
    are not resolved correctly. The first run generates
    GlobalAssemblyInfo.cs; the second run actually builds the project
2014-02-24 16:23:17 +01:00
thefiddler
4884c65b17 Added Travis-CI build script 2014-02-24 11:24:16 +01:00
thefiddler
925abfdb10 [EGL] Removed unnecessary OpenTK.Platform.Windows reference 2014-02-21 14:04:33 +01:00
Benjamin Nitschke
c6dcca0772 Fixed line breaks in release notes again
links require extra new lines
2014-02-17 19:46:22 +01:00
Benjamin Nitschke
ca6c0a4080 Fixed line breaks in release notes 2014-02-17 19:45:32 +01:00
Benjamin Nitschke
6ca0a8a7ed Added stable release notes and nuget package links 2014-02-17 19:44:15 +01:00
thefiddler
295522d8b7 [Doc] Generate oxygen reference for OpenGL/AL
This is useful, even though it takes a lot of time and generates large
files.
2014-02-16 17:10:49 +01:00
thefiddler
ee04127cff [Doc] Add links to OpenTK manual and API reference 2014-02-16 17:10:10 +01:00
thefiddler
2d04f92277 [Doc] Updated version number in doxygen documentation 2014-02-16 16:21:30 +01:00
thefiddler
3c24a951b1 [Doc] Removed deprecated doxygen directives 2014-02-16 15:30:38 +01:00
thefiddler
ae3f8cff55 [Doc] Fixed doxygen latex-to-pdf conversion
pdflatex will fail when a <seealso> elements is placed within a
<summary> element. This is now fixed.
2014-02-16 15:30:22 +01:00
thefiddler
0dd5761953 [Doc] Removed pdf OpenGL/AL specifications in favor of html links
This reduces download size significantly without loss in functionality.
2014-02-16 13:20:36 +01:00
Stefanos A.
181e8e8036 [Doc] Updated documentation for release 2014-02-16 12:01:52 +01:00
Stefanos A.
0052ff435e [Win] Do not raise KeyPress for control chars
This matches the documented behavior of the GameWindow.KeyPress event.
2014-02-13 14:01:35 +01:00
Stefanos A.
1c1607da56 [OpenTK] Make VB.Net overload resolution happy
GLHelper.cs contains a number of overloads that cannot be resolved by
VB.Net. We cannot remove them, as that will break
backward-compatibility, but we can hide them by moving them after the
autogenerated overloads in GL.cs.

Terrible hack, but it appears to work.

Issue originally reported at http://www.opentk.com/node/3554 as "OpenTK
1.1, VB.net and ambiguous functions."
2014-02-12 16:14:00 +01:00
thefiddler
30571f7532 Merge pull request #58 from Frassle/develop
Replace non-breaking space.
2014-02-11 23:54:47 +01:00
Fraser Waters
a18fb1ebaa Remove non-breaking space.
Causes the build on Ubuntu to fail.
2014-02-11 16:36:31 +00:00
Stefanos A
61f0ca89b4 Merge branch 'joyhat' into develop 2014-02-10 10:54:22 +01:00
thefiddler
ccd1ad0fd7 [GL] Do not limit strings to StringBuilder.Capacity. Fixes issue #57
We let StringBuilder grow to fit the unmanaged string. This appears to
match the default CLR marshaling behavior, which was used in OpenTK 1.0.
2014-02-07 15:57:36 +01:00
thefiddler
63dd4597c7 [GL][ES] Mark DebugProc* delegates as unmanaged function pointers
Calling convention is platform-dependent: stdcall on Windows, cdecl
elsewhere. This maps to CallingConvention.Winapi in .Net parlance.
2014-02-06 15:01:22 +01:00
thefiddler
bb741579c6 Merge pull request #56 from l3m/matrix4d-axis-angle
Updated Matrix4d.FromAxisAngle to mirror the Matrix4 version.
2014-02-06 10:33:09 +01:00
thefiddler
2bcf153475 [GL] Fixed invalid IL instruction in Get*() and Delete*() functions 2014-02-04 16:07:58 +01:00
thefiddler
d8eda71a2c [GL] Added missing ActiveUniformType.FloatMat3x2 token 2014-02-04 14:26:52 +01:00
Jonas Boesch
e2ecba7274 Updated Matrix4d.FromAxisAngle to mirror the Matrix4 version. 2014-02-04 14:03:59 +01:00