From f11ecd016d4ba4377cae1346561001ce25851a34 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Fri, 23 Jun 2017 19:35:32 +0200 Subject: [PATCH] Removed region declarations across the codebase. --- src/Generator.Bind/BindStreamWriter.cs | 10 +- src/Generator.Bind/CSharpSpecWriter.cs | 42 +- src/Generator.Bind/EnumProcessor.cs | 12 +- src/Generator.Bind/FuncProcessor.cs | 18 +- src/Generator.Bind/GL2/GL2Generator.cs | 2 - src/Generator.Bind/GL2/GL4Generator.cs | 4 +- src/Generator.Bind/GL2/Generator.cs | 18 - src/Generator.Bind/IBind.cs | 4 +- src/Generator.Bind/ISpecReader.cs | 4 +- src/Generator.Bind/Main.cs | 12 +- src/Generator.Bind/Settings.cs | 12 +- src/Generator.Bind/Structures/Constant.cs | 40 +- src/Generator.Bind/Structures/Delegate.cs | 76 +- .../Structures/Documentation.cs | 4 +- src/Generator.Bind/Structures/Enum.cs | 24 +- .../Structures/FlowDirection.cs | 4 +- src/Generator.Bind/Structures/Function.cs | 56 +- src/Generator.Bind/Structures/Parameter.cs | 106 +- src/Generator.Bind/Structures/Type.cs | 65 +- src/Generator.Bind/Utilities.cs | 36 +- src/Generator.Bind/XmlSpecReader.cs | 22 +- src/Generator.Converter/GLXmlParser.cs | 10 +- src/Generator.Converter/Options.cs | 24 +- src/OpenTK.GLControl/Agl.cs | 5 - src/OpenTK.GLControl/AglContext.cs | 16 +- src/OpenTK.GLControl/AglGraphicsMode.cs | 10 +- src/OpenTK.GLControl/CarbonGLControl.cs | 16 +- src/OpenTK.GLControl/DummyGLControl.cs | 22 +- src/OpenTK.GLControl/GLControl.Designer.cs | 16 +- src/OpenTK.GLControl/GLControl.cs | 52 +- src/OpenTK.GLControl/GLControlFactory.cs | 6 +- src/OpenTK.GLControl/IGLControl.cs | 6 +- src/OpenTK.GLControl/NS.cs | 3 - src/OpenTK.GLControl/Sdl2GLControl.cs | 6 +- src/OpenTK.GLControl/WinGLControl.cs | 38 +- src/OpenTK.GLControl/X11GLControl.cs | 22 +- src/OpenTK.GLWidget/GLWidget.cs | 22 +- src/OpenTK/Audio/AudioCapture.cs | 63 +- src/OpenTK/Audio/AudioContext.cs | 134 +- src/OpenTK/Audio/AudioContextException.cs | 6 +- src/OpenTK/Audio/AudioDeviceEnumerator.cs | 24 +- src/OpenTK/Audio/AudioDeviceErrorChecker.cs | 26 +- src/OpenTK/Audio/AudioDeviceException.cs | 6 +- src/OpenTK/Audio/AudioException.cs | 8 +- src/OpenTK/Audio/AudioValueException.cs | 6 +- src/OpenTK/Audio/OpenAL/AL/AL.cs | 238 +-- src/OpenTK/Audio/OpenAL/AL/ALEnums.cs | 4 +- .../Audio/OpenAL/AL/EffectsExtension.cs | 150 +- .../Audio/OpenAL/AL/EffectsExtensionEnums.cs | 22 +- .../OpenAL/AL/EffectsExtensionPresets.cs | 6 +- src/OpenTK/Audio/OpenAL/AL/XRamExtension.cs | 24 +- src/OpenTK/Audio/OpenAL/Alc/Alc.cs | 58 +- src/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs | 4 +- src/OpenTK/AutoGeneratedAttribute.cs | 6 +- src/OpenTK/BindingsBase.cs | 20 +- src/OpenTK/BlittableValueType.cs | 40 +- src/OpenTK/Compute/CL10/CL.cs | 1320 ++++++++--------- src/OpenTK/Compute/CL10/CLHelper.cs | 43 +- src/OpenTK/Compute/CL10/Core.cs | 4 +- src/OpenTK/Compute/CL10/Delegates.cs | 4 +- src/OpenTK/Compute/CL10/Enums.cs | 4 +- src/OpenTK/Compute/CL10/ErrorHelper.cs | 14 +- src/OpenTK/Compute/CL10/ImageFormat.cs | 6 +- src/OpenTK/Compute/CLHelper.cs | 4 +- src/OpenTK/Compute/CommandQueue.cs | 4 +- src/OpenTK/Compute/ComputeContext.cs | 4 +- src/OpenTK/Compute/Configuration.cs | 4 +- src/OpenTK/Compute/Device.cs | 4 +- src/OpenTK/Compute/Enums.cs | 4 +- src/OpenTK/Compute/Event.cs | 4 +- src/OpenTK/Compute/Kernel.cs | 4 +- src/OpenTK/Compute/Memory.cs | 4 +- src/OpenTK/Compute/Platform.cs | 4 +- src/OpenTK/Compute/Profiler.cs | 4 +- src/OpenTK/Compute/Program.cs | 4 +- src/OpenTK/Compute/Sampler.cs | 4 +- src/OpenTK/Compute/Structs.cs | 50 +- src/OpenTK/Configuration.cs | 58 +- src/OpenTK/ContextHandle.cs | 52 +- src/OpenTK/DisplayDevice.cs | 109 -- src/OpenTK/DisplayIndex.cs | 6 +- src/OpenTK/DisplayResolution.cs | 59 +- src/OpenTK/Exceptions.cs | 4 +- src/OpenTK/FrameEventArgs.cs | 14 +- src/OpenTK/GameWindow.cs | 210 --- src/OpenTK/GameWindowFlags.cs | 6 +- src/OpenTK/Graphics/Color4.cs | 52 +- src/OpenTK/Graphics/ColorFormat.cs | 32 +- src/OpenTK/Graphics/ES10/Core.cs | 4 +- src/OpenTK/Graphics/ES10/ES.cs | 638 ++++---- src/OpenTK/Graphics/ES10/Enums.cs | 4 +- src/OpenTK/Graphics/ES10/ErrorHelper.cs | 22 +- src/OpenTK/Graphics/ES11/ES11Obsolete.cs | 4 +- src/OpenTK/Graphics/ES11/ErrorHelper.cs | 22 +- src/OpenTK/Graphics/ES11/Helper.cs | 8 - src/OpenTK/Graphics/ES20/ErrorHelper.cs | 22 +- src/OpenTK/Graphics/ES20/Helper.cs | 105 +- src/OpenTK/Graphics/ES30/ErrorHelper.cs | 22 +- src/OpenTK/Graphics/ES30/Helper.cs | 101 +- src/OpenTK/Graphics/GraphicsBindingsBase.cs | 2 - src/OpenTK/Graphics/GraphicsContext.cs | 50 - src/OpenTK/Graphics/GraphicsContextBase.cs | 30 +- src/OpenTK/Graphics/GraphicsContextFlags.cs | 14 +- src/OpenTK/Graphics/GraphicsContextVersion.cs | 18 +- src/OpenTK/Graphics/GraphicsExceptions.cs | 4 +- src/OpenTK/Graphics/GraphicsMode.cs | 98 +- src/OpenTK/Graphics/GraphicsModeComparer.cs | 10 +- src/OpenTK/Graphics/IGraphicsContext.cs | 4 +- src/OpenTK/Graphics/IGraphicsMode.cs | 4 +- src/OpenTK/Graphics/OpenGL/ErrorHelper.cs | 22 +- src/OpenTK/Graphics/OpenGL/GLHelper.cs | 121 -- src/OpenTK/Graphics/OpenGL/GLObsolete.cs | 288 ++-- src/OpenTK/Graphics/OpenGL4/ErrorHelper.cs | 22 +- src/OpenTK/Graphics/OpenGL4/Helper.cs | 111 +- src/OpenTK/IGameWindow.cs | 6 +- src/OpenTK/INativeWindow.cs | 4 +- src/OpenTK/Input/ButtonState.cs | 2 - src/OpenTK/Input/ConfigurationType.cs | 2 - src/OpenTK/Input/GamePad.cs | 2 - src/OpenTK/Input/GamePadButtons.cs | 14 - src/OpenTK/Input/GamePadCapabilities.cs | 14 - src/OpenTK/Input/GamePadConfiguration.cs | 8 +- .../Input/GamePadConfigurationDatabase.cs | 8 +- src/OpenTK/Input/GamePadConfigurationItem.cs | 2 - .../Input/GamePadConfigurationSource.cs | 2 - .../Input/GamePadConfigurationTarget.cs | 2 - src/OpenTK/Input/GamePadDPad.cs | 18 - src/OpenTK/Input/GamePadState.cs | 20 +- src/OpenTK/Input/GamePadThumbSticks.cs | 12 +- src/OpenTK/Input/GamePadTriggers.cs | 12 +- src/OpenTK/Input/GamePadType.cs | 4 +- src/OpenTK/Input/HatPosition.cs | 2 - src/OpenTK/Input/IInputDevice.cs | 4 +- src/OpenTK/Input/IInputDriver2.cs | 6 +- src/OpenTK/Input/IJoystickDriver2.cs | 4 +- src/OpenTK/Input/IMouseDriver2.cs | 6 +- src/OpenTK/Input/Joystick.cs | 6 +- src/OpenTK/Input/JoystickAxis.cs | 4 +- src/OpenTK/Input/JoystickCapabilities.cs | 20 +- src/OpenTK/Input/JoystickDevice.cs | 96 +- src/OpenTK/Input/JoystickHat.cs | 2 - src/OpenTK/Input/JoystickHatState.cs | 8 +- src/OpenTK/Input/JoystickState.cs | 20 +- src/OpenTK/Input/Key.cs | 26 +- src/OpenTK/Input/KeyModifiers.cs | 2 - src/OpenTK/Input/Keyboard.cs | 12 +- src/OpenTK/Input/KeyboardDevice.cs | 42 +- src/OpenTK/Input/KeyboardKeyEventArgs.cs | 20 +- src/OpenTK/Input/KeyboardState.cs | 26 +- src/OpenTK/Input/Mouse.cs | 12 +- src/OpenTK/Input/MouseButton.cs | 4 +- src/OpenTK/Input/MouseDevice.cs | 63 - src/OpenTK/Input/MouseEventArgs.cs | 64 +- src/OpenTK/Input/MouseScroll.cs | 12 +- src/OpenTK/Input/MouseState.cs | 28 +- src/OpenTK/IntPtrEqualityComparer.cs | 4 +- src/OpenTK/InteropHelper.cs | 6 +- src/OpenTK/KeyPressEventArgs.cs | 6 +- src/OpenTK/Math/BezierCurve.cs | 24 +- src/OpenTK/Math/BezierCurveCubic.cs | 16 +- src/OpenTK/Math/BezierCurveQuadric.cs | 16 +- src/OpenTK/Math/Box2.cs | 5 +- src/OpenTK/Math/Box2d.cs | 5 +- src/OpenTK/Math/Half.cs | 64 +- src/OpenTK/Math/MathHelper.cs | 40 +- src/OpenTK/Math/Matrix2.cs | 91 +- src/OpenTK/Math/Matrix2d.cs | 92 +- src/OpenTK/Math/Matrix2x3.cs | 79 +- src/OpenTK/Math/Matrix2x3d.cs | 79 +- src/OpenTK/Math/Matrix2x4.cs | 76 +- src/OpenTK/Math/Matrix2x4d.cs | 76 +- src/OpenTK/Math/Matrix3.cs | 225 ++- src/OpenTK/Math/Matrix3d.cs | 223 +-- src/OpenTK/Math/Matrix3x2.cs | 79 +- src/OpenTK/Math/Matrix3x2d.cs | 79 +- src/OpenTK/Math/Matrix3x4.cs | 100 +- src/OpenTK/Math/Matrix3x4d.cs | 100 +- src/OpenTK/Math/Matrix4.cs | 122 -- src/OpenTK/Math/Matrix4d.cs | 126 -- src/OpenTK/Math/Matrix4x2.cs | 76 +- src/OpenTK/Math/Matrix4x2d.cs | 76 +- src/OpenTK/Math/Matrix4x3.cs | 100 +- src/OpenTK/Math/Matrix4x3d.cs | 100 +- src/OpenTK/Math/Point.cs | 22 +- src/OpenTK/Math/Quaternion.cs | 114 -- src/OpenTK/Math/Quaterniond.cs | 142 -- src/OpenTK/Math/Rectangle.cs | 36 +- src/OpenTK/Math/Size.cs | 21 +- src/OpenTK/Math/Vector2.cs | 154 -- src/OpenTK/Math/Vector2d.cs | 134 -- src/OpenTK/Math/Vector2h.cs | 46 - src/OpenTK/Math/Vector3.cs | 166 --- src/OpenTK/Math/Vector3d.cs | 158 -- src/OpenTK/Math/Vector3h.cs | 54 - src/OpenTK/Math/Vector4.cs | 150 -- src/OpenTK/Math/Vector4d.cs | 150 -- src/OpenTK/Math/Vector4h.cs | 58 - src/OpenTK/Minimal.cs | 126 +- src/OpenTK/MouseCursor.cs | 4 +- src/OpenTK/NativeWindow.cs | 298 +--- src/OpenTK/Platform/Common/Hid.cs | 258 ++-- src/OpenTK/Platform/DesktopGraphicsContext.cs | 4 +- src/OpenTK/Platform/DeviceCollection.cs | 22 +- src/OpenTK/Platform/DisplayDeviceBase.cs | 6 +- src/OpenTK/Platform/Dummy/DummyGLContext.cs | 14 - src/OpenTK/Platform/Dummy/DummyWindowInfo.cs | 4 - src/OpenTK/Platform/Egl/Egl.cs | 12 +- .../Platform/Egl/EglAnglePlatformFactory.cs | 15 +- src/OpenTK/Platform/Egl/EglContext.cs | 34 +- src/OpenTK/Platform/Egl/EglGraphicsMode.cs | 18 +- .../Platform/Egl/EglMacPlatformFactory.cs | 6 +- .../Platform/Egl/EglSdl2PlatformFactory.cs | 4 +- src/OpenTK/Platform/Egl/EglUnixContext.cs | 4 +- src/OpenTK/Platform/Egl/EglWinContext.cs | 8 +- .../Platform/Egl/EglWinPlatformFactory.cs | 14 +- src/OpenTK/Platform/Egl/EglWindowInfo.cs | 26 +- .../Platform/Egl/EglX11PlatformFactory.cs | 6 +- .../Platform/EmbeddedGraphicsContext.cs | 4 +- src/OpenTK/Platform/Factory.cs | 30 - src/OpenTK/Platform/IDisplayDeviceDriver.cs | 6 +- src/OpenTK/Platform/IPlatformFactory.cs | 2 - src/OpenTK/Platform/IWindowInfo.cs | 4 +- src/OpenTK/Platform/Linux/Bindings/Drm.cs | 4 +- src/OpenTK/Platform/Linux/Bindings/Evdev.cs | 10 +- src/OpenTK/Platform/Linux/Bindings/Gbm.cs | 8 +- src/OpenTK/Platform/Linux/Bindings/Kms.cs | 6 +- .../Platform/Linux/Bindings/LibInput.cs | 4 +- src/OpenTK/Platform/Linux/Bindings/Libc.cs | 4 +- src/OpenTK/Platform/Linux/Bindings/Poll.cs | 2 - .../Platform/Linux/Bindings/Terminal.cs | 4 +- src/OpenTK/Platform/Linux/Bindings/Udev.cs | 4 +- src/OpenTK/Platform/Linux/DefaultCursor.cs | 70 +- .../Platform/Linux/LinuxDisplayDriver.cs | 6 - src/OpenTK/Platform/Linux/LinuxFactory.cs | 18 +- .../Platform/Linux/LinuxGraphicsContext.cs | 4 +- src/OpenTK/Platform/Linux/LinuxInput.cs | 22 +- src/OpenTK/Platform/Linux/LinuxJoystick.cs | 28 +- src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs | 18 +- .../Platform/Linux/LinuxNativeWindow.cs | 12 +- src/OpenTK/Platform/Linux/LinuxWindowInfo.cs | 2 - src/OpenTK/Platform/MacOS/Carbon/Cgl.cs | 4 +- src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs | 22 +- src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs | 25 +- src/OpenTK/Platform/MacOS/Cocoa/Class.cs | 4 +- src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs | 8 +- .../Platform/MacOS/Cocoa/NSApplication.cs | 8 +- .../Cocoa/NSApplicationActivationPolicy.cs | 4 +- .../Cocoa/NSApplicationPresentationOptions.cs | 4 +- .../Platform/MacOS/Cocoa/NSBackingStore.cs | 4 +- .../Platform/MacOS/Cocoa/NSBitmapFormat.cs | 4 +- .../MacOS/Cocoa/NSEventModifierMask.cs | 4 +- .../Platform/MacOS/Cocoa/NSEventType.cs | 4 +- src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs | 8 +- .../MacOS/Cocoa/NSOpenGLContextParameter.cs | 4 +- .../Cocoa/NSOpenGLPixelFormatAttribute.cs | 4 +- .../Platform/MacOS/Cocoa/NSOpenGLProfile.cs | 4 +- .../MacOS/Cocoa/NSTrackingAreaOptions.cs | 4 +- .../Platform/MacOS/Cocoa/NSWindowStyle.cs | 4 +- src/OpenTK/Platform/MacOS/Cocoa/Selector.cs | 2 - src/OpenTK/Platform/MacOS/CocoaContext.cs | 30 +- .../Platform/MacOS/CocoaNativeWindow.cs | 34 +- src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs | 16 +- src/OpenTK/Platform/MacOS/HIDInput.cs | 64 +- src/OpenTK/Platform/MacOS/MacOSException.cs | 4 +- src/OpenTK/Platform/MacOS/MacOSFactory.cs | 11 +- src/OpenTK/Platform/MacOS/MacOSKeyMap.cs | 6 +- src/OpenTK/Platform/MacOS/NS.cs | 3 - .../Platform/MacOS/Quartz/CoreFoundation.cs | 2 - .../Platform/MacOS/Quartz/DisplayServices.cs | 2 - .../Platform/MacOS/Quartz/EventServices.cs | 4 +- .../MacOS/QuartzDisplayDeviceDriver.cs | 70 +- src/OpenTK/Platform/MappedGamePadDriver.cs | 8 +- src/OpenTK/Platform/NativeWindowBase.cs | 16 +- src/OpenTK/Platform/PlatformException.cs | 4 +- src/OpenTK/Platform/PlatformFactoryBase.cs | 10 - src/OpenTK/Platform/SDL2/Sdl2.cs | 37 +- .../Platform/SDL2/Sdl2DisplayDeviceDriver.cs | 12 +- src/OpenTK/Platform/SDL2/Sdl2Factory.cs | 12 +- .../Platform/SDL2/Sdl2GraphicsContext.cs | 20 +- src/OpenTK/Platform/SDL2/Sdl2GraphicsMode.cs | 8 +- src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs | 16 +- .../Platform/SDL2/Sdl2JoystickDriver.cs | 28 +- src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs | 4 +- src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs | 16 +- src/OpenTK/Platform/SDL2/Sdl2Mouse.cs | 16 +- src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs | 18 +- src/OpenTK/Platform/SDL2/Sdl2WindowInfo.cs | 8 +- src/OpenTK/Platform/Utilities.cs | 58 - src/OpenTK/Platform/Windows/API.cs | 1014 ++----------- .../Platform/Windows/Bindings/HidProtocol.cs | 4 +- src/OpenTK/Platform/Windows/Bindings/Wgl.cs | 4 +- src/OpenTK/Platform/Windows/WglHelper.cs | 18 - .../Platform/Windows/WinDisplayDevice.cs | 34 +- src/OpenTK/Platform/Windows/WinFactory.cs | 16 +- src/OpenTK/Platform/Windows/WinGLContext.cs | 69 - src/OpenTK/Platform/Windows/WinGLNative.cs | 151 +- .../Platform/Windows/WinGraphicsMode.cs | 36 +- src/OpenTK/Platform/Windows/WinInputBase.cs | 54 +- src/OpenTK/Platform/Windows/WinKeyMap.cs | 6 +- src/OpenTK/Platform/Windows/WinRawInput.cs | 42 +- src/OpenTK/Platform/Windows/WinRawJoystick.cs | 30 +- src/OpenTK/Platform/Windows/WinRawKeyboard.cs | 22 +- src/OpenTK/Platform/Windows/WinRawMouse.cs | 24 +- src/OpenTK/Platform/Windows/WinWindowInfo.cs | 36 +- src/OpenTK/Platform/Windows/XInputJoystick.cs | 28 +- src/OpenTK/Platform/X11/API.cs | 126 +- src/OpenTK/Platform/X11/Bindings/DL.cs | 4 +- src/OpenTK/Platform/X11/Bindings/Glx.cs | 22 - src/OpenTK/Platform/X11/Bindings/XI.cs | 8 +- src/OpenTK/Platform/X11/Bindings/Xkb.cs | 12 +- src/OpenTK/Platform/X11/Functions.cs | 90 +- src/OpenTK/Platform/X11/X11DisplayDevice.cs | 41 +- src/OpenTK/Platform/X11/X11Factory.cs | 12 +- src/OpenTK/Platform/X11/X11GLContext.cs | 58 +- src/OpenTK/Platform/X11/X11GLNative.cs | 217 +-- src/OpenTK/Platform/X11/X11GraphicsMode.cs | 19 +- src/OpenTK/Platform/X11/X11Input.cs | 12 +- src/OpenTK/Platform/X11/X11KeyMap.cs | 8 +- src/OpenTK/Platform/X11/X11Keyboard.cs | 2 - src/OpenTK/Platform/X11/X11Mouse.cs | 4 +- src/OpenTK/Platform/X11/X11WindowInfo.cs | 34 +- src/OpenTK/Platform/X11/XI2Input.cs | 12 +- src/OpenTK/Platform/X11/XI2MouseKeyboard.cs | 24 +- src/OpenTK/RewrittenAttribute.cs | 4 +- src/OpenTK/SlotAttribute.cs | 4 +- src/OpenTK/Toolkit.cs | 22 +- src/OpenTK/ToolkitOptions.cs | 10 +- src/OpenTK/WindowIcon.cs | 4 +- src/OpenTK/WindowState.cs | 4 +- 329 files changed, 2329 insertions(+), 11479 deletions(-) diff --git a/src/Generator.Bind/BindStreamWriter.cs b/src/Generator.Bind/BindStreamWriter.cs index 985447d2..05629750 100644 --- a/src/Generator.Bind/BindStreamWriter.cs +++ b/src/Generator.Bind/BindStreamWriter.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 Stefanos Apostolopoulos for the Open Toolkit Library // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -24,9 +23,6 @@ // OTHER DEALINGS IN THE SOFTWARE. // - -#endregion - using System; using System.IO; using System.Text.RegularExpressions; @@ -66,7 +62,7 @@ namespace Bind if (indent_level > 0) --indent_level; } - + public void Write(WriteOptions options, string value) { var lines = value.Split(SplitStrings, StringSplitOptions.None); diff --git a/src/Generator.Bind/CSharpSpecWriter.cs b/src/Generator.Bind/CSharpSpecWriter.cs index 5b91f28b..0ca5a7a9 100644 --- a/src/Generator.Bind/CSharpSpecWriter.cs +++ b/src/Generator.Bind/CSharpSpecWriter.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,18 +42,12 @@ namespace Bind IBind Generator { get; set; } Settings Settings { get { return Generator.Settings; } } - #region ISpecWriter Members - public void WriteBindings(IBind generator) { Generator = generator; WriteBindings(generator.Delegates, generator.Wrappers, generator.Enums); } - #endregion - - #region Private Members - private static void ConsoleRewrite(string text) { int left = Console.CursorLeft; @@ -67,8 +59,6 @@ namespace Bind Console.SetCursorPosition(left, top); } - #region WriteBindings - void WriteBindings(DelegateCollection delegates, FunctionCollection wrappers, EnumCollection enums) { Console.WriteLine("Writing bindings to {0}", Settings.OutputPath); @@ -143,10 +133,6 @@ namespace Bind File.Move(temp_wrappers_file, output_wrappers); } - #endregion - - #region WriteWrappers - void WriteWrappers(BindStreamWriter sw, FunctionCollection wrappers, DelegateCollection delegates, EnumCollection enums, IDictionary CSTypes) @@ -163,7 +149,7 @@ namespace Bind sw.WriteLine("partial class {0}", Settings.OutputClass); sw.WriteLine("{"); sw.Indent(); - + // Write constructor sw.WriteLine("static {0}()", Settings.OutputClass); sw.WriteLine("{"); @@ -395,13 +381,9 @@ namespace Bind catch (Exception e) { Console.WriteLine("[Warning] Error documenting function {0}: {1}", f.WrappedDelegate.Name, e.ToString()); - } + } } - #endregion - - #region WriteTypes - public void WriteTypes(BindStreamWriter sw, Dictionary CSTypes) { sw.WriteLine(); @@ -411,10 +393,6 @@ namespace Bind } } - #endregion - - #region WriteConstants - void WriteConstants(BindStreamWriter sw, IEnumerable constants) { // Make sure everything is sorted. This will avoid random changes between @@ -439,10 +417,6 @@ namespace Bind } } - #endregion - - #region WriteEnums - void WriteEnums(BindStreamWriter sw, EnumCollection enums, FunctionCollection wrappers) { //sw.WriteLine("#pragma warning disable 3019"); // CLSCompliant attribute @@ -548,18 +522,12 @@ namespace Bind } } - #endregion - - #region WriteLicense - public void WriteLicense(BindStreamWriter sw) { sw.WriteLine(File.ReadAllText(Path.Combine(Settings.InputPath, Settings.LicenseFile))); sw.WriteLine(); } - #endregion - // For example, if parameter foo has indirection level = 1, then it // is consumed as 'foo*' in the fixed_statements and the call string. readonly static string[] pointer_levels = new string[] { "", "*", "**", "***", "****" }; @@ -757,7 +725,5 @@ namespace Bind pointer_levels[type.Pointer], array_levels[type.Array]); } - - #endregion } } diff --git a/src/Generator.Bind/EnumProcessor.cs b/src/Generator.Bind/EnumProcessor.cs index b1f65c93..f082f332 100644 --- a/src/Generator.Bind/EnumProcessor.cs +++ b/src/Generator.Bind/EnumProcessor.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -87,8 +85,6 @@ namespace Bind return path.ToString(); } - #region Private Members - EnumCollection ProcessNames(EnumCollection enums, XPathNavigator nav, string apiname) { EnumCollection processed_enums = new EnumCollection(); @@ -210,7 +206,7 @@ namespace Bind is_after_underscore_or_number = false; } - // First letter should always be uppercase in order + // First letter should always be uppercase in order // to conform to .Net style guidelines. translator[0] = Char.ToUpper(translator[0]); @@ -420,7 +416,5 @@ namespace Bind } return is_number; } - - #endregion } } diff --git a/src/Generator.Bind/FuncProcessor.cs b/src/Generator.Bind/FuncProcessor.cs index 72e31227..77a8890d 100644 --- a/src/Generator.Bind/FuncProcessor.cs +++ b/src/Generator.Bind/FuncProcessor.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 Stefanos Apostolopoulos for the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -141,8 +139,6 @@ namespace Bind return wrappers; } - #region Private Members - void GenerateDocumentation(FunctionCollection wrappers, EnumProcessor enum_processor, DocProcessor doc_processor) { @@ -163,7 +159,7 @@ namespace Bind // - Core functions get a slot, unless UseDllImports is enabled // - On Windows, core functions with version > 1.1 must be treated as extensions. // This is controlled via the UseWindowsCompatibleGL setting. - // Entry points without a slot are assigned the magic slot index -1. + // Entry points without a slot are assigned the magic slot index -1. // Generator.Rewrite detects this and generates a static DllImport call // instead of a calli instruction for these functions. @@ -189,7 +185,7 @@ namespace Bind } } } - + // When we have a list of overloaded delegates, make sure that // all generated wrappers use the first (original) delegate, not // the overloaded ones. This allows us to reduce the amount @@ -816,7 +812,7 @@ namespace Bind // (from list in collection // from w1 in list.Value // from w2 in list.Value - // where + // where // w1.TrimmedName == w2.TrimmedName && // w1.Parameters.Count == w2.Parameters.Count && // ParametersDifferOnlyInReference(w1.Parameters, w2.Parameters) @@ -1203,7 +1199,7 @@ namespace Bind } else { - p.QualifiedType = "String"; + p.QualifiedType = "String"; } } @@ -1248,7 +1244,5 @@ namespace Bind func.ReturnType.QualifiedType = "bool"; } } - - #endregion } } diff --git a/src/Generator.Bind/GL2/GL2Generator.cs b/src/Generator.Bind/GL2/GL2Generator.cs index 26e0fe92..3d00fc82 100644 --- a/src/Generator.Bind/GL2/GL2Generator.cs +++ b/src/Generator.Bind/GL2/GL2Generator.cs @@ -1,4 +1,3 @@ -#region License // // GL2Generator.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.IO; diff --git a/src/Generator.Bind/GL2/GL4Generator.cs b/src/Generator.Bind/GL2/GL4Generator.cs index b5130ea1..d40aa425 100644 --- a/src/Generator.Bind/GL2/GL4Generator.cs +++ b/src/Generator.Bind/GL2/GL4Generator.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/Generator.Bind/GL2/Generator.cs b/src/Generator.Bind/GL2/Generator.cs index 6da30cd5..4c2b0186 100644 --- a/src/Generator.Bind/GL2/Generator.cs +++ b/src/Generator.Bind/GL2/Generator.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -20,8 +18,6 @@ namespace Bind.GL2 { abstract class Generator : IBind { - #region Fields - protected string glTypemap = "GL2/gl.tm"; protected string csTypemap = "csharp.tm"; protected string enumSpec = "GL2/enum.spec"; @@ -56,10 +52,6 @@ namespace Bind.GL2 public Settings Settings { get; protected set; } - #endregion - - #region Constructors - public Generator(Settings settings) { if (settings == null) @@ -86,10 +78,6 @@ namespace Bind.GL2 SpecReader = new XmlSpecReader(Settings); } - #endregion - - #region Private Members - IEnumerable GetFiles(string path) { path = Path.Combine(Settings.InputPath, path); @@ -107,10 +95,6 @@ namespace Bind.GL2 } } - #endregion - - #region IBind Members - public DelegateCollection Delegates { get; private set; } public EnumCollection Enums { get; private set; } public FunctionCollection Wrappers { get; private set; } @@ -146,7 +130,5 @@ namespace Bind.GL2 Wrappers = func_processor.Process(enum_processor, doc_processor, Delegates, Enums, Profile, Version); } - - #endregion } } diff --git a/src/Generator.Bind/IBind.cs b/src/Generator.Bind/IBind.cs index 07e5215d..3b0bbc6d 100644 --- a/src/Generator.Bind/IBind.cs +++ b/src/Generator.Bind/IBind.cs @@ -1,8 +1,6 @@ -#region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos +/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using Bind.Structures; using System.Collections.Generic; diff --git a/src/Generator.Bind/ISpecReader.cs b/src/Generator.Bind/ISpecReader.cs index 66e8d959..884401f8 100644 --- a/src/Generator.Bind/ISpecReader.cs +++ b/src/Generator.Bind/ISpecReader.cs @@ -1,8 +1,6 @@ -#region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos +/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System.Collections.Generic; using System.IO; diff --git a/src/Generator.Bind/Main.cs b/src/Generator.Bind/Main.cs index e578ee5b..72a0114a 100644 --- a/src/Generator.Bind/Main.cs +++ b/src/Generator.Bind/Main.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -52,7 +50,7 @@ namespace Bind Assembly.GetExecutingAssembly().GetName().Version.ToString()); Console.WriteLine("For comments, bugs and suggestions visit http://github.com/opentk/opentk"); Console.WriteLine(); - + try { var split = new Regex(@"-\w+", RegexOptions.Compiled); @@ -172,11 +170,11 @@ namespace Bind case GeneratorMode.ES10: Generators.Add(new ESGenerator(Settings)); break; - + case GeneratorMode.ES11: Generators.Add(new ESGenerator(Settings)); break; - + case GeneratorMode.ES20: Generators.Add(new ES2Generator(Settings)); break; @@ -192,7 +190,7 @@ namespace Bind case GeneratorMode.CL10: Generators.Add(new CLGenerator(Settings)); break; - + default: Console.WriteLine("Please specify a generator mode (use '-mode:gl2/gl4/es10/es11/es20/es30')"); return; @@ -212,7 +210,7 @@ namespace Bind Console.WriteLine(); Console.WriteLine("Bindings generated in {0} seconds.", ticks / (double)10000000.0); } - + Console.WriteLine(); if (Debugger.IsAttached) { diff --git a/src/Generator.Bind/Settings.cs b/src/Generator.Bind/Settings.cs index 49a42ecc..f52e51b9 100644 --- a/src/Generator.Bind/Settings.cs +++ b/src/Generator.Bind/Settings.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -74,8 +72,8 @@ namespace Bind normalEnumsClassOverride; } } - - public string AuxEnumsClass + + public string AuxEnumsClass { get { return GLClass + NamespaceSeparator + NestedEnumsClass; } } @@ -198,11 +196,11 @@ namespace Bind /// True if multiple tokens should be dropped (e.g. FooARB, FooEXT and FooSGI). public bool DropMultipleTokens - { - get { return (Compatibility & Legacy.NoDropMultipleTokens) == Legacy.None; } + { + get { return (Compatibility & Legacy.NoDropMultipleTokens) == Legacy.None; } set { if (value) Compatibility |= Legacy.NoDropMultipleTokens; else Compatibility &= ~Legacy.NoDropMultipleTokens; } } - + public string WindowsGDI = "OpenTK.Platform.Windows.API"; public Settings Clone() diff --git a/src/Generator.Bind/Structures/Constant.cs b/src/Generator.Bind/Structures/Constant.cs index a3f891a0..ece8db6a 100644 --- a/src/Generator.Bind/Structures/Constant.cs +++ b/src/Generator.Bind/Structures/Constant.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Diagnostics; @@ -15,12 +13,10 @@ namespace Bind.Structures /// /// Represents an opengl constant in C# format. Both the constant name and value /// can be retrieved or set. The value can be either a number, another constant - /// or an alias to a constant + /// or an alias to a constant /// class Constant : IComparable { - #region PreviousName - string original_name; // Gets the name prior to translation. @@ -30,10 +26,6 @@ namespace Bind.Structures private set { original_name = value; } } - #endregion - - #region public string Name - string _name; /// @@ -43,7 +35,7 @@ namespace Bind.Structures public string Name { get { return _name; } - set + set { if (String.IsNullOrEmpty(value)) throw new ArgumentNullException("value"); @@ -55,10 +47,6 @@ namespace Bind.Structures } } - #endregion - - #region public string Value - string _value; /// @@ -79,10 +67,6 @@ namespace Bind.Structures } } - #endregion - - #region public string Reference - string _reference; /// @@ -98,10 +82,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool Unchecked - public bool Unchecked { get @@ -111,14 +91,10 @@ namespace Bind.Structures string test = Value; return UInt64.TryParse(test.ToLower().Replace("0x", String.Empty), NumberStyles.AllowHexSpecifier, null, out number) && - number > Int32.MaxValue; + number > Int32.MaxValue; } } - #endregion - - #region Constructors - /// /// Creates an empty Constant. /// @@ -137,8 +113,6 @@ namespace Bind.Structures Value = value; } - #endregion - /// /// Replces the Value of the given constant with the value referenced by the [c.Reference, c.Value] pair. /// @@ -192,8 +166,6 @@ namespace Bind.Structures return true; } - #region ToString - public override string ToString() { return @@ -204,10 +176,6 @@ namespace Bind.Structures Value); } - #endregion - - #region IComparable Members - public int CompareTo(Constant other) { int ret = Value.CompareTo(other.Value); @@ -215,7 +183,5 @@ namespace Bind.Structures return Name.CompareTo(other.Name); return ret; } - - #endregion } } diff --git a/src/Generator.Bind/Structures/Delegate.cs b/src/Generator.Bind/Structures/Delegate.cs index 61f290b9..0bc48734 100644 --- a/src/Generator.Bind/Structures/Delegate.cs +++ b/src/Generator.Bind/Structures/Delegate.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -30,11 +28,9 @@ namespace Bind.Structures // Add a trailing v to functions matching this regex. Used to differntiate between overloads taking both // a 'type' and a 'ref type' (such overloads are not CLS Compliant). - // The default Regex matches no functions. Create a new Regex in Bind.Generator classes to override the default behavior. + // The default Regex matches no functions. Create a new Regex in Bind.Generator classes to override the default behavior. internal static Regex endingsAddV = new Regex("^0", RegexOptions.Compiled); - #region --- Constructors --- - public Delegate() { Parameters = new ParameterCollection(); @@ -57,12 +53,6 @@ namespace Bind.Structures Slot = d.Slot; } - #endregion - - #region --- Properties --- - - #region public bool CLSCompliant - /// /// Gets the CLSCompliant property. True if the delegate is not CLSCompliant. /// @@ -92,10 +82,6 @@ namespace Bind.Structures } } - #endregion - - #region public string Category - private string _category; public string Category @@ -104,10 +90,6 @@ namespace Bind.Structures set { _category = value; } } - #endregion - - #region public bool NeedsWrapper - /// /// Gets a value that indicates whether this function needs to be wrapped with a Marshaling function. /// This flag is set if a function contains an Array parameter, or returns @@ -132,10 +114,6 @@ namespace Bind.Structures } } - #endregion - - #region public virtual bool Unsafe - /// /// True if the delegate must be declared as 'unsafe'. /// @@ -163,10 +141,6 @@ namespace Bind.Structures } } - #endregion - - #region public Parameter ReturnType - Type _return_type = new Type(); /// /// Gets or sets the return value of the opengl function. @@ -180,10 +154,6 @@ namespace Bind.Structures } } - #endregion - - #region public virtual string Name - string _name; /// /// Gets or sets the name of the opengl function. @@ -200,10 +170,6 @@ namespace Bind.Structures } } - #endregion - - #region public ParameterCollection Parameters - ParameterCollection _parameters; public ParameterCollection Parameters @@ -212,10 +178,6 @@ namespace Bind.Structures set { _parameters = value; } } - #endregion - - #region public string Version - string _version; /// @@ -227,18 +189,12 @@ namespace Bind.Structures set { _version = value; } } - #endregion - - #region public bool Extension - public string Extension { get; set; } - #endregion - public bool Deprecated { get; set; } public string DeprecatedVersion { get; set; } public string EntryPoint { get; set; } @@ -247,8 +203,6 @@ namespace Bind.Structures // Slot index in the address table public int Slot { get; set; } - #endregion - // This method should only be used for debugging purposes, not for code generation! // Returns a string representing the full delegate declaration without decorations. // (ie "(unsafe) void delegate glXxxYyy(int a, float b, IntPtr c)" @@ -266,8 +220,6 @@ namespace Bind.Structures return sb.ToString(); } - #region IComparable Members - public int CompareTo(Delegate other) { int ret = Name.CompareTo(other.Name); @@ -278,10 +230,6 @@ namespace Bind.Structures return ret; } - #endregion - - #region IEquatable Members - public bool Equals(Delegate other) { return @@ -289,12 +237,8 @@ namespace Bind.Structures Parameters.Equals(other.Parameters) && ReturnType.Equals(other.ReturnType); } - - #endregion } - #region DelegateCollection - class DelegateCollection : IDictionary> { readonly SortedDictionary> Delegates = @@ -348,8 +292,6 @@ namespace Bind.Structures } } - #region IDictionary Members - public void Add(string key, List value) { Delegates.Add(key, value.ToList()); @@ -398,10 +340,6 @@ namespace Bind.Structures } } - #endregion - - #region ICollection implementation - public void Add(KeyValuePair> item) { Delegates.Add(item.Key, item.Value.ToList()); @@ -443,26 +381,14 @@ namespace Bind.Structures } } - #endregion - - #region IEnumerable implementation - public IEnumerator>> GetEnumerator() { return Delegates.GetEnumerator(); } - #endregion - - #region IEnumerable implementation - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { return Delegates.GetEnumerator(); } - - #endregion } - - #endregion } diff --git a/src/Generator.Bind/Structures/Documentation.cs b/src/Generator.Bind/Structures/Documentation.cs index 3be81b9c..c84dcdc5 100644 --- a/src/Generator.Bind/Structures/Documentation.cs +++ b/src/Generator.Bind/Structures/Documentation.cs @@ -1,5 +1,4 @@ -#region License -// +// // Documentation.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/Generator.Bind/Structures/Enum.cs b/src/Generator.Bind/Structures/Enum.cs index 85c79cea..4f8831d0 100644 --- a/src/Generator.Bind/Structures/Enum.cs +++ b/src/Generator.Bind/Structures/Enum.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -13,8 +11,6 @@ using System.Xml.XPath; namespace Bind.Structures { - #region class Enum - class Enum { string _name, _type; @@ -52,7 +48,7 @@ namespace Bind.Structures { if (value == null) throw new ArgumentNullException("value"); - + _constant_collection.Clear(); foreach (var item in value) { @@ -81,10 +77,6 @@ namespace Bind.Structures public bool CLSCompliant { get; set; } } - #endregion - - #region class EnumCollection - class EnumCollection : IDictionary { SortedDictionary Enumerations = new SortedDictionary(); @@ -98,12 +90,12 @@ namespace Bind.Structures int ret = PreferEmpty(ext1, ext2); if (ret != 0) return ret; - + ext1 = ext1.Replace("Arb", ""); ext2 = ext2.Replace("Arb", ""); ret = PreferEmpty(ext1, ext2); if (ret != 0) return ret; - + ext1 = ext1.Replace("Ext", ""); ext2 = ext2.Replace("Ext", ""); return PreferEmpty(ext1, ext2); } @@ -119,8 +111,6 @@ namespace Bind.Structures return 0; } - #region Public Members - public void Add(Enum e) { Add(e.Name, e); @@ -134,10 +124,6 @@ namespace Bind.Structures } } - #endregion - - #region IDictionary Members - public void Add(string key, Enum value) { if (ContainsKey(key)) @@ -235,9 +221,5 @@ namespace Bind.Structures { return Enumerations.GetEnumerator(); } - - #endregion } - - #endregion } diff --git a/src/Generator.Bind/Structures/FlowDirection.cs b/src/Generator.Bind/Structures/FlowDirection.cs index 33291563..2d02dd8a 100644 --- a/src/Generator.Bind/Structures/FlowDirection.cs +++ b/src/Generator.Bind/Structures/FlowDirection.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion namespace Bind.Structures { diff --git a/src/Generator.Bind/Structures/Function.cs b/src/Generator.Bind/Structures/Function.cs index f49f3cb0..50a98e9b 100644 --- a/src/Generator.Bind/Structures/Function.cs +++ b/src/Generator.Bind/Structures/Function.cs @@ -1,8 +1,6 @@ -#region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos +/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -14,14 +12,8 @@ namespace Bind.Structures { class Function : Delegate, IEquatable, IComparable { - #region Fields - Delegate wrapped_delegate; - #endregion - - #region --- Constructors --- - public Function(Delegate d) : base(d) { @@ -42,20 +34,12 @@ namespace Bind.Structures Body.AddRange(f.Body); } - #endregion - - #region public Delegate WrappedDelegate - public Delegate WrappedDelegate { get { return wrapped_delegate; } set { wrapped_delegate = value; } } - #endregion - - #region public void TurnVoidPointersToIntPtr() - public void TurnVoidPointersToIntPtr() { foreach (Parameter p in Parameters) @@ -68,10 +52,6 @@ namespace Bind.Structures } } - #endregion - - #region public override bool Unsafe - public override bool Unsafe { get @@ -80,10 +60,6 @@ namespace Bind.Structures } } - #endregion - - #region public FunctionBody Body - FunctionBody _body; public FunctionBody Body @@ -92,22 +68,10 @@ namespace Bind.Structures set { _body = value; } } - #endregion - - #region public string TrimmedName - public string TrimmedName { get; set; } - #endregion - - #region Documentation - public Documentation Documentation { get; set; } - #endregion - - #region ToString - public override string ToString() { return String.Format("{0} {1}{2}", @@ -116,10 +80,6 @@ namespace Bind.Structures Parameters); } - #endregion - - #region IEquatable Members - public bool Equals(Function other) { bool result = @@ -129,10 +89,6 @@ namespace Bind.Structures return result; } - #endregion - - #region IComparable Members - public int CompareTo(Function other) { int ret = Name.CompareTo(other.Name); @@ -142,12 +98,8 @@ namespace Bind.Structures ret = ReturnType.CompareTo(other.ReturnType); return ret; } - - #endregion } - #region class FunctionBody : List - public class FunctionBody : List { public FunctionBody() @@ -208,10 +160,6 @@ namespace Bind.Structures } } - #endregion - - #region class FunctionCollection : SortedDictionary> - class FunctionCollection : SortedDictionary> { Regex unsignedFunctions = new Regex(@".+(u[dfisb]v?)", RegexOptions.Compiled); @@ -276,6 +224,4 @@ namespace Bind.Structures } } } - - #endregion } diff --git a/src/Generator.Bind/Structures/Parameter.cs b/src/Generator.Bind/Structures/Parameter.cs index 762812a4..d2d1d9db 100644 --- a/src/Generator.Bind/Structures/Parameter.cs +++ b/src/Generator.Bind/Structures/Parameter.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -19,8 +17,6 @@ namespace Bind.Structures { string cache; - #region Constructors - /// /// Creates a new Parameter without type and name. /// @@ -49,10 +45,6 @@ namespace Bind.Structures //this.rebuild = false; } - #endregion - - #region RawName - /// /// Gets or sets the raw name of the parameter. /// @@ -62,10 +54,6 @@ namespace Bind.Structures private set; } - #endregion - - #region Name - /// /// Gets the name of the parameter. If the name matches a keyword of the current language, /// then it is escaped with . @@ -90,10 +78,6 @@ namespace Bind.Structures } } - #endregion - - #region UnmanagedType - UnmanagedType _unmanaged_type; /// /// Gets or sets the name of the parameter. @@ -110,10 +94,6 @@ namespace Bind.Structures } } - #endregion - - #region public FlowDirection Flow - FlowDirection _flow; /// @@ -131,10 +111,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool NeedsPin - public bool NeedsPin { get @@ -144,10 +120,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool Unchecked - private bool _unchecked; public bool Unchecked @@ -162,10 +134,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool Generic - bool generic; public bool Generic { @@ -173,10 +141,6 @@ namespace Bind.Structures set { generic = value; } } - #endregion - - #region public bool DiffersOnlyOnReference - // Returns true if this parameter differs only on reference compared to another parameter, i.e: // returns true for 'int' & 'ref int' // returns true for 'ref float' & 'float' @@ -191,10 +155,6 @@ namespace Bind.Structures other.Reference && !(Reference || Array > 0 || Pointer != 0)); } - #endregion - - #region public string ComputeSize - string computeSize; public string ComputeSize { @@ -202,20 +162,13 @@ namespace Bind.Structures set { computeSize = value; } } - #endregion - - #region Static Members - // Returns the FlowDirection that matches the specified string // ("out" or "in", otherwise undefined). public static FlowDirection GetFlowDirection(string direction) { return direction == "out" ? FlowDirection.Out : direction == "in" ? FlowDirection.In : FlowDirection.Undefined; } - - #endregion - #region IComparable Members public int CompareTo(Parameter other) { @@ -225,24 +178,16 @@ namespace Bind.Structures return result; } - #endregion - - #region ToString - public override string ToString() { return String.Format("{2}{0} {1}", base.ToString(), Name, - Reference ? + Reference ? Flow == FlowDirection.Out ? "out " : "ref " : String.Empty); } - #endregion - - #region IEquatable Members - public bool Equals(Parameter other) { bool result = @@ -251,8 +196,6 @@ namespace Bind.Structures return result; } - - #endregion } /// @@ -270,8 +213,6 @@ namespace Bind.Structures public bool Rebuild { get; set; } Settings Settings { get; set; } - #region Constructors - public ParameterCollection() { } @@ -290,20 +231,12 @@ namespace Bind.Structures Add(new Parameter(p)); } - #endregion - - #region BuildCache - void BuildCache() { BuildReferenceAndPointerParametersCache(); Rebuild = false; } - #endregion - - #region public bool HasPointerParameters - public bool HasPointerParameters { get @@ -317,10 +250,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool HasReferenceParameters - public bool HasReferenceParameters { get @@ -334,10 +263,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool HasUnsignedParameters - public bool HasUnsignedParameters { get @@ -351,10 +276,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool HasGenericParameters - public bool HasGenericParameters { get @@ -367,10 +288,7 @@ namespace Bind.Structures return hasGenericParameters; } } - - #endregion - #region void BuildReferenceAndPointerParametersCache() void BuildReferenceAndPointerParametersCache() { @@ -390,10 +308,6 @@ namespace Bind.Structures } } - #endregion - - #region ToString - // Only use for debugging, not for code generation! public override string ToString() { @@ -414,10 +328,6 @@ namespace Bind.Structures return sb.ToString(); } - #endregion - - #region ContainsType - public bool ContainsType(string type) { foreach (Parameter p in this) @@ -426,10 +336,6 @@ namespace Bind.Structures return false; } - #endregion - - #region IList Members - public void Add(Parameter p) { Parameters.Add(p); @@ -511,10 +417,6 @@ namespace Bind.Structures } } - #endregion - - #region IComparable Members - public int CompareTo(ParameterCollection other) { if (Count < other.Count) @@ -537,10 +439,6 @@ namespace Bind.Structures } } - #endregion - - #region IEquatable Members - public bool Equals(ParameterCollection other) { if (Count != other.Count) @@ -553,7 +451,5 @@ namespace Bind.Structures } return result; } - - #endregion } } diff --git a/src/Generator.Bind/Structures/Type.cs b/src/Generator.Bind/Structures/Type.cs index 46894a8b..24da4202 100644 --- a/src/Generator.Bind/Structures/Type.cs +++ b/src/Generator.Bind/Structures/Type.cs @@ -1,8 +1,6 @@ -#region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos +/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -17,8 +15,6 @@ namespace Bind.Structures string current_qualifier = String.Empty; string previous_qualifier = String.Empty; - #region --- Constructors --- - public Type() { } @@ -39,10 +35,6 @@ namespace Bind.Structures } } - #endregion - - #region Private Members - string CurrentQualifier { get { return current_qualifier; } @@ -55,10 +47,6 @@ namespace Bind.Structures set { previous_qualifier = value; } } - #endregion - - #region Public Members - public string QualifiedType { get @@ -87,8 +75,6 @@ namespace Bind.Structures } } - #region public string CurrentType - string type; /// /// Gets the type of the parameter. @@ -117,10 +103,6 @@ namespace Bind.Structures } } - #endregion - - #region public string PreviousType - private string _previous_type; public string PreviousType @@ -129,10 +111,6 @@ namespace Bind.Structures private set { _previous_type = value; } } - #endregion - - #region public bool Reference - bool reference; public bool Reference @@ -141,10 +119,6 @@ namespace Bind.Structures set { reference = value; } } - #endregion - - #region public int Array - int array; public int Array @@ -153,10 +127,6 @@ namespace Bind.Structures set { array = value > 0 ? value : 0; } } - #endregion - - #region public int ElementCount - int element_count; // If the type is an array and ElementCount > 0, then ElemenCount defines the expected array length. @@ -166,10 +136,6 @@ namespace Bind.Structures set { element_count = value > 0 ? value : 0; } } - #endregion - - #region public int Pointer - int pointer; public int Pointer @@ -178,12 +144,9 @@ namespace Bind.Structures set { pointer = value > 0 ? value : 0; } } - #endregion - // Set to true if parameter is an enum. public bool IsEnum { get; set; } - - #region public bool CLSCompliant + public bool CLSCompliant { @@ -238,10 +201,6 @@ namespace Bind.Structures } } - #endregion - - #region public bool Unsigned - public bool Unsigned { get @@ -250,10 +209,6 @@ namespace Bind.Structures } } - #endregion - - #region public WrapperTypes WrapperType - private WrapperTypes _wrapper_type = WrapperTypes.None; public WrapperTypes WrapperType @@ -262,10 +217,6 @@ namespace Bind.Structures set { _wrapper_type = value; } } - #endregion - - #region public override string ToString() - static readonly string[] PointerLevels = { "", @@ -292,12 +243,6 @@ namespace Bind.Structures ArrayLevels[Array]); } - #endregion - - #endregion - - #region IComparable Members - public int CompareTo(Type other) { // Make sure that Pointer parameters are sorted last to avoid bug [#1098]. @@ -322,10 +267,6 @@ namespace Bind.Structures return result; } - #endregion - - #region IEquatable Members - public bool Equals(Type other) { bool result = @@ -341,7 +282,5 @@ namespace Bind.Structures // redefinition errors in the generated bindings. return result; } - - #endregion } } diff --git a/src/Generator.Bind/Utilities.cs b/src/Generator.Bind/Utilities.cs index 993513e6..b6ea621f 100644 --- a/src/Generator.Bind/Utilities.cs +++ b/src/Generator.Bind/Utilities.cs @@ -1,8 +1,6 @@ -#region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos +/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -15,8 +13,6 @@ using Enum=Bind.Structures.Enum; namespace Bind { - #region WrapperTypes enum - [Flags] public enum WrapperTypes { @@ -96,8 +92,6 @@ namespace Bind SizeParameter = 1 << 14, } - #endregion - static class Utilities { public static readonly char[] Separators = { ' ', '\n', ',', '(', ')', ';', '#' }; @@ -111,7 +105,7 @@ namespace Bind // You have been warned. static List extension_names = new List { - "SGI", "SGIS", "SGIX", "IBM", "AMD", "INTEL", + "SGI", "SGIS", "SGIX", "IBM", "AMD", "INTEL", }; public static void AddExtensions(IEnumerable extensions) @@ -149,8 +143,6 @@ namespace Bind } } - #region internal StreamReader OpenSpecFile(string file) - internal static StreamReader OpenSpecFile(string folder, string file) { if (String.IsNullOrEmpty(folder) || String.IsNullOrEmpty(file)) @@ -163,10 +155,6 @@ namespace Bind return new StreamReader(path); } - #endregion - - #region Keywords - public static readonly List CSharpKeywords = new List( new string[] { @@ -193,10 +181,6 @@ namespace Bind } ); - #endregion - - #region Merge - // Merges the specified enum collections. internal static void Merge(EnumCollection enums, EnumCollection new_enums) { @@ -245,7 +229,7 @@ namespace Bind else { // Tried to add a constant that already exists. If one constant - // is like: 'Foo = 0x5' and the other like: 'Foo = Bar.Foo', then + // is like: 'Foo = 0x5' and the other like: 'Foo = Bar.Foo', then // keep the first one. if (!String.IsNullOrEmpty(s.ConstantCollection[t.Name].Reference)) { @@ -256,10 +240,6 @@ namespace Bind return s; } - #endregion - - #region internal static string GetGL2Extension(string name) - internal static string GetGL2Extension(string name) { return GetExtension(name, false); @@ -286,26 +266,16 @@ namespace Bind } } - #endregion - - #region private static bool IsGL2Extension(string function) - private static bool IsGL2Extension(string function) { return !String.IsNullOrEmpty(GetGL2Extension(function)); } - #endregion - - #region internal static string StripGL2Extension(string p) - internal static string StripGL2Extension(string p) { return p.Substring(0, p.Length - GetGL2Extension(p).Length); } - #endregion - public static bool RequiresSlot(this Delegate d, Settings settings) { double version; diff --git a/src/Generator.Bind/XmlSpecReader.cs b/src/Generator.Bind/XmlSpecReader.cs index bc16062f..77066558 100644 --- a/src/Generator.Bind/XmlSpecReader.cs +++ b/src/Generator.Bind/XmlSpecReader.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 Stefanos Apostolopoulos for the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -43,8 +41,6 @@ namespace Bind { Settings Settings { get; set; } - #region Constructors - public XmlSpecReader(Settings settings) { if (settings == null) @@ -52,10 +48,6 @@ namespace Bind Settings = settings; } - #endregion - - #region ISpecReader Members - public void ReadDelegates(string file, DelegateCollection delegates, string apiname, string apiversions) { var specs = new XPathDocument(file); @@ -214,10 +206,6 @@ namespace Bind } } - #endregion - - #region Private Members - static void GetSignaturePaths(string apiname, string apiversion, out string xpath_add, out string xpath_delete) { xpath_add = "/signatures/add"; @@ -230,7 +218,7 @@ namespace Bind "(contains(concat('|', @version, '|'), '|{1}|') or not(boolean(@version)))]", apiname, apiversion); - xpath_add += match; + xpath_add += match; xpath_delete += match; } else if (!String.IsNullOrEmpty(apiname)) @@ -312,7 +300,7 @@ namespace Bind } } } - + p.ComputeSize = param.GetAttribute("count", String.Empty).Trim(); if (p.ComputeSize.StartsWith("COMPSIZE")) { @@ -466,7 +454,5 @@ restart: Utilities.Merge(enums, all); return enums; } - - #endregion } } diff --git a/src/Generator.Converter/GLXmlParser.cs b/src/Generator.Converter/GLXmlParser.cs index 3798f969..ccd6b2b5 100644 --- a/src/Generator.Converter/GLXmlParser.cs +++ b/src/Generator.Converter/GLXmlParser.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -67,7 +65,7 @@ namespace OpenTK.Convert else elements[key].Add(e.Elements()); } - + return elements.Values; } @@ -254,7 +252,7 @@ namespace OpenTK.Convert { var category = TrimName(feature.Attribute("name").Value); var apinames = GetApiNames(feature); - + var version = (feature.Attribute("number") != null ? feature.Attribute("number").Value : "") .Split('|'); @@ -418,7 +416,7 @@ namespace OpenTK.Convert // - void glGetSharpenTexFuncSGIS // -> void // - const GLubyte *glGetString - // -> String + // -> String // Note: group attribute takes precedence if it exists. This matches the old .spec file format. // Parameter types: // - GLenum shadertype diff --git a/src/Generator.Converter/Options.cs b/src/Generator.Converter/Options.cs index bd7ab1bd..8f263a84 100644 --- a/src/Generator.Converter/Options.cs +++ b/src/Generator.Converter/Options.cs @@ -159,32 +159,23 @@ namespace Mono.Options this.c = c; } - #region ICollection - void ICollection.CopyTo (Array array, int index) {(values as ICollection).CopyTo (array, index);} + void ICollection.CopyTo (Array array, int index) {(values as ICollection).CopyTo (array, index);} bool ICollection.IsSynchronized {get {return (values as ICollection).IsSynchronized;}} object ICollection.SyncRoot {get {return (values as ICollection).SyncRoot;}} - #endregion - #region ICollection - public void Add (string item) {values.Add (item);} + public void Add (string item) {values.Add (item);} public void Clear () {values.Clear ();} public bool Contains (string item) {return values.Contains (item);} public void CopyTo (string[] array, int arrayIndex) {values.CopyTo (array, arrayIndex);} public bool Remove (string item) {return values.Remove (item);} public int Count {get {return values.Count;}} public bool IsReadOnly {get {return false;}} - #endregion - #region IEnumerable - IEnumerator IEnumerable.GetEnumerator () {return values.GetEnumerator ();} - #endregion + IEnumerator IEnumerable.GetEnumerator () {return values.GetEnumerator ();} - #region IEnumerable - public IEnumerator GetEnumerator () {return values.GetEnumerator ();} - #endregion + public IEnumerator GetEnumerator () {return values.GetEnumerator ();} - #region IList - int IList.Add (object value) {return (values as IList).Add (value);} + int IList.Add (object value) {return (values as IList).Add (value);} bool IList.Contains (object value) {return (values as IList).Contains (value);} int IList.IndexOf (object value) {return (values as IList).IndexOf (value);} void IList.Insert (int index, object value) {(values as IList).Insert (index, value);} @@ -192,10 +183,8 @@ namespace Mono.Options void IList.RemoveAt (int index) {(values as IList).RemoveAt (index);} bool IList.IsFixedSize {get {return false;}} object IList.this [int index] {get {return this [index];} set {(values as IList)[index] = value;}} - #endregion - #region IList - public int IndexOf (string item) {return values.IndexOf (item);} + public int IndexOf (string item) {return values.IndexOf (item);} public void Insert (int index, string item) {values.Insert (index, item);} public void RemoveAt (int index) {values.RemoveAt (index);} @@ -221,7 +210,6 @@ namespace Mono.Options values [index] = value; } } - #endregion public List ToList () { diff --git a/src/OpenTK.GLControl/Agl.cs b/src/OpenTK.GLControl/Agl.cs index b56d1a5e..0ba69409 100644 --- a/src/OpenTK.GLControl/Agl.cs +++ b/src/OpenTK.GLControl/Agl.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion // Created by Erik Ylvisaker on 3/17/08. @@ -344,7 +342,6 @@ namespace OpenTK.Platform.MacOS /* ** Current state functions */ - #region --- aglSetCurrentContext --- [DllImport(agl,EntryPoint="aglSetCurrentContext")] static extern byte _aglSetCurrentContext(AGLContext ctx); internal static bool aglSetCurrentContext(IntPtr context) @@ -357,8 +354,6 @@ namespace OpenTK.Platform.MacOS return false; } - #endregion - [DllImport(agl)] internal static extern AGLContext aglGetCurrentContext(); diff --git a/src/OpenTK.GLControl/AglContext.cs b/src/OpenTK.GLControl/AglContext.cs index ee2a834f..6d807d9e 100644 --- a/src/OpenTK.GLControl/AglContext.cs +++ b/src/OpenTK.GLControl/AglContext.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion // Created by Erik Ylvisaker on 3/17/08. @@ -201,8 +199,6 @@ namespace OpenTK.Platform.MacOS function, err, Agl.ErrorString(err))); } - #region IGraphicsContext Members - bool firstSwap = true; public void SwapBuffers() { @@ -311,10 +307,6 @@ namespace OpenTK.Platform.MacOS } } - #endregion - - #region IDisposable Members - ~AglContext() { Dispose(false); @@ -363,10 +355,6 @@ namespace OpenTK.Platform.MacOS disposed = true; } - #endregion - - #region IGraphicsContextInternal Members - public IntPtr GetAddress(string function) { return NS.GetAddress(function); @@ -392,7 +380,5 @@ namespace OpenTK.Platform.MacOS return Handle; } } - - #endregion } } diff --git a/src/OpenTK.GLControl/AglGraphicsMode.cs b/src/OpenTK.GLControl/AglGraphicsMode.cs index 786df4a1..764c5e9c 100644 --- a/src/OpenTK.GLControl/AglGraphicsMode.cs +++ b/src/OpenTK.GLControl/AglGraphicsMode.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -58,8 +56,6 @@ namespace OpenTK.Platform.MacOS return GetGraphicsModeFromPixelFormat(pixelformat); } - #region Internal Members - static bool RelaxGraphicsMode(ref ColorFormat color, ref int depth, ref int stencil, ref int samples, ref ColorFormat accum, ref int buffers, ref bool stereo) { // Parameters are relaxed in order of importance. @@ -157,7 +153,7 @@ namespace OpenTK.Platform.MacOS List attribs = new List(); Debug.Print("Bits per pixel: {0}", color.BitsPerPixel); - + if (color.BitsPerPixel > 0) { if (!color.IsIndexed) @@ -224,7 +220,5 @@ namespace OpenTK.Platform.MacOS IntPtr pixelformat = Agl.aglChoosePixelFormat(IntPtr.Zero, 0, attribs.ToArray()); return pixelformat; } - - #endregion } } diff --git a/src/OpenTK.GLControl/CarbonGLControl.cs b/src/OpenTK.GLControl/CarbonGLControl.cs index 34f385a7..4afdeb7a 100644 --- a/src/OpenTK.GLControl/CarbonGLControl.cs +++ b/src/OpenTK.GLControl/CarbonGLControl.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -36,7 +34,7 @@ using OpenTK.Platform.MacOS; namespace OpenTK { - class CarbonGLControl : IGLControl + class CarbonGLControl : IGLControl { GraphicsMode mode; Control control; @@ -57,7 +55,7 @@ namespace OpenTK private int GetYOffset() { - if (control.TopLevelControl != null) + if (control.TopLevelControl != null) { System.Drawing.Point offset = control.PointToScreen (control.Location); System.Drawing.Point windowOffset = control.TopLevelControl.PointToScreen (System.Drawing.Point.Empty); @@ -67,8 +65,6 @@ namespace OpenTK return control.Location.Y; } - #region IGLControl Members - public IGraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags) { // AGL does not support OpenGL profiles @@ -79,8 +75,8 @@ namespace OpenTK bool lastIsIdle = false; public bool IsIdle { - get - { + get + { lastIsIdle = !lastIsIdle; return lastIsIdle; } @@ -93,7 +89,5 @@ namespace OpenTK return window_info; } } - - #endregion } } diff --git a/src/OpenTK.GLControl/DummyGLControl.cs b/src/OpenTK.GLControl/DummyGLControl.cs index 70501fcf..3bd6168f 100644 --- a/src/OpenTK.GLControl/DummyGLControl.cs +++ b/src/OpenTK.GLControl/DummyGLControl.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using OpenTK.Graphics; @@ -33,8 +31,6 @@ namespace OpenTK { class DummyGLControl : IGLControl { - #region IGLControl Members - public IGraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags) { return new DummyContext(); @@ -50,10 +46,6 @@ namespace OpenTK get { return Utilities.CreateDummyWindowInfo(); } } - #endregion - - #region class DummyContext - class DummyContext : IGraphicsContext, IGraphicsContextInternal { static int instance_count; @@ -65,8 +57,6 @@ namespace OpenTK bool is_disposed; int swap_interval; - #region IGraphicsContext Members - public void SwapBuffers() { } @@ -139,10 +129,6 @@ namespace OpenTK is_disposed = true; } - #endregion - - #region IGraphicsContextInternal - public ContextHandle Context { get { return handle; } @@ -162,10 +148,6 @@ namespace OpenTK { get { return this; } } - - #endregion } - - #endregion } } diff --git a/src/OpenTK.GLControl/GLControl.Designer.cs b/src/OpenTK.GLControl/GLControl.Designer.cs index c82b2d7b..ef72b71e 100644 --- a/src/OpenTK.GLControl/GLControl.Designer.cs +++ b/src/OpenTK.GLControl/GLControl.Designer.cs @@ -2,12 +2,12 @@ { partial class GLControl { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -20,18 +20,16 @@ base.Dispose(disposing); } - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() { this.SuspendLayout(); - // + // // NewGLControl - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Black; @@ -39,7 +37,5 @@ this.ResumeLayout(false); } - - #endregion } } diff --git a/src/OpenTK.GLControl/GLControl.cs b/src/OpenTK.GLControl/GLControl.cs index 8704c48f..849f7a4c 100644 --- a/src/OpenTK.GLControl/GLControl.cs +++ b/src/OpenTK.GLControl/GLControl.cs @@ -1,5 +1,4 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library, except where noted. @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -64,8 +62,6 @@ namespace OpenTK // evaluate this in the constructor. readonly bool design_mode; - #region --- Constructors --- - /// /// Constructs a new instance. /// @@ -125,10 +121,6 @@ namespace OpenTK InitializeComponent(); } - #endregion - - #region --- Private Methods --- - IGLControl Implementation { get @@ -160,10 +152,6 @@ namespace OpenTK RecreateHandle(); } - #endregion - - #region --- Protected Methods --- - /// /// Gets the CreateParams instance for this GLControl /// @@ -309,12 +297,6 @@ namespace OpenTK base.OnParentChanged(e); } - #endregion - - #region --- Public Methods --- - - #region public void SwapBuffers() - /// /// Swaps the front and back buffers, presenting the rendered scene to the screen. /// This method will have no effect on a single-buffered GraphicsMode. @@ -325,10 +307,6 @@ namespace OpenTK Context.SwapBuffers(); } - #endregion - - #region public void MakeCurrent() - /// /// /// Makes current in the calling thread. @@ -350,10 +328,6 @@ namespace OpenTK Context.MakeCurrent(Implementation.WindowInfo); } - #endregion - - #region public bool IsIdle - /// /// Gets a value indicating whether the current thread contains pending system messages. /// @@ -367,10 +341,6 @@ namespace OpenTK } } - #endregion - - #region public IGraphicsContext Context - /// /// Gets the IGraphicsContext instance that is associated with the GLControl. /// The associated IGraphicsContext is updated whenever the GLControl @@ -390,10 +360,6 @@ namespace OpenTK private set { context = value; } } - #endregion - - #region public float AspectRatio - /// /// Gets the aspect ratio of this GLControl. /// @@ -407,10 +373,6 @@ namespace OpenTK } } - #endregion - - #region public bool VSync - /// /// Gets or sets a value indicating whether vsync is active for this GLControl. /// When using multiple GLControls, ensure that @@ -451,10 +413,6 @@ namespace OpenTK } } - #endregion - - #region public GraphicsMode GraphicsMode - /// /// Gets the GraphicsMode of the IGraphicsContext associated with /// this GLControl. If you wish to change GraphicsMode, you must @@ -469,10 +427,6 @@ namespace OpenTK } } - #endregion - - #region WindowInfo - /// /// Gets the for this instance. /// @@ -480,9 +434,5 @@ namespace OpenTK { get { return implementation.WindowInfo; } } - - #endregion - - #endregion } } diff --git a/src/OpenTK.GLControl/GLControlFactory.cs b/src/OpenTK.GLControl/GLControlFactory.cs index f75dab68..106e04c7 100644 --- a/src/OpenTK.GLControl/GLControlFactory.cs +++ b/src/OpenTK.GLControl/GLControlFactory.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK.GLControl/IGLControl.cs b/src/OpenTK.GLControl/IGLControl.cs index 4494f4c1..6556eb0a 100644 --- a/src/OpenTK.GLControl/IGLControl.cs +++ b/src/OpenTK.GLControl/IGLControl.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK.GLControl/NS.cs b/src/OpenTK.GLControl/NS.cs index 281561d3..6ed9359e 100644 --- a/src/OpenTK.GLControl/NS.cs +++ b/src/OpenTK.GLControl/NS.cs @@ -1,4 +1,3 @@ -#region License // // NS.cs // @@ -26,8 +25,6 @@ // THE SOFTWARE. // -#endregion - using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK.GLControl/Sdl2GLControl.cs b/src/OpenTK.GLControl/Sdl2GLControl.cs index e6e16edf..c651a9ad 100644 --- a/src/OpenTK.GLControl/Sdl2GLControl.cs +++ b/src/OpenTK.GLControl/Sdl2GLControl.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 Stefanos Apostolopoulos // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK.GLControl/WinGLControl.cs b/src/OpenTK.GLControl/WinGLControl.cs index e491632d..c284352f 100644 --- a/src/OpenTK.GLControl/WinGLControl.cs +++ b/src/OpenTK.GLControl/WinGLControl.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -37,10 +35,6 @@ namespace OpenTK { class WinGLControl : IGLControl { - #region P/Invoke declarations - - #region Message - struct MSG { public IntPtr HWnd; @@ -57,10 +51,6 @@ namespace OpenTK } } - #endregion - - #region Point - struct POINT { public int X; @@ -83,32 +73,14 @@ namespace OpenTK } } - #endregion - - #region PeekMessage - [System.Security.SuppressUnmanagedCodeSecurity] [System.Runtime.InteropServices.DllImport("User32.dll")] static extern bool PeekMessage(ref MSG msg, IntPtr hWnd, int messageFilterMin, int messageFilterMax, int flags); - #endregion - - #region - - #endregion - - #endregion - - #region Fields - MSG msg = new MSG(); IWindowInfo window_info; GraphicsMode mode; - #endregion - - #region Constructors - public WinGLControl(GraphicsMode mode, Control control) { this.mode = mode; @@ -116,10 +88,6 @@ namespace OpenTK window_info = Utilities.CreateWindowsWindowInfo(control.Handle); } - #endregion - - #region IGLControl Members - public IGraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags) { return new GraphicsContext(mode, window_info, major, minor, flags); @@ -138,7 +106,5 @@ namespace OpenTK return window_info; } } - - #endregion } } diff --git a/src/OpenTK.GLControl/X11GLControl.cs b/src/OpenTK.GLControl/X11GLControl.cs index 6d70fbfb..376a2844 100644 --- a/src/OpenTK.GLControl/X11GLControl.cs +++ b/src/OpenTK.GLControl/X11GLControl.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; @@ -19,8 +17,6 @@ namespace OpenTK { class X11GLControl : IGLControl { - #region P/Invokes - [DllImport("libX11")] static extern IntPtr XCreateColormap(IntPtr display, IntPtr window, IntPtr visual, int alloc); @@ -56,10 +52,6 @@ namespace OpenTK } } - #endregion - - #region Fields - GraphicsMode mode; IWindowInfo window_info; IntPtr display; @@ -68,8 +60,6 @@ namespace OpenTK // Use reflection to retrieve the necessary values from Mono's Windows.Forms implementation. Type xplatui = Type.GetType("System.Windows.Forms.XplatUIX11, System.Windows.Forms"); - #endregion - internal X11GLControl(GraphicsMode mode, Control control) { if (mode == null) @@ -105,8 +95,6 @@ namespace OpenTK window_info = Utilities.CreateX11WindowInfo(display, screen, control.Handle, rootWindow, IntPtr.Zero); } - #region IGLControl Members - public IGraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags) { GraphicsContext context = new GraphicsContext(mode, this.WindowInfo, major, minor, flags); @@ -141,22 +129,16 @@ namespace OpenTK } } - #endregion - - #region Private Members - static object GetStaticFieldValue(Type type, string fieldName) { return type.GetField(fieldName, System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).GetValue(null); } - + static void SetStaticFieldValue(Type type, string fieldName, object value) { type.GetField(fieldName, System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).SetValue(null, value); } - - #endregion } } diff --git a/src/OpenTK.GLWidget/GLWidget.cs b/src/OpenTK.GLWidget/GLWidget.cs index ccf48873..4bf8ddc3 100644 --- a/src/OpenTK.GLWidget/GLWidget.cs +++ b/src/OpenTK.GLWidget/GLWidget.cs @@ -19,24 +19,14 @@ namespace OpenTK public class GLWidget: DrawingArea { - #region Static attrs. - private static int _GraphicsContextCount; private static bool _SharedContextInitialized = false; - #endregion - - #region Attributes - private IGraphicsContext _GraphicsContext; private IWindowInfo _WindowInfo; private GraphicsContextFlags _GraphicsContextFlags; private bool _Initialized = false; - #endregion - - #region Properties - /// /// Use a single buffer versus a double buffer. /// @@ -98,10 +88,6 @@ namespace OpenTK } } - #endregion - - #region Construction/Destruction - /// /// Initializes a new instance of the class. /// @@ -204,10 +190,6 @@ namespace OpenTK } } - #endregion - - #region New Events - /// /// Called when the first is created in the case where /// GraphicsContext.ShareContexts == true; @@ -281,8 +263,6 @@ namespace OpenTK ShuttingDown(this, EventArgs.Empty); } - #endregion - #if GTK3 /// /// Called when the widget needs to be (fully or partially) redrawn. @@ -407,4 +387,4 @@ namespace OpenTK OnInitialized(); } } -} \ No newline at end of file +} diff --git a/src/OpenTK/Audio/AudioCapture.cs b/src/OpenTK/Audio/AudioCapture.cs index d7af7743..880039dd 100644 --- a/src/OpenTK/Audio/AudioCapture.cs +++ b/src/OpenTK/Audio/AudioCapture.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -41,8 +39,6 @@ namespace OpenTK.Audio /// public sealed class AudioCapture : IDisposable { - #region Fields - // This must stay private info so the end-user cannot call any Alc commands for the recording device. IntPtr Handle; @@ -51,10 +47,7 @@ namespace OpenTK.Audio ALFormat sample_format; int sample_frequency; - - #endregion - #region Constructors static AudioCapture() { @@ -120,12 +113,6 @@ namespace OpenTK.Audio SampleFrequency = frequency; } - #endregion Constructor - - #region Public Members - - #region CurrentDevice - private string device_name; /// @@ -139,10 +126,6 @@ namespace OpenTK.Audio } } - #endregion - - #region AvailableDevices - /// /// Returns a list of strings containing all known recording devices. /// @@ -154,10 +137,6 @@ namespace OpenTK.Audio } } - #endregion - - #region DefaultDevice - /// /// Returns the name of the device that will be used as recording default. /// @@ -169,10 +148,6 @@ namespace OpenTK.Audio } } - #endregion - - #region CheckErrors - /// /// Checks for ALC error conditions. /// @@ -185,10 +160,6 @@ namespace OpenTK.Audio new AudioDeviceErrorChecker(Handle).Dispose(); } - #endregion - - #region CurrentError - /// Returns the ALC error code for this device. public AlcError CurrentError { @@ -198,10 +169,6 @@ namespace OpenTK.Audio } } - #endregion - - #region Start & Stop - /// /// Start recording samples. /// The number of available samples can be obtained through the property. @@ -220,10 +187,6 @@ namespace OpenTK.Audio _isrecording = false; } - #endregion Start & Stop Capture - - #region AvailableSamples - /// Returns the number of available samples for capture. public int AvailableSamples { @@ -237,10 +200,6 @@ namespace OpenTK.Audio } } - #endregion Available samples property - - #region ReadSamples - /// Fills the specified buffer with samples from the internal capture ring-buffer. This method does not block: it is an error to specify a sampleCount larger than AvailableSamples. /// A pointer to a previously initialized and pinned array. /// The number of samples to be written to the buffer. @@ -274,10 +233,6 @@ namespace OpenTK.Audio finally { buffer_ptr.Free(); } } - #endregion - - #region SampleFormat & SampleFrequency - /// /// Gets the OpenTK.Audio.ALFormat for this instance. /// @@ -296,10 +251,6 @@ namespace OpenTK.Audio private set { sample_frequency = value; } } - #endregion - - #region IsRunning - /// /// Gets a value indicating whether this instance is currently capturing samples. /// @@ -308,12 +259,6 @@ namespace OpenTK.Audio get { return _isrecording; } } - #endregion - - #endregion - - #region Private Members - // Retrieves the sample size in bytes for various ALFormats. // Compressed formats always return 1. static int GetSampleSize(ALFormat format) @@ -374,10 +319,6 @@ namespace OpenTK.Audio "\nBuffer Size: " + buffersize; } - #endregion - - #region IDisposable Members - /// /// Finalizes this instance. /// @@ -409,7 +350,5 @@ namespace OpenTK.Audio this.IsDisposed = true; } } - - #endregion Destructor } } diff --git a/src/OpenTK/Audio/AudioContext.cs b/src/OpenTK/Audio/AudioContext.cs index 9495d081..ba88e13a 100644 --- a/src/OpenTK/Audio/AudioContext.cs +++ b/src/OpenTK/Audio/AudioContext.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; @@ -41,8 +39,6 @@ namespace OpenTK.Audio /// public sealed class AudioContext : IDisposable { - #region --- Fields --- - bool disposed; bool is_processing, is_synchronized; IntPtr device_handle; @@ -53,12 +49,6 @@ namespace OpenTK.Audio static object audio_context_lock = new object(); static Dictionary available_contexts = new Dictionary(); - #endregion - - #region --- Constructors --- - - #region static AudioContext() - /// \internal /// /// Runs before the actual class constructor, to load available devices. @@ -69,28 +59,16 @@ namespace OpenTK.Audio { } } - #endregion static AudioContext() - - #region public AudioContext() - /// Constructs a new AudioContext, using the default audio device. public AudioContext() : this(null, 0, 0, false, true, MaxAuxiliarySends.UseDriverDefault) { } - #endregion - - #region public AudioContext(string device) - /// /// Constructs a new AudioContext instance. /// /// The device name that will host this instance. public AudioContext(string device) : this(device, 0, 0, false, true, MaxAuxiliarySends.UseDriverDefault) { } - #endregion - - #region public AudioContext(string device, int freq) - /// Constructs a new AudioContext, using the specified audio device and device parameters. /// The name of the audio device to use. /// Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default. @@ -100,10 +78,6 @@ namespace OpenTK.Audio /// public AudioContext(string device, int freq) : this(device, freq, 0, false, true, MaxAuxiliarySends.UseDriverDefault) { } - #endregion - - #region public AudioContext(string device, int freq, int refresh) - /// Constructs a new AudioContext, using the specified audio device and device parameters. /// The name of the audio device to use. /// Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default. @@ -115,10 +89,6 @@ namespace OpenTK.Audio public AudioContext(string device, int freq, int refresh) : this(device, freq, refresh, false, true, MaxAuxiliarySends.UseDriverDefault) { } - #endregion - - #region public AudioContext(string device, int freq, int refresh, bool sync) - /// Constructs a new AudioContext, using the specified audio device and device parameters. /// The name of the audio device to use. /// Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default. @@ -131,10 +101,6 @@ namespace OpenTK.Audio public AudioContext(string device, int freq, int refresh, bool sync) : this(AudioDeviceEnumerator.AvailablePlaybackDevices[0], freq, refresh, sync, true) { } - #endregion - - #region public AudioContext(string device, int freq, int refresh, bool sync, bool enableEfx) - /// Creates the audio context using the specified device and device parameters. /// The device descriptor obtained through AudioContext.AvailableDevices. /// Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default. @@ -165,10 +131,6 @@ namespace OpenTK.Audio CreateContext(device, freq, refresh, sync, enableEfx, MaxAuxiliarySends.UseDriverDefault); } - #endregion - - #region public AudioContext(string device, int freq, int refresh, bool sync, bool enableEfx, MaxAuxiliarySends efxMaxAuxSends) - /// Creates the audio context using the specified device and device parameters. /// The device descriptor obtained through AudioContext.AvailableDevices. /// Frequency for mixing output buffer, in units of Hz. Pass 0 for driver default. @@ -200,14 +162,6 @@ namespace OpenTK.Audio CreateContext(device, freq, refresh, sync, enableEfx, efxMaxAuxSends); } - #endregion - - #endregion --- Constructors --- - - #region --- Private Methods --- - - #region CreateContext - /// May be passed at context construction time to indicate the number of desired auxiliary effect slot sends per source. public enum MaxAuxiliarySends:int { @@ -319,7 +273,7 @@ namespace OpenTK.Audio Alc.GetInteger(device_handle, AlcGetInteger.EfxMaxAuxiliarySends, 1, out num_slots); break; } - + attributes.Add((int)AlcContextAttributes.EfxMaxAuxiliarySends); attributes.Add(num_slots); } @@ -344,7 +298,7 @@ namespace OpenTK.Audio CheckErrors(); device_name = Alc.GetString(device_handle, AlcGetString.DeviceSpecifier); - + lock (audio_context_lock) { @@ -353,10 +307,6 @@ namespace OpenTK.Audio } } - #endregion --- Private Methods --- - - #region static void MakeCurrent(AudioContext context) - /// \internal /// Makes the specified AudioContext current in the calling thread. /// The OpenTK.Audio.AudioContext to make current, or null. @@ -377,10 +327,6 @@ namespace OpenTK.Audio } } - #endregion - - #region internal bool IsCurrent - /// /// Gets or sets a System.Boolean indicating whether the AudioContext /// is current. @@ -410,20 +356,8 @@ namespace OpenTK.Audio } } - #endregion - - #region IntPtr Device - IntPtr Device { get { return device_handle; } } - #endregion - - #endregion - - #region --- Public Members --- - - #region CheckErrors - /// /// Checks for ALC error conditions. /// @@ -439,10 +373,6 @@ namespace OpenTK.Audio new AudioDeviceErrorChecker(device_handle).Dispose(); } - #endregion - - #region CurrentError - /// /// Returns the ALC error code for this instance. /// @@ -457,10 +387,6 @@ namespace OpenTK.Audio } } - #endregion - - #region MakeCurrent - /// Makes the AudioContext current in the calling thread. /// /// Occurs if this function is called after the AudioContext has been disposed. @@ -480,10 +406,6 @@ namespace OpenTK.Audio AudioContext.MakeCurrent(this); } - #endregion - - #region IsProcessing - /// /// Gets a System.Boolean indicating whether the AudioContext is /// currently processing audio events. @@ -502,10 +424,6 @@ namespace OpenTK.Audio private set { is_processing = value; } } - #endregion - - #region IsSynchronized - /// /// Gets a System.Boolean indicating whether the AudioContext is /// synchronized. @@ -523,10 +441,6 @@ namespace OpenTK.Audio private set { is_synchronized = value; } } - #endregion - - #region public void Process - /// /// Processes queued audio events. /// @@ -554,10 +468,6 @@ namespace OpenTK.Audio IsProcessing = true; } - #endregion - - #region public void Suspend - /// /// Suspends processing of audio events. /// @@ -587,10 +497,6 @@ namespace OpenTK.Audio IsProcessing = false; } - #endregion - - #region public bool SupportsExtension(string extension) - /// /// Checks whether the specified OpenAL extension is supported. /// @@ -604,10 +510,6 @@ namespace OpenTK.Audio return Alc.IsExtensionPresent(this.Device, extension); } - #endregion - - #region CurrentDevice - /// /// Gets a System.String with the name of the device used in this context. /// @@ -622,14 +524,6 @@ namespace OpenTK.Audio } } - #endregion - - #endregion --- Public Members --- - - #region --- Static Members --- - - #region public static AudioContext CurrentContext - /// /// Gets the OpenTK.Audio.AudioContext which is current in the application. /// @@ -657,10 +551,6 @@ namespace OpenTK.Audio } } - #endregion - - #region AvailableDevices - /// /// Returns a list of strings containing all known playback devices. /// @@ -671,10 +561,6 @@ namespace OpenTK.Audio return AudioDeviceEnumerator.AvailablePlaybackDevices; } } - #endregion public static IList AvailablePlaybackDevices - - #region DefaultDevice - /// /// Returns the name of the device that will be used as playback default. /// @@ -686,12 +572,6 @@ namespace OpenTK.Audio } } - #endregion - - #endregion - - #region --- IDisposable Members --- - /// /// Disposes of the AudioContext, cleaning up all resources consumed by it. /// @@ -732,10 +612,6 @@ namespace OpenTK.Audio this.Dispose(false); } - #endregion - - #region --- Overrides --- - /// /// Calculates the hash code for this instance. /// @@ -764,7 +640,5 @@ namespace OpenTK.Audio return String.Format("{0} (handle: {1}, device: {2})", this.device_name, this.context_handle, this.device_handle); } - - #endregion } } diff --git a/src/OpenTK/Audio/AudioContextException.cs b/src/OpenTK/Audio/AudioContextException.cs index af0b90a8..a33aa5c6 100644 --- a/src/OpenTK/Audio/AudioContextException.cs +++ b/src/OpenTK/Audio/AudioContextException.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Audio/AudioDeviceEnumerator.cs b/src/OpenTK/Audio/AudioDeviceEnumerator.cs index a5ffea8f..5c410244 100644 --- a/src/OpenTK/Audio/AudioDeviceEnumerator.cs +++ b/src/OpenTK/Audio/AudioDeviceEnumerator.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -36,8 +34,6 @@ namespace OpenTK.Audio { internal static class AudioDeviceEnumerator { - #region All device strings - private static readonly List available_playback_devices = new List(); private static readonly List available_recording_devices = new List(); @@ -56,10 +52,6 @@ namespace OpenTK.Audio } } - #endregion All device strings - - #region Default device strings - private static string default_playback_device; internal static string DefaultPlaybackDevice { @@ -78,10 +70,6 @@ namespace OpenTK.Audio } } - #endregion Default device strings - - #region Is OpenAL supported? - private static bool openal_supported = true; internal static bool IsOpenALSupported { @@ -91,10 +79,6 @@ namespace OpenTK.Audio } } - #endregion Is OpenAL supported? - - #region Alc Version number - internal enum AlcVersion { Alc1_0, @@ -110,10 +94,6 @@ namespace OpenTK.Audio } } - #endregion Alc Version number - - #region Constructors - // Loads all available audio devices into the available_*_devices lists. static AudioDeviceEnumerator() { @@ -222,7 +202,5 @@ namespace OpenTK.Audio } } } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Audio/AudioDeviceErrorChecker.cs b/src/OpenTK/Audio/AudioDeviceErrorChecker.cs index 939751c8..4d66169a 100644 --- a/src/OpenTK/Audio/AudioDeviceErrorChecker.cs +++ b/src/OpenTK/Audio/AudioDeviceErrorChecker.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -35,15 +33,9 @@ namespace OpenTK.Audio { struct AudioDeviceErrorChecker : IDisposable { - #region Fields - readonly IntPtr Device; static readonly string ErrorString = "Device {0} reported {1}."; - #endregion - - #region Constructors - public AudioDeviceErrorChecker(IntPtr device) { if (device == IntPtr.Zero) @@ -52,10 +44,6 @@ namespace OpenTK.Audio Device = device; } - #endregion - - #region IDisposable Members - public void Dispose() { AlcError err = Alc.GetError(Device); @@ -63,23 +51,21 @@ namespace OpenTK.Audio { case AlcError.OutOfMemory: throw new OutOfMemoryException(String.Format(ErrorString, Device, err)); - + case AlcError.InvalidValue: throw new AudioValueException(String.Format(ErrorString, Device, err)); - + case AlcError.InvalidDevice: throw new AudioDeviceException(String.Format(ErrorString, Device, err)); - + case AlcError.InvalidContext: throw new AudioContextException(String.Format(ErrorString, Device, err)); - + case AlcError.NoError: default: // everything went fine, do nothing break; } } - - #endregion } } diff --git a/src/OpenTK/Audio/AudioDeviceException.cs b/src/OpenTK/Audio/AudioDeviceException.cs index 40c64313..927ea559 100644 --- a/src/OpenTK/Audio/AudioDeviceException.cs +++ b/src/OpenTK/Audio/AudioDeviceException.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Audio/AudioException.cs b/src/OpenTK/Audio/AudioException.cs index 6fc77660..546a671f 100644 --- a/src/OpenTK/Audio/AudioException.cs +++ b/src/OpenTK/Audio/AudioException.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; @@ -39,6 +37,6 @@ namespace OpenTK.Audio public AudioException() : base() { } /// Constructs a new AudioException with the specified error message. /// The error message of the AudioException. - public AudioException(string message) : base(message) { } + public AudioException(string message) : base(message) { } } } diff --git a/src/OpenTK/Audio/AudioValueException.cs b/src/OpenTK/Audio/AudioValueException.cs index cfda06ad..2d6e48d4 100644 --- a/src/OpenTK/Audio/AudioValueException.cs +++ b/src/OpenTK/Audio/AudioValueException.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Audio/OpenAL/AL/AL.cs b/src/OpenTK/Audio/OpenAL/AL/AL.cs index 39191aa8..fe4b2b69 100644 --- a/src/OpenTK/Audio/OpenAL/AL/AL.cs +++ b/src/OpenTK/Audio/OpenAL/AL/AL.cs @@ -1,11 +1,9 @@ -#region --- OpenTK.OpenAL License --- -/* AlFunctions.cs +/* AlFunctions.cs * C header: \OpenAL 1.1 SDK\include\Al.h * Spec: http://www.openal.org/openal_webstf/specs/OpenAL11Specification.pdf * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details * http://www.OpenTK.net */ -#endregion using System; using System.Runtime.InteropServices; @@ -14,51 +12,51 @@ using System.Security; using OpenTK; /* Type Mapping -// 8-bit boolean +// 8-bit boolean typedef char ALboolean; * bool -// character +// character typedef char ALchar; * byte -// signed 8-bit 2's complement integer +// signed 8-bit 2's complement integer typedef char ALbyte; * byte -// unsigned 8-bit integer +// unsigned 8-bit integer typedef unsigned char ALubyte; * byte -// signed 16-bit 2's complement integer +// signed 16-bit 2's complement integer typedef short ALshort; * short -// unsigned 16-bit integer +// unsigned 16-bit integer typedef unsigned short ALushort; * ushort -// unsigned 32-bit integer +// unsigned 32-bit integer typedef unsigned int ALuint; * uint - -// signed 32-bit 2's complement integer + +// signed 32-bit 2's complement integer typedef int ALint; * int -// non-negative 32-bit binary integer size +// non-negative 32-bit binary integer size typedef int ALsizei; * int // enumerated 32-bit value typedef int ALenum; * int -// 32-bit IEEE754 floating-point +// 32-bit IEEE754 floating-point typedef float ALfloat; * float -// 64-bit IEEE754 floating-point +// 64-bit IEEE754 floating-point typedef double ALdouble; * double -// void type (for opaque pointers only) +// void type (for opaque pointers only) typedef void ALvoid; * void */ @@ -71,15 +69,9 @@ namespace OpenTK.Audio.OpenAL public static partial class AL { - #region Constants - internal const string Lib = "openal32.dll"; private const CallingConvention Style = CallingConvention.Cdecl; - #endregion Constants - - #region Renderer State management - /// This function enables a feature of the OpenAL driver. There are no capabilities defined in OpenAL 1.1 to be used with this function, but it may be used by an extension. /// The name of a capability to enable. [DllImport(AL.Lib, EntryPoint = "alEnable", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] @@ -90,18 +82,14 @@ namespace OpenTK.Audio.OpenAL /// The name of a capability to disable. [DllImport(AL.Lib, EntryPoint = "alDisable", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] public static extern void Disable(ALCapability capability); - // AL_API void AL_APIENTRY alDisable( ALenum capability ); + // AL_API void AL_APIENTRY alDisable( ALenum capability ); /// This function returns a boolean indicating if a specific feature is enabled in the OpenAL driver. /// The name of a capability to enable. /// True if enabled, False if disabled. [DllImport(AL.Lib, EntryPoint = "alIsEnabled", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] public static extern bool IsEnabled(ALCapability capability); - // AL_API ALboolean AL_APIENTRY alIsEnabled( ALenum capability ); - - #endregion Renderer State management - - #region State retrieval + // AL_API ALboolean AL_APIENTRY alIsEnabled( ALenum capability ); [DllImport(AL.Lib, EntryPoint = "alGetString", ExactSpelling = true, CallingConvention = AL.Style, CharSet = CharSet.Ansi), SuppressUnmanagedCodeSecurity()] private static extern IntPtr GetStringPrivate(ALGetString param); // accepts the enums AlError, AlContextString @@ -168,10 +156,6 @@ namespace OpenTK.Audio.OpenAL public static extern ALError GetError(); // AL_API ALenum AL_APIENTRY alGetError( void ); - #endregion State retrieval - - #region Extension support. - ///This function tests if a specific Extension is available for the OpenAL driver. /// A string naming the desired extension. Example: "EAX-RAM" /// Returns True if the Extension is available or False if not available. @@ -193,12 +177,10 @@ namespace OpenTK.Audio.OpenAL public static extern int GetEnumValue([In] string ename); // AL_API ALenum AL_APIENTRY alGetEnumValue( const ALchar* ename ); - #endregion Extension support. - /* Listener * Listener represents the location and orientation of the * 'user' in 3D-space. - * + * * Properties include: - * * Gain AL_GAIN ALfloat @@ -207,8 +189,6 @@ namespace OpenTK.Audio.OpenAL * Orientation AL_ORIENTATION ALfloat[6] (Forward then Up vectors) */ - #region Set Listener parameters - /// This function sets a floating-point property for the listener. /// The name of the attribute to be set: ALListenerf.Gain /// The float value to set the attribute to. @@ -281,10 +261,6 @@ namespace OpenTK.Audio.OpenAL // AL_API void AL_APIENTRY alListener3i( ALenum param, ALint value1, ALint value2, ALint value3 ); // AL_API void AL_APIENTRY alListeneriv( ALenum param, const ALint* values ); - #endregion Set Listener parameters - - #region Get Listener parameters - /// This function retrieves a floating-point property of the listener. /// the name of the attribute to be retrieved: ALListenerf.Gain /// a pointer to the floating-point value being retrieved. @@ -345,24 +321,22 @@ namespace OpenTK.Audio.OpenAL // AL_API void AL_APIENTRY alGetListener3i( ALenum param, ALint *value1, ALint *value2, ALint *value3 ); // AL_API void AL_APIENTRY alGetListeneriv( ALenum param, ALint* values ); - #endregion Get Listener parameters - /* Source * Sources represent individual sound objects in 3D-space. * Sources take the PCM buffer provided in the specified Buffer, * apply Source-specific modifications, and then * submit them to be mixed according to spatial arrangement etc. - * + * * Properties include: - * - + * Position AL_POSITION ALfloat[3] * Velocity AL_VELOCITY ALfloat[3] * Direction AL_DIRECTION ALfloat[3] * Head Relative Mode AL_SOURCE_RELATIVE ALint (AL_TRUE or AL_FALSE) * Looping AL_LOOPING ALint (AL_TRUE or AL_FALSE) - * + * * Reference Distance AL_REFERENCE_DISTANCE ALfloat * Max Distance AL_MAX_DISTANCE ALfloat * RollOff Factor AL_ROLLOFF_FACTOR ALfloat @@ -372,22 +346,18 @@ namespace OpenTK.Audio.OpenAL * Max Gain AL_MAX_GAIN ALfloat * Inner Angle AL_CONE_INNER_ANGLE ALint or ALfloat * Outer Angle AL_CONE_OUTER_ANGLE ALint or ALfloat - * Cone Outer Gain AL_CONE_OUTER_GAIN ALint or ALfloat - * + * Cone Outer Gain AL_CONE_OUTER_GAIN ALint or ALfloat + * * MS Offset AL_MSEC_OFFSET ALint or ALfloat * Byte Offset AL_BYTE_OFFSET ALint or ALfloat * Sample Offset AL_SAMPLE_OFFSET ALint or ALfloat * Attached Buffer AL_BUFFER ALint - * + * * State (Query only) AL_SOURCE_STATE ALint * Buffers Queued (Query only) AL_BUFFERS_QUEUED ALint * Buffers Processed (Query only) AL_BUFFERS_PROCESSED ALint */ - #region Create Source objects - - #region GenSources() - [DllImport(AL.Lib, EntryPoint = "alGenSources", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] unsafe private static extern void GenSourcesPrivate(int n, [Out] uint* sources); // AL_API void AL_APIENTRY alGenSources( ALsizei n, ALuint* Sources ); @@ -465,16 +435,12 @@ namespace OpenTK.Audio.OpenAL GenSources(1, out source); } - #endregion GenSources() - - #region DeleteSources() - /// This function deletes one or more sources. /// The number of sources to be deleted. /// Pointer to an array of source names identifying the sources to be deleted. [CLSCompliant(false)] [DllImport(AL.Lib, EntryPoint = "alDeleteSources", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] - unsafe public static extern void DeleteSources(int n, [In] uint* sources); // Delete Source objects + unsafe public static extern void DeleteSources(int n, [In] uint* sources); // Delete Source objects // AL_API void AL_APIENTRY alDeleteSources( ALsizei n, const ALuint* Sources ); /// This function deletes one or more sources. @@ -524,10 +490,6 @@ namespace OpenTK.Audio.OpenAL DeleteSources(1, ref source); } - #endregion DeleteSources() - - #region IsSource() - /// This function tests if a source name is valid, returning True if valid and False if not. /// A source name to be tested for validity /// Success. @@ -543,14 +505,6 @@ namespace OpenTK.Audio.OpenAL return IsSource((uint)sid); } - #endregion IsSource() - - #endregion Create Source objects - - #region Set Source parameters - - #region Sourcef - /// This function sets a floating-point property of a source. /// Source name whose attribute is being set /// The name of the attribute to set: ALSourcef.Pitch, Gain, MinGain, MaxGain, MaxDistance, RolloffFactor, ConeOuterGain, ConeInnerAngle, ConeOuterAngle, ReferenceDistance, EfxAirAbsorptionFactor, EfxRoomRolloffFactor, EfxConeOuterGainHighFrequency. @@ -568,10 +522,6 @@ namespace OpenTK.Audio.OpenAL Source((uint)sid, param, value); } - #endregion Sourcef - - #region Source3f - /// This function sets a source property requiring three floating-point values. /// Source name whose attribute is being set. /// The name of the attribute to set: ALSource3f.Position, Velocity, Direction. @@ -612,17 +562,13 @@ namespace OpenTK.Audio.OpenAL Source((uint)sid, param, values.X, values.Y, values.Z); } - #endregion Source3f - - #region Sourcei - /// This function sets an integer property of a source. /// Source name whose attribute is being set. /// The name of the attribute to set: ALSourcei.SourceRelative, ConeInnerAngle, ConeOuterAngle, Looping, Buffer, SourceState. /// The value to set the attribute to. [CLSCompliant(false), DllImport(AL.Lib, EntryPoint = "alSourcei", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] public static extern void Source(uint sid, ALSourcei param, int value); - // AL_API void AL_APIENTRY alSourcei( ALuint sid, ALenum param, ALint value ); + // AL_API void AL_APIENTRY alSourcei( ALuint sid, ALenum param, ALint value ); /// This function sets an integer property of a source. /// Source name whose attribute is being set. @@ -669,10 +615,6 @@ namespace OpenTK.Audio.OpenAL Source((uint)source, ALSourcei.Buffer, buffer); } - #endregion Sourcei - - #region Source3i - /// This function sets 3 integer properties of a source. This property is used to establish connections between Sources and Auxiliary Effect Slots. /// Source name whose attribute is being set. /// The name of the attribute to set: EfxAuxiliarySendFilter @@ -681,7 +623,7 @@ namespace OpenTK.Audio.OpenAL ///The value to set the attribute to. (EFX Extension) optional Filter ID. [CLSCompliant(false), DllImport(AL.Lib, EntryPoint = "alSource3i", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] public static extern void Source(uint sid, ALSource3i param, int value1, int value2, int value3); - // AL_API void AL_APIENTRY alSource3i( ALuint sid, ALenum param, ALint value1, ALint value2, ALint value3 ); + // AL_API void AL_APIENTRY alSource3i( ALuint sid, ALenum param, ALint value1, ALint value2, ALint value3 ); /// This function sets 3 integer properties of a source. This property is used to establish connections between Sources and Auxiliary Effect Slots. /// Source name whose attribute is being set. @@ -694,18 +636,10 @@ namespace OpenTK.Audio.OpenAL Source((uint)sid, param, value1, value2, value3); } - #endregion Source3i - // Not used by any Enum: // AL_API void AL_APIENTRY alSourcefv( ALuint sid, ALenum param, const ALfloat* values ); // AL_API void AL_APIENTRY alSourceiv( ALuint sid, ALenum param, const ALint* values ); - #endregion Set Source parameters - - #region Get Source parameters - - #region GetSourcef - /// This function retrieves a floating-point property of a source. /// Source name whose attribute is being retrieved. /// The name of the attribute to set: ALSourcef.Pitch, Gain, MinGain, MaxGain, MaxDistance, RolloffFactor, ConeOuterGain, ConeInnerAngle, ConeOuterAngle, ReferenceDistance, EfxAirAbsorptionFactor, EfxRoomRolloffFactor, EfxConeOuterGainHighFrequency. @@ -723,10 +657,6 @@ namespace OpenTK.Audio.OpenAL GetSource((uint)sid, param, out value); } - #endregion GetSourcef - - #region GetSource3f - /// This function retrieves three floating-point values representing a property of a source. /// Source name whose attribute is being retrieved. /// the name of the attribute being retrieved: ALSource3f.Position, Velocity, Direction. @@ -767,10 +697,6 @@ namespace OpenTK.Audio.OpenAL GetSource((uint)sid, param, out values.X, out values.Y, out values.Z); } - #endregion GetSource3f - - #region GetSourcei - /// This function retrieves an integer property of a source. /// Source name whose attribute is being retrieved. /// The name of the attribute to retrieve: ALSourcei.SourceRelative, Buffer, SourceState, BuffersQueued, BuffersProcessed. @@ -811,19 +737,11 @@ namespace OpenTK.Audio.OpenAL value = result != 0; } - #endregion GetSourcei - // Not used by any Enum: // AL_API void AL_APIENTRY alGetSource3i( ALuint sid, ALenum param, ALint* value1, ALint* value2, ALint* value3); // AL_API void AL_APIENTRY alGetSourcefv( ALuint sid, ALenum param, ALfloat* values ); // AL_API void AL_APIENTRY alGetSourceiv( ALuint sid, ALenum param, ALint* values ); - #endregion Get Source parameters - - #region Source vector based playback calls - - #region SourcePlay - /// This function plays a set of sources. The playing sources will have their state changed to ALSourceState.Playing. When called on a source which is already playing, the source will restart at the beginning. When the attached buffer(s) are done playing, the source will progress to the ALSourceState.Stopped state. /// The number of sources to be played. /// A pointer to an array of sources to be played. @@ -874,10 +792,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion SourcePlay - - #region SourceStop - /// This function stops a set of sources. The stopped sources will have their state changed to ALSourceState.Stopped. /// The number of sources to stop. /// A pointer to an array of sources to be stopped. @@ -928,10 +842,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion SourceStop - - #region SourceRewind - /// This function stops a set of sources and sets all their states to ALSourceState.Initial. /// The number of sources to be rewound. /// A pointer to an array of sources to be rewound. @@ -982,10 +892,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion SourceRewind - - #region SourcePause - /// This function pauses a set of sources. The paused sources will have their state changed to ALSourceState.Paused. /// The number of sources to be paused. /// A pointer to an array of sources to be paused. @@ -1035,14 +941,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion SourcePause - - #endregion Source vector based playback calls - - #region Source based playback calls - - #region SourcePlay - /// This function plays, replays or resumes a source. The playing source will have it's state changed to ALSourceState.Playing. When called on a source which is already playing, the source will restart at the beginning. When the attached buffer(s) are done playing, the source will progress to the ALSourceState.Stopped state. /// The name of the source to be played. [CLSCompliant(false), DllImport(AL.Lib, EntryPoint = "alSourcePlay", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] @@ -1056,10 +954,6 @@ namespace OpenTK.Audio.OpenAL SourcePlay((uint)sid); } - #endregion SourcePlay - - #region SourceStop - /// This function stops a source. The stopped source will have it's state changed to ALSourceState.Stopped. /// The name of the source to be stopped. [CLSCompliant(false), DllImport(AL.Lib, EntryPoint = "alSourceStop", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] @@ -1073,10 +967,6 @@ namespace OpenTK.Audio.OpenAL SourceStop((uint)sid); } - #endregion SourceStop - - #region SourceRewind - /// This function stops the source and sets its state to ALSourceState.Initial. /// The name of the source to be rewound. [CLSCompliant(false), DllImport(AL.Lib, EntryPoint = "alSourceRewind", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] @@ -1090,10 +980,6 @@ namespace OpenTK.Audio.OpenAL SourceRewind((uint)sid); } - #endregion SourceRewind - - #region SourcePause - /// This function pauses a source. The paused source will have its state changed to ALSourceState.Paused. /// The name of the source to be paused. [CLSCompliant(false), DllImport(AL.Lib, EntryPoint = "alSourcePause", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] @@ -1107,14 +993,6 @@ namespace OpenTK.Audio.OpenAL SourcePause((uint)sid); } - #endregion SourcePause - - #endregion Source based playback calls - - #region Source Queuing - - #region SourceQueueBuffers - /// This function queues a set of buffers on a source. All buffers attached to a source will be played in sequence, and the number of processed buffers can be detected using AL.GetSource with parameter ALGetSourcei.BuffersProcessed. When first created, a source will be of type ALSourceType.Undetermined. A successful AL.SourceQueueBuffers call will change the source type to ALSourceType.Streaming. /// The name of the source to queue buffers onto. /// The number of buffers to be queued. @@ -1177,10 +1055,6 @@ namespace OpenTK.Audio.OpenAL unsafe { AL.SourceQueueBuffers((uint)source, 1, (uint*)&buffer); } } - #endregion SourceQueueBuffers - - #region SourceUnqueueBuffers - /// This function unqueues a set of buffers attached to a source. The number of processed buffers can be detected using AL.GetSource with parameter ALGetSourcei.BuffersProcessed, which is the maximum number of buffers that can be unqueued using this call. The unqueue operation will only take place if all n buffers can be removed from the queue. /// The name of the source to unqueue buffers from. /// The number of buffers to be unqueued. @@ -1239,10 +1113,6 @@ namespace OpenTK.Audio.OpenAL return buf; } - #endregion SourceUnqueueBuffers - - #endregion Source Queuing - /* * Buffer * Buffer objects are storage space for sample buffer. @@ -1257,10 +1127,6 @@ namespace OpenTK.Audio.OpenAL * Channels (Query only) AL_CHANNELS ALint */ - #region Buffer objects - - #region GenBuffers - /// This function generates one or more buffers, which contain audio buffer (see AL.BufferData). References to buffers are uint values, which are used wherever a buffer reference is needed (in calls such as AL.DeleteBuffers, AL.Source with parameter ALSourcei, AL.SourceQueueBuffers, and AL.SourceUnqueueBuffers). /// The number of buffers to be generated. /// Pointer to an array of uint values which will store the names of the new buffers. @@ -1332,10 +1198,6 @@ namespace OpenTK.Audio.OpenAL GenBuffers(1, out buffer); } - #endregion GenBuffers - - #region DeleteBuffers - /// This function deletes one or more buffers, freeing the resources used by the buffer. Buffers which are attached to a source can not be deleted. See AL.Source (ALSourcei) and AL.SourceUnqueueBuffers for information on how to detach a buffer from a source. /// The number of buffers to be deleted. /// Pointer to an array of buffer names identifying the buffers to be deleted. @@ -1414,10 +1276,6 @@ namespace OpenTK.Audio.OpenAL DeleteBuffers(1, ref buffer); } - #endregion DeleteBuffers - - #region IsBuffer - /// This function tests if a buffer name is valid, returning True if valid, False if not. /// A buffer Handle previously allocated with . /// Success. @@ -1434,10 +1292,6 @@ namespace OpenTK.Audio.OpenAL return IsBuffer(temp); } - #endregion IsBuffer - - #region BufferData - /// This function fills a buffer with audio buffer. All the pre-defined formats are PCM buffer, but this function may be used by extensions to load other buffer types as well. /// buffer Handle/Name to be filled with buffer. /// Format type from among the following: ALFormat.Mono8, ALFormat.Mono16, ALFormat.Stereo8, ALFormat.Stereo16. @@ -1476,12 +1330,6 @@ namespace OpenTK.Audio.OpenAL finally { handle.Free(); } } - #endregion BufferData - - #endregion Buffer objects - - #region Set Buffer parameters (currently parameters can only be read) - /* Remarks (from Manual) * There are no relevant buffer properties defined in OpenAL 1.1 which can be affected by this call, @@ -1504,12 +1352,6 @@ namespace OpenTK.Audio.OpenAL Buffer3f( bid, param, values.X, values.Y, values.Z ); }*/ - #endregion Set Buffer parameters - - #region Get Buffer parameters - - #region GetBufferi - /// This function retrieves an integer property of a buffer. /// Buffer name whose attribute is being retrieved /// The name of the attribute to be retrieved: ALGetBufferi.Frequency, Bits, Channels, Size, and the currently hidden AL_DATA (dangerous). @@ -1527,18 +1369,12 @@ namespace OpenTK.Audio.OpenAL GetBuffer((uint)bid, param, out value); } - #endregion GetBufferi - // AL_API void AL_APIENTRY alGetBufferf( ALuint bid, ALenum param, ALfloat* value ); // AL_API void AL_APIENTRY alGetBuffer3f( ALuint bid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); // AL_API void AL_APIENTRY alGetBufferfv( ALuint bid, ALenum param, ALfloat* values ); // AL_API void AL_APIENTRY alGetBuffer3i( ALuint bid, ALenum param, ALint* value1, ALint* value2, ALint* value3); // AL_API void AL_APIENTRY alGetBufferiv( ALuint bid, ALenum param, ALint* values ); - #endregion Get Buffer parameters - - #region Global Parameters - /// AL.DopplerFactor is a simple scaling of source and listener velocities to exaggerate or deemphasize the Doppler (pitch) shift resulting from the calculation. /// A negative value will result in an error, the command is then ignored. The default value is 1f. The current setting can be queried using AL.Get with parameter ALGetFloat.SpeedOfSound. [DllImport(AL.Lib, EntryPoint = "alDopplerFactor", ExactSpelling = true, CallingConvention = AL.Style), SuppressUnmanagedCodeSecurity()] @@ -1561,29 +1397,29 @@ namespace OpenTK.Audio.OpenAL /// /// The ALDistanceModel .InverseDistance model works according to the following formula: /// gain = ALSourcef.ReferenceDistance / (ALSourcef.ReferenceDistance + ALSourcef.RolloffFactor * (distance – ALSourcef.ReferenceDistance)); - /// + /// /// The ALDistanceModel .InverseDistanceClamped model works according to the following formula: /// distance = max(distance,ALSourcef.ReferenceDistance); /// distance = min(distance,ALSourcef.MaxDistance); /// gain = ALSourcef.ReferenceDistance / (ALSourcef.ReferenceDistance + ALSourcef.RolloffFactor * (distance – ALSourcef.ReferenceDistance)); - /// - /// The ALDistanceModel.LinearDistance model works according to the following formula: + /// + /// The ALDistanceModel.LinearDistance model works according to the following formula: /// distance = min(distance, ALSourcef.MaxDistance) // avoid negative gain /// gain = (1 – ALSourcef.RolloffFactor * (distance – ALSourcef.ReferenceDistance) / (ALSourcef.MaxDistance – ALSourcef.ReferenceDistance)) - /// + /// /// The ALDistanceModel.LinearDistanceClamped model works according to the following formula: /// distance = max(distance, ALSourcef.ReferenceDistance) /// distance = min(distance, ALSourcef.MaxDistance) /// gain = (1 – ALSourcef.RolloffFactor * (distance – ALSourcef.ReferenceDistance) / (ALSourcef.MaxDistance – ALSourcef.ReferenceDistance)) - /// + /// /// The ALDistanceModel.ExponentDistance model works according to the following formula: - /// gain = (distance / ALSourcef.ReferenceDistance) ^ (- ALSourcef.RolloffFactor) - /// + /// gain = (distance / ALSourcef.ReferenceDistance) ^ (- ALSourcef.RolloffFactor) + /// /// The ALDistanceModel.ExponentDistanceClamped model works according to the following formula: /// distance = max(distance, ALSourcef.ReferenceDistance) /// distance = min(distance, ALSourcef.MaxDistance) /// gain = (distance / ALSourcef.ReferenceDistance) ^ (- ALSourcef.RolloffFactor) - /// + /// /// The ALDistanceModel.None model works according to the following formula: /// gain = 1f; /// @@ -1592,10 +1428,6 @@ namespace OpenTK.Audio.OpenAL public static extern void DistanceModel(ALDistanceModel distancemodel); // AL_API void AL_APIENTRY alDistanceModel( ALenum distanceModel ); - #endregion Global Parameters - - #region Helpers - /// (Helper) Returns Source state information. /// The source to be queried. /// state information from OpenAL. @@ -1646,7 +1478,5 @@ namespace OpenTK.Audio.OpenAL { return (ALDistanceModel)AL.Get(ALGetInteger.DistanceModel); } - - #endregion Helpers } } diff --git a/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs b/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs index e6c90be6..c5659e06 100644 --- a/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs +++ b/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs @@ -1,11 +1,9 @@ -#region --- OpenTK.OpenAL License --- -/* AlTokens.cs +/* AlTokens.cs * C header: \OpenAL 1.1 SDK\include\Al.h * Spec: http://www.openal.org/openal_webstf/specs/OpenAL11Specification.pdf * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details * http://www.OpenTK.net */ -#endregion using System; diff --git a/src/OpenTK/Audio/OpenAL/AL/EffectsExtension.cs b/src/OpenTK/Audio/OpenAL/AL/EffectsExtension.cs index 8d744217..5cadc936 100644 --- a/src/OpenTK/Audio/OpenAL/AL/EffectsExtension.cs +++ b/src/OpenTK/Audio/OpenAL/AL/EffectsExtension.cs @@ -1,11 +1,9 @@ -#region --- OpenTK.OpenAL License --- -/* EfxFunctions.cs +/* EfxFunctions.cs * C headers: \OpenAL 1.1 SDK\include\ "efx.h", "efx-creative.h", "Efx-Util.h" * Spec: Effects Extension Guide.pdf (bundled with OpenAL SDK) * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details * http://www.OpenTK.net */ -#endregion using System; using System.Diagnostics; @@ -19,10 +17,6 @@ namespace OpenTK.Audio.OpenAL /// public partial class EffectsExtension { - #region Helpers - - #region BindEffect - /// (Helper) Selects the Effect type used by this Effect handle. /// Effect id returned from a successful call to GenEffects. /// Effect type. @@ -41,10 +35,6 @@ namespace OpenTK.Audio.OpenAL Imported_alEffecti((uint)eid, EfxEffecti.EffectType, (int)type); } - #endregion BindEffect - - #region BindFilterToSource - /// (Helper) reroutes the output of a Source through a Filter. /// A valid Source handle. /// A valid Filter handle. @@ -63,10 +53,6 @@ namespace OpenTK.Audio.OpenAL AL.Source((uint)source, ALSourcei.EfxDirectFilter, (int)filter); } - #endregion BindFilterToSource - - #region BindEffectToAuxiliarySlot - /// (Helper) Attaches an Effect to an Auxiliary Effect Slot. /// The slot handle to attach the Effect to. /// The Effect handle that is being attached. @@ -85,10 +71,6 @@ namespace OpenTK.Audio.OpenAL AuxiliaryEffectSlot((uint)auxiliaryeffectslot, EfxAuxiliaryi.EffectslotEffect, (int)effect); } - #endregion BindEffectToAuxiliarySlot - - #region BindSourceToAuxiliarySlot - /// (Helper) Reroutes a Source's output into an Auxiliary Effect Slot. /// The Source handle who's output is forwarded. /// The Auxiliary Effect Slot handle that receives input from the Source. @@ -111,14 +93,6 @@ namespace OpenTK.Audio.OpenAL AL.Source((uint)source, ALSource3i.EfxAuxiliarySendFilter, (int)slot, (int)slotnumber, (int)filter); } - #endregion BindSourceToAuxiliarySlot - - #endregion Helpers - - #region Effect Object - - #region alGenEffects - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGenEffects(int n, [Out] uint* effects); // typedef void (__cdecl *LPALGENEFFECTS)( ALsizei n, ALuint* effects ); @@ -202,10 +176,6 @@ namespace OpenTK.Audio.OpenAL } - #endregion alGenEffects - - #region alDeleteEffects - //[CLSCompliant(false)] unsafe private delegate void Delegate_alDeleteEffects(int n, [In] uint* effects); // typedef void (__cdecl *LPALDELETEEFFECTS)( ALsizei n, ALuint* effects ); @@ -280,10 +250,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion alDeleteEffects - - #region alIsEffect - //[CLSCompliant(false)] private delegate bool Delegate_alIsEffect(uint eid); // typedef ALboolean (__cdecl *LPALISEFFECT)( ALuint eid ); @@ -309,13 +275,9 @@ namespace OpenTK.Audio.OpenAL return Imported_alIsEffect((uint)eid); } - #endregion alIsEffect - - #region alEffecti - //[CLSCompliant(false)] private delegate void Delegate_alEffecti(uint eid, EfxEffecti param, int value); - // typedef void (__cdecl *LPALEFFECTI)( ALuint eid, ALenum param, ALint value); + // typedef void (__cdecl *LPALEFFECTI)( ALuint eid, ALenum param, ALint value); //[CLSCompliant(false)] private Delegate_alEffecti Imported_alEffecti; @@ -340,10 +302,6 @@ namespace OpenTK.Audio.OpenAL Imported_alEffecti((uint)eid, param, value); } - #endregion alEffecti - - #region alEffectf - //[CLSCompliant(false)] private delegate void Delegate_alEffectf(uint eid, EfxEffectf param, float value); // typedef void (__cdecl *LPALEFFECTF)( ALuint eid, ALenum param, ALfloat value); @@ -371,13 +329,9 @@ namespace OpenTK.Audio.OpenAL Imported_alEffectf((uint)eid, param, value); } - #endregion alEffectf - - #region alEffectfv - //[CLSCompliant(false)] unsafe private delegate void Delegate_alEffectfv(uint eid, EfxEffect3f param, [In] float* values); - // typedef void (__cdecl *LPALEFFECTFV)( ALuint eid, ALenum param, ALfloat* values ); + // typedef void (__cdecl *LPALEFFECTFV)( ALuint eid, ALenum param, ALfloat* values ); //[CLSCompliant(false)] private Delegate_alEffectfv Imported_alEffectfv; @@ -408,10 +362,6 @@ namespace OpenTK.Audio.OpenAL Effect((uint)eid, param, ref values); } - #endregion alEffectfv - - #region alGetEffecti - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGetEffecti(uint eid, EfxEffecti pname, [Out] int* value); // typedef void (__cdecl *LPALGETEFFECTI)( ALuint eid, ALenum pname, ALint* value ); @@ -445,10 +395,6 @@ namespace OpenTK.Audio.OpenAL GetEffect((uint)eid, pname, out value); } - #endregion alGetEffecti - - #region alGetEffectf - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGetEffectf(uint eid, EfxEffectf pname, [Out]float* value); // typedef void (__cdecl *LPALGETEFFECTF)( ALuint eid, ALenum pname, ALfloat* value ); @@ -482,10 +428,6 @@ namespace OpenTK.Audio.OpenAL GetEffect((uint)eid, pname, out value); } - #endregion alGetEffectf - - #region alGetEffectfv - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGetEffectfv(uint eid, EfxEffect3f param, [Out] float* values); // typedef void (__cdecl *LPALGETEFFECTFV)( ALuint eid, ALenum pname, ALfloat* values ); @@ -522,21 +464,13 @@ namespace OpenTK.Audio.OpenAL GetEffect((uint)eid, param, out values); } - #endregion alGetEffectfv - // Not used: - // typedef void (__cdecl *LPALEFFECTIV)( ALuint eid, ALenum param, ALint* values ); + // typedef void (__cdecl *LPALEFFECTIV)( ALuint eid, ALenum param, ALint* values ); // typedef void (__cdecl *LPALGETEFFECTIV)( ALuint eid, ALenum pname, ALint* values ); - #endregion Effect Object - - #region Filter Object - - #region alGenFilters - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGenFilters(int n, [Out] uint* filters); - // typedef void (__cdecl *LPALGENFILTERS)( ALsizei n, ALuint* filters ); + // typedef void (__cdecl *LPALGENFILTERS)( ALsizei n, ALuint* filters ); //[CLSCompliant(false)] private Delegate_alGenFilters Imported_alGenFilters; @@ -612,10 +546,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion alGenFilters - - #region alDeleteFilters - //[CLSCompliant(false)] unsafe private delegate void Delegate_alDeleteFilters(int n, [In] uint* filters); // typedef void (__cdecl *LPALDELETEFILTERS)( ALsizei n, ALuint* filters ); @@ -690,10 +620,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion alDeleteFilters - - #region alIsFilter - //[CLSCompliant(false)] private delegate bool Delegate_alIsFilter(uint fid); // typedef ALboolean (__cdecl *LPALISFILTER)( ALuint fid ); @@ -719,10 +645,6 @@ namespace OpenTK.Audio.OpenAL return Imported_alIsFilter((uint)fid); } - #endregion alIsFilter - - #region alFilteri - //[CLSCompliant(false)] private delegate void Delegate_alFilteri(uint fid, EfxFilteri param, int value); // typedef void (__cdecl *LPALFILTERI)( ALuint fid, ALenum param, ALint value ); @@ -750,10 +672,6 @@ namespace OpenTK.Audio.OpenAL Imported_alFilteri((uint)fid, param, value); } - #endregion alFilteri - - #region alFilterf - //[CLSCompliant(false)] private delegate void Delegate_alFilterf(uint fid, EfxFilterf param, float value); // typedef void (__cdecl *LPALFILTERF)( ALuint fid, ALenum param, ALfloat value); @@ -781,10 +699,6 @@ namespace OpenTK.Audio.OpenAL Imported_alFilterf((uint)fid, param, value); } - #endregion alFilterf - - #region alGetFilteri - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGetFilteri(uint fid, EfxFilteri pname, [Out] int* value); // typedef void (__cdecl *LPALGETFILTERI)( ALuint fid, ALenum pname, ALint* value ); @@ -818,10 +732,6 @@ namespace OpenTK.Audio.OpenAL GetFilter((uint)fid, pname, out value); } - #endregion alGetFilteri - - #region alGetFilterf - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGetFilterf(uint fid, EfxFilterf pname, [Out] float* value); // typedef void (__cdecl *LPALGETFILTERF)( ALuint fid, ALenum pname, ALfloat* value ); @@ -855,20 +765,12 @@ namespace OpenTK.Audio.OpenAL GetFilter((uint)fid, pname, out value); } - #endregion alGetFilterf - // Not used: - // typedef void (__cdecl *LPALFILTERIV)( ALuint fid, ALenum param, ALint* values ); - // typedef void (__cdecl *LPALFILTERFV)( ALuint fid, ALenum param, ALfloat* values ); + // typedef void (__cdecl *LPALFILTERIV)( ALuint fid, ALenum param, ALint* values ); + // typedef void (__cdecl *LPALFILTERFV)( ALuint fid, ALenum param, ALfloat* values ); // typedef void (__cdecl *LPALGETFILTERIV)( ALuint fid, ALenum pname, ALint* values ); // typedef void (__cdecl *LPALGETFILTERFV)( ALuint fid, ALenum pname, ALfloat* values ); - #endregion Filter Object - - #region Auxiliary Effect Slot Object - - #region alGenAuxiliaryEffectSlots - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGenAuxiliaryEffectSlots(int n, [Out] uint* slots); // typedef void (__cdecl *LPALGENAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots ); @@ -945,10 +847,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion alGenAuxiliaryEffectSlots - - #region DeleteAuxiliaryEffectSlots - unsafe private delegate void Delegate_alDeleteAuxiliaryEffectSlots(int n, [In] uint* slots); // typedef void (__cdecl *LPALDELETEAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots ); @@ -1021,10 +919,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion alDeleteAuxiliaryEffectSlots - - #region alIsAuxiliaryEffectSlot - //[CLSCompliant(false)] private delegate bool Delegate_alIsAuxiliaryEffectSlot(uint slot); // typedef ALboolean (__cdecl *LPALISAUXILIARYEFFECTSLOT)( ALuint slot ); @@ -1050,13 +944,9 @@ namespace OpenTK.Audio.OpenAL return Imported_alIsAuxiliaryEffectSlot((uint)slot); } - #endregion alIsAuxiliaryEffectSlot - - #region alAuxiliaryEffectSloti - //[CLSCompliant(false)] private delegate void Delegate_alAuxiliaryEffectSloti(uint asid, EfxAuxiliaryi param, int value); - // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum param, ALint value ); + // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum param, ALint value ); //[CLSCompliant(false)] private Delegate_alAuxiliaryEffectSloti Imported_alAuxiliaryEffectSloti; @@ -1081,10 +971,6 @@ namespace OpenTK.Audio.OpenAL Imported_alAuxiliaryEffectSloti((uint)asid, param, value); } - #endregion alAuxiliaryEffectSloti - - #region alAuxiliaryEffectSlotf - //[CLSCompliant(false)] private delegate void Delegate_alAuxiliaryEffectSlotf(uint asid, EfxAuxiliaryf param, float value); // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum param, ALfloat value ); @@ -1112,10 +998,6 @@ namespace OpenTK.Audio.OpenAL Imported_alAuxiliaryEffectSlotf((uint)asid, param, value); } - #endregion alAuxiliaryEffectSlotf - - #region alGetAuxiliaryEffectSloti - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGetAuxiliaryEffectSloti(uint asid, EfxAuxiliaryi pname, [Out] int* value); // typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum pname, ALint* value ); @@ -1149,10 +1031,6 @@ namespace OpenTK.Audio.OpenAL GetAuxiliaryEffectSlot((uint)asid, pname, out value); } - #endregion alGetAuxiliaryEffectSloti - - #region alGetAuxiliaryEffectSlotf - //[CLSCompliant(false)] unsafe private delegate void Delegate_alGetAuxiliaryEffectSlotf(uint asid, EfxAuxiliaryf pname, [Out] float* value); // typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum pname, ALfloat* value ); @@ -1186,18 +1064,12 @@ namespace OpenTK.Audio.OpenAL GetAuxiliaryEffectSlot((uint)asid, pname, out value); } - #endregion alGetAuxiliaryEffectSlotf - // Not used: - // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTIV)( ALuint asid, ALenum param, ALint* values ); - // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTFV)( ALuint asid, ALenum param, ALfloat* values ); + // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTIV)( ALuint asid, ALenum param, ALint* values ); + // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTFV)( ALuint asid, ALenum param, ALfloat* values ); // typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTIV)( ALuint asid, ALenum pname, ALint* values ); // typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTFV)( ALuint asid, ALenum pname, ALfloat* values ); - #endregion Auxiliary Effect Slot Object - - #region Constructor / Extension Loading - private bool _valid; /// Returns True if the EFX Extension has been found and could be initialized. @@ -1282,7 +1154,5 @@ namespace OpenTK.Audio.OpenAL // didn't return so far, everything went fine. _valid = true; } - - #endregion Constructor / Extension Loading } } \ No newline at end of file diff --git a/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs b/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs index 313f213f..db977d98 100644 --- a/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs +++ b/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs @@ -1,18 +1,14 @@ -#region --- OpenTK.OpenAL License --- -/* EfxTokens.cs +/* EfxTokens.cs * C headers: \OpenAL 1.1 SDK\include\ "efx.h", "efx-creative.h", "Efx-Util.h" * Spec: Effects Extension Guide.pdf (bundled with OpenAL SDK) * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details * http://www.OpenTK.net */ -#endregion using System; namespace OpenTK.Audio.OpenAL { - #region Effect - ///A list of valid 32-bit Float Effect/GetEffect parameters public enum EfxEffectf : int { @@ -167,7 +163,7 @@ namespace OpenTK.Audio.OpenAL ///A list of valid Math.Vector3 Effect/GetEffect parameters public enum EfxEffect3f : int { - /// Reverb Pan does for the Reverb what Reflections Pan does for the Reflections. Unit: Vector3 of length 0f to 1f Default: {0.0f, 0.0f, 0.0f} + /// Reverb Pan does for the Reverb what Reflections Pan does for the Reflections. Unit: Vector3 of length 0f to 1f Default: {0.0f, 0.0f, 0.0f} EaxReverbLateReverbPan = 0x000E, /// This Vector3 controls the spatial distribution of the cluster of early reflections. The direction of this vector controls the global direction of the reflections, while its magnitude controls how focused the reflections are towards this direction. For legacy reasons this Vector3 follows a left-handed co-ordinate system! Note that OpenAL uses a right-handed coordinate system. Unit: Vector3 of length 0f to 1f Default: {0.0f, 0.0f, 0.0f} EaxReverbReflectionsPan = 0x000B, @@ -230,7 +226,7 @@ namespace OpenTK.Audio.OpenAL /// The A phoneme of the vocal morpher. /// VocalMorpherPhonemeA = 0, - + /// /// The E phoneme of the vocal morpher. /// @@ -377,7 +373,7 @@ namespace OpenTK.Audio.OpenAL VocalMorpherPhonemeZ = 29, } - ///Effect type definitions to be used with EfxEffecti.EffectType. + ///Effect type definitions to be used with EfxEffecti.EffectType. public enum EfxEffectType : int { ///No Effect, disable. This Effect type is used when an Effect object is initially created. @@ -410,10 +406,6 @@ namespace OpenTK.Audio.OpenAL EaxReverb = 0x8000, } - #endregion Effect - - #region Auxiliary Effect Slot - ///A list of valid Int32 AuxiliaryEffectSlot/GetAuxiliaryEffectSlot parameters public enum EfxAuxiliaryi : int { @@ -431,10 +423,6 @@ namespace OpenTK.Audio.OpenAL EffectslotGain = 0x0002, } - #endregion Auxiliary Effect Slot - - #region Filter Object - ///A list of valid 32-bits Float Filter/GetFilter parameters public enum EfxFilterf : int { @@ -475,6 +463,4 @@ namespace OpenTK.Audio.OpenAL ///Currently not implemented. A band-pass filter is used to remove high and low frequency content from a signal. Bandpass = 0x0003, } - - #endregion Filter Object } diff --git a/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionPresets.cs b/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionPresets.cs index cd87ef32..1323a106 100644 --- a/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionPresets.cs +++ b/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionPresets.cs @@ -1,11 +1,9 @@ -#region --- OpenTK.OpenAL License --- -/* EfxPresets.cs +/* EfxPresets.cs * C headers: \OpenAL 1.1 SDK\include\ "efx.h", "efx-creative.h", "Efx-Util.h" * Spec: Effects Extension Guide.pdf (bundled with OpenAL SDK) * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details * http://www.OpenTK.net */ -#endregion using System; @@ -199,7 +197,7 @@ namespace OpenTK.Audio.OpenAL } _EFXLOWPASSFILTER EFXLOWPASSFILTER;//, *LPEFXLOWPASSFILTER; - + void ConvertReverbParameters(EAXREVERBPROPERTIES *pEAXProp, EFXEAXREVERBPROPERTIES *pEFXEAXReverb); void ConvertObstructionParameters(EAXOBSTRUCTIONPROPERTIES *pObProp, EFXLOWPASSFILTER *pDirectLowPassFilter); void ConvertExclusionParameters(EAXEXCLUSIONPROPERTIES *pExProp, EFXLOWPASSFILTER *pSendLowPassFilter); diff --git a/src/OpenTK/Audio/OpenAL/AL/XRamExtension.cs b/src/OpenTK/Audio/OpenAL/AL/XRamExtension.cs index 95a64f85..d094736b 100644 --- a/src/OpenTK/Audio/OpenAL/AL/XRamExtension.cs +++ b/src/OpenTK/Audio/OpenAL/AL/XRamExtension.cs @@ -1,11 +1,9 @@ -#region --- OpenTK.OpenAL License --- -/* XRamExtension.cs +/* XRamExtension.cs * C header: \OpenAL 1.1 SDK\include\xram.h * Spec: ? * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details (MIT) * http://www.OpenTK.net */ -#endregion using System; using System.Diagnostics; @@ -21,8 +19,6 @@ namespace OpenTK.Audio.OpenAL [CLSCompliant(true)] public sealed class XRamExtension { - #region Instance state - private bool _valid = false; /// Returns True if the X-Ram Extension has been found and could be initialized. @@ -31,10 +27,6 @@ namespace OpenTK.Audio.OpenAL get { return _valid; } } - #endregion Instance state - - #region X-RAM Function pointer definitions - // [CLSCompliant(false)] private delegate bool Delegate_SetBufferMode(int n, ref uint buffers, int value); //typedef ALboolean (__cdecl *EAXSetBufferMode)(ALsizei n, ALuint *buffers, ALint value); @@ -48,17 +40,9 @@ namespace OpenTK.Audio.OpenAL //[CLSCompliant(false)] private Delegate_GetBufferMode Imported_GetBufferMode; - #endregion X-RAM Function pointer definitions - - #region X-RAM Tokens - private int AL_EAX_RAM_SIZE, AL_EAX_RAM_FREE, AL_STORAGE_AUTOMATIC, AL_STORAGE_HARDWARE, AL_STORAGE_ACCESSIBLE; - #endregion X-RAM Tokens - - #region Constructor / Extension Loading - /// /// Constructs a new XRamExtension instance. /// @@ -102,10 +86,6 @@ namespace OpenTK.Audio.OpenAL _valid = true; } - #endregion Constructor / Extension Loading - - #region Public Methods - /// Query total amount of X-RAM in bytes. public int GetRamSize { @@ -191,8 +171,6 @@ namespace OpenTK.Audio.OpenAL uint temp = (uint)buffer; return GetBufferMode(ref temp); } - - #endregion Public Methods } } diff --git a/src/OpenTK/Audio/OpenAL/Alc/Alc.cs b/src/OpenTK/Audio/OpenAL/Alc/Alc.cs index 371bd81f..e0782820 100644 --- a/src/OpenTK/Audio/OpenAL/Alc/Alc.cs +++ b/src/OpenTK/Audio/OpenAL/Alc/Alc.cs @@ -1,11 +1,9 @@ -#region --- OpenTK.OpenAL License --- -/* AlcFunctions.cs +/* AlcFunctions.cs * C header: \OpenAL 1.1 SDK\include\Alc.h * Spec: http://www.openal.org/openal_webstf/specs/OpenAL11Specification.pdf * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details * http://www.OpenTK.net */ -#endregion using System; using System.Collections.Generic; @@ -14,33 +12,33 @@ using System.Runtime.InteropServices; using System.Security; /* Type Mapping -// 8-bit boolean +// 8-bit boolean typedef char ALCboolean; * byte -// character +// character typedef char ALCchar; * byte -// signed 8-bit 2's complement integer +// signed 8-bit 2's complement integer typedef char ALCbyte; * byte -// unsigned 8-bit integer +// unsigned 8-bit integer typedef unsigned char ALCubyte; * ubyte -// signed 16-bit 2's complement integer +// signed 16-bit 2's complement integer typedef short ALCshort; * short -// unsigned 16-bit integer +// unsigned 16-bit integer typedef unsigned short ALCushort; * ushort -// unsigned 32-bit integer +// unsigned 32-bit integer typedef unsigned int ALCuint; * uint - -// signed 32-bit 2's complement integer + +// signed 32-bit 2's complement integer typedef int ALCint; * int // non-negative 32-bit binary integer size @@ -57,11 +55,11 @@ typedef float ALCfloat; // 64-bit IEEE754 floating-point typedef double ALCdouble; * double - + // void type (for opaque pointers only) typedef void ALCvoid; * void - + * ALCdevice * ALCcontext *context * IntPtr @@ -73,17 +71,9 @@ namespace OpenTK.Audio.OpenAL /// Alc = Audio Library Context public static class Alc { - #region Constants - private const string Lib = AL.Lib; private const CallingConvention Style = CallingConvention.Cdecl; - #endregion Constants - - #region Context Management - - #region CreateContext - [DllImport(Alc.Lib, EntryPoint = "alcCreateContext", ExactSpelling = true, CallingConvention = Alc.Style), SuppressUnmanagedCodeSecurity] unsafe static extern IntPtr sys_CreateContext([In] IntPtr device, [In] int* attrlist); @@ -115,8 +105,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion - [DllImport(Alc.Lib, EntryPoint = "alcMakeContextCurrent", ExactSpelling = true, CallingConvention = Alc.Style), SuppressUnmanagedCodeSecurity()] static extern bool MakeContextCurrent(IntPtr context); @@ -185,10 +173,6 @@ namespace OpenTK.Audio.OpenAL } // ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice( ALCcontext *context ); - #endregion Context Management - - #region Device Management - /// This function opens a device by name. /// a null-terminated string describing a device. /// Returns a pointer to the opened device. The return value will be NULL if there is an error. @@ -203,10 +187,6 @@ namespace OpenTK.Audio.OpenAL public static extern bool CloseDevice([In] IntPtr device); // ALC_API ALCboolean ALC_APIENTRY alcCloseDevice( ALCdevice *device ); - #endregion Device Management - - #region Error support. - /// This function retrieves the current context error state. /// a pointer to the device to retrieve the error state from /// Errorcode Int32. @@ -214,10 +194,6 @@ namespace OpenTK.Audio.OpenAL public static extern AlcError GetError([In] IntPtr device); // ALC_API ALCenum ALC_APIENTRY alcGetError( ALCdevice *device ); - #endregion Error support. - - #region Extension support. - /// This function queries if a specified context extension is available. /// a pointer to the device to be queried for an extension. /// a null-terminated string describing the extension. @@ -242,10 +218,6 @@ namespace OpenTK.Audio.OpenAL public static extern int GetEnumValue([In] IntPtr device, [In] string enumname); // ALC_API ALCenum ALC_APIENTRY alcGetEnumValue( ALCdevice *device, const ALCchar *enumname ); - #endregion Extension support. - - #region Query functions - [DllImport(Alc.Lib, EntryPoint = "alcGetString", ExactSpelling = true, CallingConvention = Alc.Style, CharSet = CharSet.Ansi), SuppressUnmanagedCodeSecurity()] private static extern IntPtr GetStringPrivate([In] IntPtr device, AlcGetString param); // ALC_API const ALCchar * ALC_APIENTRY alcGetString( ALCdevice *device, ALCenum param ); @@ -370,10 +342,6 @@ namespace OpenTK.Audio.OpenAL } } - #endregion Query functions - - #region Capture functions - /// This function opens a capture device by name. /// a pointer to a device name string. /// the frequency that the buffer should be captured at. @@ -473,8 +441,6 @@ namespace OpenTK.Audio.OpenAL CaptureSamples(device, ref buffer[0, 0, 0], samples); } - #endregion Capture functions - } } \ No newline at end of file diff --git a/src/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs b/src/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs index 6f68fc62..dd25c54e 100644 --- a/src/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs +++ b/src/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs @@ -1,11 +1,9 @@ -#region --- OpenTK.OpenAL License --- -/* AlcTokens.cs +/* AlcTokens.cs * C header: \OpenAL 1.1 SDK\include\Alc.h * Spec: http://www.openal.org/openal_webstf/specs/OpenAL11Specification.pdf * Copyright (c) 2008 Christoph Brandtner and Stefanos Apostolopoulos * See license.txt for license details * http://www.OpenTK.net */ -#endregion using System; diff --git a/src/OpenTK/AutoGeneratedAttribute.cs b/src/OpenTK/AutoGeneratedAttribute.cs index a705f15b..dc3c8104 100644 --- a/src/OpenTK/AutoGeneratedAttribute.cs +++ b/src/OpenTK/AutoGeneratedAttribute.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2008 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/BindingsBase.cs b/src/OpenTK/BindingsBase.cs index 09b44b32..44a65ba5 100644 --- a/src/OpenTK/BindingsBase.cs +++ b/src/OpenTK/BindingsBase.cs @@ -1,5 +1,4 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -39,14 +37,8 @@ namespace OpenTK /// public abstract class BindingsBase { - #region Fields - bool rebuildExtensionList = true; - #endregion - - #region Constructors - /// /// Constructs a new BindingsBase instance. /// @@ -54,10 +46,6 @@ namespace OpenTK { } - #endregion - - #region Protected Members - /// /// Gets or sets a that indicates whether the list of supported extensions may have changed. /// @@ -222,12 +210,6 @@ namespace OpenTK Marshal.FreeHGlobal(ptr); } - #endregion - - #region Internal Members - internal abstract void LoadEntryPoints(); - - #endregion } } diff --git a/src/OpenTK/BlittableValueType.cs b/src/OpenTK/BlittableValueType.cs index 1c3e1213..62aa9073 100644 --- a/src/OpenTK/BlittableValueType.cs +++ b/src/OpenTK/BlittableValueType.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -34,8 +32,6 @@ using System.Reflection; namespace OpenTK { - #region BlittableValueType - /// /// Checks whether the specified type parameter is a blittable value type. /// @@ -45,15 +41,9 @@ namespace OpenTK /// public static class BlittableValueType { - #region Fields - static readonly Type Type; static readonly int stride; - #endregion - - #region Constructors - static BlittableValueType() { Type = typeof(T); @@ -66,10 +56,6 @@ namespace OpenTK } } - #endregion - - #region Public Members - /// /// Gets the size of the type in bytes or 0 for non-blittable types. /// @@ -78,8 +64,6 @@ namespace OpenTK /// public static int Stride { get { return stride; } } - #region Check - /// /// Checks whether the current typename T is blittable. /// @@ -102,12 +86,6 @@ namespace OpenTK return CheckType(type); } - #endregion - - #endregion - - #region Private Members - // Checks whether the parameter is a primitive type or consists of primitive types recursively. // Throws a NotSupportedException if it is not. static bool CheckType(Type type) @@ -144,14 +122,8 @@ namespace OpenTK return true; } - - #endregion } - #endregion - - #region BlittableValueType - /// /// Checks whether the specified type parameter is a blittable value type. /// @@ -161,8 +133,6 @@ namespace OpenTK /// public static class BlittableValueType { - #region Check - /// /// Checks whether type is a blittable value type. /// @@ -217,10 +187,6 @@ namespace OpenTK return BlittableValueType.Check(); } - #endregion - - #region StrideOf - /// /// Returns the size of the specified value type in bytes or 0 if the type is not blittable. /// @@ -283,9 +249,5 @@ namespace OpenTK return BlittableValueType.Stride; } - - #endregion } - - #endregion } diff --git a/src/OpenTK/Compute/CL10/CL.cs b/src/OpenTK/Compute/CL10/CL.cs index de4fbcc3..3a18470c 100644 --- a/src/OpenTK/Compute/CL10/CL.cs +++ b/src/OpenTK/Compute/CL10/CL.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL @@ -41,7 +39,7 @@ namespace OpenTK.Compute.CL10 { [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, IntPtr user_data) { unsafe @@ -54,7 +52,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[] user_data) where T5 : struct { @@ -76,7 +74,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,] user_data) where T5 : struct { @@ -98,7 +96,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,,] user_data) where T5 : struct { @@ -120,7 +118,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T5 user_data) where T5 : struct { @@ -144,7 +142,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, IntPtr user_data) { unsafe @@ -157,7 +155,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[] user_data) where T5 : struct { @@ -179,7 +177,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,] user_data) where T5 : struct { @@ -201,7 +199,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,,] user_data) where T5 : struct { @@ -223,7 +221,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, Int32 num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T5 user_data) where T5 : struct { @@ -248,7 +246,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, Int32 num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, IntPtr user_data) { return Delegates.clBuildProgram((IntPtr)program, (uint)num_devices, (IntPtr*)device_list, (String)options, (IntPtr)pfn_notify, (IntPtr)user_data); @@ -256,7 +254,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, Int32 num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[] user_data) where T5 : struct { @@ -273,7 +271,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, Int32 num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,] user_data) where T5 : struct { @@ -290,7 +288,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, Int32 num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,,] user_data) where T5 : struct { @@ -307,7 +305,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, Int32 num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T5 user_data) where T5 : struct { @@ -326,7 +324,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, IntPtr user_data) { unsafe @@ -340,7 +338,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[] user_data) where T5 : struct { @@ -363,7 +361,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,] user_data) where T5 : struct { @@ -386,7 +384,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,,] user_data) where T5 : struct { @@ -409,7 +407,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, IntPtr[] device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T5 user_data) where T5 : struct { @@ -434,7 +432,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, IntPtr user_data) { unsafe @@ -448,7 +446,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[] user_data) where T5 : struct { @@ -471,7 +469,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,] user_data) where T5 : struct { @@ -494,7 +492,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,,] user_data) where T5 : struct { @@ -517,7 +515,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static int BuildProgram(IntPtr program, uint num_devices, ref IntPtr device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T5 user_data) where T5 : struct { @@ -542,7 +540,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, uint num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, IntPtr user_data) { return Delegates.clBuildProgram((IntPtr)program, (uint)num_devices, (IntPtr*)device_list, (String)options, (IntPtr)pfn_notify, (IntPtr)user_data); @@ -550,7 +548,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, uint num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[] user_data) where T5 : struct { @@ -567,7 +565,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, uint num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,] user_data) where T5 : struct { @@ -584,7 +582,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, uint num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] T5[,,] user_data) where T5 : struct { @@ -601,7 +599,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clBuildProgram")] - public static + public static unsafe int BuildProgram(IntPtr program, uint num_devices, IntPtr* device_list, String options, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T5 user_data) where T5 : struct { @@ -619,7 +617,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, IntPtr host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -632,7 +630,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, IntPtr host_ptr, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -648,14 +646,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static unsafe IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, IntPtr host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateBuffer((IntPtr)context, (MemFlags)flags, (IntPtr)size, (IntPtr)host_ptr, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[] host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -677,7 +675,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[] host_ptr, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -702,7 +700,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static unsafe IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[] host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -718,7 +716,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[,] host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -740,7 +738,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[,] host_ptr, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -765,7 +763,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static unsafe IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[,] host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -781,7 +779,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[,,] host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -803,7 +801,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[,,] host_ptr, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -828,7 +826,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static unsafe IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] T3[,,] host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -844,7 +842,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] ref T3 host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -868,7 +866,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] ref T3 host_ptr, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -894,7 +892,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateBuffer")] - public static + public static unsafe IntPtr CreateBuffer(IntPtr context, MemFlags flags, IntPtr size, [InAttribute, OutAttribute] ref T3 host_ptr, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -912,7 +910,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateCommandQueue")] - public static + public static IntPtr CreateCommandQueue(IntPtr context, IntPtr device, CommandQueueFlags properties, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -925,7 +923,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateCommandQueue")] - public static + public static IntPtr CreateCommandQueue(IntPtr context, IntPtr device, CommandQueueFlags properties, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -941,14 +939,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateCommandQueue")] - public static + public static unsafe IntPtr CreateCommandQueue(IntPtr context, IntPtr device, CommandQueueFlags properties, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateCommandQueue((IntPtr)context, (IntPtr)device, (CommandQueueFlags)properties, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, Int32 num_devices, IntPtr[] devices, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -963,7 +961,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, Int32 num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -987,7 +985,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, Int32 num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -1011,7 +1009,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, Int32 num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -1035,7 +1033,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, Int32 num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T4 user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -1062,7 +1060,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, uint num_devices, IntPtr[] devices, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -1078,7 +1076,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, uint num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -1103,7 +1101,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, uint num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -1128,7 +1126,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, uint num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -1153,7 +1151,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(IntPtr[] properties, uint num_devices, IntPtr[] devices, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T4 user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -1179,7 +1177,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, Int32 num_devices, ref IntPtr devices, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -1196,7 +1194,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, Int32 num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1222,7 +1220,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, Int32 num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1248,7 +1246,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, Int32 num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,,] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1274,7 +1272,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, Int32 num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T4 user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1302,7 +1300,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, uint num_devices, ref IntPtr devices, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -1320,7 +1318,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, uint num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1347,7 +1345,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, uint num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1374,7 +1372,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, uint num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,,] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1401,7 +1399,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static IntPtr CreateContext(ref IntPtr properties, uint num_devices, ref IntPtr devices, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T4 user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { @@ -1429,7 +1427,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, Int32 num_devices, IntPtr* devices, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateContext((IntPtr*)properties, (uint)num_devices, (IntPtr*)devices, (IntPtr)pfn_notify, (IntPtr)user_data, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); @@ -1437,7 +1435,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, Int32 num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1454,7 +1452,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, Int32 num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1471,7 +1469,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, Int32 num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1488,7 +1486,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, Int32 num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T4 user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1507,7 +1505,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, uint num_devices, IntPtr* devices, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateContext((IntPtr*)properties, (uint)num_devices, (IntPtr*)devices, (IntPtr)pfn_notify, (IntPtr)user_data, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); @@ -1515,7 +1513,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, uint num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1532,7 +1530,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, uint num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1549,7 +1547,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, uint num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] T4[,,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1566,7 +1564,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContext")] - public static + public static unsafe IntPtr CreateContext(IntPtr* properties, uint num_devices, IntPtr* devices, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T4 user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { @@ -1584,7 +1582,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(IntPtr[] properties, DeviceTypeFlags device_type, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -1598,7 +1596,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(IntPtr[] properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -1621,7 +1619,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(IntPtr[] properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -1644,7 +1642,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(IntPtr[] properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[,,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -1667,7 +1665,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(IntPtr[] properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T3 user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T3 : struct { @@ -1692,7 +1690,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(ref IntPtr properties, DeviceTypeFlags device_type, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -1708,7 +1706,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(ref IntPtr properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -1733,7 +1731,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(ref IntPtr properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[,] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -1758,7 +1756,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(ref IntPtr properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[,,] user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -1783,7 +1781,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static IntPtr CreateContextFromType(ref IntPtr properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T3 user_data, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T3 : struct { @@ -1810,7 +1808,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static unsafe IntPtr CreateContextFromType(IntPtr* properties, DeviceTypeFlags device_type, IntPtr pfn_notify, IntPtr user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateContextFromType((IntPtr*)properties, (DeviceTypeFlags)device_type, (IntPtr)pfn_notify, (IntPtr)user_data, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); @@ -1818,7 +1816,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static unsafe IntPtr CreateContextFromType(IntPtr* properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -1835,7 +1833,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static unsafe IntPtr CreateContextFromType(IntPtr* properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -1852,7 +1850,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static unsafe IntPtr CreateContextFromType(IntPtr* properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] T3[,,] user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -1869,7 +1867,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateContextFromType")] - public static + public static unsafe IntPtr CreateContextFromType(IntPtr* properties, DeviceTypeFlags device_type, IntPtr pfn_notify, [InAttribute, OutAttribute] ref T3 user_data, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T3 : struct { @@ -1887,7 +1885,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, IntPtr host_ptr, [OutAttribute] int[] errcode_ret) { unsafe @@ -1901,7 +1899,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[] host_ptr, [OutAttribute] int[] errcode_ret) where T6 : struct { @@ -1924,7 +1922,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[,] host_ptr, [OutAttribute] int[] errcode_ret) where T6 : struct { @@ -1947,7 +1945,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[,,] host_ptr, [OutAttribute] int[] errcode_ret) where T6 : struct { @@ -1970,7 +1968,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] ref T6 host_ptr, [OutAttribute] int[] errcode_ret) where T6 : struct { @@ -1995,7 +1993,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, IntPtr host_ptr, [OutAttribute] out int errcode_ret) { unsafe @@ -2011,7 +2009,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[] host_ptr, [OutAttribute] out int errcode_ret) where T6 : struct { @@ -2036,7 +2034,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[,] host_ptr, [OutAttribute] out int errcode_ret) where T6 : struct { @@ -2061,7 +2059,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[,,] host_ptr, [OutAttribute] out int errcode_ret) where T6 : struct { @@ -2086,7 +2084,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static IntPtr CreateImage2D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] ref T6 host_ptr, [OutAttribute] out int errcode_ret) where T6 : struct { @@ -2113,7 +2111,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static unsafe IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, IntPtr host_ptr, [OutAttribute] int* errcode_ret) { return Delegates.clCreateImage2D((IntPtr)context, (MemFlags)flags, (ImageFormat*)image_format, (IntPtr)image_width, (IntPtr)image_height, (IntPtr)image_row_pitch, (IntPtr)host_ptr, (int*)errcode_ret); @@ -2121,7 +2119,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static unsafe IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[] host_ptr, [OutAttribute] int* errcode_ret) where T6 : struct { @@ -2138,7 +2136,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static unsafe IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[,] host_ptr, [OutAttribute] int* errcode_ret) where T6 : struct { @@ -2155,7 +2153,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static unsafe IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] T6[,,] host_ptr, [OutAttribute] int* errcode_ret) where T6 : struct { @@ -2172,7 +2170,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage2D")] - public static + public static unsafe IntPtr CreateImage2D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_row_pitch, [InAttribute, OutAttribute] ref T6 host_ptr, [OutAttribute] int* errcode_ret) where T6 : struct { @@ -2190,7 +2188,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, IntPtr host_ptr, [OutAttribute] int[] errcode_ret) { unsafe @@ -2204,7 +2202,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[] host_ptr, [OutAttribute] int[] errcode_ret) where T8 : struct { @@ -2227,7 +2225,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[,] host_ptr, [OutAttribute] int[] errcode_ret) where T8 : struct { @@ -2250,7 +2248,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[,,] host_ptr, [OutAttribute] int[] errcode_ret) where T8 : struct { @@ -2273,7 +2271,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat[] image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] ref T8 host_ptr, [OutAttribute] int[] errcode_ret) where T8 : struct { @@ -2298,7 +2296,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, IntPtr host_ptr, [OutAttribute] out int errcode_ret) { unsafe @@ -2314,7 +2312,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[] host_ptr, [OutAttribute] out int errcode_ret) where T8 : struct { @@ -2339,7 +2337,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[,] host_ptr, [OutAttribute] out int errcode_ret) where T8 : struct { @@ -2364,7 +2362,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[,,] host_ptr, [OutAttribute] out int errcode_ret) where T8 : struct { @@ -2389,7 +2387,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static IntPtr CreateImage3D(IntPtr context, MemFlags flags, ref ImageFormat image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] ref T8 host_ptr, [OutAttribute] out int errcode_ret) where T8 : struct { @@ -2416,7 +2414,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static unsafe IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, IntPtr host_ptr, [OutAttribute] int* errcode_ret) { return Delegates.clCreateImage3D((IntPtr)context, (MemFlags)flags, (ImageFormat*)image_format, (IntPtr)image_width, (IntPtr)image_height, (IntPtr)image_depth, (IntPtr)image_row_pitch, (IntPtr)image_slice_pitch, (IntPtr)host_ptr, (int*)errcode_ret); @@ -2424,7 +2422,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static unsafe IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[] host_ptr, [OutAttribute] int* errcode_ret) where T8 : struct { @@ -2441,7 +2439,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static unsafe IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[,] host_ptr, [OutAttribute] int* errcode_ret) where T8 : struct { @@ -2458,7 +2456,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static unsafe IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] T8[,,] host_ptr, [OutAttribute] int* errcode_ret) where T8 : struct { @@ -2475,7 +2473,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateImage3D")] - public static + public static unsafe IntPtr CreateImage3D(IntPtr context, MemFlags flags, ImageFormat* image_format, IntPtr image_width, IntPtr image_height, IntPtr image_depth, IntPtr image_row_pitch, IntPtr image_slice_pitch, [InAttribute, OutAttribute] ref T8 host_ptr, [OutAttribute] int* errcode_ret) where T8 : struct { @@ -2493,7 +2491,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernel")] - public static + public static IntPtr CreateKernel(IntPtr program, String kernel_name, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -2506,7 +2504,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernel")] - public static + public static IntPtr CreateKernel(IntPtr program, String kernel_name, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -2522,14 +2520,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernel")] - public static + public static unsafe IntPtr CreateKernel(IntPtr program, String kernel_name, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateKernel((IntPtr)program, (String)kernel_name, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernelsInProgram")] - public static + public static int CreateKernelsInProgram(IntPtr program, Int32 num_kernels, IntPtr[] kernels, [OutAttribute] Int32[] num_kernels_ret) { unsafe @@ -2543,7 +2541,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernelsInProgram")] - public static + public static int CreateKernelsInProgram(IntPtr program, Int32 num_kernels, ref IntPtr kernels, [OutAttribute] out Int32 num_kernels_ret) { unsafe @@ -2560,7 +2558,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernelsInProgram")] - public static + public static unsafe int CreateKernelsInProgram(IntPtr program, Int32 num_kernels, IntPtr* kernels, [OutAttribute] Int32* num_kernels_ret) { return Delegates.clCreateKernelsInProgram((IntPtr)program, (uint)num_kernels, (IntPtr*)kernels, (uint*)num_kernels_ret); @@ -2568,7 +2566,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernelsInProgram")] - public static + public static int CreateKernelsInProgram(IntPtr program, uint num_kernels, IntPtr[] kernels, [OutAttribute] uint[] num_kernels_ret) { unsafe @@ -2583,7 +2581,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernelsInProgram")] - public static + public static int CreateKernelsInProgram(IntPtr program, uint num_kernels, ref IntPtr kernels, [OutAttribute] out uint num_kernels_ret) { unsafe @@ -2600,7 +2598,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateKernelsInProgram")] - public static + public static unsafe int CreateKernelsInProgram(IntPtr program, uint num_kernels, IntPtr* kernels, [OutAttribute] uint* num_kernels_ret) { return Delegates.clCreateKernelsInProgram((IntPtr)program, (uint)num_kernels, (IntPtr*)kernels, (uint*)num_kernels_ret); @@ -2608,7 +2606,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithBinary")] - public static + public static unsafe IntPtr CreateProgramWithBinary(IntPtr context, Int32 num_devices, IntPtr[] device_list, IntPtr[] lengths, byte*[] binaries, int[] binary_status, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { fixed (IntPtr* device_list_ptr = device_list) @@ -2623,7 +2621,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithBinary")] - public static + public static unsafe IntPtr CreateProgramWithBinary(IntPtr context, Int32 num_devices, ref IntPtr device_list, ref IntPtr lengths, ref byte* binaries, ref int binary_status, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { fixed (IntPtr* device_list_ptr = &device_list) @@ -2640,7 +2638,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithBinary")] - public static + public static unsafe IntPtr CreateProgramWithBinary(IntPtr context, Int32 num_devices, IntPtr* device_list, IntPtr* lengths, byte** binaries, int* binary_status, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateProgramWithBinary((IntPtr)context, (uint)num_devices, (IntPtr*)device_list, (IntPtr*)lengths, (byte**)binaries, (int*)binary_status, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); @@ -2648,7 +2646,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithBinary")] - public static + public static unsafe IntPtr CreateProgramWithBinary(IntPtr context, uint num_devices, IntPtr[] device_list, IntPtr[] lengths, byte*[] binaries, int[] binary_status, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { fixed (IntPtr* device_list_ptr = device_list) @@ -2663,7 +2661,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithBinary")] - public static + public static unsafe IntPtr CreateProgramWithBinary(IntPtr context, uint num_devices, ref IntPtr device_list, ref IntPtr lengths, ref byte* binaries, ref int binary_status, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { fixed (IntPtr* device_list_ptr = &device_list) @@ -2680,14 +2678,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithBinary")] - public static + public static unsafe IntPtr CreateProgramWithBinary(IntPtr context, uint num_devices, IntPtr* device_list, IntPtr* lengths, byte** binaries, int* binary_status, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateProgramWithBinary((IntPtr)context, (uint)num_devices, (IntPtr*)device_list, (IntPtr*)lengths, (byte**)binaries, (int*)binary_status, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithSource")] - public static + public static IntPtr CreateProgramWithSource(IntPtr context, Int32 count, String[] strings, IntPtr[] lengths, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -2701,7 +2699,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithSource")] - public static + public static IntPtr CreateProgramWithSource(IntPtr context, Int32 count, String[] strings, ref IntPtr lengths, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -2718,7 +2716,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithSource")] - public static + public static unsafe IntPtr CreateProgramWithSource(IntPtr context, Int32 count, String[] strings, IntPtr* lengths, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateProgramWithSource((IntPtr)context, (uint)count, (String[])strings, (IntPtr*)lengths, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); @@ -2726,7 +2724,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithSource")] - public static + public static IntPtr CreateProgramWithSource(IntPtr context, uint count, String[] strings, IntPtr[] lengths, [OutAttribute] OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { unsafe @@ -2741,7 +2739,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithSource")] - public static + public static IntPtr CreateProgramWithSource(IntPtr context, uint count, String[] strings, ref IntPtr lengths, [OutAttribute] out OpenTK.Compute.CL10.ErrorCode errcode_ret) { unsafe @@ -2758,14 +2756,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateProgramWithSource")] - public static + public static unsafe IntPtr CreateProgramWithSource(IntPtr context, uint count, String[] strings, IntPtr* lengths, [OutAttribute] OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return Delegates.clCreateProgramWithSource((IntPtr)context, (uint)count, (String[])strings, (IntPtr*)lengths, (OpenTK.Compute.CL10.ErrorCode*)errcode_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateSampler")] - public static + public static IntPtr CreateSampler(IntPtr context, bool normalized_coords, AddressingMode addressing_mode, FilterMode filter_mode, [OutAttribute] int[] errcode_ret) { unsafe @@ -2778,7 +2776,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateSampler")] - public static + public static IntPtr CreateSampler(IntPtr context, bool normalized_coords, AddressingMode addressing_mode, FilterMode filter_mode, [OutAttribute] out int errcode_ret) { unsafe @@ -2794,21 +2792,21 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clCreateSampler")] - public static + public static unsafe IntPtr CreateSampler(IntPtr context, bool normalized_coords, AddressingMode addressing_mode, FilterMode filter_mode, [OutAttribute] int* errcode_ret) { return Delegates.clCreateSampler((IntPtr)context, (bool)normalized_coords, (AddressingMode)addressing_mode, (FilterMode)filter_mode, (int*)errcode_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueBarrier")] - public static + public static int EnqueueBarrier(IntPtr command_queue) { return Delegates.clEnqueueBarrier((IntPtr)command_queue); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBuffer")] - public static + public static int EnqueueCopyBuffer(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_buffer, IntPtr src_offset, IntPtr dst_offset, IntPtr cb, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -2822,7 +2820,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBuffer")] - public static + public static int EnqueueCopyBuffer(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_buffer, IntPtr src_offset, IntPtr dst_offset, IntPtr cb, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -2837,7 +2835,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBuffer")] - public static + public static unsafe int EnqueueCopyBuffer(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_buffer, IntPtr src_offset, IntPtr dst_offset, IntPtr cb, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyBuffer((IntPtr)command_queue, (IntPtr)src_buffer, (IntPtr)dst_buffer, (IntPtr)src_offset, (IntPtr)dst_offset, (IntPtr)cb, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -2845,7 +2843,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBuffer")] - public static + public static int EnqueueCopyBuffer(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_buffer, IntPtr src_offset, IntPtr dst_offset, IntPtr cb, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -2860,7 +2858,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBuffer")] - public static + public static int EnqueueCopyBuffer(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_buffer, IntPtr src_offset, IntPtr dst_offset, IntPtr cb, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -2875,7 +2873,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBuffer")] - public static + public static unsafe int EnqueueCopyBuffer(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_buffer, IntPtr src_offset, IntPtr dst_offset, IntPtr cb, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyBuffer((IntPtr)command_queue, (IntPtr)src_buffer, (IntPtr)dst_buffer, (IntPtr)src_offset, (IntPtr)dst_offset, (IntPtr)cb, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -2883,7 +2881,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBufferToImage")] - public static + public static unsafe int EnqueueCopyBufferToImage(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_image, IntPtr src_offset, IntPtr*[] dst_origin, IntPtr*[] region, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** dst_origin_ptr = dst_origin) @@ -2897,7 +2895,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBufferToImage")] - public static + public static unsafe int EnqueueCopyBufferToImage(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_image, IntPtr src_offset, IntPtr*[] dst_origin, IntPtr*[] region, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** dst_origin_ptr = dst_origin) @@ -2911,7 +2909,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBufferToImage")] - public static + public static unsafe int EnqueueCopyBufferToImage(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_image, IntPtr src_offset, ref IntPtr* dst_origin, ref IntPtr* region, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** dst_origin_ptr = &dst_origin) @@ -2925,7 +2923,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBufferToImage")] - public static + public static unsafe int EnqueueCopyBufferToImage(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_image, IntPtr src_offset, ref IntPtr* dst_origin, ref IntPtr* region, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** dst_origin_ptr = &dst_origin) @@ -2939,7 +2937,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBufferToImage")] - public static + public static unsafe int EnqueueCopyBufferToImage(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_image, IntPtr src_offset, IntPtr** dst_origin, IntPtr** region, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyBufferToImage((IntPtr)command_queue, (IntPtr)src_buffer, (IntPtr)dst_image, (IntPtr)src_offset, (IntPtr**)dst_origin, (IntPtr**)region, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -2947,7 +2945,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyBufferToImage")] - public static + public static unsafe int EnqueueCopyBufferToImage(IntPtr command_queue, IntPtr src_buffer, IntPtr dst_image, IntPtr src_offset, IntPtr** dst_origin, IntPtr** region, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyBufferToImage((IntPtr)command_queue, (IntPtr)src_buffer, (IntPtr)dst_image, (IntPtr)src_offset, (IntPtr**)dst_origin, (IntPtr**)region, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -2955,7 +2953,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImage")] - public static + public static unsafe int EnqueueCopyImage(IntPtr command_queue, IntPtr src_image, IntPtr dst_image, IntPtr*[] src_origin, IntPtr*[] dst_origin, IntPtr*[] region, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** src_origin_ptr = src_origin) @@ -2970,7 +2968,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImage")] - public static + public static unsafe int EnqueueCopyImage(IntPtr command_queue, IntPtr src_image, IntPtr dst_image, IntPtr*[] src_origin, IntPtr*[] dst_origin, IntPtr*[] region, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** src_origin_ptr = src_origin) @@ -2985,7 +2983,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImage")] - public static + public static unsafe int EnqueueCopyImage(IntPtr command_queue, IntPtr src_image, IntPtr dst_image, ref IntPtr* src_origin, ref IntPtr* dst_origin, ref IntPtr* region, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** src_origin_ptr = &src_origin) @@ -3000,7 +2998,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImage")] - public static + public static unsafe int EnqueueCopyImage(IntPtr command_queue, IntPtr src_image, IntPtr dst_image, ref IntPtr* src_origin, ref IntPtr* dst_origin, ref IntPtr* region, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** src_origin_ptr = &src_origin) @@ -3015,7 +3013,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImage")] - public static + public static unsafe int EnqueueCopyImage(IntPtr command_queue, IntPtr src_image, IntPtr dst_image, IntPtr** src_origin, IntPtr** dst_origin, IntPtr** region, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyImage((IntPtr)command_queue, (IntPtr)src_image, (IntPtr)dst_image, (IntPtr**)src_origin, (IntPtr**)dst_origin, (IntPtr**)region, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -3023,7 +3021,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImage")] - public static + public static unsafe int EnqueueCopyImage(IntPtr command_queue, IntPtr src_image, IntPtr dst_image, IntPtr** src_origin, IntPtr** dst_origin, IntPtr** region, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyImage((IntPtr)command_queue, (IntPtr)src_image, (IntPtr)dst_image, (IntPtr**)src_origin, (IntPtr**)dst_origin, (IntPtr**)region, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -3031,7 +3029,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImageToBuffer")] - public static + public static unsafe int EnqueueCopyImageToBuffer(IntPtr command_queue, IntPtr src_image, IntPtr dst_buffer, IntPtr*[] src_origin, IntPtr*[] region, IntPtr dst_offset, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** src_origin_ptr = src_origin) @@ -3045,7 +3043,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImageToBuffer")] - public static + public static unsafe int EnqueueCopyImageToBuffer(IntPtr command_queue, IntPtr src_image, IntPtr dst_buffer, IntPtr*[] src_origin, IntPtr*[] region, IntPtr dst_offset, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** src_origin_ptr = src_origin) @@ -3059,7 +3057,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImageToBuffer")] - public static + public static unsafe int EnqueueCopyImageToBuffer(IntPtr command_queue, IntPtr src_image, IntPtr dst_buffer, ref IntPtr* src_origin, ref IntPtr* region, IntPtr dst_offset, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** src_origin_ptr = &src_origin) @@ -3073,7 +3071,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImageToBuffer")] - public static + public static unsafe int EnqueueCopyImageToBuffer(IntPtr command_queue, IntPtr src_image, IntPtr dst_buffer, ref IntPtr* src_origin, ref IntPtr* region, IntPtr dst_offset, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** src_origin_ptr = &src_origin) @@ -3087,7 +3085,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImageToBuffer")] - public static + public static unsafe int EnqueueCopyImageToBuffer(IntPtr command_queue, IntPtr src_image, IntPtr dst_buffer, IntPtr** src_origin, IntPtr** region, IntPtr dst_offset, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyImageToBuffer((IntPtr)command_queue, (IntPtr)src_image, (IntPtr)dst_buffer, (IntPtr**)src_origin, (IntPtr**)region, (IntPtr)dst_offset, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -3095,7 +3093,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueCopyImageToBuffer")] - public static + public static unsafe int EnqueueCopyImageToBuffer(IntPtr command_queue, IntPtr src_image, IntPtr dst_buffer, IntPtr** src_origin, IntPtr** region, IntPtr dst_offset, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueCopyImageToBuffer((IntPtr)command_queue, (IntPtr)src_image, (IntPtr)dst_buffer, (IntPtr**)src_origin, (IntPtr**)region, (IntPtr)dst_offset, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -3103,7 +3101,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapBuffer")] - public static + public static unsafe System.IntPtr EnqueueMapBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_map, MapFlags map_flags, IntPtr offset, IntPtr cb, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event, [OutAttribute] int[] errcode_ret) { fixed (IntPtr* event_wait_list_ptr = event_wait_list) @@ -3116,7 +3114,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapBuffer")] - public static + public static unsafe System.IntPtr EnqueueMapBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_map, MapFlags map_flags, IntPtr offset, IntPtr cb, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event, [OutAttribute] out int errcode_ret) { fixed (IntPtr* event_wait_list_ptr = &event_wait_list) @@ -3131,7 +3129,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapBuffer")] - public static + public static unsafe System.IntPtr EnqueueMapBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_map, MapFlags map_flags, IntPtr offset, IntPtr cb, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event, [OutAttribute] int* errcode_ret) { return Delegates.clEnqueueMapBuffer((IntPtr)command_queue, (IntPtr)buffer, (bool)blocking_map, (MapFlags)map_flags, (IntPtr)offset, (IntPtr)cb, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event, (int*)errcode_ret); @@ -3139,7 +3137,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapBuffer")] - public static + public static unsafe System.IntPtr EnqueueMapBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_map, MapFlags map_flags, IntPtr offset, IntPtr cb, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event, [OutAttribute] int[] errcode_ret) { fixed (IntPtr* event_wait_list_ptr = event_wait_list) @@ -3152,7 +3150,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapBuffer")] - public static + public static unsafe System.IntPtr EnqueueMapBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_map, MapFlags map_flags, IntPtr offset, IntPtr cb, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event, [OutAttribute] out int errcode_ret) { fixed (IntPtr* event_wait_list_ptr = &event_wait_list) @@ -3167,7 +3165,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapBuffer")] - public static + public static unsafe System.IntPtr EnqueueMapBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_map, MapFlags map_flags, IntPtr offset, IntPtr cb, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event, [OutAttribute] int* errcode_ret) { return Delegates.clEnqueueMapBuffer((IntPtr)command_queue, (IntPtr)buffer, (bool)blocking_map, (MapFlags)map_flags, (IntPtr)offset, (IntPtr)cb, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event, (int*)errcode_ret); @@ -3175,7 +3173,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapImage")] - public static + public static unsafe System.IntPtr EnqueueMapImage(IntPtr command_queue, IntPtr image, bool blocking_map, MapFlags map_flags, IntPtr*[] origin, IntPtr*[] region, IntPtr[] image_row_pitch, IntPtr[] image_slice_pitch, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event, [OutAttribute] int[] errcode_ret) { fixed (IntPtr** origin_ptr = origin) @@ -3192,7 +3190,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapImage")] - public static + public static unsafe System.IntPtr EnqueueMapImage(IntPtr command_queue, IntPtr image, bool blocking_map, MapFlags map_flags, IntPtr*[] origin, IntPtr*[] region, IntPtr[] image_row_pitch, IntPtr[] image_slice_pitch, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event, [OutAttribute] int[] errcode_ret) { fixed (IntPtr** origin_ptr = origin) @@ -3209,7 +3207,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapImage")] - public static + public static unsafe System.IntPtr EnqueueMapImage(IntPtr command_queue, IntPtr image, bool blocking_map, MapFlags map_flags, ref IntPtr* origin, ref IntPtr* region, ref IntPtr image_row_pitch, ref IntPtr image_slice_pitch, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event, [OutAttribute] out int errcode_ret) { fixed (IntPtr** origin_ptr = &origin) @@ -3228,7 +3226,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapImage")] - public static + public static unsafe System.IntPtr EnqueueMapImage(IntPtr command_queue, IntPtr image, bool blocking_map, MapFlags map_flags, ref IntPtr* origin, ref IntPtr* region, ref IntPtr image_row_pitch, ref IntPtr image_slice_pitch, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event, [OutAttribute] out int errcode_ret) { fixed (IntPtr** origin_ptr = &origin) @@ -3247,7 +3245,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapImage")] - public static + public static unsafe System.IntPtr EnqueueMapImage(IntPtr command_queue, IntPtr image, bool blocking_map, MapFlags map_flags, IntPtr** origin, IntPtr** region, IntPtr* image_row_pitch, IntPtr* image_slice_pitch, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event, [OutAttribute] int* errcode_ret) { return Delegates.clEnqueueMapImage((IntPtr)command_queue, (IntPtr)image, (bool)blocking_map, (MapFlags)map_flags, (IntPtr**)origin, (IntPtr**)region, (IntPtr*)image_row_pitch, (IntPtr*)image_slice_pitch, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event, (int*)errcode_ret); @@ -3255,14 +3253,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMapImage")] - public static + public static unsafe System.IntPtr EnqueueMapImage(IntPtr command_queue, IntPtr image, bool blocking_map, MapFlags map_flags, IntPtr** origin, IntPtr** region, IntPtr* image_row_pitch, IntPtr* image_slice_pitch, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event, [OutAttribute] int* errcode_ret) { return Delegates.clEnqueueMapImage((IntPtr)command_queue, (IntPtr)image, (bool)blocking_map, (MapFlags)map_flags, (IntPtr**)origin, (IntPtr**)region, (IntPtr*)image_row_pitch, (IntPtr*)image_slice_pitch, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event, (int*)errcode_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMarker")] - public static + public static int EnqueueMarker(IntPtr command_queue, IntPtr[] @event) { unsafe @@ -3275,7 +3273,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMarker")] - public static + public static int EnqueueMarker(IntPtr command_queue, ref IntPtr @event) { unsafe @@ -3289,14 +3287,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueMarker")] - public static + public static unsafe int EnqueueMarker(IntPtr command_queue, IntPtr* @event) { return Delegates.clEnqueueMarker((IntPtr)command_queue, (IntPtr*)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, IntPtr args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -3311,7 +3309,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[] args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3335,7 +3333,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3359,7 +3357,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3383,7 +3381,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] ref T6 args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3409,7 +3407,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, IntPtr args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -3424,7 +3422,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[] args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3448,7 +3446,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,] args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3472,7 +3470,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3496,7 +3494,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] ref T6 args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3523,7 +3521,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, IntPtr args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueNativeKernel((IntPtr)command_queue, (IntPtr)user_func, (IntPtr)args, (IntPtr)cb_args, (uint)num_mem_objects, (IntPtr*)mem_list, (IntPtr)args_mem_loc, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -3531,7 +3529,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[] args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3548,7 +3546,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3565,7 +3563,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3582,7 +3580,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] ref T6 args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3601,7 +3599,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, IntPtr args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -3617,7 +3615,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[] args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3642,7 +3640,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,] args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3667,7 +3665,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3692,7 +3690,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] ref T6 args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T6 : struct { @@ -3719,7 +3717,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, IntPtr args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -3735,7 +3733,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[] args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3760,7 +3758,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,] args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3785,7 +3783,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3810,7 +3808,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] ref T6 args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T6 : struct { @@ -3837,7 +3835,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, IntPtr args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueNativeKernel((IntPtr)command_queue, (IntPtr)user_func, (IntPtr)args, (IntPtr)cb_args, (uint)num_mem_objects, (IntPtr*)mem_list, (IntPtr)args_mem_loc, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -3845,7 +3843,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[] args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3862,7 +3860,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,] args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3879,7 +3877,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3896,7 +3894,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, IntPtr args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] ref T6 args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T6 : struct { @@ -3914,7 +3912,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[] args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -3941,7 +3939,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[] args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -3969,7 +3967,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[] args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -3989,7 +3987,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[] args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -4017,7 +4015,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[] args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -4045,7 +4043,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[] args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -4064,7 +4062,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,] args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -4091,7 +4089,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,] args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -4119,7 +4117,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,] args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -4139,7 +4137,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,] args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -4167,7 +4165,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,] args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -4195,7 +4193,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,] args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -4214,7 +4212,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,,] args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -4241,7 +4239,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,,] args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -4269,7 +4267,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,,] args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -4289,7 +4287,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,,] args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -4317,7 +4315,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,,] args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -4345,7 +4343,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] T2[,,] args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -4364,7 +4362,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] ref T2 args, IntPtr cb_args, Int32 num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -4393,7 +4391,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] ref T2 args, IntPtr cb_args, Int32 num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -4423,7 +4421,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] ref T2 args, IntPtr cb_args, Int32 num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -4445,7 +4443,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] ref T2 args, IntPtr cb_args, uint num_mem_objects, IntPtr[] mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct where T6 : struct @@ -4475,7 +4473,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] ref T2 args, IntPtr cb_args, uint num_mem_objects, ref IntPtr mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct where T6 : struct @@ -4505,7 +4503,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNativeKernel")] - public static + public static unsafe int EnqueueNativeKernel(IntPtr command_queue, IntPtr user_func, [InAttribute, OutAttribute] ref T2 args, IntPtr cb_args, uint num_mem_objects, IntPtr* mem_list, [InAttribute, OutAttribute] T6[,,] args_mem_loc, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct where T6 : struct @@ -4526,7 +4524,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNDRangeKernel")] - public static + public static int EnqueueNDRangeKernel(IntPtr command_queue, IntPtr kernel, Int32 work_dim, IntPtr[] global_work_offset, IntPtr[] global_work_size, IntPtr[] local_work_size, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -4543,7 +4541,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNDRangeKernel")] - public static + public static int EnqueueNDRangeKernel(IntPtr command_queue, IntPtr kernel, Int32 work_dim, ref IntPtr global_work_offset, ref IntPtr global_work_size, ref IntPtr local_work_size, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -4561,7 +4559,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNDRangeKernel")] - public static + public static unsafe int EnqueueNDRangeKernel(IntPtr command_queue, IntPtr kernel, Int32 work_dim, IntPtr* global_work_offset, IntPtr* global_work_size, IntPtr* local_work_size, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueNDRangeKernel((IntPtr)command_queue, (IntPtr)kernel, (uint)work_dim, (IntPtr*)global_work_offset, (IntPtr*)global_work_size, (IntPtr*)local_work_size, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -4569,7 +4567,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNDRangeKernel")] - public static + public static int EnqueueNDRangeKernel(IntPtr command_queue, IntPtr kernel, uint work_dim, IntPtr[] global_work_offset, IntPtr[] global_work_size, IntPtr[] local_work_size, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -4587,7 +4585,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNDRangeKernel")] - public static + public static int EnqueueNDRangeKernel(IntPtr command_queue, IntPtr kernel, uint work_dim, ref IntPtr global_work_offset, ref IntPtr global_work_size, ref IntPtr local_work_size, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -4605,14 +4603,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueNDRangeKernel")] - public static + public static unsafe int EnqueueNDRangeKernel(IntPtr command_queue, IntPtr kernel, uint work_dim, IntPtr* global_work_offset, IntPtr* global_work_size, IntPtr* local_work_size, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueNDRangeKernel((IntPtr)command_queue, (IntPtr)kernel, (uint)work_dim, (IntPtr*)global_work_offset, (IntPtr*)global_work_size, (IntPtr*)local_work_size, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -4626,7 +4624,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, IntPtr ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -4641,7 +4639,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueReadBuffer((IntPtr)command_queue, (IntPtr)buffer, (bool)blocking_read, (IntPtr)offset, (IntPtr)cb, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -4649,7 +4647,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, IntPtr ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -4664,7 +4662,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, IntPtr ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -4679,14 +4677,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, IntPtr ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueReadBuffer((IntPtr)command_queue, (IntPtr)buffer, (bool)blocking_read, (IntPtr)offset, (IntPtr)cb, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -4709,7 +4707,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -4733,7 +4731,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -4750,7 +4748,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -4774,7 +4772,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -4798,7 +4796,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -4814,7 +4812,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -4837,7 +4835,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -4861,7 +4859,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -4878,7 +4876,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -4902,7 +4900,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -4926,7 +4924,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -4942,7 +4940,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -4965,7 +4963,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -4989,7 +4987,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -5006,7 +5004,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -5030,7 +5028,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -5054,7 +5052,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -5070,7 +5068,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -5095,7 +5093,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -5121,7 +5119,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -5140,7 +5138,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -5166,7 +5164,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -5192,7 +5190,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadBuffer")] - public static + public static unsafe int EnqueueReadBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_read, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -5211,7 +5209,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** origin_ptr = origin) @@ -5225,7 +5223,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, IntPtr ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** origin_ptr = origin) @@ -5239,7 +5237,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5262,7 +5260,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5285,7 +5283,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5308,7 +5306,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5331,7 +5329,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5354,7 +5352,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5377,7 +5375,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5402,7 +5400,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr*[] origin, IntPtr*[] region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -5427,7 +5425,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, IntPtr ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** origin_ptr = &origin) @@ -5441,7 +5439,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, IntPtr ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** origin_ptr = &origin) @@ -5455,7 +5453,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5478,7 +5476,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5501,7 +5499,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5524,7 +5522,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5547,7 +5545,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5570,7 +5568,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5593,7 +5591,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5618,7 +5616,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, ref IntPtr* origin, ref IntPtr* region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -5643,7 +5641,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueReadImage((IntPtr)command_queue, (IntPtr)image, (bool)blocking_read, (IntPtr**)origin, (IntPtr**)region, (IntPtr)row_pitch, (IntPtr)slice_pitch, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -5651,7 +5649,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, IntPtr ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueReadImage((IntPtr)command_queue, (IntPtr)image, (bool)blocking_read, (IntPtr**)origin, (IntPtr**)region, (IntPtr)row_pitch, (IntPtr)slice_pitch, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -5659,7 +5657,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5676,7 +5674,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5693,7 +5691,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5710,7 +5708,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5727,7 +5725,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5744,7 +5742,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5761,7 +5759,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5780,7 +5778,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueReadImage")] - public static + public static unsafe int EnqueueReadImage(IntPtr command_queue, IntPtr image, bool blocking_read, IntPtr** origin, IntPtr** region, IntPtr row_pitch, IntPtr slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -5798,7 +5796,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueTask")] - public static + public static int EnqueueTask(IntPtr command_queue, IntPtr kernel, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -5812,7 +5810,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueTask")] - public static + public static int EnqueueTask(IntPtr command_queue, IntPtr kernel, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -5827,7 +5825,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueTask")] - public static + public static unsafe int EnqueueTask(IntPtr command_queue, IntPtr kernel, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueTask((IntPtr)command_queue, (IntPtr)kernel, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -5835,7 +5833,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueTask")] - public static + public static int EnqueueTask(IntPtr command_queue, IntPtr kernel, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -5850,7 +5848,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueTask")] - public static + public static int EnqueueTask(IntPtr command_queue, IntPtr kernel, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -5865,14 +5863,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueTask")] - public static + public static unsafe int EnqueueTask(IntPtr command_queue, IntPtr kernel, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueTask((IntPtr)command_queue, (IntPtr)kernel, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, IntPtr mapped_ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -5886,7 +5884,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, IntPtr mapped_ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -5901,7 +5899,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, IntPtr mapped_ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueUnmapMemObject((IntPtr)command_queue, (IntPtr)memobj, (IntPtr)mapped_ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -5909,7 +5907,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, IntPtr mapped_ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -5924,7 +5922,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, IntPtr mapped_ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -5939,14 +5937,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, IntPtr mapped_ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueUnmapMemObject((IntPtr)command_queue, (IntPtr)memobj, (IntPtr)mapped_ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[] mapped_ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -5969,7 +5967,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[] mapped_ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -5993,7 +5991,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[] mapped_ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6010,7 +6008,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[] mapped_ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -6034,7 +6032,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[] mapped_ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -6058,7 +6056,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[] mapped_ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6074,7 +6072,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,] mapped_ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -6097,7 +6095,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,] mapped_ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -6121,7 +6119,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,] mapped_ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6138,7 +6136,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,] mapped_ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -6162,7 +6160,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,] mapped_ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -6186,7 +6184,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,] mapped_ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6202,7 +6200,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,,] mapped_ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -6225,7 +6223,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,,] mapped_ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -6249,7 +6247,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,,] mapped_ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6266,7 +6264,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,,] mapped_ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -6290,7 +6288,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,,] mapped_ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -6314,7 +6312,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] T2[,,] mapped_ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6330,7 +6328,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] ref T2 mapped_ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -6355,7 +6353,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] ref T2 mapped_ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -6381,7 +6379,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] ref T2 mapped_ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6400,7 +6398,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] ref T2 mapped_ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T2 : struct { @@ -6426,7 +6424,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] ref T2 mapped_ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T2 : struct { @@ -6452,7 +6450,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueUnmapMemObject")] - public static + public static unsafe int EnqueueUnmapMemObject(IntPtr command_queue, IntPtr memobj, [InAttribute, OutAttribute] ref T2 mapped_ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T2 : struct { @@ -6470,7 +6468,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWaitForEvents")] - public static + public static int EnqueueWaitForEvents(IntPtr command_queue, Int32 num_events, IntPtr[] event_list) { unsafe @@ -6483,7 +6481,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWaitForEvents")] - public static + public static int EnqueueWaitForEvents(IntPtr command_queue, Int32 num_events, ref IntPtr event_list) { unsafe @@ -6497,7 +6495,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWaitForEvents")] - public static + public static unsafe int EnqueueWaitForEvents(IntPtr command_queue, Int32 num_events, IntPtr* event_list) { return Delegates.clEnqueueWaitForEvents((IntPtr)command_queue, (uint)num_events, (IntPtr*)event_list); @@ -6505,7 +6503,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWaitForEvents")] - public static + public static int EnqueueWaitForEvents(IntPtr command_queue, uint num_events, IntPtr[] event_list) { unsafe @@ -6519,7 +6517,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWaitForEvents")] - public static + public static int EnqueueWaitForEvents(IntPtr command_queue, uint num_events, ref IntPtr event_list) { unsafe @@ -6533,14 +6531,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWaitForEvents")] - public static + public static unsafe int EnqueueWaitForEvents(IntPtr command_queue, uint num_events, IntPtr* event_list) { return Delegates.clEnqueueWaitForEvents((IntPtr)command_queue, (uint)num_events, (IntPtr*)event_list); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -6554,7 +6552,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, IntPtr ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -6569,7 +6567,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueWriteBuffer((IntPtr)command_queue, (IntPtr)buffer, (bool)blocking_write, (IntPtr)offset, (IntPtr)cb, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -6577,7 +6575,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, IntPtr ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { unsafe @@ -6592,7 +6590,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, IntPtr ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { unsafe @@ -6607,14 +6605,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, IntPtr ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueWriteBuffer((IntPtr)command_queue, (IntPtr)buffer, (bool)blocking_write, (IntPtr)offset, (IntPtr)cb, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -6637,7 +6635,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -6661,7 +6659,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -6678,7 +6676,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -6702,7 +6700,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -6726,7 +6724,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -6742,7 +6740,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -6765,7 +6763,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -6789,7 +6787,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -6806,7 +6804,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -6830,7 +6828,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -6854,7 +6852,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -6870,7 +6868,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -6893,7 +6891,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -6917,7 +6915,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -6934,7 +6932,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -6958,7 +6956,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -6982,7 +6980,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] T5[,,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -6998,7 +6996,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -7023,7 +7021,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -7049,7 +7047,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -7068,7 +7066,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T5 : struct { @@ -7094,7 +7092,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T5 : struct { @@ -7120,7 +7118,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteBuffer")] - public static + public static unsafe int EnqueueWriteBuffer(IntPtr command_queue, IntPtr buffer, bool blocking_write, IntPtr offset, IntPtr cb, [InAttribute, OutAttribute] ref T5 ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T5 : struct { @@ -7139,7 +7137,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** origin_ptr = origin) @@ -7153,7 +7151,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, IntPtr ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) { fixed (IntPtr** origin_ptr = origin) @@ -7167,7 +7165,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7190,7 +7188,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7213,7 +7211,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7236,7 +7234,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7259,7 +7257,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7282,7 +7280,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7305,7 +7303,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, Int32 num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7330,7 +7328,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr*[] origin, IntPtr*[] region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, uint num_events_in_wait_list, IntPtr[] event_wait_list, IntPtr[] @event) where T7 : struct { @@ -7355,7 +7353,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, IntPtr ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** origin_ptr = &origin) @@ -7369,7 +7367,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, IntPtr ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) { fixed (IntPtr** origin_ptr = &origin) @@ -7383,7 +7381,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7406,7 +7404,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7429,7 +7427,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7452,7 +7450,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7475,7 +7473,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7498,7 +7496,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7521,7 +7519,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, Int32 num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7546,7 +7544,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, ref IntPtr* origin, ref IntPtr* region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, uint num_events_in_wait_list, ref IntPtr event_wait_list, ref IntPtr @event) where T7 : struct { @@ -7571,7 +7569,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, IntPtr ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueWriteImage((IntPtr)command_queue, (IntPtr)image, (bool)blocking_write, (IntPtr**)origin, (IntPtr**)region, (IntPtr)input_row_pitch, (IntPtr)input_slice_pitch, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -7579,7 +7577,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, IntPtr ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) { return Delegates.clEnqueueWriteImage((IntPtr)command_queue, (IntPtr)image, (bool)blocking_write, (IntPtr**)origin, (IntPtr**)region, (IntPtr)input_row_pitch, (IntPtr)input_slice_pitch, (IntPtr)ptr, (uint)num_events_in_wait_list, (IntPtr*)event_wait_list, (IntPtr*)@event); @@ -7587,7 +7585,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7604,7 +7602,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7621,7 +7619,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7638,7 +7636,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7655,7 +7653,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7672,7 +7670,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] T7[,,] ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7689,7 +7687,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, Int32 num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7708,7 +7706,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clEnqueueWriteImage")] - public static + public static unsafe int EnqueueWriteImage(IntPtr command_queue, IntPtr image, bool blocking_write, IntPtr** origin, IntPtr** region, IntPtr input_row_pitch, IntPtr input_slice_pitch, [InAttribute, OutAttribute] ref T7 ptr, uint num_events_in_wait_list, IntPtr* event_wait_list, IntPtr* @event) where T7 : struct { @@ -7726,21 +7724,21 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clFinish")] - public static + public static int Finish(IntPtr command_queue) { return Delegates.clFinish((IntPtr)command_queue); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clFlush")] - public static + public static int Flush(IntPtr command_queue) { return Delegates.clFlush((IntPtr)command_queue); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -7753,7 +7751,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -7769,14 +7767,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static unsafe int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetCommandQueueInfo((IntPtr)command_queue, (CommandQueueInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -7798,7 +7796,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -7823,7 +7821,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static unsafe int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -7839,7 +7837,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -7861,7 +7859,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -7886,7 +7884,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static unsafe int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -7902,7 +7900,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -7924,7 +7922,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -7949,7 +7947,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static unsafe int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -7965,7 +7963,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -7989,7 +7987,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8015,7 +8013,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetCommandQueueInfo")] - public static + public static unsafe int GetCommandQueueInfo(IntPtr command_queue, CommandQueueInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8033,7 +8031,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -8046,7 +8044,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -8062,14 +8060,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static unsafe int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetContextInfo((IntPtr)context, (ContextInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8091,7 +8089,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8116,7 +8114,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static unsafe int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8132,7 +8130,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8154,7 +8152,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8179,7 +8177,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static unsafe int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8195,7 +8193,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8217,7 +8215,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8242,7 +8240,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static unsafe int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8258,7 +8256,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8282,7 +8280,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8308,7 +8306,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetContextInfo")] - public static + public static unsafe int GetContextInfo(IntPtr context, ContextInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8326,7 +8324,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceIDs")] - public static + public static int GetDeviceIDs(IntPtr platform, DeviceTypeFlags device_type, Int32 num_entries, IntPtr[] devices, Int32[] num_devices) { unsafe @@ -8340,7 +8338,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceIDs")] - public static + public static int GetDeviceIDs(IntPtr platform, DeviceTypeFlags device_type, Int32 num_entries, ref IntPtr devices, ref Int32 num_devices) { unsafe @@ -8355,7 +8353,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceIDs")] - public static + public static unsafe int GetDeviceIDs(IntPtr platform, DeviceTypeFlags device_type, Int32 num_entries, IntPtr* devices, Int32* num_devices) { return Delegates.clGetDeviceIDs((IntPtr)platform, (DeviceTypeFlags)device_type, (uint)num_entries, (IntPtr*)devices, (uint*)num_devices); @@ -8363,7 +8361,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceIDs")] - public static + public static int GetDeviceIDs(IntPtr platform, DeviceTypeFlags device_type, uint num_entries, IntPtr[] devices, uint[] num_devices) { unsafe @@ -8378,7 +8376,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceIDs")] - public static + public static int GetDeviceIDs(IntPtr platform, DeviceTypeFlags device_type, uint num_entries, ref IntPtr devices, ref uint num_devices) { unsafe @@ -8393,14 +8391,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceIDs")] - public static + public static unsafe int GetDeviceIDs(IntPtr platform, DeviceTypeFlags device_type, uint num_entries, IntPtr* devices, uint* num_devices) { return Delegates.clGetDeviceIDs((IntPtr)platform, (DeviceTypeFlags)device_type, (uint)num_entries, (IntPtr*)devices, (uint*)num_devices); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -8413,7 +8411,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -8429,14 +8427,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static unsafe int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetDeviceInfo((IntPtr)device, (DeviceInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8458,7 +8456,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8483,7 +8481,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static unsafe int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8499,7 +8497,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8521,7 +8519,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8546,7 +8544,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static unsafe int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8562,7 +8560,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8584,7 +8582,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8609,7 +8607,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static unsafe int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8625,7 +8623,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8649,7 +8647,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8675,7 +8673,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetDeviceInfo")] - public static + public static unsafe int GetDeviceInfo(IntPtr device, DeviceInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8693,7 +8691,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -8706,7 +8704,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -8722,14 +8720,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static unsafe int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetEventInfo((IntPtr)@event, (EventInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8751,7 +8749,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8776,7 +8774,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static unsafe int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8792,7 +8790,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8814,7 +8812,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8839,7 +8837,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static unsafe int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8855,7 +8853,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8877,7 +8875,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8902,7 +8900,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static unsafe int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8918,7 +8916,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -8942,7 +8940,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -8968,7 +8966,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventInfo")] - public static + public static unsafe int GetEventInfo(IntPtr @event, EventInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -8986,7 +8984,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -8999,7 +8997,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -9015,14 +9013,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static unsafe int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetEventProfilingInfo((IntPtr)@event, (ProfilingInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9044,7 +9042,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9069,7 +9067,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static unsafe int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9085,7 +9083,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9107,7 +9105,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9132,7 +9130,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static unsafe int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9148,7 +9146,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9170,7 +9168,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9195,7 +9193,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static unsafe int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9211,7 +9209,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9235,7 +9233,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9261,7 +9259,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetEventProfilingInfo")] - public static + public static unsafe int GetEventProfilingInfo(IntPtr @event, ProfilingInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9279,7 +9277,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -9292,7 +9290,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -9308,14 +9306,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static unsafe int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetImageInfo((IntPtr)image, (ImageInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9337,7 +9335,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9362,7 +9360,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static unsafe int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9378,7 +9376,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9400,7 +9398,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9425,7 +9423,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static unsafe int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9441,7 +9439,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9463,7 +9461,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9488,7 +9486,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static unsafe int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9504,7 +9502,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9528,7 +9526,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9554,7 +9552,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetImageInfo")] - public static + public static unsafe int GetImageInfo(IntPtr image, ImageInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9572,7 +9570,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -9585,7 +9583,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -9601,14 +9599,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static unsafe int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetKernelInfo((IntPtr)kernel, (KernelInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9630,7 +9628,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9655,7 +9653,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static unsafe int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9671,7 +9669,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9693,7 +9691,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9718,7 +9716,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static unsafe int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9734,7 +9732,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9756,7 +9754,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9781,7 +9779,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static unsafe int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9797,7 +9795,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -9821,7 +9819,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -9847,7 +9845,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelInfo")] - public static + public static unsafe int GetKernelInfo(IntPtr kernel, KernelInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -9865,7 +9863,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -9878,7 +9876,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -9894,14 +9892,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static unsafe int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetKernelWorkGroupInfo((IntPtr)kernel, (IntPtr)device, (KernelWorkGroupInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -9923,7 +9921,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -9948,7 +9946,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static unsafe int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -9964,7 +9962,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -9986,7 +9984,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -10011,7 +10009,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static unsafe int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -10027,7 +10025,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -10049,7 +10047,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -10074,7 +10072,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static unsafe int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -10090,7 +10088,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T4 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -10114,7 +10112,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T4 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -10140,7 +10138,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetKernelWorkGroupInfo")] - public static + public static unsafe int GetKernelWorkGroupInfo(IntPtr kernel, IntPtr device, KernelWorkGroupInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T4 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -10158,7 +10156,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -10171,7 +10169,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -10187,14 +10185,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static unsafe int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetMemObjectInfo((IntPtr)memobj, (MemInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10216,7 +10214,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10241,7 +10239,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static unsafe int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10257,7 +10255,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10279,7 +10277,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10304,7 +10302,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static unsafe int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10320,7 +10318,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10342,7 +10340,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10367,7 +10365,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static unsafe int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10383,7 +10381,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10407,7 +10405,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10433,7 +10431,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetMemObjectInfo")] - public static + public static unsafe int GetMemObjectInfo(IntPtr memobj, MemInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10451,7 +10449,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformIDs")] - public static + public static int GetPlatformIDs(Int32 num_entries, IntPtr[] platforms, Int32[] num_platforms) { unsafe @@ -10465,7 +10463,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformIDs")] - public static + public static int GetPlatformIDs(Int32 num_entries, ref IntPtr platforms, ref Int32 num_platforms) { unsafe @@ -10480,7 +10478,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformIDs")] - public static + public static unsafe int GetPlatformIDs(Int32 num_entries, IntPtr* platforms, Int32* num_platforms) { return Delegates.clGetPlatformIDs((uint)num_entries, (IntPtr*)platforms, (uint*)num_platforms); @@ -10488,7 +10486,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformIDs")] - public static + public static int GetPlatformIDs(uint num_entries, IntPtr[] platforms, uint[] num_platforms) { unsafe @@ -10503,7 +10501,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformIDs")] - public static + public static int GetPlatformIDs(uint num_entries, ref IntPtr platforms, ref uint num_platforms) { unsafe @@ -10518,14 +10516,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformIDs")] - public static + public static unsafe int GetPlatformIDs(uint num_entries, IntPtr* platforms, uint* num_platforms) { return Delegates.clGetPlatformIDs((uint)num_entries, (IntPtr*)platforms, (uint*)num_platforms); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -10538,7 +10536,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -10554,14 +10552,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static unsafe int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetPlatformInfo((IntPtr)platform, (PlatformInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10583,7 +10581,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10608,7 +10606,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static unsafe int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10624,7 +10622,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10646,7 +10644,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10671,7 +10669,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static unsafe int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10687,7 +10685,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10709,7 +10707,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10734,7 +10732,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static unsafe int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10750,7 +10748,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -10774,7 +10772,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -10800,7 +10798,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetPlatformInfo")] - public static + public static unsafe int GetPlatformInfo(IntPtr platform, PlatformInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -10818,7 +10816,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -10831,7 +10829,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -10847,14 +10845,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static unsafe int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetProgramBuildInfo((IntPtr)program, (IntPtr)device, (ProgramBuildInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -10876,7 +10874,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -10901,7 +10899,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static unsafe int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -10917,7 +10915,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -10939,7 +10937,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -10964,7 +10962,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static unsafe int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -10980,7 +10978,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -11002,7 +11000,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -11027,7 +11025,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static unsafe int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T4[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -11043,7 +11041,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T4 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T4 : struct { @@ -11067,7 +11065,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T4 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T4 : struct { @@ -11093,7 +11091,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramBuildInfo")] - public static + public static unsafe int GetProgramBuildInfo(IntPtr program, IntPtr device, ProgramBuildInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T4 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T4 : struct { @@ -11111,7 +11109,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -11124,7 +11122,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -11140,14 +11138,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static unsafe int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetProgramInfo((IntPtr)program, (ProgramInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11169,7 +11167,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11194,7 +11192,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static unsafe int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11210,7 +11208,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11232,7 +11230,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11257,7 +11255,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static unsafe int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11273,7 +11271,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11295,7 +11293,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11320,7 +11318,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static unsafe int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11336,7 +11334,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11360,7 +11358,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11386,7 +11384,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetProgramInfo")] - public static + public static unsafe int GetProgramInfo(IntPtr program, ProgramInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11404,7 +11402,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr[] param_value_size_ret) { unsafe @@ -11417,7 +11415,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] out IntPtr param_value_size_ret) { unsafe @@ -11433,14 +11431,14 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static unsafe int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, IntPtr param_value, [OutAttribute] IntPtr* param_value_size_ret) { return Delegates.clGetSamplerInfo((IntPtr)sampler, (SamplerInfo)param_name, (IntPtr)param_value_size, (IntPtr)param_value, (IntPtr*)param_value_size_ret); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11462,7 +11460,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11487,7 +11485,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static unsafe int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11503,7 +11501,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11525,7 +11523,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11550,7 +11548,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static unsafe int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11566,7 +11564,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11588,7 +11586,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11613,7 +11611,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static unsafe int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] T3[,,] param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11629,7 +11627,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr[] param_value_size_ret) where T3 : struct { @@ -11653,7 +11651,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] out IntPtr param_value_size_ret) where T3 : struct { @@ -11679,7 +11677,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSamplerInfo")] - public static + public static unsafe int GetSamplerInfo(IntPtr sampler, SamplerInfo param_name, IntPtr param_value_size, [InAttribute, OutAttribute] ref T3 param_value, [OutAttribute] IntPtr* param_value_size_ret) where T3 : struct { @@ -11697,7 +11695,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSupportedImageFormats")] - public static + public static int GetSupportedImageFormats(IntPtr context, MemFlags flags, MemObjectType image_type, Int32 num_entries, ImageFormat[] image_formats, Int32[] num_image_formats) { unsafe @@ -11711,7 +11709,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSupportedImageFormats")] - public static + public static int GetSupportedImageFormats(IntPtr context, MemFlags flags, MemObjectType image_type, Int32 num_entries, ref ImageFormat image_formats, ref Int32 num_image_formats) { unsafe @@ -11726,7 +11724,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSupportedImageFormats")] - public static + public static unsafe int GetSupportedImageFormats(IntPtr context, MemFlags flags, MemObjectType image_type, Int32 num_entries, ImageFormat* image_formats, Int32* num_image_formats) { return Delegates.clGetSupportedImageFormats((IntPtr)context, (MemFlags)flags, (MemObjectType)image_type, (uint)num_entries, (ImageFormat*)image_formats, (uint*)num_image_formats); @@ -11734,7 +11732,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSupportedImageFormats")] - public static + public static int GetSupportedImageFormats(IntPtr context, MemFlags flags, MemObjectType image_type, uint num_entries, ImageFormat[] image_formats, uint[] num_image_formats) { unsafe @@ -11749,7 +11747,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSupportedImageFormats")] - public static + public static int GetSupportedImageFormats(IntPtr context, MemFlags flags, MemObjectType image_type, uint num_entries, ref ImageFormat image_formats, ref uint num_image_formats) { unsafe @@ -11764,112 +11762,112 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clGetSupportedImageFormats")] - public static + public static unsafe int GetSupportedImageFormats(IntPtr context, MemFlags flags, MemObjectType image_type, uint num_entries, ImageFormat* image_formats, uint* num_image_formats) { return Delegates.clGetSupportedImageFormats((IntPtr)context, (MemFlags)flags, (MemObjectType)image_type, (uint)num_entries, (ImageFormat*)image_formats, (uint*)num_image_formats); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clReleaseCommandQueue")] - public static + public static int ReleaseCommandQueue(IntPtr command_queue) { return Delegates.clReleaseCommandQueue((IntPtr)command_queue); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clReleaseContext")] - public static + public static int ReleaseContext(IntPtr context) { return Delegates.clReleaseContext((IntPtr)context); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clReleaseEvent")] - public static + public static int ReleaseEvent(IntPtr @event) { return Delegates.clReleaseEvent((IntPtr)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clReleaseKernel")] - public static + public static int ReleaseKernel(IntPtr kernel) { return Delegates.clReleaseKernel((IntPtr)kernel); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clReleaseMemObject")] - public static + public static int ReleaseMemObject(IntPtr memobj) { return Delegates.clReleaseMemObject((IntPtr)memobj); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clReleaseProgram")] - public static + public static int ReleaseProgram(IntPtr program) { return Delegates.clReleaseProgram((IntPtr)program); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clReleaseSampler")] - public static + public static int ReleaseSampler(IntPtr sampler) { return Delegates.clReleaseSampler((IntPtr)sampler); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clRetainCommandQueue")] - public static + public static int RetainCommandQueue(IntPtr command_queue) { return Delegates.clRetainCommandQueue((IntPtr)command_queue); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clRetainContext")] - public static + public static int RetainContext(IntPtr context) { return Delegates.clRetainContext((IntPtr)context); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clRetainEvent")] - public static + public static int RetainEvent(IntPtr @event) { return Delegates.clRetainEvent((IntPtr)@event); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clRetainKernel")] - public static + public static int RetainKernel(IntPtr kernel) { return Delegates.clRetainKernel((IntPtr)kernel); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clRetainMemObject")] - public static + public static int RetainMemObject(IntPtr memobj) { return Delegates.clRetainMemObject((IntPtr)memobj); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clRetainProgram")] - public static + public static int RetainProgram(IntPtr program) { return Delegates.clRetainProgram((IntPtr)program); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clRetainSampler")] - public static + public static int RetainSampler(IntPtr sampler) { return Delegates.clRetainSampler((IntPtr)sampler); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetCommandQueueProperty")] - public static + public static int SetCommandQueueProperty(IntPtr command_queue, CommandQueueFlags properties, bool enable, CommandQueueFlags[] old_properties) { unsafe @@ -11882,7 +11880,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetCommandQueueProperty")] - public static + public static int SetCommandQueueProperty(IntPtr command_queue, CommandQueueFlags properties, bool enable, ref CommandQueueFlags old_properties) { unsafe @@ -11896,21 +11894,21 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetCommandQueueProperty")] - public static + public static unsafe int SetCommandQueueProperty(IntPtr command_queue, CommandQueueFlags properties, bool enable, CommandQueueFlags* old_properties) { return Delegates.clSetCommandQueueProperty((IntPtr)command_queue, (CommandQueueFlags)properties, (bool)enable, (CommandQueueFlags*)old_properties); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, Int32 arg_index, IntPtr arg_size, IntPtr arg_value) { return Delegates.clSetKernelArg((IntPtr)kernel, (uint)arg_index, (IntPtr)arg_size, (IntPtr)arg_value); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, Int32 arg_index, IntPtr arg_size, [InAttribute, OutAttribute] T3[] arg_value) where T3 : struct { @@ -11926,7 +11924,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, Int32 arg_index, IntPtr arg_size, [InAttribute, OutAttribute] T3[,] arg_value) where T3 : struct { @@ -11942,7 +11940,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, Int32 arg_index, IntPtr arg_size, [InAttribute, OutAttribute] T3[,,] arg_value) where T3 : struct { @@ -11958,7 +11956,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, Int32 arg_index, IntPtr arg_size, [InAttribute, OutAttribute] ref T3 arg_value) where T3 : struct { @@ -11977,7 +11975,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, uint arg_index, IntPtr arg_size, IntPtr arg_value) { return Delegates.clSetKernelArg((IntPtr)kernel, (uint)arg_index, (IntPtr)arg_size, (IntPtr)arg_value); @@ -11985,7 +11983,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, uint arg_index, IntPtr arg_size, [InAttribute, OutAttribute] T3[] arg_value) where T3 : struct { @@ -12002,7 +12000,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, uint arg_index, IntPtr arg_size, [InAttribute, OutAttribute] T3[,] arg_value) where T3 : struct { @@ -12019,7 +12017,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, uint arg_index, IntPtr arg_size, [InAttribute, OutAttribute] T3[,,] arg_value) where T3 : struct { @@ -12036,7 +12034,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clSetKernelArg")] - public static + public static int SetKernelArg(IntPtr kernel, uint arg_index, IntPtr arg_size, [InAttribute, OutAttribute] ref T3 arg_value) where T3 : struct { @@ -12054,14 +12052,14 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clUnloadCompiler")] - public static + public static int UnloadCompiler() { return Delegates.clUnloadCompiler(); } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clWaitForEvents")] - public static + public static int WaitForEvents(Int32 num_events, IntPtr[] event_list) { unsafe @@ -12074,7 +12072,7 @@ namespace OpenTK.Compute.CL10 } [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clWaitForEvents")] - public static + public static int WaitForEvents(Int32 num_events, ref IntPtr event_list) { unsafe @@ -12088,7 +12086,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clWaitForEvents")] - public static + public static unsafe int WaitForEvents(Int32 num_events, IntPtr* event_list) { return Delegates.clWaitForEvents((uint)num_events, (IntPtr*)event_list); @@ -12096,7 +12094,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clWaitForEvents")] - public static + public static int WaitForEvents(uint num_events, IntPtr[] event_list) { unsafe @@ -12110,7 +12108,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clWaitForEvents")] - public static + public static int WaitForEvents(uint num_events, ref IntPtr event_list) { unsafe @@ -12124,7 +12122,7 @@ namespace OpenTK.Compute.CL10 [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "clWaitForEvents")] - public static + public static unsafe int WaitForEvents(uint num_events, IntPtr* event_list) { return Delegates.clWaitForEvents((uint)num_events, (IntPtr*)event_list); diff --git a/src/OpenTK/Compute/CL10/CLHelper.cs b/src/OpenTK/Compute/CL10/CLHelper.cs index 43bac75a..e680a585 100644 --- a/src/OpenTK/Compute/CL10/CLHelper.cs +++ b/src/OpenTK/Compute/CL10/CLHelper.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL @@ -39,15 +37,9 @@ namespace OpenTK.Compute.CL10 /// public sealed partial class CL : BindingsBase { - #region Fields - const string Library = "opencl.dll"; static readonly object sync_root = new object(); - #endregion - - #region Constructors - static CL() { Type imports = typeof(CL).GetNestedType("Core", BindingFlags.Static | BindingFlags.NonPublic); @@ -63,10 +55,6 @@ namespace OpenTK.Compute.CL10 } } - #endregion - - #region Protected Members - /// /// Returns a synchronization token unique for the GL class. /// @@ -93,15 +81,12 @@ namespace OpenTK.Compute.CL10 //CL.GetExtensionFunctionAddress } - #endregion - - #region Helper Overrides - + public static unsafe IntPtr CreateContext(ContextProperties* properties, uint num_devices, IntPtr* devices, IntPtr pfn_notify, IntPtr user_data, OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return CreateContext((IntPtr*)properties, num_devices, devices, pfn_notify, user_data, errcode_ret); } - + public static unsafe IntPtr CreateContext(ContextProperties[] properties, uint num_devices, IntPtr[] devices, IntPtr pfn_notify, IntPtr user_data, OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { IntPtr[] properties_correct = properties != null ? new IntPtr[properties.Length] : null; @@ -109,19 +94,19 @@ namespace OpenTK.Compute.CL10 properties_correct[i] = new IntPtr((int)properties[i]); return CreateContext(properties_correct, num_devices, devices, pfn_notify, user_data, errcode_ret); } - + public static unsafe IntPtr CreateContext(ref ContextProperties properties, uint num_devices, ref IntPtr devices, IntPtr pfn_notify, IntPtr user_data, out OpenTK.Compute.CL10.ErrorCode errcode_ret) { IntPtr properties_correct = new IntPtr((int)properties); return CreateContext(ref properties_correct, num_devices, ref devices, pfn_notify, user_data, out errcode_ret); } - + public static unsafe IntPtr CreateContext(ContextProperties* properties, uint num_devices, IntPtr* devices, IntPtr pfn_notify, ref T4 user_data, OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { return CreateContext((IntPtr*)properties, num_devices, devices, pfn_notify, ref user_data, errcode_ret); } - + public static unsafe IntPtr CreateContext(ContextProperties[] properties, uint num_devices, IntPtr[] devices, IntPtr pfn_notify, ref T4 user_data, OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -130,19 +115,19 @@ namespace OpenTK.Compute.CL10 properties_correct[i] = new IntPtr((int)properties[i]); return CreateContext(properties_correct, num_devices, devices, pfn_notify, ref user_data, errcode_ret); } - + public static unsafe IntPtr CreateContext(ref ContextProperties properties, uint num_devices, ref IntPtr devices, IntPtr pfn_notify, ref T4 user_data, out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { IntPtr properties_correct = new IntPtr((int)properties); return CreateContext(ref properties_correct, num_devices, ref devices, pfn_notify, ref user_data, out errcode_ret); } - + public static unsafe IntPtr CreateContextFromType(ContextProperties* properties, DeviceTypeFlags device_type, IntPtr pfn_notify, IntPtr user_data, OpenTK.Compute.CL10.ErrorCode* errcode_ret) { return CreateContextFromType((IntPtr*)properties, device_type, pfn_notify, user_data, errcode_ret); } - + public static unsafe IntPtr CreateContextFromType(ContextProperties[] properties, DeviceTypeFlags device_type, IntPtr pfn_notify, IntPtr user_data, OpenTK.Compute.CL10.ErrorCode[] errcode_ret) { IntPtr[] properties_correct = properties != null ? new IntPtr[properties.Length] : null; @@ -150,19 +135,19 @@ namespace OpenTK.Compute.CL10 properties_correct[i] = new IntPtr((int)properties[i]); return CreateContextFromType(properties_correct, device_type, pfn_notify, user_data, errcode_ret); } - + public static unsafe IntPtr CreateContextFromType(ref ContextProperties properties, DeviceTypeFlags device_type, IntPtr pfn_notify, IntPtr user_data, out OpenTK.Compute.CL10.ErrorCode errcode_ret) { IntPtr properties_correct = new IntPtr((int)properties); return CreateContextFromType(ref properties_correct, device_type, pfn_notify, user_data, out errcode_ret); } - + public static unsafe IntPtr CreateContextFromType(ContextProperties* properties, DeviceTypeFlags device_type, IntPtr pfn_notify, ref T4 user_data, OpenTK.Compute.CL10.ErrorCode* errcode_ret) where T4 : struct { return CreateContextFromType((IntPtr*)properties, device_type, pfn_notify, ref user_data, errcode_ret); } - + public static unsafe IntPtr CreateContextFromType(ContextProperties[] properties, DeviceTypeFlags device_type, IntPtr pfn_notify, ref T4 user_data, OpenTK.Compute.CL10.ErrorCode[] errcode_ret) where T4 : struct { @@ -171,15 +156,13 @@ namespace OpenTK.Compute.CL10 properties_correct[i] = new IntPtr((int)properties[i]); return CreateContextFromType(properties_correct, device_type, pfn_notify, ref user_data, errcode_ret); } - + public static unsafe IntPtr CreateContextFromType(ref ContextProperties properties, DeviceTypeFlags device_type, IntPtr pfn_notify, ref T4 user_data, out OpenTK.Compute.CL10.ErrorCode errcode_ret) where T4 : struct { IntPtr properties_correct = new IntPtr((int)properties); return CreateContextFromType(ref properties_correct, device_type, pfn_notify, ref user_data, out errcode_ret); } - - #endregion } } diff --git a/src/OpenTK/Compute/CL10/Core.cs b/src/OpenTK/Compute/CL10/Core.cs index c8856fb8..eb62cf15 100644 --- a/src/OpenTK/Compute/CL10/Core.cs +++ b/src/OpenTK/Compute/CL10/Core.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL diff --git a/src/OpenTK/Compute/CL10/Delegates.cs b/src/OpenTK/Compute/CL10/Delegates.cs index c6306e92..8991b2dc 100644 --- a/src/OpenTK/Compute/CL10/Delegates.cs +++ b/src/OpenTK/Compute/CL10/Delegates.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL diff --git a/src/OpenTK/Compute/CL10/Enums.cs b/src/OpenTK/Compute/CL10/Enums.cs index dd548187..fcd841f9 100644 --- a/src/OpenTK/Compute/CL10/Enums.cs +++ b/src/OpenTK/Compute/CL10/Enums.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL diff --git a/src/OpenTK/Compute/CL10/ErrorHelper.cs b/src/OpenTK/Compute/CL10/ErrorHelper.cs index a9a1a780..738adfe6 100644 --- a/src/OpenTK/Compute/CL10/ErrorHelper.cs +++ b/src/OpenTK/Compute/CL10/ErrorHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL @@ -35,22 +33,14 @@ namespace OpenTK.Compute.CL10 { struct ErrorHelper : IDisposable { - #region Constructors - public ErrorHelper(IntPtr context) { } - #endregion - - #region IDisposable Members - public void Dispose() { throw new NotImplementedException(); } - - #endregion } } diff --git a/src/OpenTK/Compute/CL10/ImageFormat.cs b/src/OpenTK/Compute/CL10/ImageFormat.cs index 7c163c90..6dead8c0 100644 --- a/src/OpenTK/Compute/CL10/ImageFormat.cs +++ b/src/OpenTK/Compute/CL10/ImageFormat.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL diff --git a/src/OpenTK/Compute/CLHelper.cs b/src/OpenTK/Compute/CLHelper.cs index 49572ec0..0f477891 100644 --- a/src/OpenTK/Compute/CLHelper.cs +++ b/src/OpenTK/Compute/CLHelper.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Compute/CommandQueue.cs b/src/OpenTK/Compute/CommandQueue.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/CommandQueue.cs +++ b/src/OpenTK/Compute/CommandQueue.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/ComputeContext.cs b/src/OpenTK/Compute/ComputeContext.cs index 3abfa512..59cc7a9e 100644 --- a/src/OpenTK/Compute/ComputeContext.cs +++ b/src/OpenTK/Compute/ComputeContext.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Compute/Configuration.cs b/src/OpenTK/Compute/Configuration.cs index 3c60a9e0..8c54c6d5 100644 --- a/src/OpenTK/Compute/Configuration.cs +++ b/src/OpenTK/Compute/Configuration.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Compute/Device.cs b/src/OpenTK/Compute/Device.cs index ba923f76..a56a1b5c 100644 --- a/src/OpenTK/Compute/Device.cs +++ b/src/OpenTK/Compute/Device.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Compute/Enums.cs b/src/OpenTK/Compute/Enums.cs index 49572ec0..0f477891 100644 --- a/src/OpenTK/Compute/Enums.cs +++ b/src/OpenTK/Compute/Enums.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Compute/Event.cs b/src/OpenTK/Compute/Event.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/Event.cs +++ b/src/OpenTK/Compute/Event.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/Kernel.cs b/src/OpenTK/Compute/Kernel.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/Kernel.cs +++ b/src/OpenTK/Compute/Kernel.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/Memory.cs b/src/OpenTK/Compute/Memory.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/Memory.cs +++ b/src/OpenTK/Compute/Memory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/Platform.cs b/src/OpenTK/Compute/Platform.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/Platform.cs +++ b/src/OpenTK/Compute/Platform.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/Profiler.cs b/src/OpenTK/Compute/Profiler.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/Profiler.cs +++ b/src/OpenTK/Compute/Profiler.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/Program.cs b/src/OpenTK/Compute/Program.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/Program.cs +++ b/src/OpenTK/Compute/Program.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/Sampler.cs b/src/OpenTK/Compute/Sampler.cs index 74035165..4b0c9402 100644 --- a/src/OpenTK/Compute/Sampler.cs +++ b/src/OpenTK/Compute/Sampler.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Compute/Structs.cs b/src/OpenTK/Compute/Structs.cs index 5bfc83ad..1c665dd5 100644 --- a/src/OpenTK/Compute/Structs.cs +++ b/src/OpenTK/Compute/Structs.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion #if EXPERIMENTAL @@ -34,12 +32,8 @@ using System.Runtime.InteropServices; namespace OpenTK.Compute { - #region struct Handle - struct Handle : IEquatable>, IComparable> { - #region Fields - IntPtr handle; /// @@ -50,22 +44,12 @@ namespace OpenTK.Compute /// A read-only field that represents a handle that has been initialized to zero. public static readonly Handle Zero = new Handle(IntPtr.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance with the specified handle. /// /// A System.IntPtr containing the value for this instance. public Handle(IntPtr h) { handle = h; } - #endregion - - #region Public Members - - #region ToString - /// /// Converts this instance to its equivalent string representation. /// @@ -75,10 +59,6 @@ namespace OpenTK.Compute return Value.ToString(); } - #endregion - - #region Equals - /// /// Compares this instance to the specified object. /// @@ -91,10 +71,6 @@ namespace OpenTK.Compute return false; } - #endregion - - #region GetHashCode - /// /// Returns the hash code for this instance. /// @@ -104,10 +80,6 @@ namespace OpenTK.Compute return Value.GetHashCode(); } - #endregion - - #region public static explicit operator IntPtr(Handle c) - /// /// Converts the specified ContextHandle to the equivalent IntPtr. /// @@ -118,10 +90,6 @@ namespace OpenTK.Compute return c != Handle.Zero ? c.Value : IntPtr.Zero; } - #endregion - - #region public static explicit operator Handle(IntPtr p) - /// /// Converts the specified IntPtr to the equivalent ContextHandle. /// @@ -132,8 +100,6 @@ namespace OpenTK.Compute return new Handle(p); } - #endregion - /// /// Compares two instances for equality. /// @@ -156,10 +122,6 @@ namespace OpenTK.Compute return !left.Equals(right); } - #endregion - - #region IComparable> Members - /// /// Compares the numerical value of this instance to other and returns a value indicating their relative order. /// @@ -173,10 +135,6 @@ namespace OpenTK.Compute } } - #endregion - - #region IEquatable> Members - /// /// Compares this instance to the specified ContextHandle for equality. /// @@ -186,12 +144,8 @@ namespace OpenTK.Compute { return Value == other.Value; } - - #endregion } - #endregion - } #endif \ No newline at end of file diff --git a/src/OpenTK/Configuration.cs b/src/OpenTK/Configuration.cs index c59c2549..b84d02c2 100644 --- a/src/OpenTK/Configuration.cs +++ b/src/OpenTK/Configuration.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -47,23 +45,11 @@ namespace OpenTK volatile static bool initialized; readonly static object InitLock = new object(); - #region Constructors - Configuration() { } - #endregion - - #region Public Methods - - #region public static bool RunningOnWindows - /// Gets a System.Boolean indicating whether OpenTK is running on a Windows platform. public static bool RunningOnWindows { get { return runningOnWindows; } } - #endregion - - #region public static bool RunningOnX11 - /// Gets a System.Boolean indicating whether OpenTK is running on an X11 platform. public static bool RunningOnX11 { @@ -78,10 +64,6 @@ namespace OpenTK get { return runningOnUnix; } } - #endregion - - #region RunningOnSDL2 - /// /// Gets a System.Boolean indicating whether OpenTK is running on the SDL2 backend. /// @@ -91,33 +73,17 @@ namespace OpenTK private set; } - #endregion - - #region public static bool RunningOnLinux - /// Gets a System.Boolean indicating whether OpenTK is running on the Linux kernel. public static bool RunningOnLinux { get { return runningOnLinux; } } - #endregion - - #region public static bool RunningOnMacOS - /// Gets a System.Boolean indicating whether OpenTK is running on a MacOS platform. public static bool RunningOnMacOS { get { return runningOnMacOS; } } - #endregion - - #region public static bool RunningOnMono - /// /// Gets a System.Boolean indicating whether OpenTK is running on the Mono runtime. /// public static bool RunningOnMono { get { return runningOnMono; } } - #endregion - - #region public static bool RunningOnAndroid - /// /// Gets a System.Boolean indicating whether /// OpenTK is running on an Android device. @@ -134,10 +100,6 @@ namespace OpenTK } } - #endregion - - #region public static bool RunningOnIOS - /// /// Gets a System.Boolean indicating whether /// OpenTK is running on an Android device. @@ -154,12 +116,6 @@ namespace OpenTK } } - #endregion - - #region --- Private Methods --- - - #region private static string DetectUnixKernel() - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] struct utsname { @@ -321,14 +277,6 @@ namespace OpenTK #endif } - #endregion - - #endregion - - #endregion - - #region Internal Methods - // Detects the underlying OS and runtime. internal static void Init(ToolkitOptions options) { @@ -350,7 +298,7 @@ namespace OpenTK { RunningOnSdl2 = DetectSdl2(); } - + if ((runningOnLinux && !RunningOnSdl2) || options.Backend == PlatformBackend.PreferX11) { runningOnX11 = DetectX11(); @@ -365,7 +313,5 @@ namespace OpenTK } } } - - #endregion } } diff --git a/src/OpenTK/ContextHandle.cs b/src/OpenTK/ContextHandle.cs index 362489d3..76a25003 100644 --- a/src/OpenTK/ContextHandle.cs +++ b/src/OpenTK/ContextHandle.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; @@ -17,8 +15,6 @@ namespace OpenTK /// public struct ContextHandle : IComparable, IEquatable { - #region Fields - IntPtr handle; /// @@ -29,22 +25,12 @@ namespace OpenTK /// A read-only field that represents a handle that has been initialized to zero. public static readonly ContextHandle Zero = new ContextHandle(IntPtr.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance with the specified handle. /// /// A System.IntPtr containing the value for this instance. public ContextHandle(IntPtr h) { handle = h; } - #endregion - - #region Public Members - - #region ToString - /// /// Converts this instance to its equivalent string representation. /// @@ -54,10 +40,6 @@ namespace OpenTK return Handle.ToString(); } - #endregion - - #region Equals - /// /// Compares this instance to the specified object. /// @@ -70,10 +52,6 @@ namespace OpenTK return false; } - #endregion - - #region GetHashCode - /// /// Returns the hash code for this instance. /// @@ -83,10 +61,6 @@ namespace OpenTK return Handle.GetHashCode(); } - #endregion - - #region public static explicit operator IntPtr(ContextHandle c) - /// /// Converts the specified ContextHandle to the equivalent IntPtr. /// @@ -97,10 +71,6 @@ namespace OpenTK return c != ContextHandle.Zero ? c.handle : IntPtr.Zero; } - #endregion - - #region public static explicit operator ContextHandle(IntPtr p) - /// /// Converts the specified IntPtr to the equivalent ContextHandle. /// @@ -111,10 +81,6 @@ namespace OpenTK return new ContextHandle(p); } - #endregion - - #region public static bool operator ==(ContextHandle left, ContextHandle right) - /// /// Compares two ContextHandles for equality. /// @@ -126,10 +92,6 @@ namespace OpenTK return left.Equals(right); } - #endregion - - #region public static bool operator !=(ContextHandle left, ContextHandle right) - /// /// Compares two ContextHandles for inequality. /// @@ -141,12 +103,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #endregion - - #region IComparable Members - /// /// Compares the numerical value of this instance to the specified ContextHandle and /// returns a value indicating their relative order. @@ -158,10 +114,6 @@ namespace OpenTK unsafe { return (int)((int*)other.handle.ToPointer() - (int*)this.handle.ToPointer()); } } - #endregion - - #region IEquatable Members - /// /// Compares this instance to the specified ContextHandle for equality. /// @@ -171,7 +123,5 @@ namespace OpenTK { return Handle == other.Handle; } - - #endregion } } diff --git a/src/OpenTK/DisplayDevice.cs b/src/OpenTK/DisplayDevice.cs index 6d5e354c..1e54d5e0 100644 --- a/src/OpenTK/DisplayDevice.cs +++ b/src/OpenTK/DisplayDevice.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -43,8 +41,6 @@ namespace OpenTK // TODO: Add properties that describe the 'usable' size of the Display, i.e. the maximized size without the taskbar etc. // TODO: Does not detect changes to primary device. - #region Fields - bool primary; Rectangle bounds; DisplayResolution current_resolution = new DisplayResolution(); @@ -59,10 +55,6 @@ namespace OpenTK static Platform.IDisplayDeviceDriver implementation; - #endregion - - #region Constructors - static DisplayDevice() { implementation = Platform.Factory.Default.CreateDisplayDeviceDriver(); @@ -88,12 +80,6 @@ namespace OpenTK this.Id = id; } - #endregion - - #region --- Public Methods --- - - #region public Rectangle Bounds - /// /// Gets the bounds of this instance in pixel coordinates.. /// @@ -108,24 +94,12 @@ namespace OpenTK } } - #endregion - - #region public int Width - /// Gets a System.Int32 that contains the width of this display in pixels. public int Width { get { return current_resolution.Width; } } - #endregion - - #region public int Height - /// Gets a System.Int32 that contains the height of this display in pixels. public int Height { get { return current_resolution.Height; } } - #endregion - - #region public int BitsPerPixel - /// Gets a System.Int32 that contains number of bits per pixel of this display. Typical values include 8, 16, 24 and 32. public int BitsPerPixel { @@ -133,10 +107,6 @@ namespace OpenTK internal set { current_resolution.BitsPerPixel = value; } } - #endregion - - #region public float RefreshRate - /// /// Gets a System.Single representing the vertical refresh rate of this display. /// @@ -146,10 +116,6 @@ namespace OpenTK internal set { current_resolution.RefreshRate = value; } } - #endregion - - #region public bool IsPrimary - /// Gets a System.Boolean that indicates whether this Display is the primary Display in systems with multiple Displays. public bool IsPrimary { @@ -168,10 +134,6 @@ namespace OpenTK } } - #endregion - - #region public DisplayResolution SelectResolution(int width, int height, int bitsPerPixel, float refreshRate) - /// /// Selects an available resolution that matches the specified parameters. /// @@ -200,10 +162,6 @@ namespace OpenTK return resolution; } - #endregion - - #region public IList AvailableResolutions - /// /// Gets the list of objects available on this device. /// @@ -217,10 +175,6 @@ namespace OpenTK } } - #endregion - - #region public void ChangeResolution(DisplayResolution resolution) - /// Changes the resolution of the DisplayDevice. /// The resolution to set. /// Thrown if the requested resolution could not be set. @@ -247,10 +201,6 @@ namespace OpenTK //effect.FadeIn(); } - #endregion - - #region public void ChangeResolution(int width, int height, int bitsPerPixel, float refreshRate) - /// Changes the resolution of the DisplayDevice. /// The new width of the DisplayDevice. /// The new height of the DisplayDevice. @@ -262,10 +212,6 @@ namespace OpenTK this.ChangeResolution(this.SelectResolution(width, height, bitsPerPixel, refreshRate)); } - #endregion - - #region public void RestoreResolution() - /// Restores the original resolution of the DisplayDevice. /// Thrown if the original resolution could not be restored. public void RestoreResolution() @@ -285,20 +231,12 @@ namespace OpenTK } } - #endregion - - #region public static DisplayDevice Default - /// Gets the default (primary) display of this system. public static DisplayDevice Default { get { return implementation.GetDisplay(DisplayIndex.Primary); } } - #endregion - - #region GetDisplay - /// /// Gets the for the specified . /// @@ -309,14 +247,6 @@ namespace OpenTK return implementation.GetDisplay(index); } - #endregion - - #endregion - - #region --- Internal Methods --- - - #region internal DisplayResolution OriginalResolution - /// /// Gets the original resolution of this instance. /// @@ -326,10 +256,6 @@ namespace OpenTK set { original_resolution = value; } } - #endregion - - #region FromPoint - internal static DisplayDevice FromPoint(int x, int y) { for (DisplayIndex i = DisplayIndex.First; i < DisplayIndex.Sixth; i++) @@ -346,14 +272,6 @@ namespace OpenTK return null; } - #endregion - - #endregion - - #region --- Private Methods --- - - #region DisplayResolution FindResolution(int width, int height, int bitsPerPixel, float refreshRate) - DisplayResolution FindResolution(int width, int height, int bitsPerPixel, float refreshRate) { return available_resolutions.Find(delegate(DisplayResolution test) @@ -366,14 +284,6 @@ namespace OpenTK }); } - #endregion - - #endregion - - #region --- Overrides --- - - #region public override string ToString() - /// /// Returns a System.String representing this DisplayDevice. /// @@ -384,10 +294,6 @@ namespace OpenTK Bounds.ToString(), available_resolutions.Count); } - #endregion - - #region public override bool Equals(object obj) - ///// Determines whether the specified DisplayDevices are equal. ///// The System.Object to check against. ///// True if the System.Object is an equal DisplayDevice; false otherwise. @@ -405,23 +311,13 @@ namespace OpenTK // return false; //} - #endregion - - #region public override int GetHashCode() - ///// Returns a unique hash representing this DisplayDevice. ///// A System.Int32 that may serve as a hash code for this DisplayDevice. ////public override int GetHashCode() //{ // return current_resolution.GetHashCode() ^ IsPrimary.GetHashCode() ^ available_resolutions.Count; //} - - #endregion - - #endregion } - - #region --- FadeEffect --- #if false class FadeEffect : IDisposable { @@ -525,16 +421,11 @@ namespace OpenTK form.Visible = false; } - #region IDisposable Members - public void Dispose() { foreach (Form form in forms) form.Dispose(); } - - #endregion } #endif - #endregion } diff --git a/src/OpenTK/DisplayIndex.cs b/src/OpenTK/DisplayIndex.cs index 540486d1..7dda3018 100644 --- a/src/OpenTK/DisplayIndex.cs +++ b/src/OpenTK/DisplayIndex.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/DisplayResolution.cs b/src/OpenTK/DisplayResolution.cs index 43419408..b37bd5e1 100644 --- a/src/OpenTK/DisplayResolution.cs +++ b/src/OpenTK/DisplayResolution.cs @@ -1,10 +1,8 @@ -#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK team. * This notice may not be removed. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; @@ -23,12 +21,8 @@ namespace OpenTK int bits_per_pixel; float refresh_rate; - #region --- Constructors --- - internal DisplayResolution() { } - #region public DisplayResolution(int width, int height, int bitsPerPixel, float refreshRate) - // Creates a new DisplayResolution object for the primary DisplayDevice. internal DisplayResolution(int x, int y, int width, int height, int bitsPerPixel, float refreshRate) { @@ -43,10 +37,6 @@ namespace OpenTK this.refresh_rate = refreshRate; } - #endregion - - #region public DisplayResolution(int width, int height, int bitsPerPixel, float refreshRate, DisplayDevice device) - #if false /// @@ -57,7 +47,7 @@ namespace OpenTK /// The requested bits per pixel in bits. /// The requested refresh rate in hertz. /// OpenTK will select the closest match between all available resolutions on the specified DisplayDevice. - /// + /// public DisplayResolution(int width, int height, int bitsPerPixel, float refreshRate, DisplayDevice device) { // Refresh rate may be zero, since this information may not be available on some platforms. @@ -75,13 +65,6 @@ namespace OpenTK this.refresh_rate = res.refresh_rate; } #endif - #endregion - - #endregion - - #region --- Public Methods --- - - #region Bounds /// /// Gets a System.Drawing.Rectangle that contains the bounds of this display device. @@ -93,10 +76,6 @@ namespace OpenTK get { return bounds; } } - #endregion - - #region public int Width - /// Gets a System.Int32 that contains the width of this display in pixels. public int Width { @@ -104,10 +83,6 @@ namespace OpenTK internal set { bounds.Width = value; } } - #endregion - - #region public int Height - /// Gets a System.Int32 that contains the height of this display in pixels. public int Height { @@ -115,10 +90,6 @@ namespace OpenTK internal set { bounds.Height = value; } } - #endregion - - #region public int BitsPerPixel - /// Gets a System.Int32 that contains number of bits per pixel of this display. Typical values include 8, 16, 24 and 32. public int BitsPerPixel { @@ -126,10 +97,6 @@ namespace OpenTK internal set { bits_per_pixel = value; } } - #endregion - - #region public float RefreshRate - /// /// Gets a System.Single representing the vertical refresh rate of this display. /// @@ -139,14 +106,6 @@ namespace OpenTK internal set { refresh_rate = value; } } - #endregion - - #endregion - - #region --- Overrides --- - - #region public override string ToString() - /// /// Returns a System.String representing this DisplayResolution. /// @@ -158,10 +117,6 @@ namespace OpenTK #pragma warning restore 612,618 } - #endregion - - #region public override bool Equals(object obj) - /// Determines whether the specified resolutions are equal. /// The System.Object to check against. /// True if the System.Object is an equal DisplayResolution; false otherwise. @@ -181,10 +136,6 @@ namespace OpenTK return false; } - #endregion - - #region public override int GetHashCode() - /// Returns a unique hash representing this resolution. /// A System.Int32 that may serve as a hash code for this resolution. public override int GetHashCode() @@ -194,12 +145,6 @@ namespace OpenTK #pragma warning restore 612,618 } - #endregion - - #endregion - - #region --- Operator Overloads --- - /// /// Compares two instances for equality. /// @@ -226,7 +171,5 @@ namespace OpenTK { return !(left == right); } - - #endregion } } diff --git a/src/OpenTK/Exceptions.cs b/src/OpenTK/Exceptions.cs index d6930e39..d46cdfab 100644 --- a/src/OpenTK/Exceptions.cs +++ b/src/OpenTK/Exceptions.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/FrameEventArgs.cs b/src/OpenTK/FrameEventArgs.cs index 6c8d3937..ff3a1fa2 100644 --- a/src/OpenTK/FrameEventArgs.cs +++ b/src/OpenTK/FrameEventArgs.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; @@ -39,13 +37,13 @@ namespace OpenTK double elapsed; /// - /// Constructs a new FrameEventArgs instance. + /// Constructs a new FrameEventArgs instance. /// public FrameEventArgs() { } - + /// - /// Constructs a new FrameEventArgs instance. + /// Constructs a new FrameEventArgs instance. /// /// The amount of time that has elapsed since the previous event, in seconds. public FrameEventArgs(double elapsed) @@ -56,7 +54,7 @@ namespace OpenTK /// /// Gets a that indicates how many seconds of time elapsed since the previous event. /// - public double Time + public double Time { get { return elapsed; } internal set diff --git a/src/OpenTK/GameWindow.cs b/src/OpenTK/GameWindow.cs index cb8f22e3..5f374393 100644 --- a/src/OpenTK/GameWindow.cs +++ b/src/OpenTK/GameWindow.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -73,8 +71,6 @@ namespace OpenTK /// public class GameWindow : NativeWindow, IGameWindow, IDisposable { - #region --- Fields --- - const double MaxFrequency = 500.0; // Frequency cap for Update/RenderFrame events readonly Stopwatch watch = new Stopwatch(); @@ -99,30 +95,16 @@ namespace OpenTK FrameEventArgs update_args = new FrameEventArgs(); FrameEventArgs render_args = new FrameEventArgs(); - #endregion - - #region --- Contructors --- - - #region public GameWindow() - /// Constructs a new GameWindow with sensible default attributes. public GameWindow() : this(640, 480, GraphicsMode.Default, "OpenTK Game Window", 0, DisplayDevice.Default) { } - #endregion - - #region public GameWindow(int width, int height) - /// Constructs a new GameWindow with the specified attributes. /// The width of the GameWindow in pixels. /// The height of the GameWindow in pixels. public GameWindow(int width, int height) : this(width, height, GraphicsMode.Default, "OpenTK Game Window", 0, DisplayDevice.Default) { } - #endregion - - #region public GameWindow(int width, int height, GraphicsMode mode) - /// Constructs a new GameWindow with the specified attributes. /// The width of the GameWindow in pixels. /// The height of the GameWindow in pixels. @@ -130,10 +112,6 @@ namespace OpenTK public GameWindow(int width, int height, GraphicsMode mode) : this(width, height, mode, "OpenTK Game Window", 0, DisplayDevice.Default) { } - #endregion - - #region public GameWindow(int width, int height, GraphicsMode mode, string title) - /// Constructs a new GameWindow with the specified attributes. /// The width of the GameWindow in pixels. /// The height of the GameWindow in pixels. @@ -142,10 +120,6 @@ namespace OpenTK public GameWindow(int width, int height, GraphicsMode mode, string title) : this(width, height, mode, title, 0, DisplayDevice.Default) { } - #endregion - - #region public GameWindow(int width, int height, GraphicsMode mode, string title, GameWindowFlags options) - /// Constructs a new GameWindow with the specified attributes. /// The width of the GameWindow in pixels. /// The height of the GameWindow in pixels. @@ -155,10 +129,6 @@ namespace OpenTK public GameWindow(int width, int height, GraphicsMode mode, string title, GameWindowFlags options) : this(width, height, mode, title, options, DisplayDevice.Default) { } - #endregion - - #region public GameWindow(int width, int height, GraphicsMode mode, string title, GameWindowFlags options, DisplayDevice device) - /// Constructs a new GameWindow with the specified attributes. /// The width of the GameWindow in pixels. /// The height of the GameWindow in pixels. @@ -170,10 +140,6 @@ namespace OpenTK : this(width, height, mode, title, options, device, 1, 0, GraphicsContextFlags.Default) { } - #endregion - - #region public GameWindow(int width, int height, GraphicsMode mode, string title, GameWindowFlags options, DisplayDevice device, int major, int minor, GraphicsContextFlags flags) - /// Constructs a new GameWindow with the specified attributes. /// The width of the GameWindow in pixels. /// The height of the GameWindow in pixels. @@ -189,10 +155,6 @@ namespace OpenTK : this(width, height, mode, title, options, device, major, minor, flags, null) { } - #endregion - - #region public GameWindow(int width, int height, GraphicsMode mode, string title, GameWindowFlags options, DisplayDevice device, int major, int minor, GraphicsContextFlags flags, IGraphicsContext sharedContext) - /// Constructs a new GameWindow with the specified attributes. /// The width of the GameWindow in pixels. /// The height of the GameWindow in pixels. @@ -228,16 +190,6 @@ namespace OpenTK } } - #endregion - - #endregion - - #region --- Public Members --- - - #region Methods - - #region Dispose - /// /// Disposes of the GameWindow, releasing all resources consumed by it. /// @@ -265,10 +217,6 @@ namespace OpenTK GC.SuppressFinalize(this); } - #endregion - - #region Exit - /// /// Closes the GameWindow. Equivalent to method. /// @@ -281,10 +229,6 @@ namespace OpenTK Close(); } - #endregion - - #region MakeCurrent - /// /// Makes the GraphicsContext current on the calling thread. /// @@ -294,10 +238,6 @@ namespace OpenTK Context.MakeCurrent(WindowInfo); } - #endregion - - #region OnClose - /// /// Called when the NativeWindow is about to close. /// @@ -315,10 +255,6 @@ namespace OpenTK } - #endregion - - #region OnLoad - /// /// Called after an OpenGL context has been established, but before entering the main loop. /// @@ -328,10 +264,6 @@ namespace OpenTK Load(this, e); } - #endregion - - #region OnUnload - /// /// Called after GameWindow.Exit was called, but before destroying the OpenGL context. /// @@ -341,10 +273,6 @@ namespace OpenTK Unload(this, e); } - #endregion - - #region public void Run() - /// /// Enters the game loop of the GameWindow using the maximum update rate. /// @@ -354,10 +282,6 @@ namespace OpenTK Run(0.0, 0.0); } - #endregion - - #region public void Run(double updateFrequency) - /// /// Enters the game loop of the GameWindow using the specified update rate. /// maximum possible render frequency. @@ -367,10 +291,6 @@ namespace OpenTK Run(updateRate, 0.0); } - #endregion - - #region public void Run(double updates_per_second, double frames_per_second) - /// /// Enters the game loop of the GameWindow updating and rendering at the specified frequency. /// @@ -521,10 +441,6 @@ namespace OpenTK render_time = timestamp - render_timestamp; } - #endregion - - #region SwapBuffers - /// /// Swaps the front and back buffer, presenting the rendered scene to the user. /// @@ -534,14 +450,6 @@ namespace OpenTK this.Context.SwapBuffers(); } - #endregion - - #endregion - - #region Properties - - #region Context - /// /// Returns the opengl IGraphicsContext associated with the current GameWindow. /// @@ -554,10 +462,6 @@ namespace OpenTK } } - #endregion - - #region IsExiting - /// /// Gets a value indicating whether the shutdown sequence has been initiated /// for this window, by calling GameWindow.Exit() or hitting the 'close' button. @@ -573,10 +477,6 @@ namespace OpenTK } } - #endregion - - #region --- GameWindow Timing --- - // TODO: Disabled because it is not reliable enough. Use vsync as a workaround. //#region public bool AllowSleep @@ -589,8 +489,6 @@ namespace OpenTK //#endregion - #region RenderFrequency - /// /// Gets a double representing the actual frequency of RenderFrame events, in hertz (i.e. fps or frames per second). /// @@ -605,10 +503,6 @@ namespace OpenTK } } - #endregion - - #region RenderPeriod - /// /// Gets a double representing the period of RenderFrame events, in seconds. /// @@ -621,10 +515,6 @@ namespace OpenTK } } - #endregion - - #region RenderTime - /// /// Gets a double representing the time spent in the RenderFrame function, in seconds. /// @@ -642,10 +532,6 @@ namespace OpenTK } } - #endregion - - #region TargetRenderFrequency - /// /// Gets or sets a double representing the target render frequency, in hertz. /// @@ -677,10 +563,6 @@ namespace OpenTK } } - #endregion - - #region TargetRenderPeriod - /// /// Gets or sets a double representing the target render period, in seconds. /// @@ -710,10 +592,6 @@ namespace OpenTK } } - #endregion - - #region TargetUpdateFrequency - /// /// Gets or sets a double representing the target update frequency, in hertz. /// @@ -745,10 +623,6 @@ namespace OpenTK } } - #endregion - - #region TargetUpdatePeriod - /// /// Gets or sets a double representing the target update period, in seconds. /// @@ -778,10 +652,6 @@ namespace OpenTK } } - #endregion - - #region UpdateFrequency - /// /// Gets a double representing the frequency of UpdateFrame events, in hertz. /// @@ -796,10 +666,6 @@ namespace OpenTK } } - #endregion - - #region UpdatePeriod - /// /// Gets a double representing the period of UpdateFrame events, in seconds. /// @@ -812,10 +678,6 @@ namespace OpenTK } } - #endregion - - #region UpdateTime - /// /// Gets a double representing the time spent in the UpdateFrame function, in seconds. /// @@ -828,12 +690,6 @@ namespace OpenTK } } - #endregion - - #endregion - - #region VSync - /// /// Gets or sets the VSyncMode. /// @@ -877,10 +733,6 @@ namespace OpenTK } } - #endregion - - #region WindowState - /// /// Gets or states the state of the NativeWindow. /// @@ -899,12 +751,6 @@ namespace OpenTK Context.Update(WindowInfo); } } - #endregion - - #endregion - - #region Events - /// /// Occurs before the window is displayed for the first time. /// @@ -925,24 +771,12 @@ namespace OpenTK /// public event EventHandler UpdateFrame = delegate { }; - #endregion - - #endregion - - #region --- Protected Members --- - - #region Dispose - /// /// Override to add custom cleanup logic. /// /// True, if this method was called by the application; false if this was called by the finalizer thread. protected virtual void Dispose(bool manual) { } - #endregion - - #region OnRenderFrame - /// /// Called when the frame is rendered. /// @@ -955,10 +789,6 @@ namespace OpenTK RenderFrame(this, e); } - #endregion - - #region OnUpdateFrame - /// /// Called when the frame is updated. /// @@ -971,20 +801,12 @@ namespace OpenTK UpdateFrame(this, e); } - #endregion - - #region OnWindowInfoChanged - /// /// Called when the WindowInfo for this GameWindow has changed. /// /// Not used. protected virtual void OnWindowInfoChanged(EventArgs e) { } - #endregion - - #region OnResize - /// /// Called when this window is resized. /// @@ -1000,55 +822,25 @@ namespace OpenTK glContext.Update(base.WindowInfo); } - #endregion - - #endregion - - #region --- Private Members --- - - #region OnLoadInternal - private void OnLoadInternal(EventArgs e) { OnLoad(e); } - #endregion - - #region OnRenderFrameInternal - private void OnRenderFrameInternal(FrameEventArgs e) { if (Exists && !isExiting) OnRenderFrame(e); } - #endregion - - #region OnUnloadInternal - private void OnUnloadInternal(EventArgs e) { OnUnload(e); } - #endregion - - #region OnUpdateFrameInternal - private void OnUpdateFrameInternal(FrameEventArgs e) { if (Exists && !isExiting) OnUpdateFrame(e); } - #endregion - - #region OnWindowInfoChangedInternal - private void OnWindowInfoChangedInternal(EventArgs e) { glContext.MakeCurrent(WindowInfo); OnWindowInfoChanged(e); } - - #endregion - - #endregion } - #region public enum VSyncMode - /// /// Enumerates available VSync modes. /// @@ -1068,6 +860,4 @@ namespace OpenTK /// Adaptive, } - - #endregion } diff --git a/src/OpenTK/GameWindowFlags.cs b/src/OpenTK/GameWindowFlags.cs index dfb6fbda..094af924 100644 --- a/src/OpenTK/GameWindowFlags.cs +++ b/src/OpenTK/GameWindowFlags.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; @@ -39,7 +37,7 @@ namespace OpenTK /// Indicates default construction options. /// Default = 0, - + /// /// Indicates that the GameWindow should cover the whole screen. /// diff --git a/src/OpenTK/Graphics/Color4.cs b/src/OpenTK/Graphics/Color4.cs index 9f2d2602..5dfc68ed 100644 --- a/src/OpenTK/Graphics/Color4.cs +++ b/src/OpenTK/Graphics/Color4.cs @@ -1,5 +1,4 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2008 the Open Toolkit library, except where noted. @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -41,8 +39,6 @@ namespace OpenTK.Graphics [Serializable] public struct Color4 : IEquatable { - #region Fields - /// /// The red component of this Color4 structure. /// @@ -63,10 +59,6 @@ namespace OpenTK.Graphics /// public float A; - #endregion - - #region Constructors - /// /// Constructs a new Color4 structure from the specified components. /// @@ -97,10 +89,6 @@ namespace OpenTK.Graphics A = a / (float)Byte.MaxValue; } - #endregion - - #region Public Members - /// /// Converts this color to an integer representation with 8 bits per channel. /// @@ -194,8 +182,6 @@ namespace OpenTK.Graphics return String.Format("{{(R, G, B, A) = ({0}, {1}, {2}, {3})}}", R.ToString(), G.ToString(), B.ToString(), A.ToString()); } - #region System colors - /// /// Gets the system color with (R, G, B, A) = (255, 255, 255, 0). /// @@ -901,14 +887,6 @@ namespace OpenTK.Graphics /// public static Color4 YellowGreen { get { return new Color4(154, 205, 50, 255); } } - #endregion - - #endregion - - #region Color conversions - - #region sRGB - /// /// Converts sRGB color values to RGB color values. /// @@ -993,10 +971,6 @@ namespace OpenTK.Graphics return new Color4(r, g, b, rgb.A); } - #endregion - - #region HSL - /// /// Converts HSL color values to RGB color values. /// @@ -1113,10 +1087,6 @@ namespace OpenTK.Graphics return new Vector4(hue, saturation, lightness, rgb.A); } - #endregion - - #region HSV - /// /// Converts HSV color values to RGB color values. /// @@ -1227,10 +1197,6 @@ namespace OpenTK.Graphics return new Vector4(hue, saturation, M, rgb.A); } - #endregion - - #region XYZ - /// /// Converts XYZ color values to RGB color values. /// @@ -1267,10 +1233,6 @@ namespace OpenTK.Graphics return new Vector4(x, y, z, rgb.A); } - #endregion - - #region YUV - /// /// Converts YCbCr color values to RGB color values. /// @@ -1308,10 +1270,6 @@ namespace OpenTK.Graphics return new Vector4(y, u, v, rgb.A); } - #endregion - - #region HCY - /// /// Converts HCY color values to RGB color values. /// @@ -1416,12 +1374,6 @@ namespace OpenTK.Graphics return new Vector4(hue, C, luminance, rgb.A); } - #endregion - - #endregion - - #region IEquatable Members - /// /// Compares whether this Color4 structure is equal to the specified Color4. /// @@ -1435,7 +1387,5 @@ namespace OpenTK.Graphics this.B == other.B && this.A == other.A; } - - #endregion } } diff --git a/src/OpenTK/Graphics/ColorFormat.cs b/src/OpenTK/Graphics/ColorFormat.cs index f781410a..52dce127 100644 --- a/src/OpenTK/Graphics/ColorFormat.cs +++ b/src/OpenTK/Graphics/ColorFormat.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -42,8 +40,6 @@ namespace OpenTK.Graphics bool isIndexed; int bitsPerPixel; - #region Constructors - /// /// Constructs a new ColorFormat with the specified aggregate bits per pixel. /// @@ -92,7 +88,7 @@ namespace OpenTK.Graphics } /// - /// Constructs a new ColorFormat with the specified bits per pixel for + /// Constructs a new ColorFormat with the specified bits per pixel for /// the Red, Green, Blue and Alpha color channels. /// /// Bits per pixel for the Red color channel. @@ -113,10 +109,6 @@ namespace OpenTK.Graphics this.isIndexed = true; } - #endregion - - #region Public Members - /// Gets the bits per pixel for the Red channel. public int Red { get { return red; } private set { red = (byte)value; } } /// Gets the bits per pixel for the Green channel. @@ -135,10 +127,6 @@ namespace OpenTK.Graphics /// public static readonly ColorFormat Empty = new ColorFormat(0); - #endregion - - #region Operator Overloads - /// /// Converts the specified bpp into a new ColorFormat. /// @@ -154,10 +142,6 @@ namespace OpenTK.Graphics // return mode.BitsPerPixel; //} - #endregion - - #region IComparable Members - /// /// Compares two instances. /// @@ -179,10 +163,6 @@ namespace OpenTK.Graphics return result; } - #endregion - - #region IEquatable Members - /// /// Compares whether this ColorFormat structure is equal to the specified ColorFormat. /// @@ -197,10 +177,6 @@ namespace OpenTK.Graphics Alpha == other.Alpha; } - #endregion - - #region Overrides - /// /// Indicates whether this instance and a specified object are equal. /// @@ -294,7 +270,5 @@ namespace OpenTK.Graphics { return string.Format("{0} ({1})", BitsPerPixel, (IsIndexed ? " indexed" : Red.ToString() + Green.ToString() + Blue.ToString() + Alpha.ToString())); } - - #endregion } } diff --git a/src/OpenTK/Graphics/ES10/Core.cs b/src/OpenTK/Graphics/ES10/Core.cs index a94cf0c9..009b3ea4 100644 --- a/src/OpenTK/Graphics/ES10/Core.cs +++ b/src/OpenTK/Graphics/ES10/Core.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion namespace OpenTK.Graphics.ES10 { diff --git a/src/OpenTK/Graphics/ES10/ES.cs b/src/OpenTK/Graphics/ES10/ES.cs index 9da61a4a..7e1165fe 100644 --- a/src/OpenTK/Graphics/ES10/ES.cs +++ b/src/OpenTK/Graphics/ES10/ES.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion namespace OpenTK.Graphics.ES10 { @@ -39,7 +37,7 @@ namespace OpenTK.Graphics.ES10 partial class GL { - + /// [requires: v1.0 and 1.0] /// Select active texture unit /// @@ -49,7 +47,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glActiveTexture")] - public static + public static void ActiveTexture(OpenTK.Graphics.ES10.All texture) { #if DEBUG @@ -62,7 +60,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify the alpha test function /// @@ -77,7 +75,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glAlphaFunc")] - public static + public static void AlphaFunc(OpenTK.Graphics.ES10.All func, Single @ref) { #if DEBUG @@ -92,7 +90,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glAlphaFuncx")] - public static + public static void AlphaFuncx(OpenTK.Graphics.ES10.All func, int @ref) { #if DEBUG @@ -105,7 +103,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Bind a named texture to a texturing target /// @@ -120,7 +118,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glBindTexture")] - public static + public static void BindTexture(OpenTK.Graphics.ES10.All target, Int32 texture) { #if DEBUG @@ -133,7 +131,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Bind a named texture to a texturing target /// @@ -149,7 +147,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glBindTexture")] - public static + public static void BindTexture(OpenTK.Graphics.ES10.All target, UInt32 texture) { #if DEBUG @@ -162,7 +160,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify pixel arithmetic /// @@ -177,7 +175,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glBlendFunc")] - public static + public static void BlendFunc(OpenTK.Graphics.ES10.All sfactor, OpenTK.Graphics.ES10.All dfactor) { #if DEBUG @@ -190,7 +188,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Clear buffers to preset values /// @@ -200,7 +198,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClear")] - public static + public static void Clear(Int32 mask) { #if DEBUG @@ -213,7 +211,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Clear buffers to preset values /// @@ -224,7 +222,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClear")] - public static + public static void Clear(UInt32 mask) { #if DEBUG @@ -237,7 +235,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify clear values for the color buffers /// @@ -247,7 +245,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClearColor")] - public static + public static void ClearColor(Single red, Single green, Single blue, Single alpha) { #if DEBUG @@ -262,7 +260,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClearColorx")] - public static + public static void ClearColorx(int red, int green, int blue, int alpha) { #if DEBUG @@ -275,7 +273,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify the clear value for the depth buffer /// @@ -285,7 +283,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClearDepthf")] - public static + public static void ClearDepth(Single depth) { #if DEBUG @@ -300,7 +298,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClearDepthx")] - public static + public static void ClearDepthx(int depth) { #if DEBUG @@ -313,7 +311,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify the clear value for the stencil buffer /// @@ -323,7 +321,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClearStencil")] - public static + public static void ClearStencil(Int32 s) { #if DEBUG @@ -336,7 +334,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Select active texture unit /// @@ -346,7 +344,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glClientActiveTexture")] - public static + public static void ClientActiveTexture(OpenTK.Graphics.ES10.All texture) { #if DEBUG @@ -359,7 +357,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the current color /// @@ -374,7 +372,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColor4f")] - public static + public static void Color4(Single red, Single green, Single blue, Single alpha) { #if DEBUG @@ -389,7 +387,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColor4x")] - public static + public static void Color4x(int red, int green, int blue, int alpha) { #if DEBUG @@ -402,7 +400,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Enable and disable writing of frame buffer color components /// @@ -412,7 +410,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColorMask")] - public static + public static void ColorMask(bool red, bool green, bool blue, bool alpha) { #if DEBUG @@ -425,7 +423,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of colors /// @@ -450,7 +448,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColorPointer")] - public static + public static void ColorPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, IntPtr pointer) { #if DEBUG @@ -463,7 +461,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of colors /// @@ -488,7 +486,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColorPointer")] - public static + public static void ColorPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer) where T3 : struct { @@ -510,7 +508,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of colors /// @@ -535,7 +533,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColorPointer")] - public static + public static void ColorPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[,] pointer) where T3 : struct { @@ -557,7 +555,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of colors /// @@ -582,7 +580,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColorPointer")] - public static + public static void ColorPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer) where T3 : struct { @@ -604,7 +602,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of colors /// @@ -629,7 +627,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glColorPointer")] - public static + public static void ColorPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer) where T3 : struct { @@ -652,7 +650,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image in a compressed format /// @@ -697,7 +695,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexImage2D")] - public static + public static void CompressedTexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, OpenTK.Graphics.ES10.All internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data) { #if DEBUG @@ -710,7 +708,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image in a compressed format /// @@ -755,7 +753,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexImage2D")] - public static + public static void CompressedTexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, OpenTK.Graphics.ES10.All internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data) where T7 : struct { @@ -777,7 +775,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image in a compressed format /// @@ -822,7 +820,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexImage2D")] - public static + public static void CompressedTexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, OpenTK.Graphics.ES10.All internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,] data) where T7 : struct { @@ -844,7 +842,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image in a compressed format /// @@ -889,7 +887,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexImage2D")] - public static + public static void CompressedTexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, OpenTK.Graphics.ES10.All internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data) where T7 : struct { @@ -911,7 +909,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image in a compressed format /// @@ -956,7 +954,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexImage2D")] - public static + public static void CompressedTexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, OpenTK.Graphics.ES10.All internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data) where T7 : struct { @@ -979,7 +977,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage in a compressed format /// @@ -1029,7 +1027,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexSubImage2D")] - public static + public static void CompressedTexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, Int32 imageSize, IntPtr data) { #if DEBUG @@ -1042,7 +1040,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage in a compressed format /// @@ -1092,7 +1090,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexSubImage2D")] - public static + public static void CompressedTexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data) where T8 : struct { @@ -1114,7 +1112,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage in a compressed format /// @@ -1164,7 +1162,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexSubImage2D")] - public static + public static void CompressedTexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, Int32 imageSize, [InAttribute, OutAttribute] T8[,] data) where T8 : struct { @@ -1186,7 +1184,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage in a compressed format /// @@ -1236,7 +1234,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexSubImage2D")] - public static + public static void CompressedTexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data) where T8 : struct { @@ -1258,7 +1256,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage in a compressed format /// @@ -1308,7 +1306,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCompressedTexSubImage2D")] - public static + public static void CompressedTexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data) where T8 : struct { @@ -1331,7 +1329,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Copy pixels into a 2D texture image /// @@ -1371,7 +1369,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCopyTexImage2D")] - public static + public static void CopyTexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, OpenTK.Graphics.ES10.All internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border) { #if DEBUG @@ -1384,7 +1382,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Copy a two-dimensional texture subimage /// @@ -1424,7 +1422,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCopyTexSubImage2D")] - public static + public static void CopyTexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 x, Int32 y, Int32 width, Int32 height) { #if DEBUG @@ -1437,7 +1435,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify whether front- or back-facing facets can be culled /// @@ -1447,7 +1445,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glCullFace")] - public static + public static void CullFace(OpenTK.Graphics.ES10.All mode) { #if DEBUG @@ -1460,7 +1458,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Delete named textures /// @@ -1475,7 +1473,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDeleteTextures")] - public static + public static void DeleteTextures(Int32 n, Int32[] textures) { #if DEBUG @@ -1494,7 +1492,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Delete named textures /// @@ -1509,7 +1507,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDeleteTextures")] - public static + public static void DeleteTextures(Int32 n, ref Int32 textures) { #if DEBUG @@ -1528,7 +1526,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Delete named textures /// @@ -1544,7 +1542,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDeleteTextures")] - public static + public static unsafe void DeleteTextures(Int32 n, Int32* textures) { #if DEBUG @@ -1557,7 +1555,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Delete named textures /// @@ -1573,7 +1571,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDeleteTextures")] - public static + public static void DeleteTextures(Int32 n, UInt32[] textures) { #if DEBUG @@ -1592,7 +1590,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Delete named textures /// @@ -1608,7 +1606,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDeleteTextures")] - public static + public static void DeleteTextures(Int32 n, ref UInt32 textures) { #if DEBUG @@ -1627,7 +1625,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Delete named textures /// @@ -1643,7 +1641,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDeleteTextures")] - public static + public static unsafe void DeleteTextures(Int32 n, UInt32* textures) { #if DEBUG @@ -1656,7 +1654,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify the value used for depth buffer comparisons /// @@ -1666,7 +1664,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDepthFunc")] - public static + public static void DepthFunc(OpenTK.Graphics.ES10.All func) { #if DEBUG @@ -1679,7 +1677,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Enable or disable writing into the depth buffer /// @@ -1689,7 +1687,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDepthMask")] - public static + public static void DepthMask(bool flag) { #if DEBUG @@ -1702,7 +1700,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify mapping of depth values from normalized device coordinates to window coordinates /// @@ -1717,7 +1715,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDepthRangef")] - public static + public static void DepthRange(Single zNear, Single zFar) { #if DEBUG @@ -1732,7 +1730,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDepthRangex")] - public static + public static void DepthRangex(int zNear, int zFar) { #if DEBUG @@ -1747,7 +1745,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDisable")] - public static + public static void Disable(OpenTK.Graphics.ES10.All cap) { #if DEBUG @@ -1762,7 +1760,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDisableClientState")] - public static + public static void DisableClientState(OpenTK.Graphics.ES10.All array) { #if DEBUG @@ -1775,7 +1773,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Render primitives from array data /// @@ -1795,7 +1793,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDrawArrays")] - public static + public static void DrawArrays(OpenTK.Graphics.ES10.All mode, Int32 first, Int32 count) { #if DEBUG @@ -1808,7 +1806,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Render primitives from array data /// @@ -1833,7 +1831,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDrawElements")] - public static + public static void DrawElements(OpenTK.Graphics.ES10.All mode, Int32 count, OpenTK.Graphics.ES10.All type, IntPtr indices) { #if DEBUG @@ -1846,7 +1844,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Render primitives from array data /// @@ -1871,7 +1869,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDrawElements")] - public static + public static void DrawElements(OpenTK.Graphics.ES10.All mode, Int32 count, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T3[] indices) where T3 : struct { @@ -1893,7 +1891,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Render primitives from array data /// @@ -1918,7 +1916,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDrawElements")] - public static + public static void DrawElements(OpenTK.Graphics.ES10.All mode, Int32 count, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T3[,] indices) where T3 : struct { @@ -1940,7 +1938,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Render primitives from array data /// @@ -1965,7 +1963,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDrawElements")] - public static + public static void DrawElements(OpenTK.Graphics.ES10.All mode, Int32 count, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T3[,,] indices) where T3 : struct { @@ -1987,7 +1985,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Render primitives from array data /// @@ -2012,7 +2010,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glDrawElements")] - public static + public static void DrawElements(OpenTK.Graphics.ES10.All mode, Int32 count, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] ref T3 indices) where T3 : struct { @@ -2035,7 +2033,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Enable or disable server-side GL capabilities /// @@ -2045,7 +2043,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glEnable")] - public static + public static void Enable(OpenTK.Graphics.ES10.All cap) { #if DEBUG @@ -2058,7 +2056,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Enable or disable client-side capability /// @@ -2068,7 +2066,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glEnableClientState")] - public static + public static void EnableClientState(OpenTK.Graphics.ES10.All array) { #if DEBUG @@ -2081,12 +2079,12 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Block until all GL execution is complete /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFinish")] - public static + public static void Finish() { #if DEBUG @@ -2099,12 +2097,12 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Force execution of GL commands in finite time /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFlush")] - public static + public static void Flush() { #if DEBUG @@ -2117,7 +2115,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify fog parameters /// @@ -2132,7 +2130,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFogf")] - public static + public static void Fog(OpenTK.Graphics.ES10.All pname, Single param) { #if DEBUG @@ -2145,7 +2143,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify fog parameters /// @@ -2160,7 +2158,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFogfv")] - public static + public static void Fog(OpenTK.Graphics.ES10.All pname, Single[] @params) { #if DEBUG @@ -2179,7 +2177,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify fog parameters /// @@ -2195,7 +2193,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFogfv")] - public static + public static unsafe void Fog(OpenTK.Graphics.ES10.All pname, Single* @params) { #if DEBUG @@ -2210,7 +2208,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFogx")] - public static + public static void Fogx(OpenTK.Graphics.ES10.All pname, int param) { #if DEBUG @@ -2225,7 +2223,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFogxv")] - public static + public static void Fogx(OpenTK.Graphics.ES10.All pname, int[] @params) { #if DEBUG @@ -2247,7 +2245,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFogxv")] - public static + public static unsafe void Fogx(OpenTK.Graphics.ES10.All pname, int* @params) { #if DEBUG @@ -2260,7 +2258,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define front- and back-facing polygons /// @@ -2270,7 +2268,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFrontFace")] - public static + public static void FrontFace(OpenTK.Graphics.ES10.All mode) { #if DEBUG @@ -2283,7 +2281,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix by a perspective matrix /// @@ -2303,7 +2301,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFrustumf")] - public static + public static void Frustum(Single left, Single right, Single bottom, Single top, Single zNear, Single zFar) { #if DEBUG @@ -2318,7 +2316,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glFrustumx")] - public static + public static void Frustumx(int left, int right, int bottom, int top, int zNear, int zFar) { #if DEBUG @@ -2331,7 +2329,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Generate texture names /// @@ -2346,7 +2344,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGenTextures")] - public static + public static void GenTextures(Int32 n, Int32[] textures) { #if DEBUG @@ -2365,7 +2363,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Generate texture names /// @@ -2380,7 +2378,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGenTextures")] - public static + public static void GenTextures(Int32 n, ref Int32 textures) { #if DEBUG @@ -2399,7 +2397,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Generate texture names /// @@ -2415,7 +2413,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGenTextures")] - public static + public static unsafe void GenTextures(Int32 n, Int32* textures) { #if DEBUG @@ -2428,7 +2426,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Generate texture names /// @@ -2444,7 +2442,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGenTextures")] - public static + public static void GenTextures(Int32 n, UInt32[] textures) { #if DEBUG @@ -2463,7 +2461,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Generate texture names /// @@ -2479,7 +2477,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGenTextures")] - public static + public static void GenTextures(Int32 n, ref UInt32 textures) { #if DEBUG @@ -2498,7 +2496,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Generate texture names /// @@ -2514,7 +2512,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGenTextures")] - public static + public static unsafe void GenTextures(Int32 n, UInt32* textures) { #if DEBUG @@ -2527,12 +2525,12 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Return error information /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGetError")] - public static + public static OpenTK.Graphics.ES10.All GetError() { return Core.GetError(); @@ -2540,7 +2538,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGetIntegerv")] - public static + public static void GetInteger(OpenTK.Graphics.ES10.All pname, Int32[] @params) { #if DEBUG @@ -2561,7 +2559,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGetIntegerv")] - public static + public static void GetInteger(OpenTK.Graphics.ES10.All pname, ref Int32 @params) { #if DEBUG @@ -2583,7 +2581,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGetIntegerv")] - public static + public static unsafe void GetInteger(OpenTK.Graphics.ES10.All pname, Int32* @params) { #if DEBUG @@ -2596,7 +2594,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Return a string describing the current GL connection /// @@ -2612,7 +2610,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glGetString")] - public static + public static unsafe System.String GetString(OpenTK.Graphics.ES10.All name) { #if DEBUG @@ -2625,7 +2623,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify implementation-specific hints /// @@ -2640,7 +2638,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glHint")] - public static + public static void Hint(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All mode) { #if DEBUG @@ -2653,7 +2651,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set light source parameters /// @@ -2673,7 +2671,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightf")] - public static + public static void Light(OpenTK.Graphics.ES10.All light, OpenTK.Graphics.ES10.All pname, Single param) { #if DEBUG @@ -2686,7 +2684,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set light source parameters /// @@ -2706,7 +2704,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightfv")] - public static + public static void Light(OpenTK.Graphics.ES10.All light, OpenTK.Graphics.ES10.All pname, Single[] @params) { #if DEBUG @@ -2725,7 +2723,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set light source parameters /// @@ -2746,7 +2744,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightfv")] - public static + public static unsafe void Light(OpenTK.Graphics.ES10.All light, OpenTK.Graphics.ES10.All pname, Single* @params) { #if DEBUG @@ -2759,7 +2757,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the lighting model parameters /// @@ -2774,7 +2772,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightModelf")] - public static + public static void LightModel(OpenTK.Graphics.ES10.All pname, Single param) { #if DEBUG @@ -2787,7 +2785,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the lighting model parameters /// @@ -2802,7 +2800,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightModelfv")] - public static + public static void LightModel(OpenTK.Graphics.ES10.All pname, Single[] @params) { #if DEBUG @@ -2821,7 +2819,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the lighting model parameters /// @@ -2837,7 +2835,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightModelfv")] - public static + public static unsafe void LightModel(OpenTK.Graphics.ES10.All pname, Single* @params) { #if DEBUG @@ -2852,7 +2850,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightModelx")] - public static + public static void LightModelx(OpenTK.Graphics.ES10.All pname, int param) { #if DEBUG @@ -2867,7 +2865,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightModelxv")] - public static + public static void LightModelx(OpenTK.Graphics.ES10.All pname, int[] @params) { #if DEBUG @@ -2889,7 +2887,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightModelxv")] - public static + public static unsafe void LightModelx(OpenTK.Graphics.ES10.All pname, int* @params) { #if DEBUG @@ -2904,7 +2902,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightx")] - public static + public static void Lightx(OpenTK.Graphics.ES10.All light, OpenTK.Graphics.ES10.All pname, int param) { #if DEBUG @@ -2919,7 +2917,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightxv")] - public static + public static void Lightx(OpenTK.Graphics.ES10.All light, OpenTK.Graphics.ES10.All pname, int[] @params) { #if DEBUG @@ -2941,7 +2939,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLightxv")] - public static + public static unsafe void Lightx(OpenTK.Graphics.ES10.All light, OpenTK.Graphics.ES10.All pname, int* @params) { #if DEBUG @@ -2954,7 +2952,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify the width of rasterized lines /// @@ -2964,7 +2962,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLineWidth")] - public static + public static void LineWidth(Single width) { #if DEBUG @@ -2979,7 +2977,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLineWidthx")] - public static + public static void LineWidthx(int width) { #if DEBUG @@ -2992,12 +2990,12 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Replace the current matrix with the identity matrix /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLoadIdentity")] - public static + public static void LoadIdentity() { #if DEBUG @@ -3010,7 +3008,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Replace the current matrix with the specified matrix /// @@ -3020,7 +3018,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLoadMatrixf")] - public static + public static void LoadMatrix(Single[] m) { #if DEBUG @@ -3039,7 +3037,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Replace the current matrix with the specified matrix /// @@ -3049,7 +3047,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLoadMatrixf")] - public static + public static void LoadMatrix(ref Single m) { #if DEBUG @@ -3068,7 +3066,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Replace the current matrix with the specified matrix /// @@ -3079,7 +3077,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLoadMatrixf")] - public static + public static unsafe void LoadMatrix(Single* m) { #if DEBUG @@ -3094,7 +3092,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLoadMatrixx")] - public static + public static void LoadMatrixx(int[] m) { #if DEBUG @@ -3115,7 +3113,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLoadMatrixx")] - public static + public static void LoadMatrixx(ref int m) { #if DEBUG @@ -3137,7 +3135,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLoadMatrixx")] - public static + public static unsafe void LoadMatrixx(int* m) { #if DEBUG @@ -3150,7 +3148,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a logical pixel operation for rendering /// @@ -3160,7 +3158,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glLogicOp")] - public static + public static void LogicOp(OpenTK.Graphics.ES10.All opcode) { #if DEBUG @@ -3173,7 +3171,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify material parameters for the lighting model /// @@ -3193,7 +3191,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMaterialf")] - public static + public static void Material(OpenTK.Graphics.ES10.All face, OpenTK.Graphics.ES10.All pname, Single param) { #if DEBUG @@ -3206,7 +3204,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify material parameters for the lighting model /// @@ -3226,7 +3224,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMaterialfv")] - public static + public static void Material(OpenTK.Graphics.ES10.All face, OpenTK.Graphics.ES10.All pname, Single[] @params) { #if DEBUG @@ -3245,7 +3243,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify material parameters for the lighting model /// @@ -3266,7 +3264,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMaterialfv")] - public static + public static unsafe void Material(OpenTK.Graphics.ES10.All face, OpenTK.Graphics.ES10.All pname, Single* @params) { #if DEBUG @@ -3281,7 +3279,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMaterialx")] - public static + public static void Materialx(OpenTK.Graphics.ES10.All face, OpenTK.Graphics.ES10.All pname, int param) { #if DEBUG @@ -3296,7 +3294,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMaterialxv")] - public static + public static void Materialx(OpenTK.Graphics.ES10.All face, OpenTK.Graphics.ES10.All pname, int[] @params) { #if DEBUG @@ -3318,7 +3316,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMaterialxv")] - public static + public static unsafe void Materialx(OpenTK.Graphics.ES10.All face, OpenTK.Graphics.ES10.All pname, int* @params) { #if DEBUG @@ -3331,7 +3329,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify which matrix is the current matrix /// @@ -3341,7 +3339,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMatrixMode")] - public static + public static void MatrixMode(OpenTK.Graphics.ES10.All mode) { #if DEBUG @@ -3354,7 +3352,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the current texture coordinates /// @@ -3369,7 +3367,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultiTexCoord4f")] - public static + public static void MultiTexCoord4(OpenTK.Graphics.ES10.All target, Single s, Single t, Single r, Single q) { #if DEBUG @@ -3384,7 +3382,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultiTexCoord4x")] - public static + public static void MultiTexCoord4x(OpenTK.Graphics.ES10.All target, int s, int t, int r, int q) { #if DEBUG @@ -3397,7 +3395,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix with the specified matrix /// @@ -3407,7 +3405,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultMatrixf")] - public static + public static void MultMatrix(Single[] m) { #if DEBUG @@ -3426,7 +3424,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix with the specified matrix /// @@ -3436,7 +3434,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultMatrixf")] - public static + public static void MultMatrix(ref Single m) { #if DEBUG @@ -3455,7 +3453,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix with the specified matrix /// @@ -3466,7 +3464,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultMatrixf")] - public static + public static unsafe void MultMatrix(Single* m) { #if DEBUG @@ -3481,7 +3479,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultMatrixx")] - public static + public static void MultMatrixx(int[] m) { #if DEBUG @@ -3502,7 +3500,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultMatrixx")] - public static + public static void MultMatrixx(ref int m) { #if DEBUG @@ -3524,7 +3522,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glMultMatrixx")] - public static + public static unsafe void MultMatrixx(int* m) { #if DEBUG @@ -3537,7 +3535,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the current normal vector /// @@ -3546,11 +3544,11 @@ namespace OpenTK.Graphics.ES10 /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1). /// /// - /// + /// /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glNormal3f")] - public static + public static void Normal3(Single nx, Single ny, Single nz) { #if DEBUG @@ -3565,7 +3563,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glNormal3x")] - public static + public static void Normal3x(int nx, int ny, int nz) { #if DEBUG @@ -3578,7 +3576,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of normals /// @@ -3598,7 +3596,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glNormalPointer")] - public static + public static void NormalPointer(OpenTK.Graphics.ES10.All type, Int32 stride, IntPtr pointer) { #if DEBUG @@ -3611,7 +3609,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of normals /// @@ -3631,7 +3629,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glNormalPointer")] - public static + public static void NormalPointer(OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer) where T2 : struct { @@ -3653,7 +3651,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of normals /// @@ -3673,7 +3671,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glNormalPointer")] - public static + public static void NormalPointer(OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T2[,] pointer) where T2 : struct { @@ -3695,7 +3693,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of normals /// @@ -3715,7 +3713,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glNormalPointer")] - public static + public static void NormalPointer(OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer) where T2 : struct { @@ -3737,7 +3735,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of normals /// @@ -3757,7 +3755,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glNormalPointer")] - public static + public static void NormalPointer(OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer) where T2 : struct { @@ -3780,7 +3778,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix with an orthographic matrix /// @@ -3800,7 +3798,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glOrthof")] - public static + public static void Ortho(Single left, Single right, Single bottom, Single top, Single zNear, Single zFar) { #if DEBUG @@ -3815,7 +3813,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glOrthox")] - public static + public static void Orthox(int left, int right, int bottom, int top, int zNear, int zFar) { #if DEBUG @@ -3828,7 +3826,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set pixel storage modes /// @@ -3843,7 +3841,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glPixelStorei")] - public static + public static void PixelStore(OpenTK.Graphics.ES10.All pname, Int32 param) { #if DEBUG @@ -3856,7 +3854,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify the diameter of rasterized points /// @@ -3866,7 +3864,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glPointSize")] - public static + public static void PointSize(Single size) { #if DEBUG @@ -3881,7 +3879,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glPointSizex")] - public static + public static void PointSizex(int size) { #if DEBUG @@ -3894,7 +3892,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the scale and units used to calculate depth values /// @@ -3909,7 +3907,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glPolygonOffset")] - public static + public static void PolygonOffset(Single factor, Single units) { #if DEBUG @@ -3924,7 +3922,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glPolygonOffsetx")] - public static + public static void PolygonOffsetx(int factor, int units) { #if DEBUG @@ -3939,7 +3937,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glPopMatrix")] - public static + public static void PopMatrix() { #if DEBUG @@ -3952,12 +3950,12 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Push and pop the current matrix stack /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glPushMatrix")] - public static + public static void PushMatrix() { #if DEBUG @@ -3970,7 +3968,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Read a block of pixels from the frame buffer /// @@ -4000,7 +3998,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glReadPixels")] - public static + public static void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, IntPtr pixels) { #if DEBUG @@ -4013,7 +4011,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Read a block of pixels from the frame buffer /// @@ -4043,7 +4041,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glReadPixels")] - public static + public static void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T6[] pixels) where T6 : struct { @@ -4065,7 +4063,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Read a block of pixels from the frame buffer /// @@ -4095,7 +4093,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glReadPixels")] - public static + public static void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T6[,] pixels) where T6 : struct { @@ -4117,7 +4115,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Read a block of pixels from the frame buffer /// @@ -4147,7 +4145,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glReadPixels")] - public static + public static void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T6[,,] pixels) where T6 : struct { @@ -4169,7 +4167,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Read a block of pixels from the frame buffer /// @@ -4199,7 +4197,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glReadPixels")] - public static + public static void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] ref T6 pixels) where T6 : struct { @@ -4222,7 +4220,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix by a rotation matrix /// @@ -4237,7 +4235,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glRotatef")] - public static + public static void Rotate(Single angle, Single x, Single y, Single z) { #if DEBUG @@ -4252,7 +4250,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glRotatex")] - public static + public static void Rotatex(int angle, int x, int y, int z) { #if DEBUG @@ -4265,7 +4263,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify multisample coverage parameters /// @@ -4280,7 +4278,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glSampleCoverage")] - public static + public static void SampleCoverage(Single value, bool invert) { #if DEBUG @@ -4295,7 +4293,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glSampleCoveragex")] - public static + public static void SampleCoveragex(int value, bool invert) { #if DEBUG @@ -4308,7 +4306,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix by a general scaling matrix /// @@ -4318,7 +4316,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glScalef")] - public static + public static void Scale(Single x, Single y, Single z) { #if DEBUG @@ -4333,7 +4331,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glScalex")] - public static + public static void Scalex(int x, int y, int z) { #if DEBUG @@ -4346,7 +4344,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define the scissor box /// @@ -4361,7 +4359,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glScissor")] - public static + public static void Scissor(Int32 x, Int32 y, Int32 width, Int32 height) { #if DEBUG @@ -4374,7 +4372,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Select flat or smooth shading /// @@ -4384,7 +4382,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glShadeModel")] - public static + public static void ShadeModel(OpenTK.Graphics.ES10.All mode) { #if DEBUG @@ -4397,7 +4395,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set front and back function and reference value for stencil testing /// @@ -4417,7 +4415,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glStencilFunc")] - public static + public static void StencilFunc(OpenTK.Graphics.ES10.All func, Int32 @ref, Int32 mask) { #if DEBUG @@ -4430,7 +4428,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set front and back function and reference value for stencil testing /// @@ -4451,7 +4449,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glStencilFunc")] - public static + public static void StencilFunc(OpenTK.Graphics.ES10.All func, Int32 @ref, UInt32 mask) { #if DEBUG @@ -4464,7 +4462,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Control the front and back writing of individual bits in the stencil planes /// @@ -4474,7 +4472,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glStencilMask")] - public static + public static void StencilMask(Int32 mask) { #if DEBUG @@ -4487,7 +4485,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Control the front and back writing of individual bits in the stencil planes /// @@ -4498,7 +4496,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glStencilMask")] - public static + public static void StencilMask(UInt32 mask) { #if DEBUG @@ -4511,7 +4509,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set front and back stencil test actions /// @@ -4531,7 +4529,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glStencilOp")] - public static + public static void StencilOp(OpenTK.Graphics.ES10.All fail, OpenTK.Graphics.ES10.All zfail, OpenTK.Graphics.ES10.All zpass) { #if DEBUG @@ -4544,7 +4542,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of texture coordinates /// @@ -4569,7 +4567,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexCoordPointer")] - public static + public static void TexCoordPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, IntPtr pointer) { #if DEBUG @@ -4582,7 +4580,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of texture coordinates /// @@ -4607,7 +4605,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexCoordPointer")] - public static + public static void TexCoordPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer) where T3 : struct { @@ -4629,7 +4627,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of texture coordinates /// @@ -4654,7 +4652,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexCoordPointer")] - public static + public static void TexCoordPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[,] pointer) where T3 : struct { @@ -4676,7 +4674,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of texture coordinates /// @@ -4701,7 +4699,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexCoordPointer")] - public static + public static void TexCoordPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer) where T3 : struct { @@ -4723,7 +4721,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of texture coordinates /// @@ -4748,7 +4746,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexCoordPointer")] - public static + public static void TexCoordPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer) where T3 : struct { @@ -4771,7 +4769,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set texture environment parameters /// @@ -4791,7 +4789,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexEnvf")] - public static + public static void TexEnv(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, Single param) { #if DEBUG @@ -4804,7 +4802,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set texture environment parameters /// @@ -4824,7 +4822,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexEnvfv")] - public static + public static void TexEnv(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, Single[] @params) { #if DEBUG @@ -4843,7 +4841,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set texture environment parameters /// @@ -4864,7 +4862,7 @@ namespace OpenTK.Graphics.ES10 /// [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexEnvfv")] - public static + public static unsafe void TexEnv(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, Single* @params) { #if DEBUG @@ -4879,7 +4877,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexEnvx")] - public static + public static void TexEnvx(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, int param) { #if DEBUG @@ -4894,7 +4892,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexEnvxv")] - public static + public static void TexEnvx(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, int[] @params) { #if DEBUG @@ -4916,7 +4914,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [System.CLSCompliant(false)] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexEnvxv")] - public static + public static unsafe void TexEnvx(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, int* @params) { #if DEBUG @@ -4929,7 +4927,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image /// @@ -4979,7 +4977,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexImage2D")] - public static + public static void TexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, IntPtr pixels) { #if DEBUG @@ -4992,7 +4990,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image /// @@ -5042,7 +5040,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexImage2D")] - public static + public static void TexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T8[] pixels) where T8 : struct { @@ -5064,7 +5062,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image /// @@ -5114,7 +5112,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexImage2D")] - public static + public static void TexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T8[,] pixels) where T8 : struct { @@ -5136,7 +5134,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image /// @@ -5186,7 +5184,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexImage2D")] - public static + public static void TexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T8[,,] pixels) where T8 : struct { @@ -5208,7 +5206,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture image /// @@ -5258,7 +5256,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexImage2D")] - public static + public static void TexImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] ref T8 pixels) where T8 : struct { @@ -5281,7 +5279,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set texture parameters /// @@ -5301,7 +5299,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexParameterf")] - public static + public static void TexParameter(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, Single param) { #if DEBUG @@ -5316,7 +5314,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexParameterx")] - public static + public static void TexParameterx(OpenTK.Graphics.ES10.All target, OpenTK.Graphics.ES10.All pname, int param) { #if DEBUG @@ -5329,7 +5327,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage /// @@ -5379,7 +5377,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexSubImage2D")] - public static + public static void TexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, IntPtr pixels) { #if DEBUG @@ -5392,7 +5390,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage /// @@ -5442,7 +5440,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexSubImage2D")] - public static + public static void TexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T8[] pixels) where T8 : struct { @@ -5464,7 +5462,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage /// @@ -5514,7 +5512,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexSubImage2D")] - public static + public static void TexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T8[,] pixels) where T8 : struct { @@ -5536,7 +5534,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage /// @@ -5586,7 +5584,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexSubImage2D")] - public static + public static void TexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] T8[,,] pixels) where T8 : struct { @@ -5608,7 +5606,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Specify a two-dimensional texture subimage /// @@ -5658,7 +5656,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTexSubImage2D")] - public static + public static void TexSubImage2D(OpenTK.Graphics.ES10.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES10.All format, OpenTK.Graphics.ES10.All type, [InAttribute, OutAttribute] ref T8 pixels) where T8 : struct { @@ -5681,7 +5679,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Multiply the current matrix by a translation matrix /// @@ -5691,7 +5689,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTranslatef")] - public static + public static void Translate(Single x, Single y, Single z) { #if DEBUG @@ -5706,7 +5704,7 @@ namespace OpenTK.Graphics.ES10 /// [requires: v1.0 and 1.0] [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glTranslatex")] - public static + public static void Translatex(int x, int y, int z) { #if DEBUG @@ -5719,7 +5717,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of vertex data /// @@ -5744,7 +5742,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glVertexPointer")] - public static + public static void VertexPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, IntPtr pointer) { #if DEBUG @@ -5757,7 +5755,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of vertex data /// @@ -5782,7 +5780,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glVertexPointer")] - public static + public static void VertexPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer) where T3 : struct { @@ -5804,7 +5802,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of vertex data /// @@ -5829,7 +5827,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glVertexPointer")] - public static + public static void VertexPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[,] pointer) where T3 : struct { @@ -5851,7 +5849,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of vertex data /// @@ -5876,7 +5874,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glVertexPointer")] - public static + public static void VertexPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer) where T3 : struct { @@ -5898,7 +5896,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Define an array of vertex data /// @@ -5923,7 +5921,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glVertexPointer")] - public static + public static void VertexPointer(Int32 size, OpenTK.Graphics.ES10.All type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer) where T3 : struct { @@ -5946,7 +5944,7 @@ namespace OpenTK.Graphics.ES10 #endif } - + /// [requires: v1.0 and 1.0] /// Set the viewport /// @@ -5961,7 +5959,7 @@ namespace OpenTK.Graphics.ES10 /// /// [AutoGenerated(Category = "1.0", Version = "1.0", EntryPoint = "glViewport")] - public static + public static void Viewport(Int32 x, Int32 y, Int32 width, Int32 height) { #if DEBUG diff --git a/src/OpenTK/Graphics/ES10/Enums.cs b/src/OpenTK/Graphics/ES10/Enums.cs index 8eb7e636..d68526bc 100644 --- a/src/OpenTK/Graphics/ES10/Enums.cs +++ b/src/OpenTK/Graphics/ES10/Enums.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Graphics/ES10/ErrorHelper.cs b/src/OpenTK/Graphics/ES10/ErrorHelper.cs index f4bbcfd2..8bd50d99 100644 --- a/src/OpenTK/Graphics/ES10/ErrorHelper.cs +++ b/src/OpenTK/Graphics/ES10/ErrorHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,17 +42,11 @@ namespace OpenTK.Graphics.ES10 // as that would cause infinite recursion! struct ErrorHelper : IDisposable { - #region Fields - static readonly object SyncRoot = new object(); static readonly Dictionary> ContextErrors = new Dictionary>(); readonly GraphicsContext Context; - #endregion - - #region Constructors - public ErrorHelper(IGraphicsContext context) { if (context == null) @@ -69,10 +61,6 @@ namespace OpenTK.Graphics.ES10 ResetErrors(); } - #endregion - - #region Public Members - // Retrieve all OpenGL errors to clear the error list. // See http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/geterror.html [Conditional("DEBUG")] @@ -120,15 +108,9 @@ namespace OpenTK.Graphics.ES10 } } - #endregion - - #region IDisposable Members - public void Dispose() { CheckErrors(); } - - #endregion } } diff --git a/src/OpenTK/Graphics/ES11/ES11Obsolete.cs b/src/OpenTK/Graphics/ES11/ES11Obsolete.cs index 00e9928e..25d7377e 100644 --- a/src/OpenTK/Graphics/ES11/ES11Obsolete.cs +++ b/src/OpenTK/Graphics/ES11/ES11Obsolete.cs @@ -1,5 +1,4 @@ -#region License -// +// // ES11Obsolete.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Graphics/ES11/ErrorHelper.cs b/src/OpenTK/Graphics/ES11/ErrorHelper.cs index da3fef89..969b5175 100644 --- a/src/OpenTK/Graphics/ES11/ErrorHelper.cs +++ b/src/OpenTK/Graphics/ES11/ErrorHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,17 +42,11 @@ namespace OpenTK.Graphics.ES11 // as that would cause infinite recursion! struct ErrorHelper : IDisposable { - #region Fields - static readonly object SyncRoot = new object(); static readonly Dictionary> ContextErrors = new Dictionary>(); readonly GraphicsContext Context; - #endregion - - #region Constructors - public ErrorHelper(IGraphicsContext context) { if (context == null) @@ -69,10 +61,6 @@ namespace OpenTK.Graphics.ES11 ResetErrors(); } - #endregion - - #region Public Members - // Retrieve all OpenGL errors to clear the error list. // See http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/geterror.html [Conditional("DEBUG")] @@ -120,15 +108,9 @@ namespace OpenTK.Graphics.ES11 } } - #endregion - - #region IDisposable Members - public void Dispose() { CheckErrors(); } - - #endregion } } diff --git a/src/OpenTK/Graphics/ES11/Helper.cs b/src/OpenTK/Graphics/ES11/Helper.cs index 3edce516..423dc8b8 100644 --- a/src/OpenTK/Graphics/ES11/Helper.cs +++ b/src/OpenTK/Graphics/ES11/Helper.cs @@ -23,8 +23,6 @@ namespace OpenTK.Graphics.ES11 static byte[] EntryPointNames; static int[] EntryPointNameOffsets; - #region Constructors - /// /// Constructs a new instance. /// @@ -35,10 +33,6 @@ namespace OpenTK.Graphics.ES11 _EntryPointNameOffsetsInstance = EntryPointNameOffsets; } - #endregion - - #region --- Protected Members --- - /// /// Returns a synchronization token unique for the GL class. /// @@ -47,7 +41,5 @@ namespace OpenTK.Graphics.ES11 get { return sync_root; } } - #endregion - } } diff --git a/src/OpenTK/Graphics/ES20/ErrorHelper.cs b/src/OpenTK/Graphics/ES20/ErrorHelper.cs index ed1e8b02..66e7f517 100644 --- a/src/OpenTK/Graphics/ES20/ErrorHelper.cs +++ b/src/OpenTK/Graphics/ES20/ErrorHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,17 +42,11 @@ namespace OpenTK.Graphics.ES20 // as that would cause infinite recursion! struct ErrorHelper : IDisposable { - #region Fields - static readonly object SyncRoot = new object(); static readonly Dictionary> ContextErrors = new Dictionary>(); readonly GraphicsContext Context; - #endregion - - #region Constructors - public ErrorHelper(IGraphicsContext context) { if (context == null) @@ -69,10 +61,6 @@ namespace OpenTK.Graphics.ES20 ResetErrors(); } - #endregion - - #region Public Members - // Retrieve all OpenGL errors to clear the error list. // See http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/geterror.html [Conditional("DEBUG")] @@ -120,15 +108,9 @@ namespace OpenTK.Graphics.ES20 } } - #endregion - - #region IDisposable Members - public void Dispose() { CheckErrors(); } - - #endregion } } diff --git a/src/OpenTK/Graphics/ES20/Helper.cs b/src/OpenTK/Graphics/ES20/Helper.cs index 4beff383..0a1c3e27 100644 --- a/src/OpenTK/Graphics/ES20/Helper.cs +++ b/src/OpenTK/Graphics/ES20/Helper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -51,8 +49,6 @@ namespace OpenTK.Graphics.ES20 static byte[] EntryPointNames; static int[] EntryPointNameOffsets; - #region Constructors - /// /// Constructs a new instance. /// @@ -63,10 +59,6 @@ namespace OpenTK.Graphics.ES20 _EntryPointNameOffsetsInstance = EntryPointNameOffsets; } - #endregion - - #region --- Protected Members --- - /// /// Returns a synchronization token unique for the GL class. /// @@ -75,10 +67,6 @@ namespace OpenTK.Graphics.ES20 get { return sync_root; } } - #endregion - - #region Helper Overloads - #pragma warning disable 3019 #pragma warning disable 1591 #pragma warning disable 1572 @@ -87,8 +75,6 @@ namespace OpenTK.Graphics.ES20 // Note: Mono 1.9.1 truncates StringBuilder results (for 'out string' parameters). // We work around this issue by doubling the StringBuilder capacity. - #region public static void ClearColor() overloads - public static void ClearColor(Color color) { GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -99,10 +85,6 @@ namespace OpenTK.Graphics.ES20 GL.ClearColor(color.R, color.G, color.B, color.A); } - #endregion - - #region public static void BlendColor() overloads - public static void BlendColor(Color color) { GL.BlendColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -113,10 +95,6 @@ namespace OpenTK.Graphics.ES20 GL.BlendColor(color.R, color.G, color.B, color.A); } - #endregion - - #region Uniform - [CLSCompliant(false)] public static void Uniform2(int location, ref Vector2 vector) { @@ -194,12 +172,6 @@ namespace OpenTK.Graphics.ES20 } - #endregion - - #region Shaders - - #region GetActiveAttrib - public static string GetActiveAttrib(int program, int index, out int size, out ActiveAttribType type) { int length; @@ -210,10 +182,6 @@ namespace OpenTK.Graphics.ES20 return sb.ToString(); } - #endregion - - #region GetActiveUniform - public static string GetActiveUniform(int program, int uniformIndex, out int size, out ActiveUniformType type) { int length; @@ -224,10 +192,6 @@ namespace OpenTK.Graphics.ES20 return sb.ToString(); } - #endregion - - #region public static void ShaderSource(Int32 shader, System.String @string) - public static void ShaderSource(Int32 shader, System.String @string) { unsafe @@ -237,10 +201,6 @@ namespace OpenTK.Graphics.ES20 } } - #endregion - - #region public static string GetShaderInfoLog(Int32 shader) - public static string GetShaderInfoLog(Int32 shader) { string info; @@ -248,10 +208,6 @@ namespace OpenTK.Graphics.ES20 return info; } - #endregion - - #region public static void GetShaderInfoLog(Int32 shader, out string info) - public static void GetShaderInfoLog(Int32 shader, out string info) { unsafe @@ -269,10 +225,6 @@ namespace OpenTK.Graphics.ES20 } } - #endregion - - #region public static string GetProgramInfoLog(Int32 program) - public static string GetProgramInfoLog(Int32 program) { string info; @@ -280,10 +232,6 @@ namespace OpenTK.Graphics.ES20 return info; } - #endregion - - #region public static void GetProgramInfoLog(Int32 program, out string info) - public static void GetProgramInfoLog(Int32 program, out string info) { unsafe @@ -300,69 +248,39 @@ namespace OpenTK.Graphics.ES20 } } - #endregion - - #endregion - - #region public static void VertexAttrib2(Int32 index, ref Vector2 v) - [CLSCompliant(false)] public static void VertexAttrib2(Int32 index, ref Vector2 v) { GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, ref Vector3 v) - [CLSCompliant(false)] public static void VertexAttrib3(Int32 index, ref Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, ref Vector4 v) - [CLSCompliant(false)] public static void VertexAttrib4(Int32 index, ref Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region public static void VertexAttrib2(Int32 index, Vector2 v) - public static void VertexAttrib2(Int32 index, Vector2 v) { GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, Vector3 v) - public static void VertexAttrib3(Int32 index, Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, Vector4 v) - public static void VertexAttrib4(Int32 index, Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region VertexAttribPointer - public static void VertexAttribPointer(int index, int size, VertexAttribPointerType type, bool normalized, int stride, int offset) { VertexAttribPointer(index, size, type, normalized, stride, (IntPtr)offset); @@ -374,19 +292,11 @@ namespace OpenTK.Graphics.ES20 VertexAttribPointer(index, size, type, normalized, stride, (IntPtr)offset); } - #endregion - - #region DrawElements - public static void DrawElements(BeginMode mode, int count, DrawElementsType type, int offset) { DrawElements((PrimitiveType)mode, count, type, new IntPtr(offset)); } - #endregion - - #region Get[Float|Double] - public static void GetFloat(GetPName pname, out Vector2 vector) { unsafe @@ -423,10 +333,6 @@ namespace OpenTK.Graphics.ES20 } } - #endregion - - #region Viewport - public static void Viewport(Size size) { GL.Viewport(0, 0, size.Width, size.Height); @@ -452,20 +358,17 @@ namespace OpenTK.Graphics.ES20 GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height); } #endif - #endregion #pragma warning restore 3019 #pragma warning restore 1591 #pragma warning restore 1572 #pragma warning restore 1573 - - #endregion } #pragma warning disable 1574 // XML comment cref attribute could not be resolved, compiler bug in Mono 3.4.0 /// - /// Defines the signature of a debug callback for + /// Defines the signature of a debug callback for /// . /// /// The for this debug message. @@ -482,7 +385,7 @@ namespace OpenTK.Graphics.ES20 IntPtr userParam); /// - /// Defines the signature of a debug callback for + /// Defines the signature of a debug callback for /// . /// /// The for this debug message. diff --git a/src/OpenTK/Graphics/ES30/ErrorHelper.cs b/src/OpenTK/Graphics/ES30/ErrorHelper.cs index eaaa44fb..a7cce2dc 100644 --- a/src/OpenTK/Graphics/ES30/ErrorHelper.cs +++ b/src/OpenTK/Graphics/ES30/ErrorHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,17 +42,11 @@ namespace OpenTK.Graphics.ES30 // as that would cause infinite recursion! struct ErrorHelper : IDisposable { - #region Fields - static readonly object SyncRoot = new object(); static readonly Dictionary> ContextErrors = new Dictionary>(); readonly GraphicsContext Context; - #endregion - - #region Constructors - public ErrorHelper(IGraphicsContext context) { if (context == null) @@ -69,10 +61,6 @@ namespace OpenTK.Graphics.ES30 ResetErrors(); } - #endregion - - #region Public Members - // Retrieve all OpenGL errors to clear the error list. // See http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/geterror.html [Conditional("DEBUG")] @@ -120,15 +108,9 @@ namespace OpenTK.Graphics.ES30 } } - #endregion - - #region IDisposable Members - public void Dispose() { CheckErrors(); } - - #endregion } } diff --git a/src/OpenTK/Graphics/ES30/Helper.cs b/src/OpenTK/Graphics/ES30/Helper.cs index ff0bb2fe..e7a9ffab 100644 --- a/src/OpenTK/Graphics/ES30/Helper.cs +++ b/src/OpenTK/Graphics/ES30/Helper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -51,8 +49,6 @@ namespace OpenTK.Graphics.ES30 static byte[] EntryPointNames; static int[] EntryPointNameOffsets; - #region Constructors - /// /// Constructs a new instance. /// @@ -63,10 +59,6 @@ namespace OpenTK.Graphics.ES30 _EntryPointNameOffsetsInstance = EntryPointNameOffsets; } - #endregion - - #region --- Protected Members --- - /// /// Returns a synchronization token unique for the GL class. /// @@ -75,10 +67,6 @@ namespace OpenTK.Graphics.ES30 get { return sync_root; } } - #endregion - - #region Helper Overloads - #pragma warning disable 3019 #pragma warning disable 1591 #pragma warning disable 1572 @@ -87,8 +75,6 @@ namespace OpenTK.Graphics.ES30 // Note: Mono 1.9.1 truncates StringBuilder results (for 'out string' parameters). // We work around this issue by doubling the StringBuilder capacity. - #region public static void ClearColor() overloads - public static void ClearColor(Color color) { GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -99,10 +85,6 @@ namespace OpenTK.Graphics.ES30 GL.ClearColor(color.R, color.G, color.B, color.A); } - #endregion - - #region public static void BlendColor() overloads - public static void BlendColor(Color color) { GL.BlendColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -113,10 +95,6 @@ namespace OpenTK.Graphics.ES30 GL.BlendColor(color.R, color.G, color.B, color.A); } - #endregion - - #region Uniform - [CLSCompliant(false)] public static void Uniform2(int location, ref Vector2 vector) { @@ -194,12 +172,6 @@ namespace OpenTK.Graphics.ES30 } - #endregion - - #region Shaders - - #region GetActiveAttrib - public static string GetActiveAttrib(int program, int index, out int size, out ActiveAttribType type) { int length; @@ -210,10 +182,6 @@ namespace OpenTK.Graphics.ES30 return sb.ToString(); } - #endregion - - #region GetActiveUniform - public static string GetActiveUniform(int program, int uniformIndex, out int size, out ActiveUniformType type) { int length; @@ -224,10 +192,6 @@ namespace OpenTK.Graphics.ES30 return sb.ToString(); } - #endregion - - #region public static void ShaderSource(Int32 shader, System.String @string) - public static void ShaderSource(Int32 shader, System.String @string) { unsafe @@ -237,10 +201,6 @@ namespace OpenTK.Graphics.ES30 } } - #endregion - - #region public static string GetShaderInfoLog(Int32 shader) - public static string GetShaderInfoLog(Int32 shader) { string info; @@ -248,10 +208,6 @@ namespace OpenTK.Graphics.ES30 return info; } - #endregion - - #region public static void GetShaderInfoLog(Int32 shader, out string info) - public static void GetShaderInfoLog(Int32 shader, out string info) { unsafe @@ -269,10 +225,6 @@ namespace OpenTK.Graphics.ES30 } } - #endregion - - #region public static string GetProgramInfoLog(Int32 program) - public static string GetProgramInfoLog(Int32 program) { string info; @@ -280,10 +232,6 @@ namespace OpenTK.Graphics.ES30 return info; } - #endregion - - #region public static void GetProgramInfoLog(Int32 program, out string info) - public static void GetProgramInfoLog(Int32 program, out string info) { unsafe @@ -300,69 +248,39 @@ namespace OpenTK.Graphics.ES30 } } - #endregion - - #endregion - - #region public static void VertexAttrib2(Int32 index, ref Vector2 v) - [CLSCompliant(false)] public static void VertexAttrib2(Int32 index, ref Vector2 v) { GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, ref Vector3 v) - [CLSCompliant(false)] public static void VertexAttrib3(Int32 index, ref Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, ref Vector4 v) - [CLSCompliant(false)] public static void VertexAttrib4(Int32 index, ref Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region public static void VertexAttrib2(Int32 index, Vector2 v) - public static void VertexAttrib2(Int32 index, Vector2 v) { GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, Vector3 v) - public static void VertexAttrib3(Int32 index, Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, Vector4 v) - public static void VertexAttrib4(Int32 index, Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region VertexAttribPointer - public static void VertexAttribPointer(int index, int size, VertexAttribPointerType type, bool normalized, int stride, int offset) { VertexAttribPointer(index, size, type, normalized, stride, (IntPtr)offset); @@ -374,10 +292,6 @@ namespace OpenTK.Graphics.ES30 VertexAttribPointer(index, size, type, normalized, stride, (IntPtr)offset); } - #endregion - - #region Get[Float|Double] - public static void GetFloat(GetPName pname, out Vector2 vector) { unsafe @@ -414,10 +328,6 @@ namespace OpenTK.Graphics.ES30 } } - #endregion - - #region Viewport - public static void Viewport(Size size) { GL.Viewport(0, 0, size.Width, size.Height); @@ -443,20 +353,17 @@ namespace OpenTK.Graphics.ES30 GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height); } #endif - #endregion #pragma warning restore 3019 #pragma warning restore 1591 #pragma warning restore 1572 #pragma warning restore 1573 - - #endregion } #pragma warning disable 1574 // XML comment cref attribute could not be resolved, compiler bug in Mono 3.4.0 /// - /// Defines the signature of a debug callback for + /// Defines the signature of a debug callback for /// . /// /// The for this debug message. @@ -473,7 +380,7 @@ namespace OpenTK.Graphics.ES30 IntPtr userParam); /// - /// Defines the signature of a debug callback for + /// Defines the signature of a debug callback for /// . /// /// The for this debug message. diff --git a/src/OpenTK/Graphics/GraphicsBindingsBase.cs b/src/OpenTK/Graphics/GraphicsBindingsBase.cs index d8815407..65151949 100644 --- a/src/OpenTK/Graphics/GraphicsBindingsBase.cs +++ b/src/OpenTK/Graphics/GraphicsBindingsBase.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; diff --git a/src/OpenTK/Graphics/GraphicsContext.cs b/src/OpenTK/Graphics/GraphicsContext.cs index 2f8f1c53..074c07a8 100644 --- a/src/OpenTK/Graphics/GraphicsContext.cs +++ b/src/OpenTK/Graphics/GraphicsContext.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -52,8 +50,6 @@ namespace OpenTK.Graphics /// The current OpenGL context, or IntPtr.Zero if no context is on the calling thread. public delegate ContextHandle GetCurrentContextDelegate(); - #region --- Fields --- - IGraphicsContext implementation; // The actual render context implementation for the underlying platform. bool disposed; bool check_errors = true; @@ -72,10 +68,6 @@ namespace OpenTK.Graphics readonly static Dictionary available_contexts = new Dictionary(); - #endregion - - #region --- Constructors --- - /// /// Constructs a new GraphicsContext with the specified GraphicsMode and attaches it to the specified window. /// @@ -275,10 +267,6 @@ namespace OpenTK.Graphics : this(handle, Platform.Utilities.CreateGetAddress(), Factory.Default.CreateGetCurrentGraphicsContext()) { } - #endregion - - #region Public Members - /// /// Returns a representing this instance. /// @@ -308,10 +296,6 @@ namespace OpenTK.Graphics (this as IGraphicsContextInternal).Context == (obj as IGraphicsContextInternal).Context; } - #endregion - - #region Private Members - static void AddContext(IGraphicsContextInternal context) { ContextHandle ctx = context.Context; @@ -358,12 +342,6 @@ namespace OpenTK.Graphics return null; } - #endregion - - #region --- Static Members --- - - #region public static void Assert() - /// /// Checks if a GraphicsContext exists in the calling thread and throws a GraphicsContextMissingException if it doesn't. /// @@ -374,10 +352,6 @@ namespace OpenTK.Graphics throw new GraphicsContextMissingException(); } - #endregion - - #region public static IGraphicsContext CurrentContext - internal static GetCurrentContextDelegate GetCurrentContext; /// @@ -412,10 +386,6 @@ namespace OpenTK.Graphics } } - #endregion - - #region public static bool ShareContexts - /// Gets or sets a System.Boolean, indicating whether GraphicsContext resources are shared /// /// If ShareContexts is true, new GLContexts will share resources. If this value is @@ -424,10 +394,6 @@ namespace OpenTK.Graphics /// public static bool ShareContexts { get { return share_contexts; } set { share_contexts = value; } } - #endregion - - #region public static bool DirectRendering - /// Gets or sets a System.Boolean, indicating whether GraphicsContexts will perform direct rendering. /// /// @@ -445,12 +411,6 @@ namespace OpenTK.Graphics set { direct_rendering = value; } } - #endregion - - #endregion - - #region --- IGraphicsContext Members --- - /// /// Gets or sets a System.Boolean, indicating whether automatic error checking should be performed. /// Influences the debug version of OpenTK.dll, only. @@ -538,10 +498,6 @@ namespace OpenTK.Graphics implementation.LoadAll(); } - #endregion - - #region --- IGraphicsContextInternal Members --- - /// /// Gets the platform-specific implementation of this IGraphicsContext. /// @@ -607,10 +563,6 @@ namespace OpenTK.Graphics return (implementation as IGraphicsContextInternal).GetAddress(function); } - #endregion - - #region --- IDisposable Members --- - /// /// Disposes of the GraphicsContext. /// @@ -655,7 +607,5 @@ namespace OpenTK.Graphics { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Graphics/GraphicsContextBase.cs b/src/OpenTK/Graphics/GraphicsContextBase.cs index a985f936..713d3794 100644 --- a/src/OpenTK/Graphics/GraphicsContextBase.cs +++ b/src/OpenTK/Graphics/GraphicsContextBase.cs @@ -1,5 +1,4 @@ -#region License -// +// // GraphicsContextBase.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -38,17 +36,11 @@ namespace OpenTK.Graphics // Provides the foundation for all IGraphicsContext implementations. abstract class GraphicsContextBase : IGraphicsContext, IGraphicsContextInternal, IEquatable { - #region Fields - bool disposed; protected ContextHandle Handle; protected GraphicsMode Mode; - #endregion - - #region IGraphicsContext Members - public abstract void SwapBuffers(); public abstract void MakeCurrent(IWindowInfo window); @@ -85,10 +77,6 @@ namespace OpenTK.Graphics set { throw new NotImplementedException(); } } - #endregion - - #region IGraphicsContextInternal Members - public IGraphicsContext Implementation { get { return this; } } public abstract void LoadAll(); @@ -105,10 +93,6 @@ namespace OpenTK.Graphics public abstract IntPtr GetAddress(IntPtr function); - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -126,19 +110,11 @@ namespace OpenTK.Graphics } #endif - #endregion - - #region IEquatable Members - public bool Equals(IGraphicsContextInternal other) { return Context.Equals(other.Context); } - #endregion - - #region Public Members - public override string ToString() { return string.Format("[{0}: IsCurrent={1}, IsDisposed={2}, VSync={3}, SwapInterval={4}, GraphicsMode={5}, Context={6}]", @@ -152,11 +128,9 @@ namespace OpenTK.Graphics public override bool Equals(object obj) { - return + return obj is IGraphicsContextInternal && Equals((IGraphicsContextInternal)obj); } - - #endregion } } diff --git a/src/OpenTK/Graphics/GraphicsContextFlags.cs b/src/OpenTK/Graphics/GraphicsContextFlags.cs index a7df6e16..024ec4e6 100644 --- a/src/OpenTK/Graphics/GraphicsContextFlags.cs +++ b/src/OpenTK/Graphics/GraphicsContextFlags.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2008 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -62,22 +60,22 @@ namespace OpenTK.Graphics /// Offscreen = 0x0008, /// - /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle + /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle /// and that angle-specific extensions are available. /// Angle = 0x0010, /// - /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle + /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle /// and uses Direct3D9 as rendering backend. /// AngleD3D9 = 0x0020, /// - /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle + /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle /// and uses Direct3D11 as rendering backend. /// AngleD3D11 = 0x0040, /// - /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle + /// Indicates that this GraphicsContext is targeting OpenGL|ES via Angle /// and uses OpenGL as rendering backend. /// AngleOpenGL = 0x0080, diff --git a/src/OpenTK/Graphics/GraphicsContextVersion.cs b/src/OpenTK/Graphics/GraphicsContextVersion.cs index 2e0efb62..44d67abc 100644 --- a/src/OpenTK/Graphics/GraphicsContextVersion.cs +++ b/src/OpenTK/Graphics/GraphicsContextVersion.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2008 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -36,15 +34,9 @@ namespace OpenTK.Graphics /// public sealed class GraphicsContextVersion { - #region Fields - int minor, major; string vendor = String.Empty, renderer = String.Empty; - #endregion - - #region Constructors - internal GraphicsContextVersion(int minor, int major, string vendor, string renderer) { Minor = minor; @@ -53,10 +45,6 @@ namespace OpenTK.Graphics Renderer = renderer; } - #endregion - - #region Public Members - /// /// Gets a System.Int32 indicating the minor version of a GraphicsContext instance. /// @@ -76,7 +64,5 @@ namespace OpenTK.Graphics /// Gets a System.String indicating the renderer of a GraphicsContext instance. /// public string Renderer { get { return renderer; } private set { renderer = value; } } - - #endregion } } diff --git a/src/OpenTK/Graphics/GraphicsExceptions.cs b/src/OpenTK/Graphics/GraphicsExceptions.cs index f53062b6..4436e6c4 100644 --- a/src/OpenTK/Graphics/GraphicsExceptions.cs +++ b/src/OpenTK/Graphics/GraphicsExceptions.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK team. * This notice may not be removed. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Graphics/GraphicsMode.cs b/src/OpenTK/Graphics/GraphicsMode.cs index 9322ab44..ff2364fb 100644 --- a/src/OpenTK/Graphics/GraphicsMode.cs +++ b/src/OpenTK/Graphics/GraphicsMode.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; @@ -24,20 +22,12 @@ namespace OpenTK.Graphics static GraphicsMode defaultMode; static readonly object SyncRoot = new object(); - #region Constructors - // Disable BeforeFieldInit static GraphicsMode() { } - #region internal GraphicsMode(GraphicsMode mode) - internal GraphicsMode(GraphicsMode mode) : this(mode.ColorFormat, mode.Depth, mode.Stencil, mode.Samples, mode.AccumulatorFormat, mode.Buffers, mode.Stereo) { } - #endregion - - #region internal GraphicsMode(IntPtr? index, ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo) - internal GraphicsMode(IntPtr? index, ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo) { @@ -56,29 +46,17 @@ namespace OpenTK.Graphics this.Stereo = stereo; } - #endregion - - #region public GraphicsMode() - /// Constructs a new GraphicsMode with sensible default parameters. public GraphicsMode() : this(Default) { } - #endregion - - #region public GraphicsMode(ColorFormat color) - /// Constructs a new GraphicsMode with the specified parameters. /// The ColorFormat of the color buffer. public GraphicsMode(ColorFormat color) : this(color, Default.Depth, Default.Stencil, Default.Samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) { } - #endregion - - #region public GraphicsMode(ColorFormat color, int depth) - /// Constructs a new GraphicsMode with the specified parameters. /// The ColorFormat of the color buffer. /// The number of bits in the depth buffer. @@ -86,10 +64,6 @@ namespace OpenTK.Graphics : this(color, depth, Default.Stencil, Default.Samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) { } - #endregion - - #region public GraphicsMode(ColorFormat color, int depth, int stencil) - /// Constructs a new GraphicsMode with the specified parameters. /// The ColorFormat of the color buffer. /// The number of bits in the depth buffer. @@ -98,10 +72,6 @@ namespace OpenTK.Graphics : this(color, depth, stencil, Default.Samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) { } - #endregion - - #region public GraphicsMode(ColorFormat color, int depth, int stencil, int samples) - /// Constructs a new GraphicsMode with the specified parameters. /// The ColorFormat of the color buffer. /// The number of bits in the depth buffer. @@ -111,10 +81,6 @@ namespace OpenTK.Graphics : this(color, depth, stencil, samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) { } - #endregion - - #region public GraphicsMode(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum) - /// Constructs a new GraphicsMode with the specified parameters. /// The ColorFormat of the color buffer. /// The number of bits in the depth buffer. @@ -125,10 +91,6 @@ namespace OpenTK.Graphics : this(color, depth, stencil, samples, accum, Default.Buffers, Default.Stereo) { } - #endregion - - #region public GraphicsMode(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers) - /// Constructs a new GraphicsMode with the specified parameters. /// The ColorFormat of the color buffer. /// The number of bits in the depth buffer. @@ -140,10 +102,6 @@ namespace OpenTK.Graphics : this(color, depth, stencil, samples, accum, buffers, Default.Stereo) { } - #endregion - - #region public GraphicsMode(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo) - /// Constructs a new GraphicsMode with the specified parameters. /// The ColorFormat of the color buffer. /// The number of bits in the depth buffer. @@ -155,14 +113,6 @@ namespace OpenTK.Graphics public GraphicsMode(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo) : this(null, color, depth, stencil, samples, accum, buffers, stereo) { } - #endregion - - #endregion - - #region --- Public Methods --- - - #region public IntPtr Index - /// /// Gets a nullable value, indicating the platform-specific index for this GraphicsMode. /// @@ -175,10 +125,6 @@ namespace OpenTK.Graphics set { index = value; } } - #endregion - - #region public int ColorFormat - /// /// Gets an OpenTK.Graphics.ColorFormat that describes the color format for this GraphicsFormat. /// @@ -191,26 +137,18 @@ namespace OpenTK.Graphics private set { color_format = value; } } - #endregion - - #region public int AccumulatorFormat - /// /// Gets an OpenTK.Graphics.ColorFormat that describes the accumulator format for this GraphicsFormat. /// public ColorFormat AccumulatorFormat { - get + get { return accumulator_format; } private set { accumulator_format = value; } } - #endregion - - #region public int Depth - /// /// Gets a System.Int32 that contains the bits per pixel for the depth buffer /// for this GraphicsFormat. @@ -224,10 +162,6 @@ namespace OpenTK.Graphics private set { depth = value; } } - #endregion - - #region public int Stencil - /// /// Gets a System.Int32 that contains the bits per pixel for the stencil buffer /// of this GraphicsFormat. @@ -241,10 +175,6 @@ namespace OpenTK.Graphics private set { stencil = value; } } - #endregion - - #region public int Samples - /// /// Gets a System.Int32 that contains the number of FSAA samples per pixel for this GraphicsFormat. /// @@ -264,10 +194,6 @@ namespace OpenTK.Graphics } } - #endregion - - #region public bool Stereo - /// /// Gets a System.Boolean indicating whether this DisplayMode is stereoscopic. /// @@ -280,10 +206,6 @@ namespace OpenTK.Graphics private set { stereo = value; } } - #endregion - - #region public int Buffers - /// /// Gets a System.Int32 containing the number of buffers associated with this /// DisplayMode. @@ -297,10 +219,6 @@ namespace OpenTK.Graphics private set { buffers = value; } } - #endregion - - #region public static GraphicsFormat Default - /// Returns an OpenTK.GraphicsFormat compatible with the underlying platform. public static GraphicsMode Default { @@ -318,12 +236,6 @@ namespace OpenTK.Graphics } } - #endregion - - #endregion - - #region --- Overrides --- - /// Returns a System.String describing the current GraphicsFormat. /// ! System.String describing the current GraphicsFormat. public override string ToString() @@ -355,10 +267,6 @@ namespace OpenTK.Graphics return false; } - #endregion - - #region IEquatable Members - /// /// Indicates whether other represents the same mode as this instance. /// @@ -368,7 +276,5 @@ namespace OpenTK.Graphics { return Index.HasValue && Index == other.Index; } - - #endregion } } diff --git a/src/OpenTK/Graphics/GraphicsModeComparer.cs b/src/OpenTK/Graphics/GraphicsModeComparer.cs index 5ab7aafc..6cd77b6e 100644 --- a/src/OpenTK/Graphics/GraphicsModeComparer.cs +++ b/src/OpenTK/Graphics/GraphicsModeComparer.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -33,8 +31,6 @@ namespace OpenTK.Graphics { sealed class GraphicsModeComparer : IComparer { - #region IComparer Members - public int Compare(GraphicsMode x, GraphicsMode y) { int result = x.ColorFormat.CompareTo(y.ColorFormat); @@ -57,7 +53,5 @@ namespace OpenTK.Graphics return result; return x.AccumulatorFormat.CompareTo(y.AccumulatorFormat); } - - #endregion } } diff --git a/src/OpenTK/Graphics/IGraphicsContext.cs b/src/OpenTK/Graphics/IGraphicsContext.cs index 56e39a46..d9ca505b 100644 --- a/src/OpenTK/Graphics/IGraphicsContext.cs +++ b/src/OpenTK/Graphics/IGraphicsContext.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Graphics/IGraphicsMode.cs b/src/OpenTK/Graphics/IGraphicsMode.cs index 5c3ea68c..318905e4 100644 --- a/src/OpenTK/Graphics/IGraphicsMode.cs +++ b/src/OpenTK/Graphics/IGraphicsMode.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Graphics/OpenGL/ErrorHelper.cs b/src/OpenTK/Graphics/OpenGL/ErrorHelper.cs index 13cd0b0d..dc97a5fe 100644 --- a/src/OpenTK/Graphics/OpenGL/ErrorHelper.cs +++ b/src/OpenTK/Graphics/OpenGL/ErrorHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,17 +42,11 @@ namespace OpenTK.Graphics.OpenGL // as that would cause infinite recursion! struct ErrorHelper : IDisposable { - #region Fields - static readonly object SyncRoot = new object(); static readonly Dictionary> ContextErrors = new Dictionary>(); readonly GraphicsContext Context; - #endregion - - #region Constructors - public ErrorHelper(IGraphicsContext context) { if (context == null) @@ -69,10 +61,6 @@ namespace OpenTK.Graphics.OpenGL ResetErrors(); } - #endregion - - #region Public Members - // Retrieve all OpenGL errors to clear the error list. // See http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/geterror.html [Conditional("DEBUG")] @@ -120,15 +108,9 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #region IDisposable Members - public void Dispose() { CheckErrors(); } - - #endregion } } diff --git a/src/OpenTK/Graphics/OpenGL/GLHelper.cs b/src/OpenTK/Graphics/OpenGL/GLHelper.cs index d5068cec..2061c15a 100644 --- a/src/OpenTK/Graphics/OpenGL/GLHelper.cs +++ b/src/OpenTK/Graphics/OpenGL/GLHelper.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,11 +22,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion -#region --- Using Directives --- - using System; using System.Collections.Generic; #if !MINIMAL @@ -40,8 +36,6 @@ using System.Diagnostics; using System.Reflection.Emit; -#endregion - namespace OpenTK.Graphics.OpenGL { /// @@ -71,8 +65,6 @@ namespace OpenTK.Graphics.OpenGL /// public sealed partial class GL : GraphicsBindingsBase { - #region --- Fields --- - internal const string Library = "opengl32.dll"; static readonly object sync_root = new object(); @@ -81,10 +73,6 @@ namespace OpenTK.Graphics.OpenGL static byte[] EntryPointNames; static int[] EntryPointNameOffsets; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -95,10 +83,6 @@ namespace OpenTK.Graphics.OpenGL _EntryPointNameOffsetsInstance = EntryPointNameOffsets; } - #endregion - - #region --- Protected Members --- - /// /// Returns a synchronization token unique for the GL class. /// @@ -107,15 +91,9 @@ namespace OpenTK.Graphics.OpenGL get { return sync_root; } } - #endregion - - #region --- GL Overloads --- - // Note: Mono 1.9.1 truncates StringBuilder results (for 'out string' parameters). // We work around this issue by doubling the StringBuilder capacity. - #region public static void Color[34]() overloads - public static void Color3(Color color) { GL.Color3(color.R, color.G, color.B); @@ -141,10 +119,6 @@ namespace OpenTK.Graphics.OpenGL GL.Color4(color.R, color.G, color.B, color.A); } - #endregion - - #region public static void ClearColor() overloads - public static void ClearColor(Color color) { GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -155,10 +129,6 @@ namespace OpenTK.Graphics.OpenGL GL.ClearColor(color.R, color.G, color.B, color.A); } - #endregion - - #region public static void BlendColor() overloads - public static void BlendColor(Color color) { GL.BlendColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -169,10 +139,6 @@ namespace OpenTK.Graphics.OpenGL GL.BlendColor(color.R, color.G, color.B, color.A); } - #endregion - - #region public static void Material() overloads - public static void Material(MaterialFace face, MaterialParameter pname, Vector4 @params) { unsafe { Material(face, pname, (float*)&@params.X); } @@ -183,10 +149,6 @@ namespace OpenTK.Graphics.OpenGL unsafe { GL.Material(face, pname, (float*)&@params); } } - #endregion - - #region public static void Light() overloads - public static void Light(LightName name, LightParameter pname, Vector4 @params) { unsafe { GL.Light(name, pname, (float*)&@params.X); } @@ -197,10 +159,6 @@ namespace OpenTK.Graphics.OpenGL unsafe { GL.Light(name, pname, (float*)&@params); } } - #endregion - - #region Normal|RasterPos|Vertex|TexCoord|Rotate|Scale|Translate|*Matrix - public static void Normal3(Vector3 normal) { GL.Normal3(normal.X, normal.Y, normal.Z); @@ -419,10 +377,6 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #region Uniform - [CLSCompliant(false)] public static void Uniform2(int location, ref Vector2 vector) { @@ -664,10 +618,6 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #region ProgramUniform - [CLSCompliant(false)] public static void ProgramUniform2(int program, int location, ref Vector2 vector) { @@ -909,12 +859,6 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #region Shaders - - #region GetActiveAttrib - public static string GetActiveAttrib(int program, int index, out int size, out ActiveAttribType type) { int length; @@ -925,10 +869,6 @@ namespace OpenTK.Graphics.OpenGL return sb.ToString(); } - #endregion - - #region GetActiveUniform - public static string GetActiveUniform(int program, int uniformIndex, out int size, out ActiveUniformType type) { int length; @@ -939,10 +879,6 @@ namespace OpenTK.Graphics.OpenGL return sb.ToString(); } - #endregion - - #region GetActiveUniformName - public static string GetActiveUniformName(int program, int uniformIndex) { int length; @@ -953,10 +889,6 @@ namespace OpenTK.Graphics.OpenGL return sb.ToString(); } - #endregion - - #region GetActiveUniformBlockName - public static string GetActiveUniformBlockName(int program, int uniformIndex) { int length; @@ -967,10 +899,6 @@ namespace OpenTK.Graphics.OpenGL return sb.ToString(); } - #endregion - - #region public static void ShaderSource(Int32 shader, System.String @string) - public static void ShaderSource(Int32 shader, System.String @string) { unsafe @@ -980,10 +908,6 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #region public static string GetShaderInfoLog(Int32 shader) - public static string GetShaderInfoLog(Int32 shader) { string info; @@ -991,10 +915,6 @@ namespace OpenTK.Graphics.OpenGL return info; } - #endregion - - #region public static void GetShaderInfoLog(Int32 shader, out string info) - public static void GetShaderInfoLog(Int32 shader, out string info) { unsafe @@ -1012,10 +932,6 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #region public static string GetProgramInfoLog(Int32 program) - public static string GetProgramInfoLog(Int32 program) { string info; @@ -1023,10 +939,6 @@ namespace OpenTK.Graphics.OpenGL return info; } - #endregion - - #region public static void GetProgramInfoLog(Int32 program, out string info) - public static void GetProgramInfoLog(Int32 program, out string info) { unsafe @@ -1043,12 +955,6 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #endregion - - #region public static void PointParameter(PointSpriteCoordOriginParameter param) - /// /// Helper function that defines the coordinate origin of the Point Sprite. /// @@ -1061,10 +967,6 @@ namespace OpenTK.Graphics.OpenGL GL.PointParameter(PointParameterName.PointSpriteCoordOrigin, (int)param); } - #endregion - - #region VertexAttrib|MultiTexCoord - [CLSCompliant(false)] public static void VertexAttrib2(Int32 index, ref Vector2 v) { @@ -1161,10 +1063,6 @@ namespace OpenTK.Graphics.OpenGL GL.MultiTexCoord4(target, v.X, v.Y, v.Z, v.W); } - #endregion - - #region Rect - [CLSCompliant(false)] public static void Rect(RectangleF rect) { @@ -1189,10 +1087,6 @@ namespace OpenTK.Graphics.OpenGL GL.Rect(rect.Left, rect.Top, rect.Right, rect.Bottom); } - #endregion - - #region [Vertex|Normal|Index|Color|FogCoord|VertexAttrib]Pointer - public static void VertexPointer(int size, VertexPointerType type, int stride, int offset) { VertexPointer(size, type, stride, (IntPtr)offset); @@ -1233,10 +1127,6 @@ namespace OpenTK.Graphics.OpenGL VertexAttribPointer(index, size, type, normalized, stride, (IntPtr)offset); } - #endregion - - #region Get[Float|Double] - public static void GetFloat(GetPName pname, out Vector2 vector) { unsafe @@ -1309,10 +1199,6 @@ namespace OpenTK.Graphics.OpenGL } } - #endregion - - #region Viewport - public static void Viewport(Size size) { GL.Viewport(0, 0, size.Width, size.Height); @@ -1338,9 +1224,6 @@ namespace OpenTK.Graphics.OpenGL GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height); } #endif - #endregion - - #region TexEnv public static void TexEnv(TextureEnvTarget target, TextureEnvParameter pname, Color color) { @@ -1358,10 +1241,6 @@ namespace OpenTK.Graphics.OpenGL TexEnv(target, pname, &color.R); } } - - #endregion - - #endregion } #pragma warning disable 1574 // XML comment cref attribute could not be resolved, compiler bug in Mono 3.4.0 diff --git a/src/OpenTK/Graphics/OpenGL/GLObsolete.cs b/src/OpenTK/Graphics/OpenGL/GLObsolete.cs index 3ca8bb69..a2fe6c9a 100644 --- a/src/OpenTK/Graphics/OpenGL/GLObsolete.cs +++ b/src/OpenTK/Graphics/OpenGL/GLObsolete.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; @@ -61,7 +59,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")] [Obsolete("Use GetAttachedShaders out/array overload instead")] - public static + public static unsafe void GetAttachedShaders(Int32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32[] obj) { throw new NotImplementedException(); } @@ -91,7 +89,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")] [Obsolete("Use GetAttachedShaders out/array overload instead")] - public static + public static unsafe void GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32[] obj) { throw new NotImplementedException(); } @@ -131,7 +129,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[] span) where T5 : struct { throw new NotImplementedException(); } @@ -171,7 +169,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,] span) where T5 : struct { throw new NotImplementedException(); } @@ -212,7 +210,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,,] span) where T5 : struct { throw new NotImplementedException(); } @@ -252,7 +250,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] ref T5 span) where T5 : struct { throw new NotImplementedException(); } @@ -293,7 +291,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -335,7 +333,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -377,7 +375,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -419,7 +417,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -461,7 +459,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T3 : struct where T4 : struct @@ -504,7 +502,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T3 : struct where T4 : struct @@ -546,7 +544,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")] [Obsolete("Use GetSeparableFilter with three ref arguments instead")] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T3 : struct where T4 : struct @@ -556,7 +554,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ArbSync", Version = "1.2", EntryPoint = "glGetSynciv")] [Obsolete("Use out/array overload instead")] - public static + public static unsafe void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32[] values) { throw new NotImplementedException(); } @@ -606,7 +604,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")] [Obsolete("Use overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[] column) where T7 : struct { throw new NotImplementedException(); } @@ -657,7 +655,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")] [Obsolete("Use overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,] column) where T7 : struct { throw new NotImplementedException(); } @@ -708,7 +706,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")] [Obsolete("Use overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,,] column) where T7 : struct { throw new NotImplementedException(); } @@ -758,7 +756,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")] [Obsolete("Use overload with equal array dimensions instead")] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] ref T7 column) where T7 : struct { throw new NotImplementedException(); } @@ -809,7 +807,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")] [Obsolete("Use overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -861,7 +859,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")] [Obsolete("Use overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -913,7 +911,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")] [Obsolete("Use overload with equal array dimensions instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -923,76 +921,76 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")] [Obsolete("Use ref/array overloads instead")] - public static + public static unsafe void GetPerfMonitorCounterData(Int32 monitor, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, Int32 dataSize, [OutAttribute] Int32[] data, [OutAttribute] Int32* bytesWritten) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")] [Obsolete("Use ref/array overloads instead")] - public static + public static unsafe void GetPerfMonitorCounterData(Int32 monitor, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, Int32 dataSize, [OutAttribute] UInt32[] data, [OutAttribute] Int32* bytesWritten) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")] [Obsolete("Use ref/array overloads instead")] - public static + public static unsafe void GetPerfMonitorCounterData(UInt32 monitor, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, Int32 dataSize, [OutAttribute] UInt32[] data, [OutAttribute] Int32* bytesWritten) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")] [Obsolete("Use ref/array overloads instead")] - public static + public static unsafe void GetPerfMonitorCounters(Int32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] Int32[] counters) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")] [Obsolete("Use ref/array overloads instead")] - public static + public static unsafe void GetPerfMonitorCounters(UInt32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] UInt32[] counters) { throw new NotImplementedException(); } [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")] [Obsolete("Use GetPerfMonitorGroups instead")] - public static + public static void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out Int32 groups) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")] [Obsolete("Use GetPerfMonitorGroups instead")] - public static + public static void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out UInt32 groups) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")] [Obsolete("Use GetPerfMonitorGroups instead")] - public static + public static unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")] [Obsolete("Use GetPerfMonitorGroups instead")] - public static + public static unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")] [Obsolete("Use GetPerfMonitorGroups instead")] - public static + public static unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")] [Obsolete("Use GetPerfMonitorGroups instead")] - public static + public static unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups) { throw new NotImplementedException(); } } @@ -1001,14 +999,14 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")] [Obsolete("Use ref/array overloads instead")] - public static + public static unsafe void GetAttachedObjects(Int32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32[] obj) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")] [Obsolete("Use ref/array overloads instead")] - public static + public static unsafe void GetAttachedObjects(UInt32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32[] obj) { throw new NotImplementedException(); } } @@ -1016,14 +1014,14 @@ namespace OpenTK.Graphics.OpenGL { [AutoGenerated(Category = "AtiFragmentShader", Version = "1.2", EntryPoint = "glPassTexCoordATI")] [Obsolete("Use PassTexCoord instead")] - public static + public static void PassTexCoor(Int32 dst, Int32 coord, OpenTK.Graphics.OpenGL.AtiFragmentShader swizzle) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "AtiFragmentShader", Version = "1.2", EntryPoint = "glPassTexCoordATI")] [Obsolete("Use PassTexCoord instead")] - public static + public static void PassTexCoor(UInt32 dst, UInt32 coord, OpenTK.Graphics.OpenGL.AtiFragmentShader swizzle) { throw new NotImplementedException(); } } @@ -1031,81 +1029,81 @@ namespace OpenTK.Graphics.OpenGL { [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjecti64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64[] @params) { throw new NotImplementedException(); } [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjecti64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] out Int64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static unsafe void GetQueryObjecti64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjecti64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64[] @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjecti64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] out Int64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static unsafe void GetQueryObjecti64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params) { throw new NotImplementedException(); } [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjectui64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64[] @params) { throw new NotImplementedException(); } [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjectui64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] out Int64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static unsafe void GetQueryObjectui64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjectui64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] UInt64[] @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static void GetQueryObjectui64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] out UInt64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")] [Obsolete("Use GetQueryObject overload instead")] - public static + public static unsafe void GetQueryObjectui64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] UInt64* @params) { throw new NotImplementedException(); } @@ -1144,7 +1142,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] IntPtr span) { throw new NotImplementedException(); } @@ -1183,7 +1181,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, ref T4 row, ref T5 column, ref T6 span) where T4 : struct where T5 : struct @@ -1226,7 +1224,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] T4[] row, [OutAttribute] T5[] column, [InAttribute, OutAttribute] T6[] span) where T4 : struct where T5 : struct @@ -1269,7 +1267,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] T4[,] row, [OutAttribute] T5[,] column, [InAttribute, OutAttribute] T6[,] span) where T4 : struct where T5 : struct @@ -1312,7 +1310,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] T4[,,] row, [OutAttribute] T5[,,] column, [InAttribute, OutAttribute] T6[,,] span) where T4 : struct where T5 : struct @@ -1355,7 +1353,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[] span) where T5 : struct { throw new NotImplementedException(); } @@ -1396,7 +1394,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,] span) where T5 : struct { throw new NotImplementedException(); } @@ -1437,7 +1435,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,,] span) where T5 : struct { throw new NotImplementedException(); } @@ -1477,7 +1475,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] ref T5 span) where T5 : struct { throw new NotImplementedException(); } @@ -1518,7 +1516,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -1560,7 +1558,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -1602,7 +1600,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -1643,7 +1641,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use GetSeparableFilter overloads instead")] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span) where T4 : struct where T5 : struct { throw new NotImplementedException(); } @@ -1685,7 +1683,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use ref/array overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T3 : struct where T4 : struct @@ -1728,7 +1726,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use ref/array overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T3 : struct where T4 : struct @@ -1771,7 +1769,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")] [Obsolete("Use ref/array overloads instead")] [CLSCompliant(false)] - public static + public static void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span) where T3 : struct where T4 : struct @@ -1823,7 +1821,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use SeparableFilter2D overloads instead")] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] IntPtr column) { throw new NotImplementedException(); } @@ -1872,7 +1870,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use ref/array overloads instead")] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] ref T7 column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -1924,7 +1922,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use ref/array overloads instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -1976,7 +1974,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use ref/array overloads instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -2028,7 +2026,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use ref/array overloads instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] row, [InAttribute, OutAttribute] T7[,,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -2080,7 +2078,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use SeparableFilter2D overloads instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[] column) where T7 : struct { throw new NotImplementedException(); } @@ -2131,7 +2129,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use SeparableFilter2D overloads instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,] column) where T7 : struct { throw new NotImplementedException(); } @@ -2182,7 +2180,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use SeparableFilter2D overloads instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,,] column) where T7 : struct { throw new NotImplementedException(); } @@ -2232,7 +2230,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use SeparableFilter2D overloads instead")] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] ref T7 column) where T7 : struct { throw new NotImplementedException(); } @@ -2283,7 +2281,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use ref/array overloads instead")] [CLSCompliant(false)] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -2334,7 +2332,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use ref/array overloads instead")] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -2385,7 +2383,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")] [Obsolete("Use ref/array overloads instead")] - public static + public static void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column) where T6 : struct where T7 : struct { throw new NotImplementedException(); } @@ -2395,33 +2393,33 @@ namespace OpenTK.Graphics.OpenGL { [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawArraysIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static void MultiModeDrawArrays(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] first, Int32[] count, Int32 primcount, Int32 modestride) { throw new NotImplementedException(); } [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawArraysIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static void MultiModeDrawArrays(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 first, ref Int32 count, Int32 primcount, Int32 modestride) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawArraysIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static unsafe void MultiModeDrawArrays(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* first, Int32* count, Int32 primcount, Int32 modestride) { throw new NotImplementedException(); } [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride) { throw new NotImplementedException(); } [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] [CLSCompliant(false)] - public static + public static void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2429,7 +2427,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] [CLSCompliant(false)] - public static + public static void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2437,28 +2435,28 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] [CLSCompliant(false)] - public static + public static void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static void MultiModeDrawElements(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride) { throw new NotImplementedException(); } [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] [CLSCompliant(false)] - public static + public static void MultiModeDrawElements(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2466,7 +2464,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] [CLSCompliant(false)] - public static + public static void MultiModeDrawElements(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2474,7 +2472,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] [CLSCompliant(false)] - public static + public static void MultiModeDrawElements(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2482,7 +2480,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] [CLSCompliant(false)] - public static + public static void MultiModeDrawElements(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2490,14 +2488,14 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static unsafe void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static unsafe void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2505,7 +2503,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static unsafe void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2513,7 +2511,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static unsafe void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } @@ -2521,7 +2519,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")] [Obsolete("Use PrimitiveType overload instead")] - public static + public static unsafe void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride) where T3 : struct { throw new NotImplementedException(); } } @@ -2530,217 +2528,217 @@ namespace OpenTK.Graphics.OpenGL { [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")] [Obsolete("Use DeleteTransformFeedbacks overload instead")] - public static + public static void DeleteTransformFeedback(Int32 n, Int32[] ids) { throw new NotImplementedException(); } [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")] [Obsolete("Use DeleteTransformFeedbacks overload instead")] - public static + public static void DeleteTransformFeedback(Int32 n, ref Int32 ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")] [Obsolete("Use DeleteTransformFeedbacks overload instead")] - public static + public static unsafe void DeleteTransformFeedback(Int32 n, Int32* ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")] [Obsolete("Use DeleteTransformFeedbacks overload instead")] - public static + public static void DeleteTransformFeedback(Int32 n, UInt32[] ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")] [Obsolete("Use DeleteTransformFeedbacks overload instead")] - public static + public static void DeleteTransformFeedback(Int32 n, ref UInt32 ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")] [Obsolete("Use DeleteTransformFeedbacks overload instead")] - public static + public static unsafe void DeleteTransformFeedback(Int32 n, UInt32* ids) { throw new NotImplementedException(); } [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")] [Obsolete("Use GenTransformFeedbacks overload instead")] - public static + public static void GenTransformFeedback(Int32 n, [OutAttribute] Int32[] ids) { throw new NotImplementedException(); } [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")] [Obsolete("Use GenTransformFeedbacks overload instead")] - public static + public static void GenTransformFeedback(Int32 n, [OutAttribute] out Int32 ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")] [Obsolete("Use GenTransformFeedbacks overload instead")] - public static + public static unsafe void GenTransformFeedback(Int32 n, [OutAttribute] Int32* ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")] [Obsolete("Use GenTransformFeedbacks overload instead")] - public static + public static void GenTransformFeedback(Int32 n, [OutAttribute] UInt32[] ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")] [Obsolete("Use GenTransformFeedbacks overload instead")] - public static + public static void GenTransformFeedback(Int32 n, [OutAttribute] out UInt32 ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")] [Obsolete("Use GenTransformFeedbacks overload instead")] - public static + public static unsafe void GenTransformFeedback(Int32 n, [OutAttribute] UInt32* ids) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Double[] @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Double[] @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Single[] @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Single[] @params) { throw new NotImplementedException(); } [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoi64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64[] @params) { throw new NotImplementedException(); } [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoi64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] out Int64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static unsafe void GetVideoi64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoi64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64[] @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoi64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] out Int64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static unsafe void GetVideoi64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params) { throw new NotImplementedException(); } [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoui64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64[] @params) { throw new NotImplementedException(); } [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoui64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] out Int64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static unsafe void GetVideoui64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoui64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] UInt64[] @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static void GetVideoui64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] out UInt64 @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")] [Obsolete("Use GetVideo overload instead")] - public static + public static unsafe void GetVideoui64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] UInt64* @params) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Double[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Double[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Single[] v) { throw new NotImplementedException(); } } @@ -2749,112 +2747,112 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiColor3fVertex3(Int32* rc, Single[] c, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiColor3fVertex3(UInt32* rc, Single[] c, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiColor4fNormal3fVertex3(Int32* rc, Single[] c, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiColor4fNormal3fVertex3(UInt32* rc, Single[] c, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiColor4ubVertex3(Int32* rc, Byte[] c, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiColor4ubVertex3(UInt32* rc, Byte[] c, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiNormal3fVertex3(Int32* rc, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiNormal3fVertex3(UInt32* rc, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(Int32* rc, Single[] tc, Single[] c, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(UInt32* rc, Single[] tc, Single[] c, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiTexCoord2fNormal3fVertex3(Int32* rc, Single[] tc, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiTexCoord2fNormal3fVertex3(UInt32* rc, Single[] tc, Single[] n, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiTexCoord2fVertex3(Int32* rc, Single[] tc, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiTexCoord2fVertex3(UInt32* rc, Single[] tc, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiVertex3(Int32* rc, Single[] v) { throw new NotImplementedException(); } [System.CLSCompliant(false)] [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fvSUN")] [Obsolete("Use ref/array overload instead")] - public static + public static unsafe void ReplacementCodeuiVertex3(UInt32* rc, Single[] v) { throw new NotImplementedException(); } } } diff --git a/src/OpenTK/Graphics/OpenGL4/ErrorHelper.cs b/src/OpenTK/Graphics/OpenGL4/ErrorHelper.cs index bd3565df..a87a8b9b 100644 --- a/src/OpenTK/Graphics/OpenGL4/ErrorHelper.cs +++ b/src/OpenTK/Graphics/OpenGL4/ErrorHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,17 +42,11 @@ namespace OpenTK.Graphics.OpenGL4 // as that would cause infinite recursion! struct ErrorHelper : IDisposable { - #region Fields - static readonly object SyncRoot = new object(); static readonly Dictionary> ContextErrors = new Dictionary>(); readonly GraphicsContext Context; - #endregion - - #region Constructors - public ErrorHelper(IGraphicsContext context) { if (context == null) @@ -69,10 +61,6 @@ namespace OpenTK.Graphics.OpenGL4 ResetErrors(); } - #endregion - - #region Public Members - // Retrieve all OpenGL errors to clear the error list. // See http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/geterror.html [Conditional("DEBUG")] @@ -120,15 +108,9 @@ namespace OpenTK.Graphics.OpenGL4 } } - #endregion - - #region IDisposable Members - public void Dispose() { CheckErrors(); } - - #endregion } } diff --git a/src/OpenTK/Graphics/OpenGL4/Helper.cs b/src/OpenTK/Graphics/OpenGL4/Helper.cs index db6d9b79..996a4a16 100644 --- a/src/OpenTK/Graphics/OpenGL4/Helper.cs +++ b/src/OpenTK/Graphics/OpenGL4/Helper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2015 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -47,8 +45,6 @@ namespace OpenTK.Graphics.OpenGL4 static byte[] EntryPointNames; static int[] EntryPointNameOffsets; - #region Constructors - /// /// Constructs a new instance. /// @@ -59,10 +55,6 @@ namespace OpenTK.Graphics.OpenGL4 _EntryPointNameOffsetsInstance = EntryPointNameOffsets; } - #endregion - - #region --- Protected Members --- - /// /// Returns a synchronization token unique for the GL class. /// @@ -71,10 +63,6 @@ namespace OpenTK.Graphics.OpenGL4 get { return sync_root; } } - #endregion - - #region Helper Overloads - #pragma warning disable 3019 #pragma warning disable 1591 #pragma warning disable 1572 @@ -83,8 +71,6 @@ namespace OpenTK.Graphics.OpenGL4 // Note: Mono 1.9.1 truncates StringBuilder results (for 'out string' parameters). // We work around this issue by doubling the StringBuilder capacity. - #region public static void ClearColor() overloads - public static void ClearColor(Color color) { GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -95,10 +81,6 @@ namespace OpenTK.Graphics.OpenGL4 GL.ClearColor(color.R, color.G, color.B, color.A); } - #endregion - - #region public static void BlendColor() overloads - public static void BlendColor(Color color) { GL.BlendColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f); @@ -109,10 +91,6 @@ namespace OpenTK.Graphics.OpenGL4 GL.BlendColor(color.R, color.G, color.B, color.A); } - #endregion - - #region Uniform - [CLSCompliant(false)] public static void Uniform2(int location, ref Vector2 vector) { @@ -189,10 +167,6 @@ namespace OpenTK.Graphics.OpenGL4 } } - #endregion - - #region ProgramUniform - [CLSCompliant(false)] public static void ProgramUniform2(int program, int location, ref Vector2 vector) { @@ -269,12 +243,6 @@ namespace OpenTK.Graphics.OpenGL4 } } - #endregion - - #region Shaders - - #region GetActiveAttrib - public static string GetActiveAttrib(int program, int index, out int size, out ActiveAttribType type) { int length; @@ -285,10 +253,6 @@ namespace OpenTK.Graphics.OpenGL4 return sb.ToString(); } - #endregion - - #region GetActiveUniform - public static string GetActiveUniform(int program, int uniformIndex, out int size, out ActiveUniformType type) { int length; @@ -299,10 +263,6 @@ namespace OpenTK.Graphics.OpenGL4 return sb.ToString(); } - #endregion - - #region public static void ShaderSource(Int32 shader, System.String @string) - public static void ShaderSource(Int32 shader, System.String @string) { unsafe @@ -312,10 +272,6 @@ namespace OpenTK.Graphics.OpenGL4 } } - #endregion - - #region public static string GetShaderInfoLog(Int32 shader) - public static string GetShaderInfoLog(Int32 shader) { string info; @@ -323,10 +279,6 @@ namespace OpenTK.Graphics.OpenGL4 return info; } - #endregion - - #region public static void GetShaderInfoLog(Int32 shader, out string info) - public static void GetShaderInfoLog(Int32 shader, out string info) { unsafe @@ -344,10 +296,6 @@ namespace OpenTK.Graphics.OpenGL4 } } - #endregion - - #region public static string GetProgramInfoLog(Int32 program) - public static string GetProgramInfoLog(Int32 program) { string info; @@ -355,10 +303,6 @@ namespace OpenTK.Graphics.OpenGL4 return info; } - #endregion - - #region public static void GetProgramInfoLog(Int32 program, out string info) - public static void GetProgramInfoLog(Int32 program, out string info) { unsafe @@ -375,69 +319,39 @@ namespace OpenTK.Graphics.OpenGL4 } } - #endregion - - #endregion - - #region public static void VertexAttrib2(Int32 index, ref Vector2 v) - [CLSCompliant(false)] public static void VertexAttrib2(Int32 index, ref Vector2 v) { GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, ref Vector3 v) - [CLSCompliant(false)] public static void VertexAttrib3(Int32 index, ref Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, ref Vector4 v) - [CLSCompliant(false)] public static void VertexAttrib4(Int32 index, ref Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region public static void VertexAttrib2(Int32 index, Vector2 v) - public static void VertexAttrib2(Int32 index, Vector2 v) { GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, Vector3 v) - public static void VertexAttrib3(Int32 index, Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, Vector4 v) - public static void VertexAttrib4(Int32 index, Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region VertexAttribPointer - public static void VertexAttribPointer(int index, int size, VertexAttribPointerType type, bool normalized, int stride, int offset) { VertexAttribPointer(index, size, type, normalized, stride, (IntPtr)offset); @@ -449,19 +363,11 @@ namespace OpenTK.Graphics.OpenGL4 VertexAttribPointer(index, size, type, normalized, stride, (IntPtr)offset); } - #endregion - - #region DrawElements - public static void DrawElements(BeginMode mode, int count, DrawElementsType type, int offset) { DrawElements((PrimitiveType)mode, count, type, new IntPtr(offset)); } - #endregion - - #region Get[Float|Double] - public static void GetFloat(GetPName pname, out Vector2 vector) { unsafe @@ -498,10 +404,6 @@ namespace OpenTK.Graphics.OpenGL4 } } - #endregion - - #region Viewport - public static void Viewport(Size size) { GL.Viewport(0, 0, size.Width, size.Height); @@ -527,20 +429,17 @@ namespace OpenTK.Graphics.OpenGL4 GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height); } #endif - #endregion #pragma warning restore 3019 #pragma warning restore 1591 #pragma warning restore 1572 #pragma warning restore 1573 - - #endregion } #pragma warning disable 1574 // XML comment cref attribute could not be resolved, compiler bug in Mono 3.4.0 /// - /// Defines the signature of a debug callback for + /// Defines the signature of a debug callback for /// . /// /// The for this debug message. @@ -557,7 +456,7 @@ namespace OpenTK.Graphics.OpenGL4 IntPtr userParam); /// - /// Defines the signature of a debug callback for + /// Defines the signature of a debug callback for /// . /// /// The for this debug message. @@ -574,7 +473,7 @@ namespace OpenTK.Graphics.OpenGL4 IntPtr userParam); /// - /// Defines the signature of a debug callback for + /// Defines the signature of a debug callback for /// . /// /// The for this debug message. diff --git a/src/OpenTK/IGameWindow.cs b/src/OpenTK/IGameWindow.cs index e838522f..247318f0 100644 --- a/src/OpenTK/IGameWindow.cs +++ b/src/OpenTK/IGameWindow.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -63,7 +61,7 @@ namespace OpenTK.Platform event EventHandler Load; /// - /// Occurs before the window is destroyed. + /// Occurs before the window is destroyed. /// event EventHandler Unload; diff --git a/src/OpenTK/INativeWindow.cs b/src/OpenTK/INativeWindow.cs index 9d2bd017..2fdfd6e7 100644 --- a/src/OpenTK/INativeWindow.cs +++ b/src/OpenTK/INativeWindow.cs @@ -1,5 +1,4 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/ButtonState.cs b/src/OpenTK/Input/ButtonState.cs index a2a72d9d..065f16f0 100644 --- a/src/OpenTK/Input/ButtonState.cs +++ b/src/OpenTK/Input/ButtonState.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion namespace OpenTK.Input { diff --git a/src/OpenTK/Input/ConfigurationType.cs b/src/OpenTK/Input/ConfigurationType.cs index abfe15e5..a980bcf0 100644 --- a/src/OpenTK/Input/ConfigurationType.cs +++ b/src/OpenTK/Input/ConfigurationType.cs @@ -1,4 +1,3 @@ -#region License // // ConfigurationType.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Input/GamePad.cs b/src/OpenTK/Input/GamePad.cs index 907ec8c9..6a39e136 100644 --- a/src/OpenTK/Input/GamePad.cs +++ b/src/OpenTK/Input/GamePad.cs @@ -1,4 +1,3 @@ -#region License // // GamePad.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Input/GamePadButtons.cs b/src/OpenTK/Input/GamePadButtons.cs index aba12d47..5f769790 100644 --- a/src/OpenTK/Input/GamePadButtons.cs +++ b/src/OpenTK/Input/GamePadButtons.cs @@ -1,4 +1,3 @@ -#region License // // GamePadButtons.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; @@ -47,8 +45,6 @@ namespace OpenTK.Input buttons = state; } - #region Public Members - /// /// Gets the for the A button. /// @@ -225,10 +221,6 @@ namespace OpenTK.Input Equals((GamePadButtons)obj); } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -240,16 +232,10 @@ namespace OpenTK.Input return buttons == other.buttons; } - #endregion - - #region Private Members - ButtonState GetButton(Buttons b) { return (buttons & b) != 0 ? ButtonState.Pressed : ButtonState.Released; } - - #endregion } } diff --git a/src/OpenTK/Input/GamePadCapabilities.cs b/src/OpenTK/Input/GamePadCapabilities.cs index 9947d835..92e42f2f 100644 --- a/src/OpenTK/Input/GamePadCapabilities.cs +++ b/src/OpenTK/Input/GamePadCapabilities.cs @@ -1,4 +1,3 @@ -#region License // // GamePadCapabilities.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; @@ -42,8 +40,6 @@ namespace OpenTK.Input bool is_connected; bool is_mapped; - #region Constructors - internal GamePadCapabilities(GamePadType type, GamePadAxes axes, Buttons buttons, bool is_connected, bool is_mapped) : this() { @@ -54,10 +50,6 @@ namespace OpenTK.Input this.is_mapped = is_mapped; } - #endregion - - #region Public Members - /// /// Gets a value describing the type of a input device. /// This value depends on the connected device and the drivers in use. If IsConnected @@ -384,10 +376,6 @@ namespace OpenTK.Input Equals((GamePadCapabilities)obj); } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -402,8 +390,6 @@ namespace OpenTK.Input is_mapped == other.is_mapped && gamepad_type == other.gamepad_type; } - - #endregion } } diff --git a/src/OpenTK/Input/GamePadConfiguration.cs b/src/OpenTK/Input/GamePadConfiguration.cs index 92e9c43d..c259c34f 100644 --- a/src/OpenTK/Input/GamePadConfiguration.cs +++ b/src/OpenTK/Input/GamePadConfiguration.cs @@ -1,5 +1,4 @@ -#region License -// +// // GamePadMapping.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -65,8 +63,6 @@ namespace OpenTK.Input return configuration_items.GetEnumerator(); } - #region Private Members - // Parses a GamePad configuration string. The string // follows the rules for SDL2 GameController, outlined here: // http://wiki.libsdl.org/SDL_GameControllerAddMapping @@ -225,7 +221,5 @@ namespace OpenTK.Input return hat + id; } - - #endregion } } diff --git a/src/OpenTK/Input/GamePadConfigurationDatabase.cs b/src/OpenTK/Input/GamePadConfigurationDatabase.cs index de66b58f..5a862c4b 100644 --- a/src/OpenTK/Input/GamePadConfigurationDatabase.cs +++ b/src/OpenTK/Input/GamePadConfigurationDatabase.cs @@ -1,4 +1,3 @@ -#region License // // GamePadConfigurationDatabase.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -41,8 +39,6 @@ namespace OpenTK.Input internal GamePadConfigurationDatabase() { // Configuration database copied from SDL - - #region License // Simple DirectMedia Layer // Copyright (C) 1997-2013 Sam Lantinga // @@ -61,8 +57,6 @@ namespace OpenTK.Input // 2. Altered source versions must be plainly marked as such, and must not be // misrepresented as being the original software. // 3. This notice may not be removed or altered from any source distribution. - #endregion - // Default (unknown) configuration if (!Configuration.RunningOnSdl2) { @@ -187,7 +181,7 @@ namespace OpenTK.Input Add("03000000a306000018f5000010010000,Saitek PLC Saitek P3200 Rumble Pad,x:b0,a:b1,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a3,righty:a4,"); Add("03000000830500006020000010010000,iBuffalo USB 2-axis 8-button Gamepad,a:b1,b:b0,x:b3,y:b2,back:b6,start:b7,leftshoulder:b4,rightshoulder:b5,leftx:a0,lefty:a1,"); Add("03000000c9110000f055000011010000,HJC Game GAMEPAD,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b11,rightshoulder:b5,rightx:a2,start:b9,righty:a3,dpleft:h0.8,lefttrigger:b6,x:b2,dpup:h0.1,back:b8,leftstick:b10,leftshoulder:b4,y:b3,a:b0,dpright:h0.2,righttrigger:b7,b:b1,"); - + // Android Add("4e564944494120436f72706f72617469,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,"); diff --git a/src/OpenTK/Input/GamePadConfigurationItem.cs b/src/OpenTK/Input/GamePadConfigurationItem.cs index c2dba9f5..3c53b1ee 100644 --- a/src/OpenTK/Input/GamePadConfigurationItem.cs +++ b/src/OpenTK/Input/GamePadConfigurationItem.cs @@ -1,4 +1,3 @@ -#region License // // GamePadConfigurationItem.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Input/GamePadConfigurationSource.cs b/src/OpenTK/Input/GamePadConfigurationSource.cs index 1f4b6f4f..a6acfe33 100644 --- a/src/OpenTK/Input/GamePadConfigurationSource.cs +++ b/src/OpenTK/Input/GamePadConfigurationSource.cs @@ -1,4 +1,3 @@ -#region License // // GamePadConfigurationItem.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Input/GamePadConfigurationTarget.cs b/src/OpenTK/Input/GamePadConfigurationTarget.cs index 75199c9f..56073529 100644 --- a/src/OpenTK/Input/GamePadConfigurationTarget.cs +++ b/src/OpenTK/Input/GamePadConfigurationTarget.cs @@ -1,4 +1,3 @@ -#region License // // GamePadConfigurationTarget.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Input/GamePadDPad.cs b/src/OpenTK/Input/GamePadDPad.cs index d05300ef..ab562567 100644 --- a/src/OpenTK/Input/GamePadDPad.cs +++ b/src/OpenTK/Input/GamePadDPad.cs @@ -1,4 +1,3 @@ -// #region License // // GamePadDPad.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -// #endregion using System; @@ -47,8 +45,6 @@ namespace OpenTK.Input DPadButtons buttons; - #region Internal Members - internal GamePadDPad(Buttons state) { // DPad butons are stored in the lower 4bits @@ -56,10 +52,6 @@ namespace OpenTK.Input buttons = (DPadButtons)((int)state & 0x0f); } - #endregion - - #region Public Members - /// /// Gets the for the up button. /// @@ -187,10 +179,6 @@ namespace OpenTK.Input Equals((GamePadDPad)obj); } - #endregion - - #region Private Members - void SetButton(DPadButtons button, bool value) { if (value) @@ -203,10 +191,6 @@ namespace OpenTK.Input } } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -217,7 +201,5 @@ namespace OpenTK.Input { return buttons == other.buttons; } - - #endregion } } diff --git a/src/OpenTK/Input/GamePadState.cs b/src/OpenTK/Input/GamePadState.cs index 2859cea5..aec423a0 100644 --- a/src/OpenTK/Input/GamePadState.cs +++ b/src/OpenTK/Input/GamePadState.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; @@ -46,8 +44,6 @@ namespace OpenTK.Input byte right_trigger; bool is_connected; - #region Public Members - /// /// Gets a structure describing the /// state of the GamePad thumb sticks. @@ -139,10 +135,6 @@ namespace OpenTK.Input Equals((GamePadState)obj); } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -158,10 +150,6 @@ namespace OpenTK.Input IsConnected == other.IsConnected; } - #endregion - - #region Internal Members - internal void SetAxis(GamePadAxes axis, short value) { if ((axis & GamePadAxes.LeftX) != 0) @@ -225,10 +213,6 @@ namespace OpenTK.Input packet_number = number; } - #endregion - - #region Private Members - bool IsAxisValid(GamePadAxes axis) { int index = (int)axis; @@ -239,7 +223,5 @@ namespace OpenTK.Input { return index >= 0 && index < GamePad.MaxDPadCount; } - - #endregion } } diff --git a/src/OpenTK/Input/GamePadThumbSticks.cs b/src/OpenTK/Input/GamePadThumbSticks.cs index 42fd2c0f..3a1e01a4 100644 --- a/src/OpenTK/Input/GamePadThumbSticks.cs +++ b/src/OpenTK/Input/GamePadThumbSticks.cs @@ -1,5 +1,4 @@ -#region License -// +// // GamePadThumbSticks.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; @@ -50,8 +48,6 @@ namespace OpenTK.Input this.right_y = right_y; } - #region Public Members - /// /// Gets a describing the state of the left thumb stick. /// @@ -118,10 +114,6 @@ namespace OpenTK.Input Equals((GamePadThumbSticks)obj); } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -136,7 +128,5 @@ namespace OpenTK.Input right_x == other.right_x && right_y == other.right_y; } - - #endregion } } diff --git a/src/OpenTK/Input/GamePadTriggers.cs b/src/OpenTK/Input/GamePadTriggers.cs index da93c4e6..10740323 100644 --- a/src/OpenTK/Input/GamePadTriggers.cs +++ b/src/OpenTK/Input/GamePadTriggers.cs @@ -1,5 +1,4 @@ -// #region License -// +// // GamePadTriggers.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -// #endregion using System; @@ -47,8 +45,6 @@ namespace OpenTK.Input this.right = right; } - #region Public Members - /// /// Gets the offset of the left trigger button, between 0.0 and 1.0. /// @@ -114,10 +110,6 @@ namespace OpenTK.Input Equals((GamePadTriggers)obj); } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -130,7 +122,5 @@ namespace OpenTK.Input left == other.left && right == other.right; } - - #endregion } } diff --git a/src/OpenTK/Input/GamePadType.cs b/src/OpenTK/Input/GamePadType.cs index 1464117f..d31b4579 100644 --- a/src/OpenTK/Input/GamePadType.cs +++ b/src/OpenTK/Input/GamePadType.cs @@ -1,5 +1,4 @@ -#region License -// +// // GamePadType.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion namespace OpenTK.Input { diff --git a/src/OpenTK/Input/HatPosition.cs b/src/OpenTK/Input/HatPosition.cs index c0db4019..3218604b 100644 --- a/src/OpenTK/Input/HatPosition.cs +++ b/src/OpenTK/Input/HatPosition.cs @@ -1,4 +1,3 @@ -#region License // // HatPosition.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Input/IInputDevice.cs b/src/OpenTK/Input/IInputDevice.cs index c27fe1d2..e6cf5c0a 100644 --- a/src/OpenTK/Input/IInputDevice.cs +++ b/src/OpenTK/Input/IInputDevice.cs @@ -1,8 +1,6 @@ -#region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos +/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/IInputDriver2.cs b/src/OpenTK/Input/IInputDriver2.cs index 0e4c5132..d9bcc7d5 100644 --- a/src/OpenTK/Input/IInputDriver2.cs +++ b/src/OpenTK/Input/IInputDriver2.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/IJoystickDriver2.cs b/src/OpenTK/Input/IJoystickDriver2.cs index 8e536aaf..5eba0d1d 100644 --- a/src/OpenTK/Input/IJoystickDriver2.cs +++ b/src/OpenTK/Input/IJoystickDriver2.cs @@ -1,5 +1,4 @@ -#region License -// +// // IJoystickDriver2.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/IMouseDriver2.cs b/src/OpenTK/Input/IMouseDriver2.cs index 45a85fa6..4c9f991a 100644 --- a/src/OpenTK/Input/IMouseDriver2.cs +++ b/src/OpenTK/Input/IMouseDriver2.cs @@ -1,12 +1,11 @@ - #region License - // + // // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/Joystick.cs b/src/OpenTK/Input/Joystick.cs index 3c79105b..0a6f25ac 100644 --- a/src/OpenTK/Input/Joystick.cs +++ b/src/OpenTK/Input/Joystick.cs @@ -1,5 +1,4 @@ -#region License -// +// // Joystick.cs // // Author: @@ -25,8 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion - + using System; using System.Collections.Generic; using System.Text; diff --git a/src/OpenTK/Input/JoystickAxis.cs b/src/OpenTK/Input/JoystickAxis.cs index 751ec7bd..09dfc7f1 100644 --- a/src/OpenTK/Input/JoystickAxis.cs +++ b/src/OpenTK/Input/JoystickAxis.cs @@ -1,5 +1,4 @@ -#region License -// +// // JoystickAxis.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/JoystickCapabilities.cs b/src/OpenTK/Input/JoystickCapabilities.cs index 89b027d2..ea62f04d 100644 --- a/src/OpenTK/Input/JoystickCapabilities.cs +++ b/src/OpenTK/Input/JoystickCapabilities.cs @@ -1,5 +1,4 @@ -#region License -// +// // JoystickCapabilities.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,8 +42,6 @@ namespace OpenTK.Input byte hat_count; bool is_connected; - #region Constructors - internal JoystickCapabilities(int axis_count, int button_count, int hat_count, bool is_connected) { if (axis_count < 0 || axis_count > JoystickState.MaxAxes) @@ -68,19 +64,11 @@ namespace OpenTK.Input this.is_connected = is_connected; } - #endregion - - #region Internal Members - internal void SetIsConnected(bool value) { is_connected = value; } - #endregion - - #region Public Members - /// /// Gets the number of axes supported by this . /// @@ -153,10 +141,6 @@ namespace OpenTK.Input Equals((JoystickCapabilities)obj); } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -171,7 +155,5 @@ namespace OpenTK.Input HatCount == other.HatCount && IsConnected == other.IsConnected; } - - #endregion } } diff --git a/src/OpenTK/Input/JoystickDevice.cs b/src/OpenTK/Input/JoystickDevice.cs index 2155a7ba..de5463a0 100644 --- a/src/OpenTK/Input/JoystickDevice.cs +++ b/src/OpenTK/Input/JoystickDevice.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2008 the Open Toolkit library, except where noted. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -35,8 +33,6 @@ namespace OpenTK.Input /// public abstract class JoystickDevice : IInputDevice { - #region Fields - int id; string description; JoystickAxisCollection axis_collection; @@ -44,10 +40,6 @@ namespace OpenTK.Input JoystickMoveEventArgs move_args = new JoystickMoveEventArgs(0, 0, 0); JoystickButtonEventArgs button_args = new JoystickButtonEventArgs(0, false); - #endregion - - #region Constructors - internal JoystickDevice(int id, int axes, int buttons) { if (axes < 0) @@ -61,10 +53,6 @@ namespace OpenTK.Input button_collection = new JoystickButtonCollection(buttons); } - #endregion - - #region Public Members - /// /// Gets a JoystickAxisCollection containing the state of each axis on this instance. Values are normalized in the [-1, 1] range. /// @@ -75,10 +63,6 @@ namespace OpenTK.Input /// public JoystickButtonCollection Button { get { return button_collection; } } - #endregion - - #region IInputDevice Members - /// /// Gets a System.String containing a unique description for this instance. /// @@ -89,17 +73,13 @@ namespace OpenTK.Input } /// - /// Gets a value indicating the InputDeviceType of this InputDevice. + /// Gets a value indicating the InputDeviceType of this InputDevice. /// public InputDeviceType DeviceType { get { return InputDeviceType.Hid; } } - #endregion - - #region Events - /// /// Occurs when an axis of this JoystickDevice instance is moved. /// @@ -118,10 +98,6 @@ namespace OpenTK.Input public EventHandler ButtonUp = delegate(object sender, JoystickButtonEventArgs e) { }; - #endregion - - #region Internal Members - internal int Id { get { return id; } @@ -154,12 +130,8 @@ namespace OpenTK.Input } } } - - #endregion } - #region JoystickDevice : JoystickDevice - // Provides platform-specific information about the relevant JoystickDevice. internal class JoystickDevice : JoystickDevice where TDetail : new() @@ -171,10 +143,6 @@ namespace OpenTK.Input internal TDetail Details = new TDetail(); } - #endregion - - #region Event Arguments - /// /// The base class for JoystickDevice event arguments. /// @@ -188,15 +156,9 @@ namespace OpenTK.Input /// public class JoystickButtonEventArgs : EventArgs { - #region Fields - int button; bool pressed; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -208,10 +170,6 @@ namespace OpenTK.Input this.pressed = pressed; } - #endregion - - #region Public Members - /// /// The index of the joystick button for the event. /// @@ -221,8 +179,6 @@ namespace OpenTK.Input /// Gets a System.Boolean representing the state of the button for the event. /// public bool Pressed { get { return pressed; } internal set { this.pressed = value; } } - - #endregion } /// @@ -231,16 +187,10 @@ namespace OpenTK.Input /// public class JoystickMoveEventArgs : JoystickEventArgs { - #region Fields - JoystickAxis axis; float value; float delta; - #endregion - - #region Constructors - /// /// Initializes a new instance of the class. /// @@ -254,10 +204,6 @@ namespace OpenTK.Input this.delta = delta; } - #endregion - - #region Public Members - /// /// Gets a System.Int32 representing the index of the axis that was moved. /// @@ -272,27 +218,15 @@ namespace OpenTK.Input /// Gets a System.Single representing the relative change in the position of the axis. /// public float Delta { get { return delta; } internal set { this.delta = value; } } - - #endregion } - #endregion - - #region JoystickButtonCollection - /// /// Defines a collection of JoystickButtons. /// public sealed class JoystickButtonCollection { - #region Fields - bool[] button_state; - #endregion - - #region Constructors - internal JoystickButtonCollection(int numButtons) { if (numButtons < 0) @@ -301,10 +235,6 @@ namespace OpenTK.Input button_state = new bool[numButtons]; } - #endregion - - #region Public Members - /// /// Gets a System.Boolean indicating whether the JoystickButton with the specified index is pressed. /// @@ -323,27 +253,15 @@ namespace OpenTK.Input { get { return button_state.Length; } } - - #endregion } - #endregion - - #region JoystickAxisCollection - /// /// Defines a collection of JoystickAxes. /// public sealed class JoystickAxisCollection { - #region Fields - float[] axis_state; - #endregion - - #region Constructors - internal JoystickAxisCollection(int numAxes) { if (numAxes < 0) @@ -352,10 +270,6 @@ namespace OpenTK.Input axis_state = new float[numAxes]; } - #endregion - - #region Public Members - /// /// Gets a System.Single indicating the absolute position of the JoystickAxis with the specified index. /// @@ -385,9 +299,5 @@ namespace OpenTK.Input { get { return axis_state.Length; } } - - #endregion } - - #endregion } diff --git a/src/OpenTK/Input/JoystickHat.cs b/src/OpenTK/Input/JoystickHat.cs index bc2f1df8..483565f8 100644 --- a/src/OpenTK/Input/JoystickHat.cs +++ b/src/OpenTK/Input/JoystickHat.cs @@ -1,4 +1,3 @@ -#region License // // JoystickHat.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Input/JoystickHatState.cs b/src/OpenTK/Input/JoystickHatState.cs index 63a3a943..29c33d6a 100644 --- a/src/OpenTK/Input/JoystickHatState.cs +++ b/src/OpenTK/Input/JoystickHatState.cs @@ -1,4 +1,3 @@ -#region License // // JoystickHatState.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; @@ -45,7 +43,7 @@ namespace OpenTK.Input /// /// Gets a value indicating - /// the position of this hat. + /// the position of this hat. /// /// The position. public HatPosition Position { get { return position; } } @@ -151,8 +149,6 @@ namespace OpenTK.Input Equals((JoystickHatState)obj); } - #region IEquatable implementation - /// /// Determines whether the specified is equal to the current . /// @@ -163,8 +159,6 @@ namespace OpenTK.Input { return Position == other.Position; } - - #endregion } } diff --git a/src/OpenTK/Input/JoystickState.cs b/src/OpenTK/Input/JoystickState.cs index aca286bc..952ed427 100644 --- a/src/OpenTK/Input/JoystickState.cs +++ b/src/OpenTK/Input/JoystickState.cs @@ -1,5 +1,4 @@ -#region License -// +// // JoystickState.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -55,8 +53,6 @@ namespace OpenTK.Input JoystickHatState hat3; bool is_connected; - #region Public Members - /// /// Gets a value between -1.0 and 1.0 representing the current offset of the specified . /// @@ -193,10 +189,6 @@ namespace OpenTK.Input Equals((JoystickState)obj); } - #endregion - - #region Internal Members - internal int PacketNumber { get { return packet_number; } @@ -287,10 +279,6 @@ namespace OpenTK.Input packet_number = number; } - #endregion - - #region Private Members - short GetAxisUnsafe(int index) { unsafe @@ -302,10 +290,6 @@ namespace OpenTK.Input } } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -328,7 +312,5 @@ namespace OpenTK.Input } return equals; } - - #endregion } } diff --git a/src/OpenTK/Input/Key.cs b/src/OpenTK/Input/Key.cs index 3402c30f..cd0dd1fc 100644 --- a/src/OpenTK/Input/Key.cs +++ b/src/OpenTK/Input/Key.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion namespace OpenTK.Input { @@ -34,7 +32,7 @@ namespace OpenTK.Input { /// A key outside the known keys. Unknown = 0, - + // Modifiers /// The left shift key. ShiftLeft, @@ -70,7 +68,7 @@ namespace OpenTK.Input RWin = WinRight, /// The menu key. Menu, - + // Function keys (hopefully enough for most keyboards - mine has 26) // on X11 reports up to 35 function keys. /// The F1 key. @@ -143,7 +141,7 @@ namespace OpenTK.Input F34, /// The F35 key. F35, - + // Direction arrows /// The up arrow key. Up, @@ -153,7 +151,7 @@ namespace OpenTK.Input Left, /// The right arrow key. Right, - + /// The enter key. Enter, /// The escape key. @@ -188,7 +186,7 @@ namespace OpenTK.Input Pause, /// The num lock key. NumLock, - + // Special keys /// The clear key (Keypad5 with NumLock disabled, on typical keyboards). Clear, @@ -207,7 +205,7 @@ namespace OpenTK.Input Spell, Save, Calculator, - + // Folders and applications Documents, Pictures, @@ -216,7 +214,7 @@ namespace OpenTK.Input Mail, Browser, Messenger, - + // Multimedia keys Mute, PlayPause, @@ -225,7 +223,7 @@ namespace OpenTK.Input VolumeDown, TrackPrevious, TrackNext,*/ - + // Keypad keys /// The keypad 0 key. Keypad0, @@ -265,7 +263,7 @@ namespace OpenTK.Input KeypadPeriod = KeypadDecimal, /// The keypad enter key. KeypadEnter, - + // Letters /// The A key. A, @@ -319,7 +317,7 @@ namespace OpenTK.Input Y, /// The Z key. Z, - + // Numbers /// The number 0 key. Number0, @@ -341,7 +339,7 @@ namespace OpenTK.Input Number8, /// The number 9 key. Number9, - + // Symbols /// The tilde key. Tilde, diff --git a/src/OpenTK/Input/KeyModifiers.cs b/src/OpenTK/Input/KeyModifiers.cs index dd47244f..0b58c3db 100644 --- a/src/OpenTK/Input/KeyModifiers.cs +++ b/src/OpenTK/Input/KeyModifiers.cs @@ -1,4 +1,3 @@ -#region License // // HatPosition.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/Keyboard.cs b/src/OpenTK/Input/Keyboard.cs index 09116aa1..de57e727 100644 --- a/src/OpenTK/Input/Keyboard.cs +++ b/src/OpenTK/Input/Keyboard.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; @@ -36,16 +34,10 @@ namespace OpenTK.Input /// public static class Keyboard { - #region Fields - static readonly IKeyboardDriver2 driver = Platform.Factory.Default.CreateKeyboardDriver(); static readonly object SyncRoot = new object(); - #endregion - - #region Public Members - /// /// Retrieves the combined for all keyboard devices. /// @@ -95,7 +87,5 @@ namespace OpenTK.Input } } #endif - - #endregion } } diff --git a/src/OpenTK/Input/KeyboardDevice.cs b/src/OpenTK/Input/KeyboardDevice.cs index 4634fba3..d935d7d1 100644 --- a/src/OpenTK/Input/KeyboardDevice.cs +++ b/src/OpenTK/Input/KeyboardDevice.cs @@ -1,22 +1,16 @@ -#region --- License --- -/* Copyright (c) 2007 Stefanos Apostolopoulos +/* Copyright (c) 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion - -#region --- Using directives --- using System; using OpenTK.Input; using System.Diagnostics; -#endregion - namespace OpenTK.Input { /// - /// Represents a keyboard device and provides methods to query its status. + /// Represents a keyboard device and provides methods to query its status. /// public sealed class KeyboardDevice : IInputDevice { @@ -27,14 +21,8 @@ namespace OpenTK.Input private bool repeat; private KeyboardState state; - #region --- Constructors --- - internal KeyboardDevice() { } - #endregion - - #region --- IKeyboard members --- - /// /// Gets a value indicating the status of the specified Key. /// @@ -92,8 +80,6 @@ namespace OpenTK.Input internal set { devID = value; } } - #region public bool KeyRepeat - /// /// Gets or sets a System.Boolean indicating key repeat status. /// @@ -116,30 +102,16 @@ namespace OpenTK.Input set { repeat = value; } } - #endregion - - #region KeyDown - /// /// Occurs when a key is pressed. /// public event EventHandler KeyDown = delegate { }; - #endregion - - #region KeyUp - /// /// Occurs when a key is released. /// public event EventHandler KeyUp = delegate { }; - #endregion - - #endregion - - #region --- IInputDevice Members --- - /// /// Gets a which describes this instance. /// @@ -157,10 +129,6 @@ namespace OpenTK.Input get { return InputDeviceType.Keyboard; } } - #endregion - - #region --- Public Methods --- - /// /// Retrieves the combined for all keyboard devices. /// This method is equivalent to . @@ -203,10 +171,6 @@ namespace OpenTK.Input DeviceID, Description, NumberOfKeys, NumberOfFunctionKeys, NumberOfLeds); } - #endregion - - #region --- Internal Methods --- - internal void HandleKeyDown(object sender, KeyboardKeyEventArgs e) { state = e.Keyboard; @@ -226,7 +190,5 @@ namespace OpenTK.Input state = e.Keyboard; KeyUp(this, e); } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Input/KeyboardKeyEventArgs.cs b/src/OpenTK/Input/KeyboardKeyEventArgs.cs index 614a8f95..3b7b4313 100644 --- a/src/OpenTK/Input/KeyboardKeyEventArgs.cs +++ b/src/OpenTK/Input/KeyboardKeyEventArgs.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -37,22 +35,16 @@ namespace OpenTK.Input /// /// /// Do not cache instances of this type outside their event handler. - /// If necessary, you can clone a KeyboardEventArgs instance using the + /// If necessary, you can clone a KeyboardEventArgs instance using the /// constructor. /// /// public class KeyboardKeyEventArgs : EventArgs { - #region Fields - Key key; bool repeat; KeyboardState state; - #endregion - - #region Constructors - /// /// Constructs a new KeyboardEventArgs instance. /// @@ -67,10 +59,6 @@ namespace OpenTK.Input Key = args.Key; } - #endregion - - #region Public Members - /// /// Gets the that generated this event. /// @@ -157,7 +145,5 @@ namespace OpenTK.Input get { return repeat; } internal set { repeat = value; } } - - #endregion } } diff --git a/src/OpenTK/Input/KeyboardState.cs b/src/OpenTK/Input/KeyboardState.cs index 2071ae95..e0b0c8ae 100644 --- a/src/OpenTK/Input/KeyboardState.cs +++ b/src/OpenTK/Input/KeyboardState.cs @@ -1,12 +1,11 @@ - #region License - // + // // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Specialized; @@ -36,8 +34,6 @@ namespace OpenTK.Input /// public struct KeyboardState : IEquatable { - #region Fields - // Allocate enough ints to store all keyboard keys const int IntSize = sizeof(int) * 8; const int NumInts = ((int)Key.LastKey + IntSize - 1) / IntSize; @@ -45,10 +41,6 @@ namespace OpenTK.Input unsafe fixed int Keys[NumInts]; bool is_connected; - #endregion - - #region Public Members - /// /// Gets a indicating whether the specified /// is pressed. @@ -233,10 +225,6 @@ namespace OpenTK.Input } } - #endregion - - #region Internal Members - internal void SetKeyState(Key key, bool down) { if (down) @@ -304,20 +292,12 @@ namespace OpenTK.Input IsConnected = value; } - #endregion - - #region Private Members - static void ValidateOffset(int offset) { if (offset < 0 || offset >= NumInts * IntSize) throw new ArgumentOutOfRangeException(); } - #endregion - - #region IEquatable Members - /// /// Compares two KeyboardState instances. /// @@ -337,7 +317,5 @@ namespace OpenTK.Input } return equal; } - - #endregion } } diff --git a/src/OpenTK/Input/Mouse.cs b/src/OpenTK/Input/Mouse.cs index 132b0590..30e67e5c 100644 --- a/src/OpenTK/Input/Mouse.cs +++ b/src/OpenTK/Input/Mouse.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; @@ -36,16 +34,10 @@ namespace OpenTK.Input /// public static class Mouse { - #region Fields - static readonly IMouseDriver2 driver = Platform.Factory.Default.CreateMouseDriver(); static readonly object SyncRoot = new object(); - #endregion - - #region Public Members - /// /// Retrieves the combined for all specified mouse devices. /// The X, Y and wheel values are defined in a hardware-specific coordinate system. @@ -119,7 +111,5 @@ namespace OpenTK.Input driver.SetPosition(x, y); } } - - #endregion } } diff --git a/src/OpenTK/Input/MouseButton.cs b/src/OpenTK/Input/MouseButton.cs index 0dca64df..a51250d2 100644 --- a/src/OpenTK/Input/MouseButton.cs +++ b/src/OpenTK/Input/MouseButton.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Input/MouseDevice.cs b/src/OpenTK/Input/MouseDevice.cs index 9b2613d4..3489e899 100644 --- a/src/OpenTK/Input/MouseDevice.cs +++ b/src/OpenTK/Input/MouseDevice.cs @@ -1,6 +1,4 @@ #define COMPAT_REV1519 // Keeps compatibility with revision 1519 - - #region License // // The Open Toolkit Library License // @@ -25,7 +23,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; @@ -43,8 +40,6 @@ namespace OpenTK.Input /// public sealed class MouseDevice : IInputDevice { - #region --- Fields --- - string description; IntPtr id; int numButtons, numWheels; @@ -55,12 +50,6 @@ namespace OpenTK.Input Point pos_last_accessed = new Point(); #endif - #endregion - - #region --- IInputDevice Members --- - - #region public string Description - /// /// Gets a string describing this MouseDevice. /// @@ -70,10 +59,6 @@ namespace OpenTK.Input internal set { description = value; } } - #endregion - - #region public InputDeviceType DeviceType - /// /// Gets a value indicating the InputDeviceType of this InputDevice. /// @@ -82,12 +67,6 @@ namespace OpenTK.Input get { return InputDeviceType.Mouse; } } - #endregion - - #endregion - - #region --- Public Members --- - /// /// Retrieves the combined hardware for all specified mouse devices. /// This method is equivalent to . @@ -122,8 +101,6 @@ namespace OpenTK.Input return Mouse.GetCursorState(); } - #region public int NumberOfButtons - /// /// Gets an integer representing the number of buttons on this MouseDevice. /// @@ -133,10 +110,6 @@ namespace OpenTK.Input internal set { numButtons = value; } } - #endregion - - #region public int NumberOfWheels - /// /// Gets an integer representing the number of wheels on this MouseDevice. /// @@ -146,10 +119,6 @@ namespace OpenTK.Input internal set { numWheels = value; } } - #endregion - - #region public IntPtr DeviceID - /// /// Gets an IntPtr representing a device dependent ID. /// @@ -159,10 +128,6 @@ namespace OpenTK.Input internal set { id = value; } } - #endregion - - #region public int Wheel - /// /// Gets the absolute wheel position in integer units. /// To support high-precision mice, it is recommended to use instead. @@ -180,10 +145,6 @@ namespace OpenTK.Input get { return state.WheelPrecise; } } - #endregion - - #region public int X - /// /// Gets an integer representing the absolute x position of the pointer, in window pixel coordinates. /// @@ -192,10 +153,6 @@ namespace OpenTK.Input get { return state.X; } } - #endregion - - #region public int Y - /// /// Gets an integer representing the absolute y position of the pointer, in window pixel coordinates. /// @@ -204,10 +161,6 @@ namespace OpenTK.Input get { return state.Y; } } - #endregion - - #region public bool this[MouseButton b] - /// /// Gets a System.Boolean indicating the state of the specified MouseButton. /// @@ -225,12 +178,6 @@ namespace OpenTK.Input } } - #endregion - - #endregion - - #region --- Internal Members --- - internal void HandleMouseDown(object sender, MouseButtonEventArgs e) { state = e.Mouse; @@ -255,10 +202,6 @@ namespace OpenTK.Input WheelChanged(this, e); } - #endregion - - #region --- Events --- - /// /// Occurs when the mouse's position is moved. /// @@ -279,8 +222,6 @@ namespace OpenTK.Input /// public event EventHandler WheelChanged = delegate { }; - #region --- Overrides --- - /// /// Calculates the hash code for this instance. /// @@ -299,9 +240,5 @@ namespace OpenTK.Input return String.Format("ID: {0} ({1}). Buttons: {2}, Wheels: {3}", DeviceID, Description, NumberOfButtons, NumberOfWheels); } - - #endregion - - #endregion } } diff --git a/src/OpenTK/Input/MouseEventArgs.cs b/src/OpenTK/Input/MouseEventArgs.cs index 9fd96810..f6b995cc 100644 --- a/src/OpenTK/Input/MouseEventArgs.cs +++ b/src/OpenTK/Input/MouseEventArgs.cs @@ -1,5 +1,4 @@ -#region License -// +// // MouseEventArgs.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; #if !MINIMAL @@ -40,20 +38,14 @@ namespace OpenTK.Input /// /// /// Do not cache instances of this type outside their event handler. - /// If necessary, you can clone an instance using the + /// If necessary, you can clone an instance using the /// constructor. /// /// public class MouseEventArgs : EventArgs { - #region Fields - MouseState state; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -83,10 +75,6 @@ namespace OpenTK.Input { } - #endregion - - #region Protected Members - internal void SetButton(MouseButton button, ButtonState state) { if (button < 0 || button > MouseButton.LastButton) @@ -114,10 +102,6 @@ namespace OpenTK.Input ButtonState.Pressed : ButtonState.Released; } - #endregion - - #region Public Members - /// /// Gets the X position of the mouse for the event. /// @@ -149,8 +133,6 @@ namespace OpenTK.Input get { return state; } internal set { state = value; } } - - #endregion } /// @@ -159,20 +141,14 @@ namespace OpenTK.Input /// /// /// Do not cache instances of this type outside their event handler. - /// If necessary, you can clone an instance using the + /// If necessary, you can clone an instance using the /// constructor. /// /// public class MouseMoveEventArgs : MouseEventArgs { - #region Fields - int x_delta, y_delta; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -201,10 +177,6 @@ namespace OpenTK.Input { } - #endregion - - #region Public Members - /// /// Gets the change in X position produced by this event. /// @@ -214,8 +186,6 @@ namespace OpenTK.Input /// Gets the change in Y position produced by this event. /// public int YDelta { get { return y_delta; } internal set { y_delta = value; } } - - #endregion } /// @@ -224,20 +194,14 @@ namespace OpenTK.Input /// /// /// Do not cache instances of this type outside their event handler. - /// If necessary, you can clone an instance using the + /// If necessary, you can clone an instance using the /// constructor. /// /// public class MouseButtonEventArgs : MouseEventArgs { - #region Fields - MouseButton button; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -266,10 +230,6 @@ namespace OpenTK.Input { } - #endregion - - #region Public Members - /// /// Gets the that triggered this event. /// @@ -283,8 +243,6 @@ namespace OpenTK.Input get { return GetButton(Button) == ButtonState.Pressed; } internal set { SetButton(Button, value ? ButtonState.Pressed : ButtonState.Released); } } - - #endregion } /// @@ -293,20 +251,14 @@ namespace OpenTK.Input /// /// /// Do not cache instances of this type outside their event handler. - /// If necessary, you can clone an instance using the + /// If necessary, you can clone an instance using the /// constructor. /// /// public class MouseWheelEventArgs : MouseEventArgs { - #region Fields - float delta; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -335,10 +287,6 @@ namespace OpenTK.Input { } - #endregion - - #region Public Members - /// /// Gets the value of the wheel in integer units. /// To support high-precision mice, it is recommended to use instead. @@ -363,8 +311,6 @@ namespace OpenTK.Input /// Gets the precise change in value of the wheel for this event in floating-point units. /// public float DeltaPrecise { get { return delta; } internal set { delta = value; } } - - #endregion } } diff --git a/src/OpenTK/Input/MouseScroll.cs b/src/OpenTK/Input/MouseScroll.cs index c9f024f8..848ddd0c 100644 --- a/src/OpenTK/Input/MouseScroll.cs +++ b/src/OpenTK/Input/MouseScroll.cs @@ -1,5 +1,4 @@ -#region License -// +// // MouseWheel.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; @@ -36,8 +34,6 @@ namespace OpenTK.Input /// public struct MouseScroll : IEquatable { - #region Public Members - /// /// Gets the absolute horizontal offset of the wheel, /// or 0 if no horizontal scroll wheel exists. @@ -98,10 +94,6 @@ namespace OpenTK.Input Equals((MouseScroll)obj); } - #endregion - - #region IEquatable Members - /// /// Determines whether the specified is equal to the current . /// @@ -112,8 +104,6 @@ namespace OpenTK.Input { return X == other.X && Y == other.Y; } - - #endregion } } diff --git a/src/OpenTK/Input/MouseState.cs b/src/OpenTK/Input/MouseState.cs index a8193401..b63fef4d 100644 --- a/src/OpenTK/Input/MouseState.cs +++ b/src/OpenTK/Input/MouseState.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; @@ -36,18 +34,12 @@ namespace OpenTK.Input /// public struct MouseState : IEquatable { - #region Fields - internal const int MaxButtons = 16; // we are storing in an ushort Vector2 position; MouseScroll scroll; ushort buttons; bool is_connected; - #endregion - - #region Public Members - /// /// Gets a indicating whether the specified /// is pressed. @@ -282,10 +274,6 @@ namespace OpenTK.Input X, Y, Scroll, b, IsConnected); } - #endregion - - #region Internal Members - internal Vector2 Position { get { return position; } @@ -324,8 +312,6 @@ namespace OpenTK.Input IsConnected = value; } - #region Internal Members - internal void SetScrollAbsolute(float x, float y) { scroll.X = x; @@ -338,22 +324,12 @@ namespace OpenTK.Input scroll.Y += y; } - #endregion - - #endregion - - #region Private Members - static void ValidateOffset(int offset) { if (offset < 0 || offset >= 16) throw new ArgumentOutOfRangeException("offset"); } - #endregion - - #region IEquatable Members - /// /// Compares two MouseState instances. /// @@ -367,7 +343,5 @@ namespace OpenTK.Input Y == other.Y && Scroll == other.Scroll; } - - #endregion } } diff --git a/src/OpenTK/IntPtrEqualityComparer.cs b/src/OpenTK/IntPtrEqualityComparer.cs index 6ddb2472..f6e48e09 100644 --- a/src/OpenTK/IntPtrEqualityComparer.cs +++ b/src/OpenTK/IntPtrEqualityComparer.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/InteropHelper.cs b/src/OpenTK/InteropHelper.cs index fb992580..55e8aeea 100644 --- a/src/OpenTK/InteropHelper.cs +++ b/src/OpenTK/InteropHelper.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 Stefanos Apostolopoulos for the Open Toolkit library // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/KeyPressEventArgs.cs b/src/OpenTK/KeyPressEventArgs.cs index 62f40d6a..1477d334 100644 --- a/src/OpenTK/KeyPressEventArgs.cs +++ b/src/OpenTK/KeyPressEventArgs.cs @@ -1,4 +1,3 @@ -// #region License // // // // The Open Toolkit Library License // // @@ -6,7 +5,7 @@ // // // // Permission is hereby granted, free of charge, to any person obtaining a copy // // of this software and associated documentation files (the "Software"), to deal -// // in the Software without restriction, including without limitation the rights to +// // in the Software without restriction, including without limitation the rights to // // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // // the Software, and to permit persons to whom the Software is furnished to do // // so, subject to the following conditions: @@ -23,7 +22,6 @@ // // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // // OTHER DEALINGS IN THE SOFTWARE. // // -// #endregion using System; @@ -36,7 +34,7 @@ namespace OpenTK public class KeyPressEventArgs : EventArgs { char key_char; - + /// /// Constructs a new instance. /// diff --git a/src/OpenTK/Math/BezierCurve.cs b/src/OpenTK/Math/BezierCurve.cs index 4e3035bd..8751272d 100644 --- a/src/OpenTK/Math/BezierCurve.cs +++ b/src/OpenTK/Math/BezierCurve.cs @@ -1,12 +1,10 @@ -#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. - * + * * Contributions by Georg W�chter. */ -#endregion using System; using System.Collections.Generic; @@ -20,8 +18,6 @@ namespace OpenTK [Serializable] public struct BezierCurve { - #region Fields - private List points; /// @@ -33,10 +29,6 @@ namespace OpenTK /// of 5.0f to the orignal curve at any point. public float Parallel; - #endregion - - #region Properties - /// /// Gets the points of this curve. /// @@ -49,10 +41,6 @@ namespace OpenTK } } - #endregion - - #region Constructors - /// /// Constructs a new . /// @@ -107,10 +95,6 @@ namespace OpenTK this.points = new List(points); } - #endregion - - #region Functions - /// /// Calculates the point with the specified t. @@ -134,8 +118,6 @@ namespace OpenTK return BezierCurve.CalculateLength(points, precision, Parallel); } - #region Static methods - /// /// Calculates the length of the specified bezier curve. /// @@ -253,9 +235,5 @@ namespace OpenTK return r; } - - #endregion - - #endregion } } diff --git a/src/OpenTK/Math/BezierCurveCubic.cs b/src/OpenTK/Math/BezierCurveCubic.cs index 149bbf7a..c1566928 100644 --- a/src/OpenTK/Math/BezierCurveCubic.cs +++ b/src/OpenTK/Math/BezierCurveCubic.cs @@ -1,12 +1,10 @@ -#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. - * + * * Contributions by Georg W�chter. */ -#endregion using System; using System.Collections.Generic; @@ -20,8 +18,6 @@ namespace OpenTK [Serializable] public struct BezierCurveCubic { - #region Fields - /// /// Start anchor point. /// @@ -51,10 +47,6 @@ namespace OpenTK /// of 5.f to the orignal curve at any point. public float Parallel; - #endregion - - #region Constructors - /// /// Constructs a new . /// @@ -88,10 +80,6 @@ namespace OpenTK this.SecondControlPoint = secondControlPoint; } - #endregion - - #region Functions - /// /// Calculates the point with the specified t. /// @@ -157,7 +145,5 @@ namespace OpenTK return length; } - - #endregion } } diff --git a/src/OpenTK/Math/BezierCurveQuadric.cs b/src/OpenTK/Math/BezierCurveQuadric.cs index 500b7fff..9f4130c4 100644 --- a/src/OpenTK/Math/BezierCurveQuadric.cs +++ b/src/OpenTK/Math/BezierCurveQuadric.cs @@ -1,12 +1,10 @@ -#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. - * + * * Contributions by Georg W�chter. */ -#endregion using System; using System.Collections.Generic; @@ -20,8 +18,6 @@ namespace OpenTK [Serializable] public struct BezierCurveQuadric { - #region Fields - /// /// Start anchor point. /// @@ -46,10 +42,6 @@ namespace OpenTK /// of 5.f to the orignal curve at any point. public float Parallel; - #endregion - - #region Constructors - /// /// Constructs a new . /// @@ -79,10 +71,6 @@ namespace OpenTK this.ControlPoint = controlPoint; } - #endregion - - #region Functions - /// /// Calculates the point with the specified t. /// @@ -145,7 +133,5 @@ namespace OpenTK return length; } - - #endregion } } diff --git a/src/OpenTK/Math/Box2.cs b/src/OpenTK/Math/Box2.cs index fdfd2ba3..16789ef3 100644 --- a/src/OpenTK/Math/Box2.cs +++ b/src/OpenTK/Math/Box2.cs @@ -1,9 +1,6 @@ -#region --- License --- -// Copyright (c) Open Toolkit library. +// Copyright (c) Open Toolkit library. // This file is subject to the terms and conditions defined in // file 'License.txt', which is part of this source code package. -#endregion - using System; using System.Runtime.InteropServices; namespace OpenTK diff --git a/src/OpenTK/Math/Box2d.cs b/src/OpenTK/Math/Box2d.cs index d2de82ff..8b32e232 100644 --- a/src/OpenTK/Math/Box2d.cs +++ b/src/OpenTK/Math/Box2d.cs @@ -1,9 +1,6 @@ -#region --- License --- -// Copyright (c) Open Toolkit library. +// Copyright (c) Open Toolkit library. // This file is subject to the terms and conditions defined in // file 'License.txt', which is part of this source code package. -#endregion - using System; using System.Runtime.InteropServices; namespace OpenTK diff --git a/src/OpenTK/Math/Half.cs b/src/OpenTK/Math/Half.cs index 06ff241c..a46878ee 100644 --- a/src/OpenTK/Math/Half.cs +++ b/src/OpenTK/Math/Half.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -40,7 +39,7 @@ in the documentation and/or other materials provided with the distribution. * Neither the name of Industrial Light & Magic nor the names of its contributors may be used to endorse or promote products derived -from this software without specific prior written permission. +from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -54,7 +53,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#endregion --- License --- using System; using System.IO; @@ -78,14 +76,8 @@ namespace OpenTK [Serializable, StructLayout(LayoutKind.Sequential)] public struct Half : ISerializable, IComparable, IFormattable, IEquatable { - #region Internal Field - UInt16 bits; - #endregion Internal Field - - #region Properties - /// Returns true if the Half is zero. public bool IsZero { get { return (bits == 0) || (bits == 0x8000); } } @@ -98,10 +90,6 @@ namespace OpenTK /// Returns true if the Half represents negative infinity. public bool IsNegativeInfinity { get { return (bits == 64512); } } - #endregion Properties - - #region Constructors - /// /// The new Half instance will convert the parameter into 16-bit half-precision floating-point. /// @@ -149,10 +137,6 @@ namespace OpenTK /// Enable checks that will throw if the conversion result is not meaningful. public Half(Double d, bool throwOnError) : this((Single)d, throwOnError) { } - #endregion Constructors - - #region Single -> Half - /// Ported from OpenEXR's IlmBase 1.0.1 private UInt16 SingleToHalf(Int32 si32) { @@ -213,7 +197,7 @@ namespace OpenTK else { // F is a NAN; we produce a half NAN that preserves the sign bit and the 10 leftmost bits of the - // significand of F, with one exception: If the 10 leftmost bits are all zero, the NAN would turn + // significand of F, with one exception: If the 10 leftmost bits are all zero, the NAN would turn // into an infinity, so we have to set at least one bit in the significand. mantissa >>= 13; @@ -243,10 +227,6 @@ namespace OpenTK } } - #endregion Single -> Half - - #region Half -> Single - /// Converts the 16-bit half to 32-bit floating-point. /// A single-precision floating-point number. public Single ToSingle() @@ -315,10 +295,6 @@ namespace OpenTK return (sign << 31) | (exponent << 23) | mantissa; } - #endregion Half -> Single - - #region Conversions - /// /// Converts a System.Single to a OpenTK.Half. /// @@ -375,10 +351,6 @@ namespace OpenTK return (double)h.ToSingle(); } - #endregion Conversions - - #region Constants - /// The size in bytes for an instance of the Half struct. public static readonly Int32 SizeInBytes = 2; @@ -394,10 +366,6 @@ namespace OpenTK /// Smallest positive e for which half (1.0 + e) != half (1.0) public static readonly Single Epsilon = 0.00097656f; - #endregion Constants - - #region ISerializable - /// Constructor used by ISerializable to deserialize the object. /// /// @@ -414,10 +382,6 @@ namespace OpenTK info.AddValue("bits", this.bits); } - #endregion ISerializable - - #region Binary dump - /// Updates the Half by reading from a Stream. /// A BinaryReader instance associated with an open Stream. public void FromBinaryStream(BinaryReader bin) @@ -433,10 +397,6 @@ namespace OpenTK bin.Write(this.bits); } - #endregion Binary dump - - #region IEquatable Members - const int maxUlps = 1; /// @@ -466,15 +426,11 @@ namespace OpenTK return false; } - #endregion - - #region IComparable Members - /// /// Compares this instance to a specified half-precision floating-point number /// and returns an integer that indicates whether the value of this instance /// is less than, equal to, or greater than the value of the specified half-precision - /// floating-point number. + /// floating-point number. /// /// A half-precision floating-point number to compare. /// @@ -492,10 +448,6 @@ namespace OpenTK return ((float)this).CompareTo((float)other); } - #endregion IComparable Members - - #region IFormattable Members - /// Converts this Half into a human-legible string representation. /// The string representation of this instance. public override string ToString() @@ -512,10 +464,6 @@ namespace OpenTK return this.ToSingle().ToString(format, formatProvider); } - #endregion IFormattable Members - - #region String -> Half - /// Converts the string representation of a number to a half-precision floating-point equivalent. /// String representation of the number to convert. /// A new Half instance. @@ -560,10 +508,6 @@ namespace OpenTK return b; } - #endregion String -> Half - - #region BitConverter - /// Returns the Half as an array of bytes. /// The Half to convert. /// The input as byte array. @@ -582,7 +526,5 @@ namespace OpenTK h.bits = BitConverter.ToUInt16(value, startIndex); return h; } - - #endregion BitConverter } } \ No newline at end of file diff --git a/src/OpenTK/Math/MathHelper.cs b/src/OpenTK/Math/MathHelper.cs index 57072e12..6542e2a6 100644 --- a/src/OpenTK/Math/MathHelper.cs +++ b/src/OpenTK/Math/MathHelper.cs @@ -1,12 +1,10 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. * * Contributions by Andy Gill, James Talton and Georg Wächter. */ -#endregion using System; using System.Collections.Generic; @@ -20,8 +18,6 @@ namespace OpenTK /// public static class MathHelper { - #region Fields - /// /// Defines the value of Pi as a . /// @@ -72,12 +68,6 @@ namespace OpenTK /// public const float Log2E = 1.442695041f; - #endregion - - #region Public Members - - #region NextPowerOfTwo - /// /// Returns the next power of two that is greater than or equal to the specified number. /// @@ -122,10 +112,6 @@ namespace OpenTK return System.Math.Pow(2, System.Math.Ceiling(System.Math.Log((double)n, 2))); } - #endregion - - #region Factorial - /// Calculates the factorial of a given natural number. /// /// The number. @@ -140,10 +126,6 @@ namespace OpenTK return result; } - #endregion - - #region BinomialCoefficient - /// /// Calculates the binomial coefficient above . /// @@ -155,10 +137,6 @@ namespace OpenTK return Factorial(n) / (Factorial(k) * Factorial(n - k)); } - #endregion - - #region InverseSqrtFast - /// /// Returns an approximation of the inverse square root of left number. /// @@ -211,10 +189,6 @@ namespace OpenTK #endif } - #endregion - - #region DegreesToRadians - /// /// Convert degrees to radians /// @@ -259,10 +233,6 @@ namespace OpenTK return radians * radToDeg; } - #endregion - - #region Swap - /// /// Swaps two double values. /// @@ -287,10 +257,6 @@ namespace OpenTK b = temp; } - #endregion - - #region Clamp - /// /// Clamps a number between a minimum and a maximum. /// @@ -468,8 +434,6 @@ namespace OpenTK return diff <= tolerance; } - #endregion - #endregion - } + } } diff --git a/src/OpenTK/Math/Matrix2.cs b/src/OpenTK/Math/Matrix2.cs index 51856069..ff4cfbf7 100644 --- a/src/OpenTK/Math/Matrix2.cs +++ b/src/OpenTK/Math/Matrix2.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix2 : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -54,10 +50,6 @@ namespace OpenTK /// public static readonly Matrix2 Zero = new Matrix2(Vector2.Zero, Vector2.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -84,12 +76,6 @@ namespace OpenTK Row1 = new Vector2(m10, m11); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets the determinant of this matrix. /// @@ -163,10 +149,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -186,12 +168,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Transpose() - /// /// Converts this instance to it's transpose. /// @@ -200,10 +176,6 @@ namespace OpenTK this = Matrix2.Transpose(this); } - #endregion - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -212,14 +184,6 @@ namespace OpenTK this = Matrix2.Invert(this); } - #endregion - - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -248,10 +212,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -329,10 +289,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -462,10 +418,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -493,10 +445,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -524,10 +472,6 @@ namespace OpenTK return result; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -561,10 +505,7 @@ namespace OpenTK Invert(ref mat, out result); return result; } - - #endregion - #region Transpose /// /// Calculate the transpose of the given matrix. @@ -591,12 +532,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -696,12 +631,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4. /// @@ -711,10 +640,6 @@ namespace OpenTK return String.Format("{0}\n{1}", Row0, Row1); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -727,10 +652,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -744,14 +665,6 @@ namespace OpenTK return this.Equals((Matrix2)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current matrix is equal to another matrix. /// An matrix to compare with this matrix. /// true if the current matrix is equal to the matrix parameter; otherwise, false. @@ -761,7 +674,5 @@ namespace OpenTK Row0 == other.Row0 && Row1 == other.Row1; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix2d.cs b/src/OpenTK/Math/Matrix2d.cs index 01fbcb2f..3fa355b3 100644 --- a/src/OpenTK/Math/Matrix2d.cs +++ b/src/OpenTK/Math/Matrix2d.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix2d : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -54,10 +50,6 @@ namespace OpenTK /// public static readonly Matrix2d Zero = new Matrix2d(Vector2d.Zero, Vector2d.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -84,12 +76,6 @@ namespace OpenTK Row1 = new Vector2d(m10, m11); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets the determinant of this matrix. /// @@ -163,10 +149,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -186,12 +168,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Transpose() - /// /// Converts this instance to it's transpose. /// @@ -200,10 +176,6 @@ namespace OpenTK this = Matrix2d.Transpose(this); } - #endregion - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -212,14 +184,6 @@ namespace OpenTK this = Matrix2d.Invert(this); } - #endregion - - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -248,10 +212,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -329,10 +289,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -462,10 +418,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -493,10 +445,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -524,10 +472,6 @@ namespace OpenTK return result; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -562,10 +506,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -591,12 +531,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -696,12 +630,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4. /// @@ -711,10 +639,6 @@ namespace OpenTK return String.Format("{0}\n{1}", Row0, Row1); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -727,10 +651,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -744,14 +664,6 @@ namespace OpenTK return this.Equals((Matrix2d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current matrix is equal to another matrix. /// An matrix to compare with this matrix. /// true if the current matrix is equal to the matrix parameter; otherwise, false. @@ -761,7 +673,5 @@ namespace OpenTK Row0 == other.Row0 && Row1 == other.Row1; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix2x3.cs b/src/OpenTK/Math/Matrix2x3.cs index 6b5f5eae..5aef28cd 100644 --- a/src/OpenTK/Math/Matrix2x3.cs +++ b/src/OpenTK/Math/Matrix2x3.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Collections.Generic; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix2x3 : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -49,10 +45,6 @@ namespace OpenTK /// public static readonly Matrix2x3 Zero = new Matrix2x3(Vector3.Zero, Vector3.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -81,12 +73,6 @@ namespace OpenTK Row1 = new Vector3(m10, m11, m12); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of this matrix. /// @@ -165,10 +151,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -188,15 +170,6 @@ namespace OpenTK } } - #endregion - - #region Instance - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -227,10 +200,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -314,10 +283,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -452,10 +417,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -485,10 +446,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -518,10 +475,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -549,12 +502,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -654,12 +601,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix2x3. /// @@ -669,10 +610,6 @@ namespace OpenTK return String.Format("{0}\n{1}", Row0, Row1); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -685,10 +622,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -702,14 +635,6 @@ namespace OpenTK return this.Equals((Matrix2x3)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -721,7 +646,5 @@ namespace OpenTK Row0 == other.Row0 && Row1 == other.Row1; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix2x3d.cs b/src/OpenTK/Math/Matrix2x3d.cs index 994c75d7..303726a3 100644 --- a/src/OpenTK/Math/Matrix2x3d.cs +++ b/src/OpenTK/Math/Matrix2x3d.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Collections.Generic; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix2x3d : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -49,10 +45,6 @@ namespace OpenTK /// public static readonly Matrix2x3d Zero = new Matrix2x3d(Vector3d.Zero, Vector3d.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -81,12 +73,6 @@ namespace OpenTK Row1 = new Vector3d(m10, m11, m12); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of this matrix. /// @@ -165,10 +151,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -188,15 +170,6 @@ namespace OpenTK } } - #endregion - - #region Instance - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -227,10 +200,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -314,10 +283,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -452,10 +417,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -485,10 +446,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -518,10 +475,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -549,12 +502,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -654,12 +601,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix2x3d. /// @@ -669,10 +610,6 @@ namespace OpenTK return String.Format("{0}\n{1}", Row0, Row1); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -685,10 +622,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -702,14 +635,6 @@ namespace OpenTK return this.Equals((Matrix2x3d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -721,7 +646,5 @@ namespace OpenTK Row0 == other.Row0 && Row1 == other.Row1; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix2x4.cs b/src/OpenTK/Math/Matrix2x4.cs index 303f95fe..4eb78954 100644 --- a/src/OpenTK/Math/Matrix2x4.cs +++ b/src/OpenTK/Math/Matrix2x4.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix2x4 : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -49,10 +45,6 @@ namespace OpenTK /// public static readonly Matrix2x4 Zero = new Matrix2x4(Vector4.Zero, Vector4.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -83,12 +75,6 @@ namespace OpenTK Row1 = new Vector4(m10, m11, m12, m13); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of the matrix. /// @@ -186,10 +172,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -209,12 +191,6 @@ namespace OpenTK } } - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -247,10 +223,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -340,10 +312,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -483,10 +451,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -518,10 +482,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -553,10 +513,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -586,12 +542,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -691,12 +641,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4. /// @@ -706,10 +650,6 @@ namespace OpenTK return String.Format("{0}\n{1}", Row0, Row1); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -722,10 +662,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -739,14 +675,6 @@ namespace OpenTK return this.Equals((Matrix2x4)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -758,7 +686,5 @@ namespace OpenTK Row0 == other.Row0 && Row1 == other.Row1; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix2x4d.cs b/src/OpenTK/Math/Matrix2x4d.cs index e01ed5a0..4834521b 100644 --- a/src/OpenTK/Math/Matrix2x4d.cs +++ b/src/OpenTK/Math/Matrix2x4d.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix2x4d : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -49,10 +45,6 @@ namespace OpenTK /// public static readonly Matrix2x4d Zero = new Matrix2x4d(Vector4d.Zero, Vector4d.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -83,12 +75,6 @@ namespace OpenTK Row1 = new Vector4d(m10, m11, m12, m13); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of the matrix. /// @@ -186,10 +172,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -209,12 +191,6 @@ namespace OpenTK } } - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -247,10 +223,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -340,10 +312,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -483,10 +451,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -518,10 +482,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -553,10 +513,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -586,12 +542,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -691,12 +641,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4. /// @@ -706,10 +650,6 @@ namespace OpenTK return String.Format("{0}\n{1}", Row0, Row1); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -722,10 +662,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -739,14 +675,6 @@ namespace OpenTK return this.Equals((Matrix2x4d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -758,7 +686,5 @@ namespace OpenTK Row0 == other.Row0 && Row1 == other.Row1; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix3.cs b/src/OpenTK/Math/Matrix3.cs index 954eb55c..81efd197 100644 --- a/src/OpenTK/Math/Matrix3.cs +++ b/src/OpenTK/Math/Matrix3.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -34,23 +32,21 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix3 : IEquatable { - #region Fields - /// /// First row of the matrix. /// public Vector3 Row0; - + /// /// Second row of the matrix. /// public Vector3 Row1; - + /// /// Third row of the matrix. /// public Vector3 Row2; - + /// /// The identity matrix. /// @@ -60,11 +56,9 @@ namespace OpenTK /// The zero matrix. /// public static readonly Matrix3 Zero = new Matrix3(Vector3.Zero, Vector3.Zero, Vector3.Zero); - - #endregion - - #region Constructors - + + + /// /// Constructs a new instance. /// @@ -77,7 +71,7 @@ namespace OpenTK Row1 = row1; Row2 = row2; } - + /// /// Constructs a new instance. /// @@ -110,13 +104,10 @@ namespace OpenTK Row1 = matrix.Row1.Xyz; Row2 = matrix.Row2.Xyz; } - - #endregion - - #region Public Members - - #region Properties - + + + + /// /// Gets the determinant of this matrix. /// @@ -127,12 +118,12 @@ namespace OpenTK float m11 = Row0.X, m12 = Row0.Y, m13 = Row0.Z, m21 = Row1.X, m22 = Row1.Y, m23 = Row1.Z, m31 = Row2.X, m32 = Row2.Y, m33 = Row2.Z; - + return m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32 - m13 * m22 * m31 - m11 * m23 * m32 - m12 * m21 * m33; } } - + /// /// Gets the first column of this matrix. /// @@ -140,7 +131,7 @@ namespace OpenTK { get { return new Vector3(Row0.X, Row1.X, Row2.X); } } - + /// /// Gets the second column of this matrix. /// @@ -148,7 +139,7 @@ namespace OpenTK { get { return new Vector3(Row0.Y, Row1.Y, Row2.Y); } } - + /// /// Gets the third column of this matrix. /// @@ -156,47 +147,47 @@ namespace OpenTK { get { return new Vector3(Row0.Z, Row1.Z, Row2.Z); } } - + /// /// Gets or sets the value at row 1, column 1 of this instance. /// public float M11 { get { return Row0.X; } set { Row0.X = value; } } - + /// /// Gets or sets the value at row 1, column 2 of this instance. /// public float M12 { get { return Row0.Y; } set { Row0.Y = value; } } - + /// /// Gets or sets the value at row 1, column 3 of this instance. /// public float M13 { get { return Row0.Z; } set { Row0.Z = value; } } - + /// /// Gets or sets the value at row 2, column 1 of this instance. /// public float M21 { get { return Row1.X; } set { Row1.X = value; } } - + /// /// Gets or sets the value at row 2, column 2 of this instance. /// public float M22 { get { return Row1.Y; } set { Row1.Y = value; } } - + /// /// Gets or sets the value at row 2, column 3 of this instance. /// public float M23 { get { return Row1.Z; } set { Row1.Z = value; } } - + /// /// Gets or sets the value at row 3, column 1 of this instance. /// public float M31 { get { return Row2.X; } set { Row2.X = value; } } - + /// /// Gets or sets the value at row 3, column 2 of this instance. /// public float M32 { get { return Row2.Y; } set { Row2.Y = value; } } - + /// /// Gets or sets the value at row 3, column 3 of this instance. /// @@ -223,10 +214,7 @@ namespace OpenTK /// Gets the trace of the matrix, the sum of the values along the diagonal. /// public float Trace { get { return Row0.X + Row1.Y + Row2.Z; } } - - #endregion - #region Indexers /// /// Gets or sets the value at a specified row and column. @@ -249,12 +237,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -262,10 +244,8 @@ namespace OpenTK { this = Matrix3.Invert(this); } - - #endregion - - #region public void Transpose() + + /// /// Converts this instance into its transpose. @@ -274,8 +254,7 @@ namespace OpenTK { this = Matrix3.Transpose(this); } - - #endregion + /// /// Returns a normalised copy of this instance. @@ -404,11 +383,7 @@ namespace OpenTK return q; } - #endregion - - #region Static - - #region CreateFromAxisAngle + /// /// Build a rotation matrix from the specified axis/angle rotation. @@ -421,12 +396,12 @@ namespace OpenTK //normalize and create a local copy of the vector. axis.Normalize(); float axisX = axis.X, axisY = axis.Y, axisZ = axis.Z; - + //calculate angles float cos = (float)System.Math.Cos(-angle); float sin = (float)System.Math.Sin(-angle); float t = 1.0f - cos; - + //do the conversion math once float tXX = t * axisX * axisX, tXY = t * axisX * axisY, @@ -434,11 +409,11 @@ namespace OpenTK tYY = t * axisY * axisY, tYZ = t * axisY * axisZ, tZZ = t * axisZ * axisZ; - + float sinX = sin * axisX, sinY = sin * axisY, sinZ = sin * axisZ; - + result.Row0.X = tXX + cos; result.Row0.Y = tXY - sinZ; result.Row0.Z = tXZ + sinY; @@ -462,10 +437,8 @@ namespace OpenTK CreateFromAxisAngle(axis, angle, out result); return result; } - - #endregion - - #region CreateFromQuaternion + + /// /// Build a rotation matrix from the specified quaternion. @@ -491,10 +464,8 @@ namespace OpenTK CreateFromQuaternion(ref q, out result); return result; } - - #endregion - - #region CreateRotation[XYZ] + + /// /// Builds a rotation matrix for a rotation around the x-axis. @@ -505,7 +476,7 @@ namespace OpenTK { float cos = (float)System.Math.Cos(angle); float sin = (float)System.Math.Sin(angle); - + result = Identity; result.Row1.Y = cos; result.Row1.Z = sin; @@ -534,7 +505,7 @@ namespace OpenTK { float cos = (float)System.Math.Cos(angle); float sin = (float)System.Math.Sin(angle); - + result = Identity; result.Row0.X = cos; result.Row0.Z = -sin; @@ -563,7 +534,7 @@ namespace OpenTK { float cos = (float)System.Math.Cos(angle); float sin = (float)System.Math.Sin(angle); - + result = Identity; result.Row0.X = cos; result.Row0.Y = sin; @@ -582,11 +553,9 @@ namespace OpenTK CreateRotationZ(angle, out result); return result; } - - #endregion - - #region CreateScale - + + + /// /// Creates a scale matrix. /// @@ -598,7 +567,7 @@ namespace OpenTK CreateScale(scale, out result); return result; } - + /// /// Creates a scale matrix. /// @@ -610,7 +579,7 @@ namespace OpenTK CreateScale(ref scale, out result); return result; } - + /// /// Creates a scale matrix. /// @@ -624,7 +593,7 @@ namespace OpenTK CreateScale(x, y, z, out result); return result; } - + /// /// Creates a scale matrix. /// @@ -637,7 +606,7 @@ namespace OpenTK result.Row1.Y = scale; result.Row2.Z = scale; } - + /// /// Creates a scale matrix. /// @@ -650,7 +619,7 @@ namespace OpenTK result.Row1.Y = scale.Y; result.Row2.Z = scale.Z; } - + /// /// Creates a scale matrix. /// @@ -665,10 +634,7 @@ namespace OpenTK result.Row1.Y = y; result.Row2.Z = z; } - - #endregion - #region Add Functions /// /// Adds two instances. @@ -696,10 +662,6 @@ namespace OpenTK Vector3.Add(ref left.Row2, ref right.Row2, out result.Row2); } - #endregion - - #region Multiply Functions - /// /// Multiplies two instances. /// @@ -727,7 +689,7 @@ namespace OpenTK rM11 = right.Row0.X, rM12 = right.Row0.Y, rM13 = right.Row0.Z, rM21 = right.Row1.X, rM22 = right.Row1.Y, rM23 = right.Row1.Z, rM31 = right.Row2.X, rM32 = right.Row2.Y, rM33 = right.Row2.Z; - + result.Row0.X = ((lM11 * rM11) + (lM12 * rM21)) + (lM13 * rM31); result.Row0.Y = ((lM11 * rM12) + (lM12 * rM22)) + (lM13 * rM32); result.Row0.Z = ((lM11 * rM13) + (lM12 * rM23)) + (lM13 * rM33); @@ -738,11 +700,9 @@ namespace OpenTK result.Row2.Y = ((lM31 * rM12) + (lM32 * rM22)) + (lM33 * rM32); result.Row2.Z = ((lM31 * rM13) + (lM32 * rM23)) + (lM33 * rM33); } - - #endregion - - #region Invert Functions - + + + /// /// Calculate the inverse of the given matrix /// @@ -754,11 +714,11 @@ namespace OpenTK int[] colIdx = { 0, 0, 0 }; int[] rowIdx = { 0, 0, 0 }; int[] pivotIdx = { -1, -1, -1 }; - + float[,] inverse = {{mat.Row0.X, mat.Row0.Y, mat.Row0.Z}, {mat.Row1.X, mat.Row1.Y, mat.Row1.Z}, {mat.Row2.X, mat.Row2.Y, mat.Row2.Z}}; - + int icol = 0; int irow = 0; for (int i = 0; i < 3; i++) @@ -788,9 +748,9 @@ namespace OpenTK } } } - + ++(pivotIdx[icol]); - + if (irow != icol) { for (int k = 0; k < 3; ++k) @@ -800,22 +760,22 @@ namespace OpenTK inverse[icol, k] = f; } } - + rowIdx[i] = irow; colIdx[i] = icol; - + float pivot = inverse[icol, icol]; - + if (pivot == 0.0f) { throw new InvalidOperationException("Matrix is singular and cannot be inverted."); } - + float oneOverPivot = 1.0f / pivot; inverse[icol, icol] = 1.0f; for (int k = 0; k < 3; ++k) inverse[icol, k] *= oneOverPivot; - + for (int j = 0; j < 3; ++j) { if (icol != j) @@ -827,7 +787,7 @@ namespace OpenTK } } } - + for (int j = 2; j >= 0; --j) { int ir = rowIdx[j]; @@ -839,7 +799,7 @@ namespace OpenTK inverse[k, ic] = f; } } - + result.Row0.X = inverse[0, 0]; result.Row0.Y = inverse[0, 1]; result.Row0.Z = inverse[0, 2]; @@ -850,7 +810,7 @@ namespace OpenTK result.Row2.Y = inverse[2, 1]; result.Row2.Z = inverse[2, 2]; } - + /// /// Calculate the inverse of the given matrix /// @@ -863,10 +823,8 @@ namespace OpenTK Invert(ref mat, out result); return result; } - - #endregion - - #region Transpose + + /// /// Calculate the transpose of the given matrix @@ -895,12 +853,9 @@ namespace OpenTK result.Row2.Y = mat.Row1.Z; result.Row2.Z = mat.Row2.Z; } - - #endregion - - #endregion - - #region Operators + + + /// /// Matrix multiplication @@ -934,13 +889,10 @@ namespace OpenTK { return !left.Equals(right); } - - #endregion - - #region Overrides - - #region public override string ToString() - + + + + /// /// Returns a System.String that represents the current Matrix3d. /// @@ -949,11 +901,9 @@ namespace OpenTK { return String.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - - #endregion - - #region public override int GetHashCode() - + + + /// /// Returns the hashcode for this instance. /// @@ -968,11 +918,9 @@ namespace OpenTK return hashCode; } } - - #endregion - - #region public override bool Equals(object obj) - + + + /// /// Indicates whether this instance and a specified object are equal. /// @@ -982,17 +930,13 @@ namespace OpenTK { if (!(obj is Matrix3)) return false; - + return this.Equals((Matrix3)obj); } - - #endregion - - #endregion - - #endregion - - #region IEquatable Members + + + + /// Indicates whether the current matrix is equal to another matrix. /// A matrix to compare with this matrix. @@ -1004,7 +948,6 @@ namespace OpenTK Row1 == other.Row1 && Row2 == other.Row2; } - - #endregion + } } \ No newline at end of file diff --git a/src/OpenTK/Math/Matrix3d.cs b/src/OpenTK/Math/Matrix3d.cs index 5c3c1da4..f805a70e 100644 --- a/src/OpenTK/Math/Matrix3d.cs +++ b/src/OpenTK/Math/Matrix3d.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -34,32 +32,28 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix3d : IEquatable { - #region Fields - /// /// First row of the matrix. /// public Vector3d Row0; - + /// /// Second row of the matrix. /// public Vector3d Row1; - + /// /// Third row of the matrix. /// public Vector3d Row2; - + /// /// The identity matrix. /// public static Matrix3d Identity = new Matrix3d(Vector3d.UnitX, Vector3d.UnitY, Vector3d.UnitZ); - - #endregion - - #region Constructors - + + + /// /// Constructs a new instance. /// @@ -72,7 +66,7 @@ namespace OpenTK Row1 = row1; Row2 = row2; } - + /// /// Constructs a new instance. /// @@ -106,12 +100,8 @@ namespace OpenTK Row2 = matrix.Row2.Xyz; } - #endregion - - #region Public Members - - #region Properties - + + /// /// Gets the determinant of this matrix. /// @@ -122,13 +112,13 @@ namespace OpenTK double m11 = Row0.X, m12 = Row0.Y, m13 = Row0.Z, m21 = Row1.X, m22 = Row1.Y, m23 = Row1.Z, m31 = Row2.X, m32 = Row2.Y, m33 = Row2.Z; - + return m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32 - m13 * m22 * m31 - m11 * m23 * m32 - m12 * m21 * m33; } } - + /// /// Gets the first column of this matrix. /// @@ -136,7 +126,7 @@ namespace OpenTK { get { return new Vector3d(Row0.X, Row1.X, Row2.X); } } - + /// /// Gets the second column of this matrix. /// @@ -144,7 +134,7 @@ namespace OpenTK { get { return new Vector3d(Row0.Y, Row1.Y, Row2.Y); } } - + /// /// Gets the third column of this matrix. /// @@ -152,47 +142,47 @@ namespace OpenTK { get { return new Vector3d(Row0.Z, Row1.Z, Row2.Z); } } - + /// /// Gets or sets the value at row 1, column 1 of this instance. /// public double M11 { get { return Row0.X; } set { Row0.X = value; } } - + /// /// Gets or sets the value at row 1, column 2 of this instance. /// public double M12 { get { return Row0.Y; } set { Row0.Y = value; } } - + /// /// Gets or sets the value at row 1, column 3 of this instance. /// public double M13 { get { return Row0.Z; } set { Row0.Z = value; } } - + /// /// Gets or sets the value at row 2, column 1 of this instance. /// public double M21 { get { return Row1.X; } set { Row1.X = value; } } - + /// /// Gets or sets the value at row 2, column 2 of this instance. /// public double M22 { get { return Row1.Y; } set { Row1.Y = value; } } - + /// /// Gets or sets the value at row 2, column 3 of this instance. /// public double M23 { get { return Row1.Z; } set { Row1.Z = value; } } - + /// /// Gets or sets the value at row 3, column 1 of this instance. /// public double M31 { get { return Row2.X; } set { Row2.X = value; } } - + /// /// Gets or sets the value at row 3, column 2 of this instance. /// public double M32 { get { return Row2.Y; } set { Row2.Y = value; } } - + /// /// Gets or sets the value at row 3, column 3 of this instance. /// @@ -220,10 +210,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y + Row2.Z; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -245,12 +231,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -258,10 +238,8 @@ namespace OpenTK { this = Matrix3d.Invert(this); } - - #endregion - - #region public void Transpose() + + /// /// Converts this instance into its transpose. @@ -270,8 +248,7 @@ namespace OpenTK { this = Matrix3d.Transpose(this); } - - #endregion + /// /// Returns a normalised copy of this instance. @@ -401,11 +378,7 @@ namespace OpenTK return q; } - #endregion - - #region Static - - #region CreateFromAxisAngle + /// /// Build a rotation matrix from the specified axis/angle rotation. @@ -418,12 +391,12 @@ namespace OpenTK //normalize and create a local copy of the vector. axis.Normalize(); double axisX = axis.X, axisY = axis.Y, axisZ = axis.Z; - + //calculate angles double cos = System.Math.Cos(-angle); double sin = System.Math.Sin(-angle); double t = 1.0f - cos; - + //do the conversion math once double tXX = t * axisX * axisX, tXY = t * axisX * axisY, @@ -431,11 +404,11 @@ namespace OpenTK tYY = t * axisY * axisY, tYZ = t * axisY * axisZ, tZZ = t * axisZ * axisZ; - + double sinX = sin * axisX, sinY = sin * axisY, sinZ = sin * axisZ; - + result.Row0.X = tXX + cos; result.Row0.Y = tXY - sinZ; result.Row0.Z = tXZ + sinY; @@ -459,10 +432,8 @@ namespace OpenTK CreateFromAxisAngle(axis, angle, out result); return result; } - - #endregion - - #region CreateFromQuaternion + + /// /// Build a rotation matrix from the specified quaternion. @@ -488,10 +459,8 @@ namespace OpenTK CreateFromQuaternion(ref q, out result); return result; } - - #endregion - - #region CreateRotation[XYZ] + + /// /// Builds a rotation matrix for a rotation around the x-axis. @@ -502,7 +471,7 @@ namespace OpenTK { double cos = System.Math.Cos(angle); double sin = System.Math.Sin(angle); - + result = Identity; result.Row1.Y = cos; result.Row1.Z = sin; @@ -531,7 +500,7 @@ namespace OpenTK { double cos = System.Math.Cos(angle); double sin = System.Math.Sin(angle); - + result = Identity; result.Row0.X = cos; result.Row0.Z = -sin; @@ -560,7 +529,7 @@ namespace OpenTK { double cos = System.Math.Cos(angle); double sin = System.Math.Sin(angle); - + result = Identity; result.Row0.X = cos; result.Row0.Y = sin; @@ -579,11 +548,9 @@ namespace OpenTK CreateRotationZ(angle, out result); return result; } - - #endregion - - #region CreateScale - + + + /// /// Creates a scale matrix. /// @@ -595,7 +562,7 @@ namespace OpenTK CreateScale(scale, out result); return result; } - + /// /// Creates a scale matrix. /// @@ -607,7 +574,7 @@ namespace OpenTK CreateScale(ref scale, out result); return result; } - + /// /// Creates a scale matrix. /// @@ -621,7 +588,7 @@ namespace OpenTK CreateScale(x, y, z, out result); return result; } - + /// /// Creates a scale matrix. /// @@ -634,7 +601,7 @@ namespace OpenTK result.Row1.Y = scale; result.Row2.Z = scale; } - + /// /// Creates a scale matrix. /// @@ -647,7 +614,7 @@ namespace OpenTK result.Row1.Y = scale.Y; result.Row2.Z = scale.Z; } - + /// /// Creates a scale matrix. /// @@ -662,10 +629,7 @@ namespace OpenTK result.Row1.Y = y; result.Row2.Z = z; } - - #endregion - #region Add Functions /// /// Adds two instances. @@ -693,10 +657,6 @@ namespace OpenTK Vector3d.Add(ref left.Row2, ref right.Row2, out result.Row2); } - #endregion - - #region Multiply Functions - /// /// Multiplies two instances. /// @@ -724,7 +684,7 @@ namespace OpenTK rM11 = right.Row0.X, rM12 = right.Row0.Y, rM13 = right.Row0.Z, rM21 = right.Row1.X, rM22 = right.Row1.Y, rM23 = right.Row1.Z, rM31 = right.Row2.X, rM32 = right.Row2.Y, rM33 = right.Row2.Z; - + result.Row0.X = ((lM11 * rM11) + (lM12 * rM21)) + (lM13 * rM31); result.Row0.Y = ((lM11 * rM12) + (lM12 * rM22)) + (lM13 * rM32); result.Row0.Z = ((lM11 * rM13) + (lM12 * rM23)) + (lM13 * rM33); @@ -735,11 +695,9 @@ namespace OpenTK result.Row2.Y = ((lM31 * rM12) + (lM32 * rM22)) + (lM33 * rM32); result.Row2.Z = ((lM31 * rM13) + (lM32 * rM23)) + (lM33 * rM33); } - - #endregion - - #region Invert Functions - + + + /// /// Calculate the inverse of the given matrix /// @@ -751,11 +709,11 @@ namespace OpenTK int[] colIdx = { 0, 0, 0 }; int[] rowIdx = { 0, 0, 0 }; int[] pivotIdx = { -1, -1, -1 }; - + double[,] inverse = {{mat.Row0.X, mat.Row0.Y, mat.Row0.Z}, {mat.Row1.X, mat.Row1.Y, mat.Row1.Z}, {mat.Row2.X, mat.Row2.Y, mat.Row2.Z}}; - + int icol = 0; int irow = 0; for (int i = 0; i < 3; i++) @@ -785,9 +743,9 @@ namespace OpenTK } } } - + ++(pivotIdx[icol]); - + if (irow != icol) { for (int k = 0; k < 3; ++k) @@ -797,22 +755,22 @@ namespace OpenTK inverse[icol, k] = f; } } - + rowIdx[i] = irow; colIdx[i] = icol; - + double pivot = inverse[icol, icol]; - + if (pivot == 0.0) { throw new InvalidOperationException("Matrix is singular and cannot be inverted."); } - + double oneOverPivot = 1.0 / pivot; inverse[icol, icol] = 1.0; for (int k = 0; k < 3; ++k) inverse[icol, k] *= oneOverPivot; - + for (int j = 0; j < 3; ++j) { if (icol != j) @@ -824,7 +782,7 @@ namespace OpenTK } } } - + for (int j = 2; j >= 0; --j) { int ir = rowIdx[j]; @@ -836,7 +794,7 @@ namespace OpenTK inverse[k, ic] = f; } } - + result.Row0.X = inverse[0, 0]; result.Row0.Y = inverse[0, 1]; result.Row0.Z = inverse[0, 2]; @@ -847,7 +805,7 @@ namespace OpenTK result.Row2.Y = inverse[2, 1]; result.Row2.Z = inverse[2, 2]; } - + /// /// Calculate the inverse of the given matrix /// @@ -860,10 +818,8 @@ namespace OpenTK Invert(ref mat, out result); return result; } - - #endregion - - #region Transpose + + /// /// Calculate the transpose of the given matrix @@ -886,12 +842,9 @@ namespace OpenTK result.Row1 = mat.Column1; result.Row2 = mat.Column2; } - - #endregion - - #endregion - - #region Operators + + + /// /// Matrix multiplication @@ -925,13 +878,10 @@ namespace OpenTK { return !left.Equals(right); } - - #endregion - - #region Overrides - - #region public override string ToString() - + + + + /// /// Returns a System.String that represents the current Matrix3d. /// @@ -940,11 +890,9 @@ namespace OpenTK { return String.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - - #endregion - - #region public override int GetHashCode() - + + + /// /// Returns the hashcode for this instance. /// @@ -959,11 +907,9 @@ namespace OpenTK return hashCode; } } - - #endregion - - #region public override bool Equals(object obj) - + + + /// /// Indicates whether this instance and a specified object are equal. /// @@ -973,17 +919,13 @@ namespace OpenTK { if (!(obj is Matrix3d)) return false; - + return this.Equals((Matrix3d)obj); } - - #endregion - - #endregion - - #endregion - - #region IEquatable Members + + + + /// Indicates whether the current matrix is equal to another matrix. /// A matrix to compare with this matrix. @@ -995,7 +937,6 @@ namespace OpenTK Row1 == other.Row1 && Row2 == other.Row2; } - - #endregion + } } diff --git a/src/OpenTK/Math/Matrix3x2.cs b/src/OpenTK/Math/Matrix3x2.cs index dd7b7aad..2978d71c 100644 --- a/src/OpenTK/Math/Matrix3x2.cs +++ b/src/OpenTK/Math/Matrix3x2.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix3x2 : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -54,10 +50,6 @@ namespace OpenTK /// public static readonly Matrix3x2 Zero = new Matrix3x2(Vector2.Zero, Vector2.Zero, Vector2.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -90,12 +82,6 @@ namespace OpenTK Row2 = new Vector2(m20, m21); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of this matrix. /// @@ -165,10 +151,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -190,15 +172,6 @@ namespace OpenTK } } - #endregion - - #region Instance - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -229,10 +202,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -316,10 +285,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -463,10 +428,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -496,10 +457,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -529,10 +486,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -560,12 +513,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -665,12 +612,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix3d. /// @@ -680,10 +621,6 @@ namespace OpenTK return String.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -699,10 +636,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -716,14 +649,6 @@ namespace OpenTK return this.Equals((Matrix3x2)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -736,7 +661,5 @@ namespace OpenTK Row1 == other.Row1 && Row2 == other.Row2; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix3x2d.cs b/src/OpenTK/Math/Matrix3x2d.cs index d977471a..94c9486b 100644 --- a/src/OpenTK/Math/Matrix3x2d.cs +++ b/src/OpenTK/Math/Matrix3x2d.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix3x2d : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -54,10 +50,6 @@ namespace OpenTK /// public static readonly Matrix3x2d Zero = new Matrix3x2d(Vector2d.Zero, Vector2d.Zero, Vector2d.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -90,12 +82,6 @@ namespace OpenTK Row2 = new Vector2d(m20, m21); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of this matrix. /// @@ -165,10 +151,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -190,15 +172,6 @@ namespace OpenTK } } - #endregion - - #region Instance - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -229,10 +202,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -316,10 +285,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -463,10 +428,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -496,10 +457,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -529,10 +486,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -560,12 +513,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -665,12 +612,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix3d. /// @@ -680,10 +621,6 @@ namespace OpenTK return String.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -699,10 +636,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -716,14 +649,6 @@ namespace OpenTK return this.Equals((Matrix3x2d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -736,7 +661,5 @@ namespace OpenTK Row1 == other.Row1 && Row2 == other.Row2; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix3x4.cs b/src/OpenTK/Math/Matrix3x4.cs index d9c843c8..38f1d930 100644 --- a/src/OpenTK/Math/Matrix3x4.cs +++ b/src/OpenTK/Math/Matrix3x4.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -34,8 +32,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix3x4 : IEquatable { - #region Fields - /// /// Top row of the matrix /// @@ -56,10 +52,6 @@ namespace OpenTK /// public static Matrix3x4 Zero = new Matrix3x4(Vector4.Zero, Vector4.Zero, Vector4.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -98,12 +90,6 @@ namespace OpenTK Row2 = new Vector4(m20, m21, m22, m23); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets the first column of this matrix. /// @@ -218,10 +204,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y + Row2.Z; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -243,12 +225,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -257,14 +233,6 @@ namespace OpenTK this = Matrix3x4.Invert(this); } - #endregion - - #endregion - - #region Static - - #region CreateFromAxisAngle - /// /// Build a rotation matrix from the specified axis/angle rotation. /// @@ -318,10 +286,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateFromQuaternion - /// /// Builds a rotation matrix from a quaternion. /// @@ -366,10 +330,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateRotation[XYZ] - /// /// Builds a rotation matrix for a rotation around the x-axis. /// @@ -478,10 +438,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateTranslation - /// /// Creates a translation matrix. /// @@ -552,10 +508,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Build a scaling matrix /// @@ -601,10 +553,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies two instances. /// @@ -722,10 +670,6 @@ namespace OpenTK result.Row2 = left.Row2 * right; } - #endregion - - #region Add Functions - /// /// Adds two instances. /// @@ -752,10 +696,6 @@ namespace OpenTK result.Row2 = left.Row2 + right.Row2; } - #endregion - - #region Subtract Functions - /// /// Subtracts one instance from another. /// @@ -782,10 +722,6 @@ namespace OpenTK result.Row2 = left.Row2 - right.Row2; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -819,10 +755,6 @@ namespace OpenTK result.Row2 = new Vector4(inverseRotation.Row2, -Vector3.Dot(inverseRotation.Row2, translation)); } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix /// @@ -846,12 +778,6 @@ namespace OpenTK result.Row3 = mat.Column3; } - #endregion - - #endregion - - #region Operators - /// /// Matrix multiplication /// @@ -929,12 +855,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4. /// @@ -944,10 +864,6 @@ namespace OpenTK return string.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -963,10 +879,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -980,14 +892,6 @@ namespace OpenTK return this.Equals((Matrix3x4)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -1000,7 +904,5 @@ namespace OpenTK Row1 == other.Row1 && Row2 == other.Row2; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix3x4d.cs b/src/OpenTK/Math/Matrix3x4d.cs index 44beb2c3..f38d0c9c 100644 --- a/src/OpenTK/Math/Matrix3x4d.cs +++ b/src/OpenTK/Math/Matrix3x4d.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -34,8 +32,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix3x4d : IEquatable { - #region Fields - /// /// Top row of the matrix /// @@ -56,10 +52,6 @@ namespace OpenTK /// public static Matrix3x4d Zero = new Matrix3x4d(Vector4d.Zero, Vector4d.Zero, Vector4d.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -98,12 +90,6 @@ namespace OpenTK Row2 = new Vector4d(m20, m21, m22, m23); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets the first column of this matrix. /// @@ -218,10 +204,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y + Row2.Z; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -243,12 +225,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -257,14 +233,6 @@ namespace OpenTK this = Matrix3x4d.Invert(this); } - #endregion - - #endregion - - #region Static - - #region CreateFromAxisAngle - /// /// Build a rotation matrix from the specified axis/angle rotation. /// @@ -318,10 +286,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateFromQuaternion - /// /// Builds a rotation matrix from a quaternion. /// @@ -366,10 +330,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateRotation[XYZ] - /// /// Builds a rotation matrix for a rotation around the x-axis. /// @@ -478,10 +438,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateTranslation - /// /// Creates a translation matrix. /// @@ -552,10 +508,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Build a scaling matrix /// @@ -601,10 +553,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies two instances. /// @@ -722,10 +670,6 @@ namespace OpenTK result.Row2 = left.Row2 * right; } - #endregion - - #region Add Functions - /// /// Adds two instances. /// @@ -752,10 +696,6 @@ namespace OpenTK result.Row2 = left.Row2 + right.Row2; } - #endregion - - #region Subtract Functions - /// /// Subtracts one instance from another. /// @@ -782,10 +722,6 @@ namespace OpenTK result.Row2 = left.Row2 - right.Row2; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -819,10 +755,6 @@ namespace OpenTK result.Row2 = new Vector4d(inverseRotation.Row2, -Vector3d.Dot(inverseRotation.Row2, translation)); } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix /// @@ -846,12 +778,6 @@ namespace OpenTK result.Row3 = mat.Column3; } - #endregion - - #endregion - - #region Operators - /// /// Matrix multiplication /// @@ -929,12 +855,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4. /// @@ -944,10 +864,6 @@ namespace OpenTK return string.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -963,10 +879,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -980,14 +892,6 @@ namespace OpenTK return this.Equals((Matrix3x4d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -1000,7 +904,5 @@ namespace OpenTK Row1 == other.Row1 && Row2 == other.Row2; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix4.cs b/src/OpenTK/Math/Matrix4.cs index e70dc089..d704bfb4 100644 --- a/src/OpenTK/Math/Matrix4.cs +++ b/src/OpenTK/Math/Matrix4.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -35,8 +33,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix4 : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -67,10 +63,6 @@ namespace OpenTK /// public static readonly Matrix4 Zero = new Matrix4(Vector4.Zero, Vector4.Zero, Vector4.Zero, Vector4.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -141,12 +133,6 @@ namespace OpenTK Row3.W = 1; } - #endregion - - #region Public Members - - #region Properties - /// /// Gets the determinant of this matrix. /// @@ -308,10 +294,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y + Row2.Z + Row3.W; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -335,12 +317,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -349,10 +325,6 @@ namespace OpenTK this = Matrix4.Invert(this); } - #endregion - - #region public void Transpose() - /// /// Converts this instance into its transpose. /// @@ -361,8 +333,6 @@ namespace OpenTK this = Matrix4.Transpose(this); } - #endregion - /// /// Returns a normalised copy of this instance. /// @@ -522,12 +492,6 @@ namespace OpenTK return Column3; } - #endregion - - #region Static - - #region CreateFromAxisAngle - /// /// Build a rotation matrix from the specified axis/angle rotation. /// @@ -585,10 +549,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateFromQuaternion - /// /// Builds a rotation matrix from a quaternion. /// @@ -614,10 +574,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateRotation[XYZ] - /// /// Builds a rotation matrix for a rotation around the x-axis. /// @@ -705,10 +661,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateTranslation - /// /// Creates a translation matrix. /// @@ -763,10 +715,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -846,10 +794,6 @@ namespace OpenTK result.Row2.Z = z; } - #endregion - - #region CreateOrthographic - /// /// Creates an orthographic projection matrix. /// @@ -878,10 +822,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateOrthographicOffCenter - /// /// Creates an orthographic projection matrix. /// @@ -926,10 +866,6 @@ namespace OpenTK return result; } - #endregion - - #region CreatePerspectiveFieldOfView - /// /// Creates a perspective projection matrix. /// @@ -992,10 +928,6 @@ namespace OpenTK return result; } - #endregion - - #region CreatePerspectiveOffCenter - /// /// Creates an perspective projection matrix. /// @@ -1073,10 +1005,6 @@ namespace OpenTK return result; } - #endregion - - #region Camera Helper Functions - /// /// Build a world space to camera space matrix /// @@ -1130,10 +1058,6 @@ namespace OpenTK return LookAt(new Vector3(eyeX, eyeY, eyeZ), new Vector3(targetX, targetY, targetZ), new Vector3(upX, upY, upZ)); } - #endregion - - #region Add Functions - /// /// Adds two instances. /// @@ -1161,10 +1085,6 @@ namespace OpenTK result.Row3 = left.Row3 + right.Row3; } - #endregion - - #region Subtract Functions - /// /// Subtracts one instance from another. /// @@ -1192,10 +1112,6 @@ namespace OpenTK result.Row3 = left.Row3 - right.Row3; } - #endregion - - #region Multiply Functions - /// /// Multiplies two instances. /// @@ -1271,10 +1187,6 @@ namespace OpenTK result.Row3 = left.Row3 * right; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -1409,10 +1321,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix /// @@ -1437,12 +1345,6 @@ namespace OpenTK result.Row3 = mat.Column3; } - #endregion - - #endregion - - #region Operators - /// /// Matrix multiplication /// @@ -1509,12 +1411,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4. /// @@ -1524,10 +1420,6 @@ namespace OpenTK return String.Format("{0}\n{1}\n{2}\n{3}", Row0, Row1, Row2, Row3); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -1544,10 +1436,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -1561,14 +1449,6 @@ namespace OpenTK return this.Equals((Matrix4)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current matrix is equal to another matrix. /// An matrix to compare with this matrix. /// true if the current matrix is equal to the matrix parameter; otherwise, false. @@ -1580,7 +1460,5 @@ namespace OpenTK Row2 == other.Row2 && Row3 == other.Row3; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix4d.cs b/src/OpenTK/Math/Matrix4d.cs index 6db03283..60fb1aa3 100644 --- a/src/OpenTK/Math/Matrix4d.cs +++ b/src/OpenTK/Math/Matrix4d.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -35,8 +33,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix4d : IEquatable { - #region Fields - /// /// Top row of the matrix /// @@ -59,10 +55,6 @@ namespace OpenTK /// public static Matrix4d Identity = new Matrix4d(Vector4d .UnitX, Vector4d .UnitY, Vector4d .UnitZ, Vector4d .UnitW); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -133,12 +125,6 @@ namespace OpenTK Row3.W = 1; } - #endregion - - #region Public Members - - #region Properties - /// /// The determinant of this matrix /// @@ -295,10 +281,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y + Row2.Z + Row3.W; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -322,12 +304,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -336,10 +312,6 @@ namespace OpenTK this = Matrix4d.Invert(this); } - #endregion - - #region public void Transpose() - /// /// Converts this instance into its transpose. /// @@ -348,8 +320,6 @@ namespace OpenTK this = Matrix4d.Transpose(this); } - #endregion - /// /// Returns a normalised copy of this instance. /// @@ -510,12 +480,6 @@ namespace OpenTK } - #endregion - - #region Static - - #region CreateFromAxisAngle - /// /// Build a rotation matrix from the specified axis/angle rotation. /// @@ -573,10 +537,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateRotation[XYZ] - /// /// Builds a rotation matrix for a rotation around the x-axis. /// @@ -661,10 +621,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateTranslation - /// /// Creates a translation matrix. /// @@ -715,10 +671,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateOrthographic - /// /// Creates an orthographic projection matrix. /// @@ -747,10 +699,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateOrthographicOffCenter - /// /// Creates an orthographic projection matrix. /// @@ -796,10 +744,6 @@ namespace OpenTK return result; } - #endregion - - #region CreatePerspectiveFieldOfView - /// /// Creates a perspective projection matrix. /// @@ -862,10 +806,6 @@ namespace OpenTK return result; } - #endregion - - #region CreatePerspectiveOffCenter - /// /// Creates an perspective projection matrix. /// @@ -930,10 +870,6 @@ namespace OpenTK CreatePerspectiveOffCenter(left, right, bottom, top, zNear, zFar, out result); return result; } - - #endregion - - #region CreateFromQuaternion /// /// Build a rotation matrix from the specified quaternion. /// @@ -959,10 +895,6 @@ namespace OpenTK return result; } - #endregion - - #region Scale Functions - /// /// Build a scaling matrix /// @@ -1000,10 +932,6 @@ namespace OpenTK return result; } - #endregion - - #region Rotation Functions - /// /// Build a rotation matrix that rotates about the x-axis /// @@ -1093,10 +1021,6 @@ namespace OpenTK return Rotate(axis, angle); } - #endregion - - #region Camera Helper Functions - /// /// Build a world space to camera space matrix /// @@ -1177,10 +1101,6 @@ namespace OpenTK return Frustum(xMin, xMax, yMin, yMax, near, far); } - #endregion - - #region Add Functions - /// /// Adds two instances. /// @@ -1208,10 +1128,6 @@ namespace OpenTK result.Row3 = left.Row3 + right.Row3; } - #endregion - - #region Subtract Functions - /// /// Subtracts one instance from another. /// @@ -1239,10 +1155,6 @@ namespace OpenTK result.Row3 = left.Row3 - right.Row3; } - #endregion - - #region Multiply Functions - /// /// Multiplies two instances. /// @@ -1318,10 +1230,6 @@ namespace OpenTK result.Row3 = left.Row3 * right; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -1432,10 +1340,6 @@ namespace OpenTK return mat; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix /// @@ -1460,12 +1364,6 @@ namespace OpenTK result.Row3 = mat.Column3; } - #endregion - - #endregion - - #region Operators - /// /// Matrix multiplication /// @@ -1532,12 +1430,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix44. /// @@ -1547,10 +1439,6 @@ namespace OpenTK return String.Format("{0}\n{1}\n{2}\n{3}", Row0, Row1, Row2, Row3); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -1567,10 +1455,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -1584,14 +1468,6 @@ namespace OpenTK return this.Equals((Matrix4d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current matrix is equal to another matrix. /// A matrix to compare with this matrix. /// true if the current matrix is equal to the matrix parameter; otherwise, false. @@ -1603,7 +1479,5 @@ namespace OpenTK Row2 == other.Row2 && Row3 == other.Row3; } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Math/Matrix4x2.cs b/src/OpenTK/Math/Matrix4x2.cs index bd618803..1ed66a22 100644 --- a/src/OpenTK/Math/Matrix4x2.cs +++ b/src/OpenTK/Math/Matrix4x2.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix4x2 : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -59,10 +55,6 @@ namespace OpenTK /// public static readonly Matrix4x2 Zero = new Matrix4x2(Vector2.Zero, Vector2.Zero, Vector2.Zero, Vector2.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -102,12 +94,6 @@ namespace OpenTK Row3 = new Vector2(m30, m31); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of this matrix. /// @@ -187,10 +173,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -214,12 +196,6 @@ namespace OpenTK } } - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -252,10 +228,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -345,10 +317,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -506,10 +474,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -541,10 +505,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -576,10 +536,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -609,12 +565,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -714,12 +664,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix3d. /// @@ -729,10 +673,6 @@ namespace OpenTK return String.Format("{0}\n{1}\n{2}\n{3}", Row0, Row1, Row2, Row3); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -749,10 +689,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -766,14 +702,6 @@ namespace OpenTK return this.Equals((Matrix4x2)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -787,7 +715,5 @@ namespace OpenTK Row2 == other.Row2 && Row3 == other.Row3; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix4x2d.cs b/src/OpenTK/Math/Matrix4x2d.cs index 638294b4..0f4b85c9 100644 --- a/src/OpenTK/Math/Matrix4x2d.cs +++ b/src/OpenTK/Math/Matrix4x2d.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -32,8 +30,6 @@ namespace OpenTK /// public struct Matrix4x2d : IEquatable { - #region Fields - /// /// Top row of the matrix. /// @@ -59,10 +55,6 @@ namespace OpenTK /// public static readonly Matrix4x2d Zero = new Matrix4x2d(Vector2d.Zero, Vector2d.Zero, Vector2d.Zero, Vector2d.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -102,12 +94,6 @@ namespace OpenTK Row3 = new Vector2d(m30, m31); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the first column of this matrix. /// @@ -187,10 +173,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -214,12 +196,6 @@ namespace OpenTK } } - #endregion - - #region Static - - #region CreateRotation - /// /// Builds a rotation matrix. /// @@ -252,10 +228,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Creates a scale matrix. /// @@ -345,10 +317,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// Multiplies and instance by a scalar. /// @@ -506,10 +474,6 @@ namespace OpenTK return result; } - #endregion - - #region Add - /// /// Adds two instances. /// @@ -541,10 +505,6 @@ namespace OpenTK return result; } - #endregion - - #region Subtract - /// /// Subtracts two instances. /// @@ -576,10 +536,6 @@ namespace OpenTK return result; } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix. /// @@ -609,12 +565,6 @@ namespace OpenTK return result; } - #endregion - - #endregion - - #region Operators - /// /// Scalar multiplication. /// @@ -714,12 +664,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix3d. /// @@ -729,10 +673,6 @@ namespace OpenTK return String.Format("{0}\n{1}\n{2}\n{3}", Row0, Row1, Row2, Row3); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -749,10 +689,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -766,14 +702,6 @@ namespace OpenTK return this.Equals((Matrix4x2d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Indicates whether the current matrix is equal to another matrix. /// @@ -787,7 +715,5 @@ namespace OpenTK Row2 == other.Row2 && Row3 == other.Row3; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix4x3.cs b/src/OpenTK/Math/Matrix4x3.cs index 792cedaa..9ec6e369 100644 --- a/src/OpenTK/Math/Matrix4x3.cs +++ b/src/OpenTK/Math/Matrix4x3.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -34,8 +32,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix4x3 : IEquatable { - #region Fields - /// /// Top row of the matrix /// @@ -61,10 +57,6 @@ namespace OpenTK /// public static readonly Matrix4x3 Zero = new Matrix4x3(Vector3.Zero, Vector3.Zero, Vector3.Zero, Vector3.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -107,12 +99,6 @@ namespace OpenTK Row3 = new Vector3(m30, m31, m32); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets the first column of this matrix. /// @@ -219,10 +205,6 @@ namespace OpenTK /// public float Trace { get { return Row0.X + Row1.Y + Row2.Z; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -246,12 +228,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into it's inverse by inverting the upper-left 3x3 and replacing Row3. /// @@ -260,14 +236,6 @@ namespace OpenTK this = Matrix4x3.Invert(this); } - #endregion - - #endregion - - #region Static - - #region CreateFromAxisAngle - /// /// Build a rotation matrix from the specified axis/angle rotation. /// @@ -321,10 +289,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateFromQuaternion - /// /// Builds a rotation matrix from a quaternion. /// @@ -369,10 +333,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateRotation[XYZ] - /// /// Builds a rotation matrix for a rotation around the x-axis. /// @@ -481,10 +441,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateTranslation - /// /// Creates a translation matrix. /// @@ -555,10 +511,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Build a scaling matrix /// @@ -604,10 +556,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// This isn't quite a multiply, but the result may be useful in some situations. /// Multiplies two instances. @@ -729,10 +677,6 @@ namespace OpenTK result.Row3 = left.Row3 * right; } - #endregion - - #region Add Functions - /// /// Adds two instances. /// @@ -760,10 +704,6 @@ namespace OpenTK result.Row3 = left.Row3 + right.Row3; } - #endregion - - #region Subtract Functions - /// /// Subtracts one instance from another. /// @@ -791,10 +731,6 @@ namespace OpenTK result.Row3 = left.Row3 - right.Row3; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -828,10 +764,6 @@ namespace OpenTK result.Row2 = inverseRotation.Row2; result.Row3 = new Vector3(-Vector3.Dot(inverseRotation.Row0, translation), -Vector3.Dot(inverseRotation.Row1, translation), -Vector3.Dot(inverseRotation.Row2, translation)); } - - #endregion - - #region Transpose /// /// Calculate the transpose of the given matrix /// @@ -854,12 +786,6 @@ namespace OpenTK result.Row2 = mat.Column2; } - #endregion - - #endregion - - #region Operators - /// /// Matrix multiplication /// @@ -937,12 +863,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4x3. /// @@ -952,10 +872,6 @@ namespace OpenTK return string.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -972,10 +888,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -989,14 +901,6 @@ namespace OpenTK return this.Equals((Matrix4x3)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current matrix is equal to another matrix. /// An matrix to compare with this matrix. /// true if the current matrix is equal to the matrix parameter; otherwise, false. @@ -1008,7 +912,5 @@ namespace OpenTK Row2 == other.Row2 && Row3 == other.Row3; } - - #endregion } } diff --git a/src/OpenTK/Math/Matrix4x3d.cs b/src/OpenTK/Math/Matrix4x3d.cs index c74d901b..522a5150 100644 --- a/src/OpenTK/Math/Matrix4x3d.cs +++ b/src/OpenTK/Math/Matrix4x3d.cs @@ -1,5 +1,4 @@ -#region --- License --- -/* +/* Copyright (c) 2006 - 2008 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -34,8 +32,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Matrix4x3d : IEquatable { - #region Fields - /// /// Top row of the matrix /// @@ -61,10 +57,6 @@ namespace OpenTK /// public static Matrix4x3d Zero = new Matrix4x3d(Vector3d.Zero, Vector3d.Zero, Vector3d.Zero, Vector3d.Zero); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -107,12 +99,6 @@ namespace OpenTK Row3 = new Vector3d(m30, m31, m32); } - #endregion - - #region Public Members - - #region Properties - /// /// Gets the first column of this matrix. /// @@ -219,10 +205,6 @@ namespace OpenTK /// public double Trace { get { return Row0.X + Row1.Y + Row2.Z; } } - #endregion - - #region Indexers - /// /// Gets or sets the value at a specified row and column. /// @@ -246,12 +228,6 @@ namespace OpenTK } } - #endregion - - #region Instance - - #region public void Invert() - /// /// Converts this instance into its inverse. /// @@ -260,14 +236,6 @@ namespace OpenTK this = Matrix4x3d.Invert(this); } - #endregion - - #endregion - - #region Static - - #region CreateFromAxisAngle - /// /// Build a rotation matrix from the specified axis/angle rotation. /// @@ -321,10 +289,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateFromQuaternion - /// /// Builds a rotation matrix from a quaternion. /// @@ -369,10 +333,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateRotation[XYZ] - /// /// Builds a rotation matrix for a rotation around the x-axis. /// @@ -481,10 +441,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateTranslation - /// /// Creates a translation matrix. /// @@ -555,10 +511,6 @@ namespace OpenTK return result; } - #endregion - - #region CreateScale - /// /// Build a scaling matrix /// @@ -604,10 +556,6 @@ namespace OpenTK return result; } - #endregion - - #region Multiply Functions - /// /// This isn't quite a multiply, but the result may be useful in some situations. /// Multiplies two instances. @@ -728,10 +676,6 @@ namespace OpenTK result.Row3 = left.Row3 * right; } - #endregion - - #region Add Functions - /// /// Adds two instances. /// @@ -759,10 +703,6 @@ namespace OpenTK result.Row3 = left.Row3 + right.Row3; } - #endregion - - #region Subtract Functions - /// /// Subtracts one instance from another. /// @@ -790,10 +730,6 @@ namespace OpenTK result.Row3 = left.Row3 - right.Row3; } - #endregion - - #region Invert Functions - /// /// Calculate the inverse of the given matrix /// @@ -828,10 +764,6 @@ namespace OpenTK result.Row3 = new Vector3d(-Vector3d.Dot(inverseRotation.Row0, translation), -Vector3d.Dot(inverseRotation.Row1, translation), -Vector3d.Dot(inverseRotation.Row2, translation)); } - #endregion - - #region Transpose - /// /// Calculate the transpose of the given matrix /// @@ -854,12 +786,6 @@ namespace OpenTK result.Row2 = mat.Column2; } - #endregion - - #endregion - - #region Operators - /// /// Matrix multiplication /// @@ -937,12 +863,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Matrix4x3d. /// @@ -952,10 +872,6 @@ namespace OpenTK return string.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -972,10 +888,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -989,14 +901,6 @@ namespace OpenTK return this.Equals((Matrix4x3d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current matrix is equal to another matrix. /// An matrix to compare with this matrix. /// true if the current matrix is equal to the matrix parameter; otherwise, false. @@ -1008,7 +912,5 @@ namespace OpenTK Row2 == other.Row2 && Row3 == other.Row3; } - - #endregion } } diff --git a/src/OpenTK/Math/Point.cs b/src/OpenTK/Math/Point.cs index dff7c67d..b86fa64c 100644 --- a/src/OpenTK/Math/Point.cs +++ b/src/OpenTK/Math/Point.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,8 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion - + using System; using System.Collections.Generic; using System.Text; @@ -37,14 +35,8 @@ namespace OpenTK /// public struct Point : IEquatable { - #region Fields - int x, y; - #endregion - - #region Constructors - /// /// Constructs a new Point instance. /// @@ -57,10 +49,6 @@ namespace OpenTK Y = y; } - #endregion - - #region Public Members - /// /// Gets a that indicates whether this instance is empty or zero. /// @@ -173,10 +161,6 @@ namespace OpenTK return String.Format("{{{0}, {1}}}", X, Y); } - #endregion - - #region IEquatable Members - /// /// Indicates whether this instance is equal to the specified Point. /// @@ -186,8 +170,6 @@ namespace OpenTK { return X == other.X && Y == other.Y; } - - #endregion } #endif } diff --git a/src/OpenTK/Math/Quaternion.cs b/src/OpenTK/Math/Quaternion.cs index 36b27663..5080be7d 100644 --- a/src/OpenTK/Math/Quaternion.cs +++ b/src/OpenTK/Math/Quaternion.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -36,8 +34,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Quaternion : IEquatable { - #region Fields - /// /// The X, Y and Z components of this instance. /// @@ -48,10 +44,6 @@ namespace OpenTK /// public float W; - #endregion - - #region Constructors - /// /// Construct a new Quaternion from vector and w components /// @@ -107,12 +99,6 @@ namespace OpenTK :this(eulerAngles.X, eulerAngles.Y, eulerAngles.Z) { } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the X component of this instance. /// @@ -131,12 +117,6 @@ namespace OpenTK [XmlIgnore] public float Z { get { return Xyz.Z; } set { Xyz.Z = value; } } - #endregion - - #region Instance - - #region ToAxisAngle - /// /// Convert the current quaternion to axis angle representation /// @@ -177,10 +157,6 @@ namespace OpenTK return result; } - #endregion - - #region public float Length - /// /// Gets the length (magnitude) of the quaternion. /// @@ -193,10 +169,6 @@ namespace OpenTK } } - #endregion - - #region public float LengthSquared - /// /// Gets the square of the quaternion length (magnitude). /// @@ -208,8 +180,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Quaternion scaled to unit length. /// @@ -238,8 +208,6 @@ namespace OpenTK return q; } - #region public void Normalize() - /// /// Scales the Quaternion to unit length. /// @@ -250,10 +218,6 @@ namespace OpenTK W *= scale; } - #endregion - - #region public void Conjugate() - /// /// Inverts the Vector3 component of this Quaternion. /// @@ -262,23 +226,11 @@ namespace OpenTK Xyz = -Xyz; } - #endregion - - #endregion - - #region Static - - #region Fields - /// /// Defines the identity quaternion. /// public static readonly Quaternion Identity = new Quaternion(0, 0, 0, 1); - #endregion - - #region Add - /// /// Add two quaternions /// @@ -305,10 +257,6 @@ namespace OpenTK left.W + right.W); } - #endregion - - #region Sub - /// /// Subtracts two instances. /// @@ -335,10 +283,6 @@ namespace OpenTK left.W - right.W); } - #endregion - - #region Multiply - /// /// Multiplies two instances. /// @@ -387,10 +331,6 @@ namespace OpenTK return new Quaternion(quaternion.X * scale, quaternion.Y * scale, quaternion.Z * scale, quaternion.W * scale); } - #endregion - - #region Conjugate - /// /// Get the conjugate of the given quaternion /// @@ -411,10 +351,6 @@ namespace OpenTK result = new Quaternion(-q.Xyz, q.W); } - #endregion - - #region Invert - /// /// Get the inverse of the given quaternion /// @@ -446,10 +382,6 @@ namespace OpenTK } } - #endregion - - #region Normalize - /// /// Scale the given quaternion to unit length /// @@ -473,10 +405,6 @@ namespace OpenTK result = new Quaternion(q.Xyz * scale, q.W * scale); } - #endregion - - #region FromAxisAngle - /// /// Build a quaternion from the given axis and angle /// @@ -498,10 +426,6 @@ namespace OpenTK return Normalize(result); } - #endregion - - #region FromEulerAngles - /// /// Builds a Quaternion from the given euler angles /// @@ -544,10 +468,6 @@ namespace OpenTK result.Xyz.Z = c1 * s2 * c3 - s1 * c2 * s3; } - #endregion - - #region FromMatrix - /// /// Builds a quaternion from the given rotation matrix /// @@ -616,10 +536,6 @@ namespace OpenTK } } - #endregion - - #region Slerp - /// /// Do Spherical linear interpolation between two quaternions /// @@ -683,12 +599,6 @@ namespace OpenTK return Identity; } - #endregion - - #endregion - - #region Operators - /// /// Adds two instances. /// @@ -772,12 +682,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Quaternion. /// @@ -787,10 +691,6 @@ namespace OpenTK return String.Format("V: {0}, W: {1}", Xyz, W); } - #endregion - - #region public override bool Equals (object o) - /// /// Compares this object instance to another object for equality. /// @@ -802,10 +702,6 @@ namespace OpenTK return this == (Quaternion)other; } - #endregion - - #region public override int GetHashCode () - /// /// Provides the hash code for this object. /// @@ -818,14 +714,6 @@ namespace OpenTK } } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// /// Compares this Quaternion instance to another Quaternion for equality. /// @@ -835,7 +723,5 @@ namespace OpenTK { return Xyz == other.Xyz && W == other.W; } - - #endregion } } diff --git a/src/OpenTK/Math/Quaterniond.cs b/src/OpenTK/Math/Quaterniond.cs index 7ca5a611..0bf12276 100644 --- a/src/OpenTK/Math/Quaterniond.cs +++ b/src/OpenTK/Math/Quaterniond.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -36,8 +34,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Quaterniond : IEquatable { - #region Fields - /// /// The X, Y and Z components of this instance. /// @@ -48,10 +44,6 @@ namespace OpenTK /// public double W; - #endregion - - #region Constructors - /// /// Construct a new Quaterniond from vector and w components /// @@ -107,12 +99,6 @@ namespace OpenTK :this(eulerAngles.X, eulerAngles.Y, eulerAngles.Z) { } - #endregion - - #region Public Members - - #region Properties - /// /// Gets or sets the X component of this instance. /// @@ -131,12 +117,6 @@ namespace OpenTK [XmlIgnore] public double Z { get { return Xyz.Z; } set { Xyz.Z = value; } } - #endregion - - #region Instance - - #region ToAxisAngle - /// /// Convert the current quaternion to axis angle representation /// @@ -177,10 +157,6 @@ namespace OpenTK return result; } - #endregion - - #region public double Length - /// /// Gets the length (magnitude) of the Quaterniond. /// @@ -193,10 +169,6 @@ namespace OpenTK } } - #endregion - - #region public double LengthSquared - /// /// Gets the square of the Quaterniond length (magnitude). /// @@ -208,8 +180,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Quaterniond scaled to unit length. /// @@ -238,8 +208,6 @@ namespace OpenTK return q; } - #region public void Normalize() - /// /// Scales the Quaterniond to unit length. /// @@ -250,10 +218,6 @@ namespace OpenTK W *= scale; } - #endregion - - #region public void Conjugate() - /// /// Inverts the Vector3d component of this Quaterniond. /// @@ -262,23 +226,11 @@ namespace OpenTK Xyz = -Xyz; } - #endregion - - #endregion - - #region Static - - #region Fields - /// /// Defines the identity quaternion. /// public readonly static Quaterniond Identity = new Quaterniond(0, 0, 0, 1); - #endregion - - #region Add - /// /// Add two quaternions /// @@ -305,10 +257,6 @@ namespace OpenTK left.W + right.W); } - #endregion - - #region Sub - /// /// Subtracts two instances. /// @@ -335,10 +283,6 @@ namespace OpenTK left.W - right.W); } - #endregion - - #region Multiply - /// /// Multiplies two instances. /// @@ -387,10 +331,6 @@ namespace OpenTK return new Quaterniond(quaternion.X * scale, quaternion.Y * scale, quaternion.Z * scale, quaternion.W * scale); } - #endregion - - #region Conjugate - /// /// Get the conjugate of the given Quaterniond /// @@ -411,10 +351,6 @@ namespace OpenTK result = new Quaterniond(-q.Xyz, q.W); } - #endregion - - #region Invert - /// /// Get the inverse of the given Quaterniond /// @@ -446,10 +382,6 @@ namespace OpenTK } } - #endregion - - #region Normalize - /// /// Scale the given Quaterniond to unit length /// @@ -473,10 +405,6 @@ namespace OpenTK result = new Quaterniond(q.Xyz * scale, q.W * scale); } - #endregion - - #region FromAxisAngle - /// /// Build a Quaterniond from the given axis and angle /// @@ -498,10 +426,6 @@ namespace OpenTK return Normalize(result); } - #endregion - - #region FromEulerAngles - /// /// Builds a Quaterniond from the given euler angles /// @@ -544,10 +468,6 @@ namespace OpenTK result.Xyz.Z = c1 * s2 * c3 - s1 * c2 * s3; } - #endregion - - #region FromMatrix - /// /// Builds a quaternion from the given rotation matrix /// @@ -616,10 +536,6 @@ namespace OpenTK } } - #endregion - - #region Slerp - /// /// Do Spherical linear interpolation between two quaternions /// @@ -683,12 +599,6 @@ namespace OpenTK return Identity; } - #endregion - - #endregion - - #region Operators - /// /// Adds two instances. /// @@ -772,12 +682,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - /// /// Returns a System.String that represents the current Quaterniond. /// @@ -787,10 +691,6 @@ namespace OpenTK return String.Format("V: {0}, W: {1}", Xyz, W); } - #endregion - - #region public override bool Equals (object o) - /// /// Compares this object instance to another object for equality. /// @@ -802,10 +702,6 @@ namespace OpenTK return this == (Quaterniond)other; } - #endregion - - #region public override int GetHashCode () - /// /// Provides the hash code for this object. /// @@ -819,16 +715,8 @@ namespace OpenTK } } - #endregion - - #endregion - - #endregion - #if false - #region Fields - /// The W component of the Quaterniond. public double W; @@ -841,10 +729,6 @@ namespace OpenTK /// The Z component of the Quaterniond. public double Z; - #endregion - - #region Constructors - /// Constructs left Quaterniond that is left copy of the given Quaterniond. /// The Quaterniond to copy. public Quaterniond(ref Quaterniond Quaterniond) : this(Quaterniond.W, Quaterniond.X, Quaterniond.Y, Quaterniond.Z) { } @@ -924,10 +808,6 @@ namespace OpenTK if (matrix[1, 0] - matrix[0, 1] < 0) Z = -Z; } - #endregion - - #region Arithmetic Operators - public void Add(ref Quaterniond Quaterniond) { W = W + Quaterniond.W; @@ -1044,10 +924,6 @@ namespace OpenTK result.Z = Quaterniond.Z / scalar; } - #endregion - - #region Functions - public double Modulus { get @@ -1387,10 +1263,6 @@ namespace OpenTK } } - #endregion - - #region HashCode - /// Returns the hash code for this instance. /// A 32-bit signed integer that is the hash code for this instance. public override int GetHashCode() @@ -1399,10 +1271,6 @@ namespace OpenTK return W.GetHashCode() ^ X.GetHashCode() ^ Y.GetHashCode() ^ Z.GetHashCode(); } - #endregion - - #region String and Parse - /// Returns the fully qualified type name of this instance. /// A System.String containing left fully qualified type name. public override string ToString() @@ -1424,10 +1292,6 @@ namespace OpenTK result.Z = double.Parse(match.Result("${z}")); } - #endregion - - #region Constants - /// A quaterion with all zero components. public static readonly Quaterniond Zero = new Quaterniond(0, 0, 0, 0); @@ -1446,12 +1310,8 @@ namespace OpenTK /// A quaterion representing the Z axis. public static readonly Quaterniond ZAxis = new Quaterniond(0, 0, 0, 1); - #endregion - #endif - #region IEquatable Members - /// /// Compares this Quaterniond instance to another Quaterniond for equality. /// @@ -1461,7 +1321,5 @@ namespace OpenTK { return Xyz == other.Xyz && W == other.W; } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Math/Rectangle.cs b/src/OpenTK/Math/Rectangle.cs index f7d73302..e4b5c535 100644 --- a/src/OpenTK/Math/Rectangle.cs +++ b/src/OpenTK/Math/Rectangle.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,8 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion - + using System; using System.Collections.Generic; using System.Text; @@ -37,15 +35,9 @@ namespace OpenTK /// public struct Rectangle : IEquatable { - #region Fields - Point location; Size size; - #endregion - - #region Constructors - /// /// Constructs a new Rectangle instance. /// @@ -57,7 +49,7 @@ namespace OpenTK Location = location; Size = size; } - + /// /// Constructs a new Rectangle instance. /// @@ -69,10 +61,6 @@ namespace OpenTK : this(new Point(x, y), new Size(width, height)) { } - #endregion - - #region Public Members - /// /// Gets or sets the x coordinate of the Rectangle. /// @@ -95,7 +83,7 @@ namespace OpenTK /// Gets or sets the width of the Rectangle. /// public int Width - { + { get { return Size.Width; } set { Size = new Size (value, Height); } } @@ -153,7 +141,7 @@ namespace OpenTK /// Gets a that indicates whether this /// Rectangle is equal to the empty Rectangle. /// - public bool IsEmpty + public bool IsEmpty { get { return Location.IsEmpty && Size.IsEmpty; } } @@ -191,7 +179,7 @@ namespace OpenTK /// are exclusive. public bool Contains(int x, int y) { - return x >= Left && x < Right && + return x >= Left && x < Right && y >= Top && y < Bottom; } @@ -204,7 +192,7 @@ namespace OpenTK /// are exclusive. public bool Contains(Point point) { - return point.X >= Left && point.X < Right && + return point.X >= Left && point.X < Right && point.Y >= Top && point.Y < Bottom; } @@ -250,11 +238,11 @@ namespace OpenTK public static Rectangle Union (Rectangle a, Rectangle b) { int x1 = Math.Min(a.X, b.X); - int x2 = Math.Max(a.X + a.Width, b.X + b.Width); + int x2 = Math.Max(a.X + a.Width, b.X + b.Width); int y1 = Math.Min(a.Y, b.Y); int y2 = Math.Max(a.Y + a.Height, b.Y + b.Height); - return new Rectangle(x1, y1, x2 - x1, y2 - y1); + return new Rectangle(x1, y1, x2 - x1, y2 - y1); } /// @@ -289,10 +277,6 @@ namespace OpenTK } - #endregion - - #region IEquatable Members - /// /// Indicates whether this instance is equal to the specified Rectangle. /// @@ -303,8 +287,6 @@ namespace OpenTK return Location.Equals(other.Location) && Size.Equals(other.Size); } - - #endregion } #endif } diff --git a/src/OpenTK/Math/Size.cs b/src/OpenTK/Math/Size.cs index 014ec765..dc014801 100644 --- a/src/OpenTK/Math/Size.cs +++ b/src/OpenTK/Math/Size.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -37,14 +35,8 @@ namespace OpenTK /// public struct Size : IEquatable { - #region Fields - int width, height; - #endregion - - #region Constructors - /// /// Constructs a new Size instance. /// @@ -57,10 +49,6 @@ namespace OpenTK Height = height; } - #endregion - - #region Public Members - /// /// Gets or sets the width of this instance. /// @@ -138,7 +126,7 @@ namespace OpenTK { if (obj is Size) return Equals((Size)obj); - + return false; } @@ -160,10 +148,6 @@ namespace OpenTK return String.Format("{{{0}, {1}}}", Width, Height); } - #endregion - - #region IEquatable Members - /// /// Indicates whether this instance is equal to the specified Size. /// @@ -173,8 +157,7 @@ namespace OpenTK { return Width == other.Width && Height == other.Height; } - - #endregion + } #endif } diff --git a/src/OpenTK/Math/Vector2.cs b/src/OpenTK/Math/Vector2.cs index dcf58f79..dbbc1be5 100644 --- a/src/OpenTK/Math/Vector2.cs +++ b/src/OpenTK/Math/Vector2.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -36,8 +34,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Vector2 : IEquatable { - #region Fields - /// /// The X component of the Vector2. /// @@ -48,10 +44,6 @@ namespace OpenTK /// public float Y; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -73,10 +65,6 @@ namespace OpenTK Y = y; } - #endregion - - #region Public Members - /// /// Gets or sets the value at the index of the Vector. /// @@ -92,10 +80,6 @@ namespace OpenTK } } - #region Instance - - #region public float Length - /// /// Gets the length (magnitude) of the vector. /// @@ -109,10 +93,6 @@ namespace OpenTK } } - #endregion - - #region public float LengthFast - /// /// Gets an approximation of the vector length (magnitude). /// @@ -130,10 +110,6 @@ namespace OpenTK } } - #endregion - - #region public float LengthSquared - /// /// Gets the square of the vector length (magnitude). /// @@ -151,10 +127,6 @@ namespace OpenTK } } - #endregion - - #region public Vector2 PerpendicularRight - /// /// Gets the perpendicular vector on the right side of this vector. /// @@ -166,10 +138,6 @@ namespace OpenTK } } - #endregion - - #region public Vector2 PerpendicularLeft - /// /// Gets the perpendicular vector on the left side of this vector. /// @@ -181,8 +149,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Vector2 scaled to unit length. /// @@ -193,8 +159,6 @@ namespace OpenTK v.Normalize(); return v; } - #region public void Normalize() - /// /// Scales the Vector2 to unit length. /// @@ -205,10 +169,6 @@ namespace OpenTK Y *= scale; } - #endregion - - #region public void NormalizeFast() - /// /// Scales the Vector2 to approximately unit length. /// @@ -219,14 +179,6 @@ namespace OpenTK Y *= scale; } - #endregion - - #endregion - - #region Static - - #region Fields - /// /// Defines a unit-length Vector2 that points towards the X-axis. /// @@ -252,10 +204,6 @@ namespace OpenTK /// public static readonly int SizeInBytes = Marshal.SizeOf(new Vector2()); - #endregion - - #region Add - /// /// Adds two vectors. /// @@ -279,10 +227,6 @@ namespace OpenTK result = new Vector2(a.X + b.X, a.Y + b.Y); } - #endregion - - #region Subtract - /// /// Subtract one Vector from another /// @@ -306,10 +250,6 @@ namespace OpenTK result = new Vector2(a.X - b.X, a.Y - b.Y); } - #endregion - - #region Multiply - /// /// Multiplies a vector by a scalar. /// @@ -356,10 +296,6 @@ namespace OpenTK result = new Vector2(vector.X * scale.X, vector.Y * scale.Y); } - #endregion - - #region Divide - /// /// Divides a vector by a scalar. /// @@ -407,10 +343,6 @@ namespace OpenTK result = new Vector2(vector.X / scale.X, vector.Y / scale.Y); } - #endregion - - #region ComponentMin - /// /// Returns a vector created from the smallest of the corresponding components of the given vectors. /// @@ -436,10 +368,6 @@ namespace OpenTK result.Y = a.Y < b.Y ? a.Y : b.Y; } - #endregion - - #region ComponentMax - /// /// Returns a vector created from the largest of the corresponding components of the given vectors. /// @@ -465,10 +393,6 @@ namespace OpenTK result.Y = a.Y > b.Y ? a.Y : b.Y; } - #endregion - - #region MagnitudeMin - /// /// Returns the Vector2 with the minimum magnitude. If the magnitudes are equal, the second vector /// is selected. @@ -494,10 +418,6 @@ namespace OpenTK result = left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region MagnitudeMax - /// /// Returns the Vector2 with the maximum magnitude. If the magnitudes are equal, the first vector /// is selected. @@ -523,10 +443,6 @@ namespace OpenTK result = left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Min - /// /// Returns the Vector3 with the minimum magnitude /// @@ -539,10 +455,6 @@ namespace OpenTK return left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region Max - /// /// Returns the Vector3 with the minimum magnitude /// @@ -555,10 +467,6 @@ namespace OpenTK return left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Clamp - /// /// Clamp a vector to the given minimum and maximum vectors /// @@ -586,10 +494,6 @@ namespace OpenTK result.Y = vec.Y < min.Y ? min.Y : vec.Y > max.Y ? max.Y : vec.Y; } - #endregion - - #region Normalize - /// /// Scale a vector to unit length /// @@ -615,10 +519,6 @@ namespace OpenTK result.Y = vec.Y * scale; } - #endregion - - #region NormalizeFast - /// /// Scale a vector to approximately unit length /// @@ -644,10 +544,6 @@ namespace OpenTK result.Y = vec.Y * scale; } - #endregion - - #region Dot - /// /// Calculate the dot (scalar) product of two vectors /// @@ -670,10 +566,6 @@ namespace OpenTK result = left.X * right.X + left.Y * right.Y; } - #endregion - - #region PerpDot - /// /// Calculate the perpendicular dot (scalar) product of two vectors /// @@ -696,10 +588,6 @@ namespace OpenTK result = left.X * right.Y - left.Y * right.X; } - #endregion - - #region Lerp - /// /// Returns a new Vector that is the linear blend of the 2 given Vectors /// @@ -727,10 +615,6 @@ namespace OpenTK result.Y = blend * (b.Y - a.Y) + a.Y; } - #endregion - - #region Barycentric - /// /// Interpolate 3 Vectors using Barycentric coordinates /// @@ -767,10 +651,6 @@ namespace OpenTK Add(ref result, ref temp, out result); } - #endregion - - #region Transform - /// /// Transforms a vector by a quaternion rotation. /// @@ -800,22 +680,12 @@ namespace OpenTK result = new Vector2(v.X, v.Y); } - #endregion - - #endregion - - #region Swizzle - /// /// Gets or sets an OpenTK.Vector2 with the Y and X components of this instance. /// [XmlIgnore] public Vector2 Yx { get { return new Vector2(Y, X); } set { Y = value.X; X = value.Y; } } - #endregion - - #region Operators - /// /// Adds the specified instances. /// @@ -928,12 +798,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// /// Returns a System.String that represents the current Vector2. @@ -944,10 +808,6 @@ namespace OpenTK return String.Format("({0}{2} {1})", X, Y, listSeparator); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -960,10 +820,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -977,14 +833,6 @@ namespace OpenTK return this.Equals((Vector2)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current vector is equal to another vector. /// A vector to compare with this vector. /// true if the current vector is equal to the vector parameter; otherwise, false. @@ -994,7 +842,5 @@ namespace OpenTK X == other.X && Y == other.Y; } - - #endregion } } diff --git a/src/OpenTK/Math/Vector2d.cs b/src/OpenTK/Math/Vector2d.cs index bc45b8bf..4736cb06 100644 --- a/src/OpenTK/Math/Vector2d.cs +++ b/src/OpenTK/Math/Vector2d.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -33,8 +31,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Vector2d : IEquatable { - #region Fields - /// The X coordinate of this instance. public double X; @@ -66,10 +62,6 @@ namespace OpenTK /// public static readonly int SizeInBytes = Marshal.SizeOf(new Vector2d()); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -89,10 +81,6 @@ namespace OpenTK this.Y = y; } - #endregion - - #region Public Members - /// /// Gets or sets the value at the index of the Vector. /// @@ -108,10 +96,6 @@ namespace OpenTK } } - #region Instance - - #region public double Length - /// /// Gets the length (magnitude) of the vector. /// @@ -124,10 +108,6 @@ namespace OpenTK } } - #endregion - - #region public double LengthSquared - /// /// Gets the square of the vector length (magnitude). /// @@ -144,10 +124,6 @@ namespace OpenTK } } - #endregion - - #region public Vector2d PerpendicularRight - /// /// Gets the perpendicular vector on the right side of this vector. /// @@ -159,10 +135,6 @@ namespace OpenTK } } - #endregion - - #region public Vector2d PerpendicularLeft - /// /// Gets the perpendicular vector on the left side of this vector. /// @@ -174,8 +146,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Vector2d scaled to unit length. /// @@ -187,8 +157,6 @@ namespace OpenTK return v; } - #region public void Normalize() - /// /// Scales the Vector2 to unit length. /// @@ -199,10 +167,6 @@ namespace OpenTK Y *= scale; } - #endregion - - #region Add - /// /// Adds two vectors. /// @@ -226,10 +190,6 @@ namespace OpenTK result = new Vector2d(a.X + b.X, a.Y + b.Y); } - #endregion - - #region Subtract - /// /// Subtract one Vector from another /// @@ -253,10 +213,6 @@ namespace OpenTK result = new Vector2d(a.X - b.X, a.Y - b.Y); } - #endregion - - #region Multiply - /// /// Multiplies a vector by a scalar. /// @@ -303,10 +259,6 @@ namespace OpenTK result = new Vector2d(vector.X * scale.X, vector.Y * scale.Y); } - #endregion - - #region Divide - /// /// Divides a vector by a scalar. /// @@ -354,10 +306,6 @@ namespace OpenTK result = new Vector2d(vector.X / scale.X, vector.Y / scale.Y); } - #endregion - - #region Min - /// /// Calculate the component-wise minimum of two vectors /// @@ -385,10 +333,6 @@ namespace OpenTK result.Y = a.Y < b.Y ? a.Y : b.Y; } - #endregion - - #region Max - /// /// Calculate the component-wise maximum of two vectors /// @@ -416,10 +360,6 @@ namespace OpenTK result.Y = a.Y > b.Y ? a.Y : b.Y; } - #endregion - - #region ComponentMin - /// /// Returns a vector created from the smallest of the corresponding components of the given vectors. /// @@ -445,10 +385,6 @@ namespace OpenTK result.Y = a.Y < b.Y ? a.Y : b.Y; } - #endregion - - #region ComponentMax - /// /// Returns a vector created from the largest of the corresponding components of the given vectors. /// @@ -474,10 +410,6 @@ namespace OpenTK result.Y = a.Y > b.Y ? a.Y : b.Y; } - #endregion - - #region MagnitudeMin - /// /// Returns the Vector2d with the minimum magnitude. If the magnitudes are equal, the second vector /// is selected. @@ -503,10 +435,6 @@ namespace OpenTK result = left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region MagnitudeMax - /// /// Returns the Vector2d with the minimum magnitude. If the magnitudes are equal, the first vector /// is selected. @@ -532,10 +460,6 @@ namespace OpenTK result = left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Clamp - /// /// Clamp a vector to the given minimum and maximum vectors /// @@ -563,10 +487,6 @@ namespace OpenTK result.Y = vec.Y < min.Y ? min.Y : vec.Y > max.Y ? max.Y : vec.Y; } - #endregion - - #region Normalize - /// /// Scale a vector to unit length /// @@ -592,10 +512,6 @@ namespace OpenTK result.Y = vec.Y * scale; } - #endregion - - #region NormalizeFast - /// /// Scale a vector to approximately unit length /// @@ -621,10 +537,6 @@ namespace OpenTK result.Y = vec.Y * scale; } - #endregion - - #region Dot - /// /// Calculate the dot (scalar) product of two vectors /// @@ -647,10 +559,6 @@ namespace OpenTK result = left.X * right.X + left.Y * right.Y; } - #endregion - - #region Lerp - /// /// Returns a new Vector that is the linear blend of the 2 given Vectors /// @@ -678,10 +586,6 @@ namespace OpenTK result.Y = blend * (b.Y - a.Y) + a.Y; } - #endregion - - #region Barycentric - /// /// Interpolate 3 Vectors using Barycentric coordinates /// @@ -718,10 +622,6 @@ namespace OpenTK Add(ref result, ref temp, out result); } - #endregion - - #region Transform - /// /// Transforms a vector by a quaternion rotation. /// @@ -751,22 +651,12 @@ namespace OpenTK result = new Vector2d(v.X, v.Y); } - #endregion - - #endregion - - #region Swizzle - /// /// Gets or sets an OpenTK.Vector2d with the Y and X components of this instance. /// [XmlIgnore] public Vector2d Yx { get { return new Vector2d(Y, X); } set { Y = value.X; X = value.Y; } } - #endregion - - #region Operators - /// /// Adds two instances. /// @@ -895,12 +785,6 @@ namespace OpenTK return new Vector2((float)v2d.X, (float)v2d.Y); } - #endregion - - #region Overrides - - #region public override string ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// /// Returns a System.String that represents the current instance. @@ -911,10 +795,6 @@ namespace OpenTK return String.Format("({0}{2} {1})", X, Y, listSeparator); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -927,10 +807,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -944,14 +820,6 @@ namespace OpenTK return this.Equals((Vector2d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current vector is equal to another vector. /// A vector to compare with this vector. /// true if the current vector is equal to the vector parameter; otherwise, false. @@ -961,7 +829,5 @@ namespace OpenTK X == other.X && Y == other.Y; } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Math/Vector2h.cs b/src/OpenTK/Math/Vector2h.cs index 85ec2805..d149c072 100644 --- a/src/OpenTK/Math/Vector2h.cs +++ b/src/OpenTK/Math/Vector2h.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.IO; @@ -35,18 +33,12 @@ namespace OpenTK [Serializable, StructLayout(LayoutKind.Sequential)] public struct Vector2h : ISerializable, IEquatable { - #region Fields - /// The X component of the Half2. public Half X; /// The Y component of the Half2. public Half Y; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -193,20 +185,12 @@ namespace OpenTK Y = new Half(v.Y, throwOnError); } - #endregion Constructors - - #region Swizzle - /// /// Gets or sets an OpenTK.Vector2h with the Y and X components of this instance. /// [XmlIgnore] public Vector2h Yx { get { return new Vector2h(Y, X); } set { Y = value.X; X = value.Y; } } - #endregion - - #region Half -> Single - /// /// Returns this Half2 instance's contents as Vector2. /// @@ -224,10 +208,6 @@ namespace OpenTK return new Vector2d(X, Y); } - #endregion Half -> Single - - #region Conversions - /// Converts OpenTK.Vector2 to OpenTK.Half2. /// The Vector2 to convert. /// The resulting Half vector. @@ -260,17 +240,9 @@ namespace OpenTK return new Vector2d(h.X, h.Y); } - #endregion Conversions - - #region Constants - /// The size in bytes for an instance of the Half2 struct is 4. public static readonly int SizeInBytes = 4; - #endregion Constants - - #region ISerializable - /// Constructor used by ISerializable to deserialize the object. /// /// @@ -289,10 +261,6 @@ namespace OpenTK info.AddValue("Y", this.Y); } - #endregion ISerializable - - #region Binary dump - /// Updates the X and Y components of this instance by reading from a Stream. /// A BinaryReader instance associated with an open Stream. public void FromBinaryStream(BinaryReader bin) @@ -309,10 +277,6 @@ namespace OpenTK Y.ToBinaryStream(bin); } - #endregion Binary dump - - #region IEquatable Members - /// Returns a value indicating whether this instance is equal to a specified OpenTK.Half2 vector. /// OpenTK.Half2 to compare to this instance.. /// True, if other is equal to this instance; false otherwise. @@ -321,10 +285,6 @@ namespace OpenTK return (this.X.Equals(other.X) && this.Y.Equals(other.Y)); } - #endregion - - #region ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// Returns a string that contains this Half2's numbers in human-legible form. public override string ToString() @@ -332,10 +292,6 @@ namespace OpenTK return String.Format("({0}{2} {1})", X, Y, listSeparator); } - #endregion ToString() - - #region BitConverter - /// Returns the Half2 as an array of bytes. /// The Half2 to convert. /// The input as byte array. @@ -364,7 +320,5 @@ namespace OpenTK h2.Y = Half.FromBytes(value, startIndex + 2); return h2; } - - #endregion BitConverter } } \ No newline at end of file diff --git a/src/OpenTK/Math/Vector3.cs b/src/OpenTK/Math/Vector3.cs index 1ac4d7c1..8d81a61d 100644 --- a/src/OpenTK/Math/Vector3.cs +++ b/src/OpenTK/Math/Vector3.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -38,8 +36,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Vector3 : IEquatable { - #region Fields - /// /// The X component of the Vector3. /// @@ -55,10 +51,6 @@ namespace OpenTK /// public float Z; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -116,10 +108,6 @@ namespace OpenTK Z = v.Z; } - #endregion - - #region Public Members - /// /// Gets or sets the value at the index of the Vector. @@ -138,10 +126,6 @@ namespace OpenTK } } - #region Instance - - #region public float Length - /// /// Gets the length (magnitude) of the vector. /// @@ -155,10 +139,6 @@ namespace OpenTK } } - #endregion - - #region public float LengthFast - /// /// Gets an approximation of the vector length (magnitude). /// @@ -176,10 +156,6 @@ namespace OpenTK } } - #endregion - - #region public float LengthSquared - /// /// Gets the square of the vector length (magnitude). /// @@ -197,8 +173,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Vector3 scaled to unit length. /// @@ -209,8 +183,6 @@ namespace OpenTK return v; } - #region public void Normalize() - /// /// Scales the Vector3 to unit length. /// @@ -222,10 +194,6 @@ namespace OpenTK Z *= scale; } - #endregion - - #region public void NormalizeFast() - /// /// Scales the Vector3 to approximately unit length. /// @@ -237,14 +205,6 @@ namespace OpenTK Z *= scale; } - #endregion - - #endregion - - #region Static - - #region Fields - /// /// Defines a unit-length Vector3 that points towards the X-axis. /// @@ -275,10 +235,6 @@ namespace OpenTK /// public static readonly int SizeInBytes = Marshal.SizeOf(new Vector3()); - #endregion - - #region Add - /// /// Adds two vectors. /// @@ -302,10 +258,6 @@ namespace OpenTK result = new Vector3(a.X + b.X, a.Y + b.Y, a.Z + b.Z); } - #endregion - - #region Subtract - /// /// Subtract one Vector from another /// @@ -329,10 +281,6 @@ namespace OpenTK result = new Vector3(a.X - b.X, a.Y - b.Y, a.Z - b.Z); } - #endregion - - #region Multiply - /// /// Multiplies a vector by a scalar. /// @@ -379,10 +327,6 @@ namespace OpenTK result = new Vector3(vector.X * scale.X, vector.Y * scale.Y, vector.Z * scale.Z); } - #endregion - - #region Divide - /// /// Divides a vector by a scalar. /// @@ -431,10 +375,6 @@ namespace OpenTK result = new Vector3(vector.X / scale.X, vector.Y / scale.Y, vector.Z / scale.Z); } - #endregion - - #region ComponentMin - /// /// Returns a vector created from the smallest of the corresponding components of the given vectors. /// @@ -462,10 +402,6 @@ namespace OpenTK result.Z = a.Z < b.Z ? a.Z : b.Z; } - #endregion - - #region ComponentMax - /// /// Returns a vector created from the largest of the corresponding components of the given vectors. /// @@ -493,10 +429,6 @@ namespace OpenTK result.Z = a.Z > b.Z ? a.Z : b.Z; } - #endregion - - #region MagnitudeMin - /// /// Returns the Vector3 with the minimum magnitude. If the magnitudes are equal, the second vector /// is selected. @@ -522,10 +454,6 @@ namespace OpenTK result = left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region MagnitudeMax - /// /// Returns the Vector3 with the maximum magnitude. If the magnitudes are equal, the first vector /// is selected. @@ -551,10 +479,6 @@ namespace OpenTK result = left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Min - /// /// Returns the Vector3 with the minimum magnitude /// @@ -567,10 +491,6 @@ namespace OpenTK return left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region Max - /// /// Returns the Vector3 with the minimum magnitude /// @@ -583,10 +503,6 @@ namespace OpenTK return left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Clamp - /// /// Clamp a vector to the given minimum and maximum vectors /// @@ -616,10 +532,6 @@ namespace OpenTK result.Z = vec.Z < min.Z ? min.Z : vec.Z > max.Z ? max.Z : vec.Z; } - #endregion - - #region Normalize - /// /// Scale a vector to unit length /// @@ -647,10 +559,6 @@ namespace OpenTK result.Z = vec.Z * scale; } - #endregion - - #region NormalizeFast - /// /// Scale a vector to approximately unit length /// @@ -678,10 +586,6 @@ namespace OpenTK result.Z = vec.Z * scale; } - #endregion - - #region Dot - /// /// Calculate the dot (scalar) product of two vectors /// @@ -704,10 +608,6 @@ namespace OpenTK result = left.X * right.X + left.Y * right.Y + left.Z * right.Z; } - #endregion - - #region Cross - /// /// Caclulate the cross (vector) product of two vectors /// @@ -735,10 +635,6 @@ namespace OpenTK left.X * right.Y - left.Y * right.X); } - #endregion - - #region Lerp - /// /// Returns a new Vector that is the linear blend of the 2 given Vectors /// @@ -768,10 +664,6 @@ namespace OpenTK result.Z = blend * (b.Z - a.Z) + a.Z; } - #endregion - - #region Barycentric - /// /// Interpolate 3 Vectors using Barycentric coordinates /// @@ -808,10 +700,6 @@ namespace OpenTK Add(ref result, ref temp, out result); } - #endregion - - #region Transform - /// Transform a direction vector by the given Matrix /// Assumes the matrix has a bottom row of (0,0,0,1), that is the translation part is ignored. /// @@ -1052,10 +940,6 @@ namespace OpenTK result.Z = v.Z / v.W; } - #endregion - - #region CalculateAngle - /// /// Calculates the angle (in radians) between two vectors. /// @@ -1082,10 +966,6 @@ namespace OpenTK result = (float)System.Math.Acos(MathHelper.Clamp(temp / (first.Length * second.Length), -1.0, 1.0)); } - #endregion - - #region Project - /// /// Projects a vector from object space into screen space. /// @@ -1139,10 +1019,6 @@ namespace OpenTK return new Vector3(result.X, result.Y, result.Z); } - #endregion - - #region Unproject - /// /// Projects a vector from screen space into object space. /// @@ -1196,14 +1072,6 @@ namespace OpenTK return new Vector3(result.X, result.Y, result.Z); } - #endregion - - #endregion - - #region Swizzle - - #region 2-component - /// /// Gets or sets an OpenTK.Vector2 with the X and Y components of this instance. /// @@ -1240,10 +1108,6 @@ namespace OpenTK [XmlIgnore] public Vector2 Zy { get { return new Vector2(Z, Y); } set { Z = value.X; Y = value.Y; } } - #endregion - - #region 3-component - /// /// Gets or sets an OpenTK.Vector3 with the X, Z, and Y components of this instance. /// @@ -1274,12 +1138,6 @@ namespace OpenTK [XmlIgnore] public Vector3 Zyx { get { return new Vector3(Z, Y, X); } set { Z = value.X; Y = value.Y; X = value.Z; } } - #endregion - - #endregion - - #region Operators - /// /// Adds two instances. /// @@ -1438,12 +1296,6 @@ namespace OpenTK return !left.Equals(right); } - #endregion - - #region Overrides - - #region public override string ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// /// Returns a System.String that represents the current Vector3. @@ -1454,10 +1306,6 @@ namespace OpenTK return String.Format("({0}{3} {1}{3} {2})", X, Y, Z, listSeparator); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -1473,10 +1321,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -1490,14 +1334,6 @@ namespace OpenTK return this.Equals((Vector3)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current vector is equal to another vector. /// A vector to compare with this vector. /// true if the current vector is equal to the vector parameter; otherwise, false. @@ -1508,7 +1344,5 @@ namespace OpenTK Y == other.Y && Z == other.Z; } - - #endregion } } diff --git a/src/OpenTK/Math/Vector3d.cs b/src/OpenTK/Math/Vector3d.cs index 0a57a412..69e4bcb6 100644 --- a/src/OpenTK/Math/Vector3d.cs +++ b/src/OpenTK/Math/Vector3d.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -35,8 +33,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Vector3d : IEquatable { - #region Fields - /// /// The X component of the Vector3. /// @@ -52,10 +48,6 @@ namespace OpenTK /// public double Z; - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -114,10 +106,6 @@ namespace OpenTK } - #endregion - - #region Public Members - /// /// Gets or sets the value at the index of the Vector. /// @@ -135,10 +123,6 @@ namespace OpenTK } } - #region Instance - - #region public double Length - /// /// Gets the length (magnitude) of the vector. /// @@ -152,10 +136,6 @@ namespace OpenTK } } - #endregion - - #region public double LengthFast - /// /// Gets an approximation of the vector length (magnitude). /// @@ -173,10 +153,6 @@ namespace OpenTK } } - #endregion - - #region public double LengthSquared - /// /// Gets the square of the vector length (magnitude). /// @@ -194,8 +170,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Vector3d scaled to unit length. /// @@ -207,8 +181,6 @@ namespace OpenTK return v; } - #region public void Normalize() - /// /// Scales the Vector3d to unit length. /// @@ -220,10 +192,6 @@ namespace OpenTK Z *= scale; } - #endregion - - #region public void NormalizeFast() - /// /// Scales the Vector3d to approximately unit length. /// @@ -235,14 +203,6 @@ namespace OpenTK Z *= scale; } - #endregion - - #endregion - - #region Static - - #region Fields - /// /// Defines a unit-length Vector3d that points towards the X-axis. /// @@ -273,10 +233,6 @@ namespace OpenTK /// public static readonly int SizeInBytes = Marshal.SizeOf(new Vector3d()); - #endregion - - #region Add - /// /// Adds two vectors. /// @@ -300,10 +256,6 @@ namespace OpenTK result = new Vector3d(a.X + b.X, a.Y + b.Y, a.Z + b.Z); } - #endregion - - #region Subtract - /// /// Subtract one Vector from another /// @@ -327,10 +279,6 @@ namespace OpenTK result = new Vector3d(a.X - b.X, a.Y - b.Y, a.Z - b.Z); } - #endregion - - #region Multiply - /// /// Multiplies a vector by a scalar. /// @@ -377,10 +325,6 @@ namespace OpenTK result = new Vector3d(vector.X * scale.X, vector.Y * scale.Y, vector.Z * scale.Z); } - #endregion - - #region Divide - /// /// Divides a vector by a scalar. /// @@ -429,10 +373,6 @@ namespace OpenTK result = new Vector3d(vector.X / scale.X, vector.Y / scale.Y, vector.Z / scale.Z); } - #endregion - - #region ComponentMin - /// /// Returns a vector created from the smallest of the corresponding components of the given vectors. /// @@ -460,10 +400,6 @@ namespace OpenTK result.Z = a.Z < b.Z ? a.Z : b.Z; } - #endregion - - #region ComponentMax - /// /// Returns a vector created from the largest of the corresponding components of the given vectors. /// @@ -491,10 +427,6 @@ namespace OpenTK result.Z = a.Z > b.Z ? a.Z : b.Z; } - #endregion - - #region MagnitudeMin - /// /// Returns the Vector3d with the minimum magnitude /// @@ -518,10 +450,6 @@ namespace OpenTK result = left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region MagnitudeMax - /// /// Returns the Vector3d with the minimum magnitude /// @@ -545,10 +473,6 @@ namespace OpenTK result = left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Min - /// /// Returns the Vector3d with the minimum magnitude /// @@ -561,10 +485,6 @@ namespace OpenTK return left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region Max - /// /// Returns the Vector3d with the minimum magnitude /// @@ -577,10 +497,6 @@ namespace OpenTK return left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Clamp - /// /// Clamp a vector to the given minimum and maximum vectors /// @@ -610,10 +526,6 @@ namespace OpenTK result.Z = vec.Z < min.Z ? min.Z : vec.Z > max.Z ? max.Z : vec.Z; } - #endregion - - #region Normalize - /// /// Scale a vector to unit length /// @@ -641,10 +553,6 @@ namespace OpenTK result.Z = vec.Z * scale; } - #endregion - - #region NormalizeFast - /// /// Scale a vector to approximately unit length /// @@ -672,10 +580,6 @@ namespace OpenTK result.Z = vec.Z * scale; } - #endregion - - #region Dot - /// /// Calculate the dot (scalar) product of two vectors /// @@ -698,10 +602,6 @@ namespace OpenTK result = left.X * right.X + left.Y * right.Y + left.Z * right.Z; } - #endregion - - #region Cross - /// /// Caclulate the cross (vector) product of two vectors /// @@ -729,10 +629,6 @@ namespace OpenTK left.X * right.Y - left.Y * right.X); } - #endregion - - #region Lerp - /// /// Returns a new Vector that is the linear blend of the 2 given Vectors /// @@ -762,10 +658,6 @@ namespace OpenTK result.Z = blend * (b.Z - a.Z) + a.Z; } - #endregion - - #region Barycentric - /// /// Interpolate 3 Vectors using Barycentric coordinates /// @@ -802,10 +694,6 @@ namespace OpenTK Add(ref result, ref temp, out result); } - #endregion - - #region Transform - /// Transform a direction vector by the given Matrix /// Assumes the matrix has a bottom row of (0,0,0,1), that is the translation part is ignored. /// @@ -1022,10 +910,6 @@ namespace OpenTK result.Z = v.Z / v.W; } - #endregion - - #region CalculateAngle - /// /// Calculates the angle (in radians) between two vectors. /// @@ -1052,14 +936,6 @@ namespace OpenTK result = System.Math.Acos(MathHelper.Clamp(temp / (first.Length * second.Length), -1.0, 1.0)); } - #endregion - - #endregion - - #region Swizzle - - #region 2-component - /// /// Gets or sets an OpenTK.Vector2d with the X and Y components of this instance. /// @@ -1096,10 +972,6 @@ namespace OpenTK [XmlIgnore] public Vector2d Zy { get { return new Vector2d(Z, Y); } set { Z = value.X; Y = value.Y; } } - #endregion - - #region 3-component - /// /// Gets or sets an OpenTK.Vector3d with the X, Z, and Y components of this instance. /// @@ -1130,12 +1002,6 @@ namespace OpenTK [XmlIgnore] public Vector3d Zyx { get { return new Vector3d(Z, Y, X); } set { Z = value.X; Y = value.Y; X = value.Z; } } - #endregion - - #endregion - - #region Operators - /// /// Adds two instances. /// @@ -1271,12 +1137,6 @@ namespace OpenTK return new Vector3((float)v3d.X, (float)v3d.Y, (float)v3d.Z); } - #endregion - - #region Overrides - - #region public override string ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// /// Returns a System.String that represents the current Vector3. @@ -1287,10 +1147,6 @@ namespace OpenTK return String.Format("({0}{3} {1}{3} {2})", X, Y, Z, listSeparator); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -1306,10 +1162,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -1323,14 +1175,6 @@ namespace OpenTK return this.Equals((Vector3d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current vector is equal to another vector. /// A vector to compare with this vector. /// true if the current vector is equal to the vector parameter; otherwise, false. @@ -1341,7 +1185,5 @@ namespace OpenTK Y == other.Y && Z == other.Z; } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Math/Vector3h.cs b/src/OpenTK/Math/Vector3h.cs index 52945c6d..b54e1817 100644 --- a/src/OpenTK/Math/Vector3h.cs +++ b/src/OpenTK/Math/Vector3h.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.IO; @@ -36,8 +34,6 @@ namespace OpenTK [Serializable, StructLayout(LayoutKind.Sequential)] public struct Vector3h : ISerializable, IEquatable { - #region Public Fields - /// The X component of the Half3. public Half X; @@ -47,10 +43,6 @@ namespace OpenTK /// The Z component of the Half3. public Half Z; - #endregion Public Fields - - #region Constructors - /// /// Constructs a new instance. /// @@ -214,12 +206,6 @@ namespace OpenTK Z = new Half(v.Z, throwOnError); } - #endregion Constructors - - #region Swizzle - - #region 2-component - /// /// Gets or sets an OpenTK.Vector2h with the X and Y components of this instance. /// @@ -256,10 +242,6 @@ namespace OpenTK [XmlIgnore] public Vector2h Zy { get { return new Vector2h(Z, Y); } set { Z = value.X; Y = value.Y; } } - #endregion - - #region 3-component - /// /// Gets or sets an OpenTK.Vector3h with the X, Z, and Y components of this instance. /// @@ -290,12 +272,6 @@ namespace OpenTK [XmlIgnore] public Vector3h Zyx { get { return new Vector3h(Z, Y, X); } set { Z = value.X; Y = value.Y; X = value.Z; } } - #endregion - - #endregion - - #region Half -> Single - /// /// Returns this Half3 instance's contents as Vector3. /// @@ -313,10 +289,6 @@ namespace OpenTK return new Vector3d(X, Y, Z); } - #endregion Half -> Single - - #region Conversions - /// Converts OpenTK.Vector3 to OpenTK.Half3. /// The Vector3 to convert. /// The resulting Half vector. @@ -357,17 +329,9 @@ namespace OpenTK return result; } - #endregion Conversions - - #region Constants - /// The size in bytes for an instance of the Half3 struct is 6. public static readonly int SizeInBytes = 6; - #endregion Constants - - #region ISerializable - /// Constructor used by ISerializable to deserialize the object. /// /// @@ -388,10 +352,6 @@ namespace OpenTK info.AddValue("Z", this.Z); } - #endregion ISerializable - - #region Binary dump - /// Updates the X,Y and Z components of this instance by reading from a Stream. /// A BinaryReader instance associated with an open Stream. public void FromBinaryStream(BinaryReader bin) @@ -410,10 +370,6 @@ namespace OpenTK Z.ToBinaryStream(bin); } - #endregion Binary dump - - #region IEquatable Members - /// Returns a value indicating whether this instance is equal to a specified OpenTK.Half3 vector. /// OpenTK.Half3 to compare to this instance.. /// True, if other is equal to this instance; false otherwise. @@ -422,10 +378,6 @@ namespace OpenTK return (this.X.Equals(other.X) && this.Y.Equals(other.Y) && this.Z.Equals(other.Z)); } - #endregion - - #region ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// Returns a string that contains this Half3's numbers in human-legible form. public override string ToString() @@ -433,10 +385,6 @@ namespace OpenTK return String.Format("({0}{3} {1}{3} {2})", X.ToString(), Y.ToString(), Z.ToString(), listSeparator); } - #endregion ToString() - - #region BitConverter - /// Returns the Half3 as an array of bytes. /// The Half3 to convert. /// The input as byte array. @@ -469,7 +417,5 @@ namespace OpenTK h3.Z = Half.FromBytes(value, startIndex + 4); return h3; } - - #endregion BitConverter } } diff --git a/src/OpenTK/Math/Vector4.cs b/src/OpenTK/Math/Vector4.cs index cc16503d..dd999f84 100644 --- a/src/OpenTK/Math/Vector4.cs +++ b/src/OpenTK/Math/Vector4.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -36,8 +34,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Vector4 : IEquatable { - #region Fields - /// /// The X component of the Vector4. /// @@ -93,10 +89,6 @@ namespace OpenTK /// public static readonly int SizeInBytes = Marshal.SizeOf(new Vector4()); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -175,10 +167,6 @@ namespace OpenTK W = v.W; } - #endregion - - #region Public Members - /// /// Gets or sets the value at the index of the Vector. /// @@ -198,10 +186,6 @@ namespace OpenTK } } - #region Instance - - #region public float Length - /// /// Gets the length (magnitude) of the vector. /// @@ -215,10 +199,6 @@ namespace OpenTK } } - #endregion - - #region public float LengthFast - /// /// Gets an approximation of the vector length (magnitude). /// @@ -236,10 +216,6 @@ namespace OpenTK } } - #endregion - - #region public float LengthSquared - /// /// Gets the square of the vector length (magnitude). /// @@ -257,8 +233,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Vector4 scaled to unit length. /// @@ -269,8 +243,6 @@ namespace OpenTK return v; } - #region public void Normalize() - /// /// Scales the Vector4 to unit length. /// @@ -283,10 +255,6 @@ namespace OpenTK W *= scale; } - #endregion - - #region public void NormalizeFast() - /// /// Scales the Vector4 to approximately unit length. /// @@ -299,14 +267,6 @@ namespace OpenTK W *= scale; } - #endregion - - #endregion - - #region Static - - #region Add - /// /// Adds two vectors. /// @@ -330,10 +290,6 @@ namespace OpenTK result = new Vector4(a.X + b.X, a.Y + b.Y, a.Z + b.Z, a.W + b.W); } - #endregion - - #region Subtract - /// /// Subtract one Vector from another /// @@ -357,10 +313,6 @@ namespace OpenTK result = new Vector4(a.X - b.X, a.Y - b.Y, a.Z - b.Z, a.W - b.W); } - #endregion - - #region Multiply - /// /// Multiplies a vector by a scalar. /// @@ -407,10 +359,6 @@ namespace OpenTK result = new Vector4(vector.X * scale.X, vector.Y * scale.Y, vector.Z * scale.Z, vector.W * scale.W); } - #endregion - - #region Divide - /// /// Divides a vector by a scalar. /// @@ -460,10 +408,6 @@ namespace OpenTK result = new Vector4(vector.X / scale.X, vector.Y / scale.Y, vector.Z / scale.Z, vector.W / scale.W); } - #endregion - - #region Min - /// /// Calculate the component-wise minimum of two vectors /// @@ -495,10 +439,6 @@ namespace OpenTK result.W = a.W < b.W ? a.W : b.W; } - #endregion - - #region Max - /// /// Calculate the component-wise maximum of two vectors /// @@ -530,10 +470,6 @@ namespace OpenTK result.W = a.W > b.W ? a.W : b.W; } - #endregion - - #region ComponentMin - /// /// Returns a vector created from the smallest of the corresponding components of the given vectors. /// @@ -563,10 +499,6 @@ namespace OpenTK result.W = a.W < b.W ? a.W : b.W; } - #endregion - - #region ComponentMax - /// /// Returns a vector created from the largest of the corresponding components of the given vectors. /// @@ -596,10 +528,6 @@ namespace OpenTK result.W = a.W > b.W ? a.W : b.W; } - #endregion - - #region MagnitudeMin - /// /// Returns the Vector4 with the minimum magnitude. If the magnitudes are equal, the second vector /// is selected. @@ -625,10 +553,6 @@ namespace OpenTK result = left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region MagnitudeMax - /// /// Returns the Vector4 with the maximum magnitude. If the magnitudes are equal, the first vector /// is selected. @@ -654,10 +578,6 @@ namespace OpenTK result = left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Clamp - /// /// Clamp a vector to the given minimum and maximum vectors /// @@ -689,10 +609,6 @@ namespace OpenTK result.W = vec.W < min.W ? min.W : vec.W > max.W ? max.W : vec.W; } - #endregion - - #region Normalize - /// /// Scale a vector to unit length /// @@ -722,10 +638,6 @@ namespace OpenTK result.W = vec.W * scale; } - #endregion - - #region NormalizeFast - /// /// Scale a vector to approximately unit length /// @@ -755,10 +667,6 @@ namespace OpenTK result.W = vec.W * scale; } - #endregion - - #region Dot - /// /// Calculate the dot product of two vectors /// @@ -781,10 +689,6 @@ namespace OpenTK result = left.X * right.X + left.Y * right.Y + left.Z * right.Z + left.W * right.W; } - #endregion - - #region Lerp - /// /// Returns a new Vector that is the linear blend of the 2 given Vectors /// @@ -816,10 +720,6 @@ namespace OpenTK result.W = blend * (b.W - a.W) + a.W; } - #endregion - - #region Barycentric - /// /// Interpolate 3 Vectors using Barycentric coordinates /// @@ -856,10 +756,6 @@ namespace OpenTK Add(ref result, ref temp, out result); } - #endregion - - #region Transform - /// Transform a Vector by the given Matrix /// The vector to transform /// The desired transformation @@ -936,14 +832,6 @@ namespace OpenTK mat.Row3.X * vec.X + mat.Row3.Y * vec.Y + mat.Row3.Z * vec.Z + mat.Row3.W * vec.W); } - #endregion - - #endregion - - #region Swizzle - - #region 2-component - /// /// Gets or sets an OpenTK.Vector2 with the X and Y components of this instance. /// @@ -1016,10 +904,6 @@ namespace OpenTK [XmlIgnore] public Vector2 Wz { get { return new Vector2(W, Z); } set { W = value.X; Z = value.Y; } } - #endregion - - #region 3-component - /// /// Gets or sets an OpenTK.Vector3 with the X, Y, and Z components of this instance. /// @@ -1164,10 +1048,6 @@ namespace OpenTK [XmlIgnore] public Vector3 Wzy { get { return new Vector3(W, Z, Y); } set { W = value.X; Z = value.Y; Y = value.Z; } } - #endregion - - #region 4-component - /// /// Gets or sets an OpenTK.Vector4 with the X, Y, W, and Z components of this instance. /// @@ -1330,12 +1210,6 @@ namespace OpenTK [XmlIgnore] public Vector4 Wzyw { get { return new Vector4(W, Z, Y, W); } set { X = value.X; Z = value.Y; Y = value.Z; W = value.W; } } - #endregion - - #endregion - - #region Operators - /// /// Adds two instances. /// @@ -1525,12 +1399,6 @@ namespace OpenTK } } - #endregion - - #region Overrides - - #region public override string ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// /// Returns a System.String that represents the current Vector4. @@ -1541,10 +1409,6 @@ namespace OpenTK return String.Format("({0}{4} {1}{4} {2}{4} {3})", X, Y, Z, W, listSeparator); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -1561,10 +1425,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -1578,14 +1438,6 @@ namespace OpenTK return this.Equals((Vector4)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current vector is equal to another vector. /// A vector to compare with this vector. /// true if the current vector is equal to the vector parameter; otherwise, false. @@ -1597,7 +1449,5 @@ namespace OpenTK Z == other.Z && W == other.W; } - - #endregion } } diff --git a/src/OpenTK/Math/Vector4d.cs b/src/OpenTK/Math/Vector4d.cs index 16816141..50baef87 100644 --- a/src/OpenTK/Math/Vector4d.cs +++ b/src/OpenTK/Math/Vector4d.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.Runtime.InteropServices; @@ -33,8 +31,6 @@ namespace OpenTK [StructLayout(LayoutKind.Sequential)] public struct Vector4d : IEquatable { - #region Fields - /// /// The X component of the Vector4d. /// @@ -90,10 +86,6 @@ namespace OpenTK /// public static readonly int SizeInBytes = Marshal.SizeOf(new Vector4d()); - #endregion - - #region Constructors - /// /// Constructs a new instance. /// @@ -172,10 +164,6 @@ namespace OpenTK W = v.W; } - #endregion - - #region Public Members - /// /// Gets or sets the value at the index of the Vector. /// @@ -195,10 +183,6 @@ namespace OpenTK } } - #region Instance - - #region public double Length - /// /// Gets the length (magnitude) of the vector. /// @@ -212,10 +196,6 @@ namespace OpenTK } } - #endregion - - #region public double LengthFast - /// /// Gets an approximation of the vector length (magnitude). /// @@ -233,10 +213,6 @@ namespace OpenTK } } - #endregion - - #region public double LengthSquared - /// /// Gets the square of the vector length (magnitude). /// @@ -253,8 +229,6 @@ namespace OpenTK } } - #endregion - /// /// Returns a copy of the Vector4d scaled to unit length. /// @@ -265,8 +239,6 @@ namespace OpenTK return v; } - #region public void Normalize() - /// /// Scales the Vector4d to unit length. /// @@ -279,10 +251,6 @@ namespace OpenTK W *= scale; } - #endregion - - #region public void NormalizeFast() - /// /// Scales the Vector4d to approximately unit length. /// @@ -295,14 +263,6 @@ namespace OpenTK W *= scale; } - #endregion - - #endregion - - #region Static - - #region Add - /// /// Adds two vectors. /// @@ -326,10 +286,6 @@ namespace OpenTK result = new Vector4d(a.X + b.X, a.Y + b.Y, a.Z + b.Z, a.W + b.W); } - #endregion - - #region Subtract - /// /// Subtract one Vector from another /// @@ -353,10 +309,6 @@ namespace OpenTK result = new Vector4d(a.X - b.X, a.Y - b.Y, a.Z - b.Z, a.W - b.W); } - #endregion - - #region Multiply - /// /// Multiplies a vector by a scalar. /// @@ -403,10 +355,6 @@ namespace OpenTK result = new Vector4d(vector.X * scale.X, vector.Y * scale.Y, vector.Z * scale.Z, vector.W * scale.W); } - #endregion - - #region Divide - /// /// Divides a vector by a scalar. /// @@ -456,10 +404,6 @@ namespace OpenTK result = new Vector4d(vector.X / scale.X, vector.Y / scale.Y, vector.Z / scale.Z, vector.W / scale.W); } - #endregion - - #region Min - /// /// Calculate the component-wise minimum of two vectors /// @@ -491,10 +435,6 @@ namespace OpenTK result.W = a.W < b.W ? a.W : b.W; } - #endregion - - #region Max - /// /// Calculate the component-wise maximum of two vectors /// @@ -526,10 +466,6 @@ namespace OpenTK result.W = a.W > b.W ? a.W : b.W; } - #endregion - - #region ComponentMin - /// /// Returns a vector created from the smallest of the corresponding components of the given vectors. /// @@ -559,10 +495,6 @@ namespace OpenTK result.W = a.W < b.W ? a.W : b.W; } - #endregion - - #region ComponentMax - /// /// Returns a vector created from the largest of the corresponding components of the given vectors. /// @@ -592,10 +524,6 @@ namespace OpenTK result.W = a.W > b.W ? a.W : b.W; } - #endregion - - #region MagnitudeMin - /// /// Returns the Vector4d with the minimum magnitude /// @@ -619,10 +547,6 @@ namespace OpenTK result = left.LengthSquared < right.LengthSquared ? left : right; } - #endregion - - #region MagnitudeMax - /// /// Returns the Vector4d with the minimum magnitude /// @@ -646,10 +570,6 @@ namespace OpenTK result = left.LengthSquared >= right.LengthSquared ? left : right; } - #endregion - - #region Clamp - /// /// Clamp a vector to the given minimum and maximum vectors /// @@ -681,10 +601,6 @@ namespace OpenTK result.W = vec.Y < min.W ? min.W : vec.W > max.W ? max.W : vec.W; } - #endregion - - #region Normalize - /// /// Scale a vector to unit length /// @@ -714,10 +630,6 @@ namespace OpenTK result.W = vec.W * scale; } - #endregion - - #region NormalizeFast - /// /// Scale a vector to approximately unit length /// @@ -747,10 +659,6 @@ namespace OpenTK result.W = vec.W * scale; } - #endregion - - #region Dot - /// /// Calculate the dot product of two vectors /// @@ -773,10 +681,6 @@ namespace OpenTK result = left.X * right.X + left.Y * right.Y + left.Z * right.Z + left.W * right.W; } - #endregion - - #region Lerp - /// /// Returns a new Vector that is the linear blend of the 2 given Vectors /// @@ -808,10 +712,6 @@ namespace OpenTK result.W = blend * (b.W - a.W) + a.W; } - #endregion - - #region Barycentric - /// /// Interpolate 3 Vectors using Barycentric coordinates /// @@ -848,10 +748,6 @@ namespace OpenTK Add(ref result, ref temp, out result); } - #endregion - - #region Transform - /// Transform a Vector by the given Matrix /// The vector to transform /// The desired transformation @@ -905,14 +801,6 @@ namespace OpenTK result = new Vector4d(v.X, v.Y, v.Z, v.W); } - #endregion - - #endregion - - #region Swizzle - - #region 2-component - /// /// Gets or sets an OpenTK.Vector2d with the X and Y components of this instance. /// @@ -985,10 +873,6 @@ namespace OpenTK [XmlIgnore] public Vector2d Wz { get { return new Vector2d(W, Z); } set { W = value.X; Z = value.Y; } } - #endregion - - #region 3-component - /// /// Gets or sets an OpenTK.Vector3d with the X, Y, and Z components of this instance. /// @@ -1133,10 +1017,6 @@ namespace OpenTK [XmlIgnore] public Vector3d Wzy { get { return new Vector3d(W, Z, Y); } set { W = value.X; Z = value.Y; Y = value.Z; } } - #endregion - - #region 4-component - /// /// Gets or sets an OpenTK.Vector4d with the X, Y, W, and Z components of this instance. /// @@ -1299,12 +1179,6 @@ namespace OpenTK [XmlIgnore] public Vector4d Wzyw { get { return new Vector4d(W, Z, Y, W); } set { X = value.X; Z = value.Y; Y = value.Z; W = value.W; } } - #endregion - - #endregion - - #region Operators - /// /// Adds two instances. /// @@ -1471,12 +1345,6 @@ namespace OpenTK return new Vector4((float)v4d.X, (float)v4d.Y, (float)v4d.Z, (float)v4d.W); } - #endregion - - #region Overrides - - #region public override string ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// /// Returns a System.String that represents the current Vector4d. @@ -1487,10 +1355,6 @@ namespace OpenTK return String.Format("({0}{4} {1}{4} {2}{4} {3})", X, Y, Z, W, listSeparator); } - #endregion - - #region public override int GetHashCode() - /// /// Returns the hashcode for this instance. /// @@ -1507,10 +1371,6 @@ namespace OpenTK } } - #endregion - - #region public override bool Equals(object obj) - /// /// Indicates whether this instance and a specified object are equal. /// @@ -1524,14 +1384,6 @@ namespace OpenTK return this.Equals((Vector4d)obj); } - #endregion - - #endregion - - #endregion - - #region IEquatable Members - /// Indicates whether the current vector is equal to another vector. /// A vector to compare with this vector. /// true if the current vector is equal to the vector parameter; otherwise, false. @@ -1543,7 +1395,5 @@ namespace OpenTK Z == other.Z && W == other.W; } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Math/Vector4h.cs b/src/OpenTK/Math/Vector4h.cs index d9499f73..1d049a87 100644 --- a/src/OpenTK/Math/Vector4h.cs +++ b/src/OpenTK/Math/Vector4h.cs @@ -1,4 +1,3 @@ -#region --- License --- /* Copyright (c) 2006 - 2008 The Open Toolkit library. @@ -20,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#endregion using System; using System.IO; @@ -36,8 +34,6 @@ namespace OpenTK [Serializable, StructLayout(LayoutKind.Sequential)] public struct Vector4h : ISerializable, IEquatable { - #region Public Fields - /// The X component of the Half4. public Half X; @@ -50,10 +46,6 @@ namespace OpenTK /// The W component of the Half4. public Half W; - #endregion Public Fields - - #region Constructors - /// /// Constructs a new instance. /// @@ -232,12 +224,6 @@ namespace OpenTK W = new Half(v.W, throwOnError); } - #endregion Constructors - - #region Swizzle - - #region 2-component - /// /// Gets or sets an OpenTK.Vector2h with the X and Y components of this instance. /// @@ -310,10 +296,6 @@ namespace OpenTK [XmlIgnore] public Vector2h Wz { get { return new Vector2h(W, Z); } set { W = value.X; Z = value.Y; } } - #endregion - - #region 3-component - /// /// Gets or sets an OpenTK.Vector3h with the X, Y, and Z components of this instance. /// @@ -458,10 +440,6 @@ namespace OpenTK [XmlIgnore] public Vector3h Wzy { get { return new Vector3h(W, Z, Y); } set { W = value.X; Z = value.Y; Y = value.Z; } } - #endregion - - #region 4-component - /// /// Gets or sets an OpenTK.Vector4h with the X, Y, W, and Z components of this instance. /// @@ -624,12 +602,6 @@ namespace OpenTK [XmlIgnore] public Vector4h Wzyw { get { return new Vector4h(W, Z, Y, W); } set { X = value.X; Z = value.Y; Y = value.Z; W = value.W; } } - #endregion - - #endregion - - #region Half -> Single - /// /// Returns this Half4 instance's contents as Vector4. /// @@ -647,10 +619,6 @@ namespace OpenTK return new Vector4d(X, Y, Z, W); } - #endregion Half -> Single - - #region Conversions - /// Converts OpenTK.Vector4 to OpenTK.Half4. /// The Vector4 to convert. /// The resulting Half vector. @@ -693,17 +661,9 @@ namespace OpenTK return result; } - #endregion Conversions - - #region Constants - /// The size in bytes for an instance of the Half4 struct is 8. public static readonly int SizeInBytes = 8; - #endregion Constants - - #region ISerializable - /// Constructor used by ISerializable to deserialize the object. /// /// @@ -726,10 +686,6 @@ namespace OpenTK info.AddValue("W", this.W); } - #endregion ISerializable - - #region Binary dump - /// Updates the X,Y,Z and W components of this instance by reading from a Stream. /// A BinaryReader instance associated with an open Stream. public void FromBinaryStream(BinaryReader bin) @@ -750,10 +706,6 @@ namespace OpenTK W.ToBinaryStream(bin); } - #endregion Binary dump - - #region IEquatable Members - /// Returns a value indicating whether this instance is equal to a specified OpenTK.Half4 vector. /// OpenTK.Half4 to compare to this instance.. /// True, if other is equal to this instance; false otherwise. @@ -762,10 +714,6 @@ namespace OpenTK return (this.X.Equals(other.X) && this.Y.Equals(other.Y) && this.Z.Equals(other.Z) && this.W.Equals(other.W)); } - #endregion - - #region ToString() - private static string listSeparator = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ListSeparator; /// Returns a string that contains this Half4's numbers in human-legible form. public override string ToString() @@ -773,10 +721,6 @@ namespace OpenTK return String.Format("({0}{4} {1}{4} {2}{4} {3})", X.ToString(), Y.ToString(), Z.ToString(), W.ToString(), listSeparator); } - #endregion ToString() - - #region BitConverter - /// Returns the Half4 as an array of bytes. /// The Half4 to convert. /// The input as byte array. @@ -813,7 +757,5 @@ namespace OpenTK h4.W = Half.FromBytes(value, startIndex + 6); return h4; } - - #endregion BitConverter } } diff --git a/src/OpenTK/Minimal.cs b/src/OpenTK/Minimal.cs index 56ddd440..b2bafe8b 100644 --- a/src/OpenTK/Minimal.cs +++ b/src/OpenTK/Minimal.cs @@ -106,8 +106,6 @@ namespace OpenTK Advanced = 2, } - #region RegistryKey - class RegistryKey { public RegistryKey OpenSubKey(string name) @@ -121,29 +119,15 @@ namespace OpenTK } } - #endregion - - #region Registry - class Registry { public static readonly RegistryKey LocalMachine = new RegistryKey(); } - #endregion - - #region PointF - public struct PointF : IEquatable { - #region Fields - float x, y; - #endregion - - #region Constructors - /// /// Constructs a new PointF instance. /// @@ -156,10 +140,6 @@ namespace OpenTK Y = y; } - #endregion - - #region Public Members - /// /// Gets a that indicates whether this instance is empty or zero. /// @@ -272,10 +252,6 @@ namespace OpenTK return String.Format("{{{0}, {1}}}", X, Y); } - #endregion - - #region IEquatable Members - /// /// Indicates whether this instance is equal to the specified PointF. /// @@ -285,24 +261,12 @@ namespace OpenTK { return X == other.X && Y == other.Y; } - - #endregion } - #endregion - - #region SizeF - public struct SizeF : IEquatable { - #region Fields - float width, height; - #endregion - - #region Constructors - /// /// Constructs a new SizeF instance. /// @@ -315,10 +279,6 @@ namespace OpenTK Height = height; } - #endregion - - #region Public Members - /// /// Gets or sets the width of this instance. /// @@ -418,10 +378,6 @@ namespace OpenTK return String.Format("{{{0}, {1}}}", Width, Height); } - #endregion - - #region IEquatable Members - /// /// Indicates whether this instance is equal to the specified SizeF. /// @@ -431,25 +387,13 @@ namespace OpenTK { return Width == other.Width && Height == other.Height; } - - #endregion } - #endregion - - #region RectangleF - public struct RectangleF : IEquatable { - #region Fields - PointF location; SizeF size; - #endregion - - #region Constructors - /// /// Constructs a new RectangleF instance. /// @@ -473,10 +417,6 @@ namespace OpenTK : this(new PointF(x, y), new SizeF(width, height)) { } - #endregion - - #region Public Members - /// /// Gets or sets the x coordinate of the RectangleF. /// @@ -663,10 +603,6 @@ namespace OpenTK return String.Format("{{{0}-{1}}}", Location, Location + Size); } - #endregion - - #region IEquatable Members - /// /// Indicates whether this instance is equal to the specified RectangleF. /// @@ -677,14 +613,8 @@ namespace OpenTK return Location.Equals(other.Location) && Size.Equals(other.Size); } - - #endregion } - #endregion - - #region Icon - public sealed class Icon : IDisposable { IntPtr handle; @@ -716,10 +646,6 @@ namespace OpenTK } } - #endregion - - #region Image - public abstract class Image : IDisposable { public void Dispose() { } @@ -729,10 +655,6 @@ namespace OpenTK } } - #endregion - - #region Bitmap - public sealed class Bitmap : Image { int width; @@ -770,7 +692,7 @@ namespace OpenTK { return new BitmapData(Width, Height, 0); } - + internal static int GetPixelFormatSize (PixelFormat format) { return 0; @@ -782,18 +704,12 @@ namespace OpenTK } } - #endregion - - #region Color - /// /// Represents a color with 4 8bit components (R, G, B, A). /// [Serializable] public struct Color : IEquatable { - #region Fields - /// /// The red component of this Color structure. /// @@ -814,10 +730,6 @@ namespace OpenTK /// public byte A; - #endregion - - #region Constructors - /// /// Constructs a new Color structure from the specified components. /// @@ -833,10 +745,6 @@ namespace OpenTK A = (byte)a; } - #endregion - - #region Public Members - /// /// Converts this color to an integer representation with 8 bits per channel. /// @@ -906,8 +814,6 @@ namespace OpenTK return String.Format("{{(R, G, B, A) = ({0}, {1}, {2}, {3})}}", R.ToString(), G.ToString(), B.ToString(), A.ToString()); } -#region System colors - /// /// Gets the system color with (R, G, B, A) = (255, 255, 255, 0). /// @@ -1613,12 +1519,6 @@ namespace OpenTK /// public static Color YellowGreen { get { return new Color(154, 205, 50, 255); } } - #endregion - - #endregion - - #region IEquatable Members - /// /// Compares whether this Color structure is equal to the specified Color. /// @@ -1633,18 +1533,12 @@ namespace OpenTK this.A == other.A; } - #endregion - public static Color FromArgb(int a, int r, int g, int b) { return new Color(r, g, b, a); } } - #endregion - - #region BitmapData - sealed class BitmapData { internal BitmapData(int width, int height, int stride) @@ -1660,10 +1554,6 @@ namespace OpenTK public int Stride { get; private set; } } - #endregion - - #region ImageLockMode - enum ImageLockMode { ReadOnly, @@ -1672,10 +1562,6 @@ namespace OpenTK UserInputBuffer } - #endregion - - #region PixelFormat - enum PixelFormat { Format32bppArgb @@ -1685,23 +1571,15 @@ namespace OpenTK Png } - #endregion - - #region SystemEvents - sealed class SystemEvents { public static event EventHandler DisplaySettingsChanged; } - - #endregion } // Need a different namespace to avoid clash with OpenTK.Graphics. namespace OpenTK.Minimal { - #region Graphics - sealed class Graphics : IDisposable { public static Graphics FromImage(OpenTK.Image img) @@ -1716,8 +1594,6 @@ namespace OpenTK.Minimal { } } - - #endregion } diff --git a/src/OpenTK/MouseCursor.cs b/src/OpenTK/MouseCursor.cs index df8cd0cf..88a872dd 100644 --- a/src/OpenTK/MouseCursor.cs +++ b/src/OpenTK/MouseCursor.cs @@ -1,5 +1,4 @@ -#region License -// +// // Cursor.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/NativeWindow.cs b/src/OpenTK/NativeWindow.cs index 2e8fb9f0..8d73c3c7 100644 --- a/src/OpenTK/NativeWindow.cs +++ b/src/OpenTK/NativeWindow.cs @@ -1,5 +1,4 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.ComponentModel; @@ -42,8 +40,6 @@ namespace OpenTK /// public class NativeWindow : INativeWindow { - #region --- Fields --- - private readonly GameWindowFlags options; private readonly DisplayDevice device; @@ -58,10 +54,6 @@ namespace OpenTK /// System.Threading.Thread.CurrentThread.ManagedThreadId of the thread that created this . /// private int thread_id; - #endregion - - #region --- Contructors --- - /// Constructs a new NativeWindow with default attributes without enabling events. public NativeWindow() : this(640, 480, "OpenTK Native Window", GameWindowFlags.Default, GraphicsMode.Default, DisplayDevice.Default) { } @@ -127,14 +119,6 @@ namespace OpenTK } } - #endregion - - #region --- INativeWindow Members --- - - #region Methods - - #region Close - /// /// Closes the NativeWindow. /// @@ -144,10 +128,6 @@ namespace OpenTK implementation.Close(); } - #endregion - - #region PointToClient - /// /// Transforms the specified point from screen to client coordinates. /// @@ -162,10 +142,6 @@ namespace OpenTK return implementation.PointToClient(point); } - #endregion - - #region PointToScreen - /// /// Transforms the specified point from client to screen coordinates. /// @@ -180,10 +156,6 @@ namespace OpenTK return implementation.PointToScreen(point); } - #endregion - - #region ProcessEvents - /// /// Processes operating system events until the NativeWindow becomes idle. /// @@ -192,14 +164,6 @@ namespace OpenTK ProcessEvents(false); } - #endregion - - #endregion - - #region Properties - - #region Bounds - /// /// Gets or sets a structure /// that specifies the external bounds of this window, in screen coordinates. @@ -220,10 +184,6 @@ namespace OpenTK } } - #endregion - - #region ClientRectangle - /// /// Gets or sets a structure /// that defines the bounds of the OpenGL surface, in window coordinates. @@ -243,10 +203,6 @@ namespace OpenTK } } - #endregion - - #region ClientSize - /// /// Gets or sets a structure /// that defines the size of the OpenGL surface in window coordinates. @@ -266,10 +222,6 @@ namespace OpenTK } } - #endregion - - #region Cursor - /// /// Gets or sets the for this window. /// @@ -291,10 +243,6 @@ namespace OpenTK } } - #endregion - - #region Exists - /// /// Gets a value indicating whether a render window exists. /// @@ -306,10 +254,6 @@ namespace OpenTK } } - #endregion - - #region Focused - /// /// Gets a System.Boolean that indicates whether this NativeWindow has input focus. /// @@ -322,10 +266,6 @@ namespace OpenTK } } - #endregion - - #region Height - /// /// Gets or sets the height of the OpenGL surface in window coordinates. /// The coordinates are specified in device-dependent pixels. @@ -344,10 +284,6 @@ namespace OpenTK } } - #endregion - - #region Icon - /// /// Gets or sets the System.Drawing.Icon for this GameWindow. /// @@ -365,10 +301,6 @@ namespace OpenTK } } - #endregion - - #region Location - /// /// Gets or sets a structure that contains the location of this window on the desktop. /// @@ -386,10 +318,6 @@ namespace OpenTK } } - #endregion - - #region Size - /// /// Gets or sets a structure that contains the external size of this window. /// @@ -407,10 +335,6 @@ namespace OpenTK } } - #endregion - - #region Title - /// /// Gets or sets the NativeWindow title. /// @@ -428,10 +352,6 @@ namespace OpenTK } } - #endregion - - #region Visible - /// /// Gets or sets a System.Boolean that indicates whether this NativeWindow is visible. /// @@ -449,10 +369,6 @@ namespace OpenTK } } - #endregion - - #region Width - /// /// Gets or sets the width of the OpenGL surface in window coordinates. /// The coordinates are specified in device-dependent pixels. @@ -471,10 +387,6 @@ namespace OpenTK } } - #endregion - - #region WindowBorder - /// /// Gets or sets the border of the NativeWindow. /// @@ -490,10 +402,6 @@ namespace OpenTK } } - #endregion - - #region WindowInfo - /// /// Gets the of this window. /// @@ -506,10 +414,6 @@ namespace OpenTK } } - #endregion - - #region WindowState - /// /// Gets or sets the state of the NativeWindow. /// @@ -525,10 +429,6 @@ namespace OpenTK } } - #endregion - - #region X - /// /// Gets or sets the horizontal location of this window in screen coordinates. /// The coordinates are specified in device-independent points. @@ -547,10 +447,6 @@ namespace OpenTK } } - #endregion - - #region Y - /// /// Gets or sets the vertical location of this window in screen coordinates. /// The coordinates are specified in device-independent points. @@ -569,10 +465,6 @@ namespace OpenTK } } - #endregion - - #region CursorVisible - /// /// Gets or sets a value indicating whether the mouse cursor is visible. /// @@ -586,12 +478,6 @@ namespace OpenTK } } - #endregion - - #endregion - - #region Events - /// /// Occurs after the window has closed. /// @@ -692,19 +578,11 @@ namespace OpenTK /// public event EventHandler MouseWheel = delegate { }; - /// - /// Occurs whenever a file dropped on window; - /// + /// + /// Occurs whenever a file dropped on window; + /// public event EventHandler FileDrop = delegate { }; - #endregion - - #endregion - - #region --- IDisposable Members --- - - #region Dispose - /// /// Releases all non-managed resources belonging to this NativeWindow. /// @@ -726,16 +604,6 @@ namespace OpenTK } } - #endregion - - #endregion - - #region --- Protected Members --- - - #region Methods - - #region EnsureUndisposed - /// /// Ensures that this NativeWindow has not been disposed. /// @@ -747,10 +615,6 @@ namespace OpenTK if (IsDisposed) throw new ObjectDisposedException(GetType().Name); } - #endregion - - #region IsDisposed - /// /// Gets or sets a , which indicates whether /// this instance has been disposed. @@ -761,10 +625,6 @@ namespace OpenTK set { disposed = value; } } - #endregion - - #region OnClosed - /// /// Called when the NativeWindow has closed. /// @@ -774,10 +634,6 @@ namespace OpenTK Closed(this, e); } - #endregion - - #region OnClosing - /// /// Called when the NativeWindow is about to close. /// @@ -789,10 +645,6 @@ namespace OpenTK Closing(this, e); } - #endregion - - #region OnDisposed - /// /// Called when the NativeWindow is disposed. /// @@ -802,10 +654,6 @@ namespace OpenTK Disposed(this, e); } - #endregion - - #region OnFocusedChanged - /// /// Called when the property of the NativeWindow has changed. /// @@ -829,10 +677,6 @@ namespace OpenTK FocusedChanged(this, e); } - #endregion - - #region OnIconChanged - /// /// Called when the property of the NativeWindow has changed. /// @@ -842,10 +686,6 @@ namespace OpenTK IconChanged(this, e); } - #endregion - - #region OnKeyDown - /// /// Occurs whenever a keyboard key is pressed. /// @@ -854,10 +694,6 @@ namespace OpenTK KeyDown(this, e); } - #endregion - - #region OnKeyPress - /// /// Called when a character is typed. /// @@ -867,10 +703,6 @@ namespace OpenTK KeyPress(this, e); } - #endregion - - #region OnKeyUp - /// /// Called when a keyboard key is released. /// @@ -880,10 +712,6 @@ namespace OpenTK KeyUp(this, e); } - #endregion - - #region OnMove - /// /// Called when the NativeWindow is moved. /// @@ -893,10 +721,6 @@ namespace OpenTK Move(this, e); } - #endregion - - #region OnMouseEnter - /// /// Called whenever the mouse cursor reenters the window . /// @@ -906,10 +730,6 @@ namespace OpenTK MouseEnter(this, e); } - #endregion - - #region OnMouseLeave - /// /// Called whenever the mouse cursor leaves the window . /// @@ -919,8 +739,6 @@ namespace OpenTK MouseLeave(this, e); } - #endregion - /// /// Raises the event. /// @@ -981,8 +799,6 @@ namespace OpenTK FileDrop(this, e); } - #region OnResize - /// /// Called when the NativeWindow is resized. /// @@ -992,10 +808,6 @@ namespace OpenTK Resize(this, e); } - #endregion - - #region OnTitleChanged - /// /// Called when the property of the NativeWindow has changed. /// @@ -1005,10 +817,6 @@ namespace OpenTK TitleChanged(this, e); } - #endregion - - #region OnVisibleChanged - /// /// Called when the property of the NativeWindow has changed. /// @@ -1018,10 +826,6 @@ namespace OpenTK VisibleChanged(this, e); } - #endregion - - #region OnWindowBorderChanged - /// /// Called when the WindowBorder of this NativeWindow has changed. /// @@ -1031,10 +835,6 @@ namespace OpenTK WindowBorderChanged(this, e); } - #endregion - - #region OnWindowStateChanged - /// /// Called when the WindowState of this NativeWindow has changed. /// @@ -1044,10 +844,6 @@ namespace OpenTK WindowStateChanged(this, e); } - #endregion - - #region ProcessEvents - /// /// Processes operating system events until the NativeWindow becomes idle. /// @@ -1063,80 +859,30 @@ namespace OpenTK implementation.ProcessEvents(); } - #endregion - - #endregion - - #endregion - - #region --- Private Members --- - - #region Methods - - #region OnClosedInternal - private void OnClosedInternal(object sender, EventArgs e) { OnClosed(e); Events = false; } - #endregion - - #region OnClosingInternal - private void OnClosingInternal(object sender, CancelEventArgs e) { OnClosing(e); } - #endregion - - #region OnDisposedInternal - private void OnDisposedInternal(object sender, EventArgs e) { OnDisposed(e); } - #endregion - - #region OnFocusedChangedInternal - private void OnFocusedChangedInternal(object sender, EventArgs e) { OnFocusedChanged(e); } - #endregion - - #region OnIconChangedInternal - private void OnIconChangedInternal(object sender, EventArgs e) { OnIconChanged(e); } - #endregion - - #region OnKeyDownInternal - private void OnKeyDownInternal(object sender, KeyboardKeyEventArgs e) { OnKeyDown(e); } - #endregion - - #region OnKeyPressInternal - private void OnKeyPressInternal(object sender, KeyPressEventArgs e) { OnKeyPress(e); } - #endregion - - #region OnKeyUpInternal - private void OnKeyUpInternal(object sender, KeyboardKeyEventArgs e) { OnKeyUp(e); } - #endregion - - #region OnMouseEnterInternal - private void OnMouseEnterInternal(object sender, EventArgs e) { OnMouseEnter(e); } - #endregion - - #region OnMouseLeaveInternal - private void OnMouseLeaveInternal(object sender, EventArgs e) { OnMouseLeave(e); } - #endregion - private void OnMouseDownInternal(object sender, MouseButtonEventArgs e) { OnMouseDown(e); } private void OnMouseUpInternal(object sender, MouseButtonEventArgs e) { OnMouseUp(e); } private void OnMouseMoveInternal(object sender, MouseMoveEventArgs e) { OnMouseMove(e); } @@ -1144,48 +890,18 @@ namespace OpenTK private void OnFileDropInternal(object sender, FileDropEventArgs e) { OnFileDrop(e); } - #region OnMoveInternal - private void OnMoveInternal(object sender, EventArgs e) { OnMove(e); } - #endregion - - #region OnResizeInternal - private void OnResizeInternal(object sender, EventArgs e) { OnResize(e); } - #endregion - - #region OnTitleChangedInternal - private void OnTitleChangedInternal(object sender, EventArgs e) { OnTitleChanged(e); } - #endregion - - #region OnVisibleChangedInternal - private void OnVisibleChangedInternal(object sender, EventArgs e) { OnVisibleChanged(e); } - #endregion - - #region OnWindowBorderChangedInternal - private void OnWindowBorderChangedInternal(object sender, EventArgs e) { OnWindowBorderChanged(e); } - #endregion - - #region OnWindowStateChangedInternal - private void OnWindowStateChangedInternal(object sender, EventArgs e) { OnWindowStateChanged(e); } - #endregion - - #endregion - - #region Properties - - #region Events - private bool Events { set @@ -1250,12 +966,6 @@ namespace OpenTK } } } - - #endregion - - #endregion - - #endregion } } diff --git a/src/OpenTK/Platform/Common/Hid.cs b/src/OpenTK/Platform/Common/Hid.cs index bf33d463..679f0182 100644 --- a/src/OpenTK/Platform/Common/Hid.cs +++ b/src/OpenTK/Platform/Common/Hid.cs @@ -1,5 +1,4 @@ -#region License -// +// // Hid.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -52,7 +50,7 @@ namespace OpenTK.Platform.Common if (value_min >= value_max || result_min >= result_max) throw new ArgumentOutOfRangeException(); MathHelper.Clamp(value, value_min, value_max); - + int range = result_max - result_min; long temp = (value - value_min) * range; // need long to avoid overflow return (int)(temp / (value_max - value_min) + result_min); @@ -113,34 +111,34 @@ namespace OpenTK.Platform.Common VR = 0x03, Sport = 0x04, Game = 0x05, - // Reserved 0x06 - KeyboardOrKeypad = 0x07, // USB Device Class Definition for Human Interface Devices (HID). Note: the usage type for all key codes is Selector (Sel). + // Reserved 0x06 + KeyboardOrKeypad = 0x07, // USB Device Class Definition for Human Interface Devices (HID). Note: the usage type for all key codes is Selector (Sel). LEDs = 0x08, Button = 0x09, Ordinal = 0x0A, Telephony = 0x0B, Consumer = 0x0C, Digitizer = 0x0D, - // Reserved 0x0E - PID = 0x0F, // USB Physical Interface Device definitions for force feedback and related devices. + // Reserved 0x0E + PID = 0x0F, // USB Physical Interface Device definitions for force feedback and related devices. Unicode = 0x10, - // Reserved 0x11 - 0x13 + // Reserved 0x11 - 0x13 AlphanumericDisplay = 0x14, - // Reserved 0x15 - 0x7F - // Monitor 0x80 - 0x83 USB Device Class Definition for Monitor Devices - // Power 0x84 - 0x87 USB Device Class Definition for Power Devices - PowerDevice = 0x84, // Power Device Page - BatterySystem = 0x85, // Battery System Page - // Reserved 0x88 - 0x8B - BarCodeScanner = 0x8C, // (Point of Sale) USB Device Class Definition for Bar Code Scanner Devices - WeighingDevice = 0x8D, // (Point of Sale) USB Device Class Definition for Weighing Devices - Scale = 0x8D, // (Point of Sale) USB Device Class Definition for Scale Devices + // Reserved 0x15 - 0x7F + // Monitor 0x80 - 0x83 USB Device Class Definition for Monitor Devices + // Power 0x84 - 0x87 USB Device Class Definition for Power Devices + PowerDevice = 0x84, // Power Device Page + BatterySystem = 0x85, // Battery System Page + // Reserved 0x88 - 0x8B + BarCodeScanner = 0x8C, // (Point of Sale) USB Device Class Definition for Bar Code Scanner Devices + WeighingDevice = 0x8D, // (Point of Sale) USB Device Class Definition for Weighing Devices + Scale = 0x8D, // (Point of Sale) USB Device Class Definition for Scale Devices MagneticStripeReader = 0x8E, - // ReservedPointofSalepages 0x8F - CameraControl = 0x90, // USB Device Class Definition for Image Class Devices - Arcade = 0x91, // OAAF Definitions for arcade and coinop related Devices - // Reserved 0x92 - 0xFEFF - // VendorDefined 0xFF00 - 0xFFFF + // ReservedPointofSalepages 0x8F + CameraControl = 0x90, // USB Device Class Definition for Image Class Devices + Arcade = 0x91, // OAAF Definitions for arcade and coinop related Devices + // Reserved 0x92 - 0xFEFF + // VendorDefined 0xFF00 - 0xFFFF VendorDefinedStart = 0xFF00 } @@ -153,118 +151,118 @@ namespace OpenTK.Platform.Common // Generic desktop usage enum HIDUsageGD : ushort { - Pointer = 0x01, // Physical Collection - Mouse = 0x02, // Application Collection - // 0x03 Reserved - Joystick = 0x04, // Application Collection - GamePad = 0x05, // Application Collection - Keyboard = 0x06, // Application Collection - Keypad = 0x07, // Application Collection - MultiAxisController = 0x08, // Application Collection - // 0x09 - 0x2F Reserved - X = 0x30, // Dynamic Value - Y = 0x31, // Dynamic Value - Z = 0x32, // Dynamic Value - Rx = 0x33, // Dynamic Value - Ry = 0x34, // Dynamic Value - Rz = 0x35, // Dynamic Value - Slider = 0x36, // Dynamic Value - Dial = 0x37, // Dynamic Value - Wheel = 0x38, // Dynamic Value - Hatswitch = 0x39, // Dynamic Value - CountedBuffer = 0x3A, // Logical Collection - ByteCount = 0x3B, // Dynamic Value - MotionWakeup = 0x3C, // One-Shot Control - Start = 0x3D, // On/Off Control - Select = 0x3E, // On/Off Control - // 0x3F Reserved - Vx = 0x40, // Dynamic Value - Vy = 0x41, // Dynamic Value - Vz = 0x42, // Dynamic Value - Vbrx = 0x43, // Dynamic Value - Vbry = 0x44, // Dynamic Value - Vbrz = 0x45, // Dynamic Value - Vno = 0x46, // Dynamic Value - // 0x47 - 0x7F Reserved - SystemControl = 0x80, // Application Collection - SystemPowerDown = 0x81, // One-Shot Control - SystemSleep = 0x82, // One-Shot Control - SystemWakeUp = 0x83, // One-Shot Control - SystemContextMenu = 0x84, // One-Shot Control - SystemMainMenu = 0x85, // One-Shot Control - SystemAppMenu = 0x86, // One-Shot Control - SystemMenuHelp = 0x87, // One-Shot Control - SystemMenuExit = 0x88, // One-Shot Control - SystemMenu = 0x89, // Selector - SystemMenuRight = 0x8A, // Re-Trigger Control - SystemMenuLeft = 0x8B, // Re-Trigger Control - SystemMenuUp = 0x8C, // Re-Trigger Control - SystemMenuDown = 0x8D, // Re-Trigger Control - // 0x8E - 0x8F Reserved - DPadUp = 0x90, // On/Off Control - DPadDown = 0x91, // On/Off Control - DPadRight = 0x92, // On/Off Control - DPadLeft = 0x93, // On/Off Control - // 0x94 - 0xFFFF Reserved + Pointer = 0x01, // Physical Collection + Mouse = 0x02, // Application Collection + // 0x03 Reserved + Joystick = 0x04, // Application Collection + GamePad = 0x05, // Application Collection + Keyboard = 0x06, // Application Collection + Keypad = 0x07, // Application Collection + MultiAxisController = 0x08, // Application Collection + // 0x09 - 0x2F Reserved + X = 0x30, // Dynamic Value + Y = 0x31, // Dynamic Value + Z = 0x32, // Dynamic Value + Rx = 0x33, // Dynamic Value + Ry = 0x34, // Dynamic Value + Rz = 0x35, // Dynamic Value + Slider = 0x36, // Dynamic Value + Dial = 0x37, // Dynamic Value + Wheel = 0x38, // Dynamic Value + Hatswitch = 0x39, // Dynamic Value + CountedBuffer = 0x3A, // Logical Collection + ByteCount = 0x3B, // Dynamic Value + MotionWakeup = 0x3C, // One-Shot Control + Start = 0x3D, // On/Off Control + Select = 0x3E, // On/Off Control + // 0x3F Reserved + Vx = 0x40, // Dynamic Value + Vy = 0x41, // Dynamic Value + Vz = 0x42, // Dynamic Value + Vbrx = 0x43, // Dynamic Value + Vbry = 0x44, // Dynamic Value + Vbrz = 0x45, // Dynamic Value + Vno = 0x46, // Dynamic Value + // 0x47 - 0x7F Reserved + SystemControl = 0x80, // Application Collection + SystemPowerDown = 0x81, // One-Shot Control + SystemSleep = 0x82, // One-Shot Control + SystemWakeUp = 0x83, // One-Shot Control + SystemContextMenu = 0x84, // One-Shot Control + SystemMainMenu = 0x85, // One-Shot Control + SystemAppMenu = 0x86, // One-Shot Control + SystemMenuHelp = 0x87, // One-Shot Control + SystemMenuExit = 0x88, // One-Shot Control + SystemMenu = 0x89, // Selector + SystemMenuRight = 0x8A, // Re-Trigger Control + SystemMenuLeft = 0x8B, // Re-Trigger Control + SystemMenuUp = 0x8C, // Re-Trigger Control + SystemMenuDown = 0x8D, // Re-Trigger Control + // 0x8E - 0x8F Reserved + DPadUp = 0x90, // On/Off Control + DPadDown = 0x91, // On/Off Control + DPadRight = 0x92, // On/Off Control + DPadLeft = 0x93, // On/Off Control + // 0x94 - 0xFFFF Reserved Reserved = 0xFFFF } enum HIDUsageSim : ushort { - FlightSimulationDevice = 0x01, // Application Collection - AutomobileSimulationDevice = 0x02, // Application Collection - TankSimulationDevice = 0x03, // Application Collection - SpaceshipSimulationDevice = 0x04, // Application Collection - SubmarineSimulationDevice = 0x05, // Application Collection - SailingSimulationDevice = 0x06, // Application Collection - MotorcycleSimulationDevice = 0x07, // Application Collection - SportsSimulationDevice = 0x08, // Application Collection - AirplaneSimulationDevice = 0x09, // Application Collection - HelicopterSimulationDevice = 0x0A, // Application Collection - MagicCarpetSimulationDevice = 0x0B, // Application Collection - BicycleSimulationDevice = 0x0C, // Application Collection - // 0x0D - 0x1F Reserved - FlightControlStick = 0x20, // Application Collection - FlightStick = 0x21, // Application Collection - CyclicControl = 0x22, // Physical Collection - CyclicTrim = 0x23, // Physical Collection - FlightYoke = 0x24, // Application Collection - TrackControl = 0x25, // Physical Collection - // 0x26 - 0xAF Reserved - Aileron = 0xB0, // Dynamic Value - AileronTrim = 0xB1, // Dynamic Value - AntiTorqueControl = 0xB2, // Dynamic Value - AutopilotEnable = 0xB3, // On/Off Control - ChaffRelease = 0xB4, // One-Shot Control - CollectiveControl = 0xB5, // Dynamic Value - DiveBrake = 0xB6, // Dynamic Value - ElectronicCountermeasures = 0xB7, // On/Off Control - Elevator = 0xB8, // Dynamic Value - ElevatorTrim = 0xB9, // Dynamic Value - Rudder = 0xBA, // Dynamic Value - Throttle = 0xBB, // Dynamic Value - FlightCommunications = 0xBC, // On/Off Control - FlareRelease = 0xBD, // One-Shot Control - LandingGear = 0xBE, // On/Off Control - ToeBrake = 0xBF, // Dynamic Value - Trigger = 0xC0, // Momentary Control - WeaponsArm = 0xC1, // On/Off Control - Weapons = 0xC2, // Selector - WingFlaps = 0xC3, // Dynamic Value - Accelerator = 0xC4, // Dynamic Value - Brake = 0xC5, // Dynamic Value - Clutch = 0xC6, // Dynamic Value - Shifter = 0xC7, // Dynamic Value - Steering = 0xC8, // Dynamic Value - TurretDirection = 0xC9, // Dynamic Value - BarrelElevation = 0xCA, // Dynamic Value - DivePlane = 0xCB, // Dynamic Value - Ballast = 0xCC, // Dynamic Value - BicycleCrank = 0xCD, // Dynamic Value - HandleBars = 0xCE, // Dynamic Value - FrontBrake = 0xCF, // Dynamic Value - RearBrake = 0xD0, // Dynamic Value - // 0xD1 - 0xFFFF Reserved + FlightSimulationDevice = 0x01, // Application Collection + AutomobileSimulationDevice = 0x02, // Application Collection + TankSimulationDevice = 0x03, // Application Collection + SpaceshipSimulationDevice = 0x04, // Application Collection + SubmarineSimulationDevice = 0x05, // Application Collection + SailingSimulationDevice = 0x06, // Application Collection + MotorcycleSimulationDevice = 0x07, // Application Collection + SportsSimulationDevice = 0x08, // Application Collection + AirplaneSimulationDevice = 0x09, // Application Collection + HelicopterSimulationDevice = 0x0A, // Application Collection + MagicCarpetSimulationDevice = 0x0B, // Application Collection + BicycleSimulationDevice = 0x0C, // Application Collection + // 0x0D - 0x1F Reserved + FlightControlStick = 0x20, // Application Collection + FlightStick = 0x21, // Application Collection + CyclicControl = 0x22, // Physical Collection + CyclicTrim = 0x23, // Physical Collection + FlightYoke = 0x24, // Application Collection + TrackControl = 0x25, // Physical Collection + // 0x26 - 0xAF Reserved + Aileron = 0xB0, // Dynamic Value + AileronTrim = 0xB1, // Dynamic Value + AntiTorqueControl = 0xB2, // Dynamic Value + AutopilotEnable = 0xB3, // On/Off Control + ChaffRelease = 0xB4, // One-Shot Control + CollectiveControl = 0xB5, // Dynamic Value + DiveBrake = 0xB6, // Dynamic Value + ElectronicCountermeasures = 0xB7, // On/Off Control + Elevator = 0xB8, // Dynamic Value + ElevatorTrim = 0xB9, // Dynamic Value + Rudder = 0xBA, // Dynamic Value + Throttle = 0xBB, // Dynamic Value + FlightCommunications = 0xBC, // On/Off Control + FlareRelease = 0xBD, // One-Shot Control + LandingGear = 0xBE, // On/Off Control + ToeBrake = 0xBF, // Dynamic Value + Trigger = 0xC0, // Momentary Control + WeaponsArm = 0xC1, // On/Off Control + Weapons = 0xC2, // Selector + WingFlaps = 0xC3, // Dynamic Value + Accelerator = 0xC4, // Dynamic Value + Brake = 0xC5, // Dynamic Value + Clutch = 0xC6, // Dynamic Value + Shifter = 0xC7, // Dynamic Value + Steering = 0xC8, // Dynamic Value + TurretDirection = 0xC9, // Dynamic Value + BarrelElevation = 0xCA, // Dynamic Value + DivePlane = 0xCB, // Dynamic Value + Ballast = 0xCC, // Dynamic Value + BicycleCrank = 0xCD, // Dynamic Value + HandleBars = 0xCE, // Dynamic Value + FrontBrake = 0xCF, // Dynamic Value + RearBrake = 0xD0, // Dynamic Value + // 0xD1 - 0xFFFF Reserved Reserved = 0xFFFF } } diff --git a/src/OpenTK/Platform/DesktopGraphicsContext.cs b/src/OpenTK/Platform/DesktopGraphicsContext.cs index 9174d6f4..0e352c80 100644 --- a/src/OpenTK/Platform/DesktopGraphicsContext.cs +++ b/src/OpenTK/Platform/DesktopGraphicsContext.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; diff --git a/src/OpenTK/Platform/DeviceCollection.cs b/src/OpenTK/Platform/DeviceCollection.cs index 02e74923..4a4c8ecf 100644 --- a/src/OpenTK/Platform/DeviceCollection.cs +++ b/src/OpenTK/Platform/DeviceCollection.cs @@ -1,11 +1,10 @@ -#region License -// +// // DeviceCollection.cs // // Author: // Stefanos A. // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,26 +42,16 @@ namespace OpenTK.Platform readonly Dictionary Map = new Dictionary(); readonly List Devices = new List(); - #region IEnumerable Members - IEnumerator IEnumerable.GetEnumerator() { return Devices.GetEnumerator(); } - #endregion - - #region IEnumerable implementation - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { return GetEnumerator(); } - #endregion - - #region Public Members - // This avoids boxing when using foreach loops public List.Enumerator GetEnumerator() { @@ -171,10 +159,6 @@ namespace OpenTK.Platform get { return Map.Count; } } - #endregion - - #region Private Members - // Return the index of the first empty slot in Devices. // If no empty slot exists, append a new one and return // that index. @@ -191,8 +175,6 @@ namespace OpenTK.Platform Devices.Add(default(T)); return Devices.Count - 1; } - - #endregion } } diff --git a/src/OpenTK/Platform/DisplayDeviceBase.cs b/src/OpenTK/Platform/DisplayDeviceBase.cs index 740e7804..edb545da 100644 --- a/src/OpenTK/Platform/DisplayDeviceBase.cs +++ b/src/OpenTK/Platform/DisplayDeviceBase.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/Dummy/DummyGLContext.cs b/src/OpenTK/Platform/Dummy/DummyGLContext.cs index 23140a23..f6007ec3 100644 --- a/src/OpenTK/Platform/Dummy/DummyGLContext.cs +++ b/src/OpenTK/Platform/Dummy/DummyGLContext.cs @@ -1,10 +1,8 @@ -#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; @@ -28,8 +26,6 @@ namespace OpenTK.Platform.Dummy static int handle_count; Thread current_thread; - #region --- Constructors --- - public DummyGLContext() { Handle = new ContextHandle( @@ -48,10 +44,6 @@ namespace OpenTK.Platform.Dummy Mode = new GraphicsMode(new IntPtr(2), 32, 16, 0, 0, 0, 2, false); } - #endregion - - #region --- IGraphicsContext Members --- - public override void SwapBuffers() { } public override void MakeCurrent(IWindowInfo info) @@ -113,12 +105,6 @@ namespace OpenTK.Platform.Dummy #endif } - #endregion - - #region --- IDisposable Members --- - protected override void Dispose(bool disposing) { IsDisposed = true; } - - #endregion } } diff --git a/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs b/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs index f4a4680e..763bd946 100644 --- a/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs +++ b/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs @@ -6,14 +6,10 @@ namespace OpenTK.Platform.Dummy { class DummyWindowInfo : IWindowInfo { - #region IDisposable Members - public void Dispose() { } - #endregion - public IntPtr Handle { get { return IntPtr.Zero; } diff --git a/src/OpenTK/Platform/Egl/Egl.cs b/src/OpenTK/Platform/Egl/Egl.cs index 8a23a006..bf973488 100644 --- a/src/OpenTK/Platform/Egl/Egl.cs +++ b/src/OpenTK/Platform/Egl/Egl.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; @@ -207,7 +205,7 @@ namespace OpenTK.Platform.Egl public const int D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE = 0x3200; // EGL_ANGLE_window_fixed_size public const int FIXED_SIZE_ANGLE = 0x3201; - // EGL_ANGLE_query_surface_pointer + // EGL_ANGLE_query_surface_pointer [DllImport("libEGL.dll", EntryPoint = "eglQuerySurfacePointerANGLE")] public static extern bool QuerySurfacePointerANGLE(EGLDisplay display, EGLSurface surface, int attribute, out IntPtr value); @@ -379,13 +377,13 @@ namespace OpenTK.Platform.Egl // EGL_EXT_platform_base [DllImport("libEGL.dll", EntryPoint = "eglGetPlatformDisplayEXT")] public static extern EGLDisplay GetPlatformDisplayEXT(int platform, EGLNativeDisplayType native_display, int[] attrib_list); - + [DllImport("libEGL.dll", EntryPoint = "eglCreatePlatformWindowSurfaceEXT")] public static extern EGLSurface CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType native_window, int[] attrib_list); - + [DllImport("libEGL.dll", EntryPoint = "eglCreatePlatformPixmapSurfaceEXT")] public static extern EGLSurface CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType native_pixmap, int[] attrib_list); - + // Returns true if Egl drivers exist on the system. public static bool IsSupported { diff --git a/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs b/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs index 914e09c0..2d2cb07e 100644 --- a/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs +++ b/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs @@ -1,5 +1,4 @@ -#region License - + // // The Open Toolkit Library License // @@ -7,7 +6,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -25,8 +24,6 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#endregion - using System; using OpenTK.Graphics; using OpenTK.Input; @@ -36,8 +33,6 @@ namespace OpenTK.Platform.Egl internal class EglAnglePlatformFactory : PlatformFactoryBase { private readonly IPlatformFactory _platform_factory; - #region Public Members - public EglAnglePlatformFactory(IPlatformFactory platform_factory) { _platform_factory = platform_factory; @@ -98,10 +93,6 @@ namespace OpenTK.Platform.Egl return _platform_factory.CreateJoystickDriver(); } - #endregion - - #region Private Members - private static bool FlagEnabled(GraphicsContextFlags flags, GraphicsContextFlags flag) { return (flags & flag) != 0; @@ -166,7 +157,5 @@ namespace OpenTK.Platform.Egl attribs ); } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Platform/Egl/EglContext.cs b/src/OpenTK/Platform/Egl/EglContext.cs index 51335731..56ffcab5 100644 --- a/src/OpenTK/Platform/Egl/EglContext.cs +++ b/src/OpenTK/Platform/Egl/EglContext.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -34,8 +32,6 @@ namespace OpenTK.Platform.Egl { abstract class EglContext : EmbeddedGraphicsContext { - #region Fields - protected readonly RenderableFlags Renderable; internal EglWindowInfo WindowInfo; @@ -44,10 +40,6 @@ namespace OpenTK.Platform.Egl internal IntPtr HandleAsEGLContext { get { return Handle.Handle; } set { Handle = new ContextHandle(value); } } int swap_interval = 1; // Default interval is defined as 1 in EGL. - #endregion - - #region Constructors - public EglContext(GraphicsMode mode, EglWindowInfo window, IGraphicsContext sharedContext, int major, int minor, GraphicsContextFlags flags) { @@ -90,8 +82,8 @@ namespace OpenTK.Platform.Egl bool offscreen = (flags & GraphicsContextFlags.Offscreen) != 0; - SurfaceType surfaceType = offscreen - ? SurfaceType.PBUFFER_BIT + SurfaceType surfaceType = offscreen + ? SurfaceType.PBUFFER_BIT : SurfaceType.WINDOW_BIT; Mode = new EglGraphicsMode().SelectGraphicsMode(surfaceType, @@ -133,10 +125,6 @@ namespace OpenTK.Platform.Egl Handle = handle; } - #endregion - - #region IGraphicsContext Members - public override void SwapBuffers() { if (!Egl.SwapBuffers(WindowInfo.Display, WindowInfo.Surface)) @@ -204,7 +192,7 @@ namespace OpenTK.Platform.Egl { MakeCurrent(window); // ANGLE updates the width and height of the back buffer surfaces in the WaitClient function. - // So without this calling this function, the surface won't match the size of the window after it + // So without this calling this function, the surface won't match the size of the window after it // was resized. // https://bugs.chromium.org/p/angleproject/issues/detail?id=1438 if (!Egl.WaitClient()) @@ -213,10 +201,6 @@ namespace OpenTK.Platform.Egl } } - #endregion - - #region IGraphicsContextInternal Members - public override IntPtr GetAddress(IntPtr function) { // Try loading a static export from ES1 or ES2 @@ -232,16 +216,8 @@ namespace OpenTK.Platform.Egl return address; } - #endregion - - #region Abstract Members - protected abstract IntPtr GetStaticAddress(IntPtr function, RenderableFlags renderable); - #endregion - - #region IDisposable Members - // Todo: cross-reference the specs. What should happen if the context is destroyed from a different // thread? protected override void Dispose(bool manual) @@ -272,7 +248,5 @@ namespace OpenTK.Platform.Egl } return (EglContext) sharedContext; } - - #endregion } } diff --git a/src/OpenTK/Platform/Egl/EglGraphicsMode.cs b/src/OpenTK/Platform/Egl/EglGraphicsMode.cs index 8a5b7ea9..36343c3e 100644 --- a/src/OpenTK/Platform/Egl/EglGraphicsMode.cs +++ b/src/OpenTK/Platform/Egl/EglGraphicsMode.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using OpenTK.Graphics; @@ -47,24 +45,24 @@ namespace OpenTK.Platform.Egl RenderableFlags renderableFlags) { return SelectGraphicsMode( - SurfaceType.WINDOW_BIT, + SurfaceType.WINDOW_BIT, window.Display, color, depth, stencil, samples, accum, buffers, stereo, renderableFlags); } - public GraphicsMode SelectGraphicsMode(SurfaceType surfaceType, + public GraphicsMode SelectGraphicsMode(SurfaceType surfaceType, IntPtr display, ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo, RenderableFlags renderableFlags) { IntPtr[] configs = new IntPtr[1]; - int[] attribList = new int[] - { + int[] attribList = new int[] + { Egl.SURFACE_TYPE, (int) surfaceType, Egl.RENDERABLE_TYPE, (int)renderableFlags, - Egl.RED_SIZE, color.Red, - Egl.GREEN_SIZE, color.Green, + Egl.RED_SIZE, color.Red, + Egl.GREEN_SIZE, color.Green, Egl.BLUE_SIZE, color.Blue, Egl.ALPHA_SIZE, color.Alpha, diff --git a/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs b/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs index d369e0a2..5891ae71 100644 --- a/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs +++ b/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs b/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs index 32aaec52..294763e0 100644 --- a/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs +++ b/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using OpenTK.Graphics; diff --git a/src/OpenTK/Platform/Egl/EglUnixContext.cs b/src/OpenTK/Platform/Egl/EglUnixContext.cs index d2f82008..fb1215f0 100644 --- a/src/OpenTK/Platform/Egl/EglUnixContext.cs +++ b/src/OpenTK/Platform/Egl/EglUnixContext.cs @@ -1,5 +1,4 @@ -#region License -// +// // EglUnixContext.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; diff --git a/src/OpenTK/Platform/Egl/EglWinContext.cs b/src/OpenTK/Platform/Egl/EglWinContext.cs index 86d736cf..de340c92 100644 --- a/src/OpenTK/Platform/Egl/EglWinContext.cs +++ b/src/OpenTK/Platform/Egl/EglWinContext.cs @@ -1,5 +1,4 @@ -#region License -// +// // EglWinContext.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using OpenTK.Graphics; @@ -49,8 +47,6 @@ namespace OpenTK.Platform.Egl { } - #region Protected Members - protected override IntPtr GetStaticAddress(IntPtr function, RenderableFlags renderable) { if ((renderable & (RenderableFlags.ES2 | RenderableFlags.ES3)) != 0 && ES2 != IntPtr.Zero) @@ -79,7 +75,5 @@ namespace OpenTK.Platform.Egl base.Dispose(manual); } - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs b/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs index f0fd6e89..c629fd59 100644 --- a/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs +++ b/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -37,8 +35,6 @@ namespace OpenTK.Platform.Egl // EGL factory for the Windows platform. class EglWinPlatformFactory : WinFactory { - #region Public Members - public override IGraphicsContext CreateGLContext(GraphicsMode mode, IWindowInfo window, IGraphicsContext shareContext, bool directRendering, int major, int minor, GraphicsContextFlags flags) { WinWindowInfo win_win = (WinWindowInfo)window; @@ -63,10 +59,6 @@ namespace OpenTK.Platform.Egl }; } - #endregion - - #region Private Members - IntPtr GetDisplay(IntPtr dc) { IntPtr display = Egl.GetDisplay(dc); @@ -75,7 +67,5 @@ namespace OpenTK.Platform.Egl return display; } - - #endregion } } diff --git a/src/OpenTK/Platform/Egl/EglWindowInfo.cs b/src/OpenTK/Platform/Egl/EglWindowInfo.cs index 0f14dc74..971c89e5 100644 --- a/src/OpenTK/Platform/Egl/EglWindowInfo.cs +++ b/src/OpenTK/Platform/Egl/EglWindowInfo.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -36,17 +34,11 @@ namespace OpenTK.Platform.Egl // Holds information about an EGL window. class EglWindowInfo : IWindowInfo { - #region Fields - IntPtr handle; IntPtr display; IntPtr surface; bool disposed; - #endregion - - #region Constructors - public EglWindowInfo(IntPtr handle, IntPtr display) : this(handle, display, IntPtr.Zero) { @@ -71,10 +63,6 @@ namespace OpenTK.Platform.Egl } } - #endregion - - #region Public Members - public IntPtr Handle { get { return handle; } set { handle = value; } } public IntPtr Display { get { return display; } private set { display = value; } } @@ -113,7 +101,7 @@ namespace OpenTK.Platform.Egl { DestroySurface(); } - CreatePbufferSurface(config, width, height, out surface); + CreatePbufferSurface(config, width, height, out surface); } public void CreatePbufferSurface(IntPtr config, int width, int height, out IntPtr bufferSurface) @@ -155,7 +143,7 @@ namespace OpenTK.Platform.Egl bufferSurface = IntPtr.Zero; return; } - + Debug.Print("[Warning] Failed to destroy {0}:{1}.", Surface.GetType().Name, Surface); Surface = IntPtr.Zero; } @@ -170,10 +158,6 @@ namespace OpenTK.Platform.Egl } } - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -200,7 +184,5 @@ namespace OpenTK.Platform.Egl { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs b/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs index e180fc5f..c685bfca 100644 --- a/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs +++ b/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/EmbeddedGraphicsContext.cs b/src/OpenTK/Platform/EmbeddedGraphicsContext.cs index 37ff71d0..04f93ae4 100644 --- a/src/OpenTK/Platform/EmbeddedGraphicsContext.cs +++ b/src/OpenTK/Platform/EmbeddedGraphicsContext.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Diagnostics; diff --git a/src/OpenTK/Platform/Factory.cs b/src/OpenTK/Platform/Factory.cs index b67ba908..ef85e2c8 100644 --- a/src/OpenTK/Platform/Factory.cs +++ b/src/OpenTK/Platform/Factory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -35,17 +33,11 @@ namespace OpenTK.Platform sealed class Factory : IPlatformFactory { - #region Fields - private bool disposed; private static IPlatformFactory defaultImplementation; private static IPlatformFactory embeddedImplementation; private static IPlatformFactory angleImplementation; - #endregion - - #region Constructors - static Factory() { Toolkit.Init(); @@ -120,10 +112,6 @@ namespace OpenTK.Platform Default = Embedded; } - #endregion - - #region Public Members - public static IPlatformFactory Default { get { return defaultImplementation; } @@ -142,10 +130,6 @@ namespace OpenTK.Platform private set { angleImplementation = value; } } - #endregion - - #region IPlatformFactory Members - public INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) { @@ -199,14 +183,8 @@ namespace OpenTK.Platform class UnsupportedPlatform : PlatformFactoryBase { - #region Fields - static readonly string error_string = "Please, refer to http://www.opentk.com for more information."; - #endregion - - #region IPlatformFactory Members - public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) { throw new PlatformNotSupportedException(error_string); @@ -246,14 +224,8 @@ namespace OpenTK.Platform { throw new PlatformNotSupportedException(error_string); } - - #endregion } - #endregion - - #region IDisposable Members - void Dispose(bool manual) { if (!disposed) @@ -284,7 +256,5 @@ namespace OpenTK.Platform { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/IDisplayDeviceDriver.cs b/src/OpenTK/Platform/IDisplayDeviceDriver.cs index cc3e67da..fa54186e 100644 --- a/src/OpenTK/Platform/IDisplayDeviceDriver.cs +++ b/src/OpenTK/Platform/IDisplayDeviceDriver.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/IPlatformFactory.cs b/src/OpenTK/Platform/IPlatformFactory.cs index 655745fc..03a251c4 100644 --- a/src/OpenTK/Platform/IPlatformFactory.cs +++ b/src/OpenTK/Platform/IPlatformFactory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/IWindowInfo.cs b/src/OpenTK/Platform/IWindowInfo.cs index 2ce984a6..e04de676 100644 --- a/src/OpenTK/Platform/IWindowInfo.cs +++ b/src/OpenTK/Platform/IWindowInfo.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/Linux/Bindings/Drm.cs b/src/OpenTK/Platform/Linux/Bindings/Drm.cs index dbfa8aa5..bee87ee8 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Drm.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Drm.cs @@ -1,5 +1,4 @@ -#region License -// +// // Drm.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/Linux/Bindings/Evdev.cs b/src/OpenTK/Platform/Linux/Bindings/Evdev.cs index 15073721..64cf9d90 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Evdev.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Evdev.cs @@ -1,11 +1,10 @@ -#region License -// +// // Evdev.cs // // Author: // Stefanos A. // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -41,8 +39,6 @@ namespace OpenTK.Platform.Linux public const int AxisCount = 0x40; public const int EventCount = (int)EvdevType.CNT; - #region KeyMap - public static readonly Key[] KeyMap = new Key[] { // 0-7 @@ -335,8 +331,6 @@ namespace OpenTK.Platform.Linux Key.Unknown, // reserved }; - #endregion - public static MouseButton GetMouseButton(EvdevButton button) { switch (button) diff --git a/src/OpenTK/Platform/Linux/Bindings/Gbm.cs b/src/OpenTK/Platform/Linux/Bindings/Gbm.cs index d298d5ea..7fe644d1 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Gbm.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Gbm.cs @@ -1,5 +1,4 @@ -#region License -// +// // Gbm.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; @@ -265,14 +263,10 @@ namespace OpenTK.Platform.Linux return string.Format("[BufferObject: {0}]", buffer); } - #region IEquatable implementation - public bool Equals(BufferObject other) { return buffer == other.buffer; } - - #endregion } } diff --git a/src/OpenTK/Platform/Linux/Bindings/Kms.cs b/src/OpenTK/Platform/Linux/Bindings/Kms.cs index a5c7f48b..8e9b9f67 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Kms.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Kms.cs @@ -1,11 +1,10 @@ -#region License -// +// // Kms.cs // // Author: // Stefanos A. // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/Linux/Bindings/LibInput.cs b/src/OpenTK/Platform/Linux/Bindings/LibInput.cs index 2ca8da45..a18c9203 100644 --- a/src/OpenTK/Platform/Linux/Bindings/LibInput.cs +++ b/src/OpenTK/Platform/Linux/Bindings/LibInput.cs @@ -1,5 +1,4 @@ -#region License -// +// // LibInput.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion #pragma warning disable 0169, 0219 diff --git a/src/OpenTK/Platform/Linux/Bindings/Libc.cs b/src/OpenTK/Platform/Linux/Bindings/Libc.cs index 11318756..e9afbb76 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Libc.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Libc.cs @@ -1,5 +1,4 @@ -#region License -// +// // Linux.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/Linux/Bindings/Poll.cs b/src/OpenTK/Platform/Linux/Bindings/Poll.cs index f78d6d73..a7209d2b 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Poll.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Poll.cs @@ -1,4 +1,3 @@ -#region License // // Poll.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/Linux/Bindings/Terminal.cs b/src/OpenTK/Platform/Linux/Bindings/Terminal.cs index e72ad741..b8dfcabd 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Terminal.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Terminal.cs @@ -1,5 +1,4 @@ -#region License -// +// // Terminal.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/Linux/Bindings/Udev.cs b/src/OpenTK/Platform/Linux/Bindings/Udev.cs index 4c341b70..997a5923 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Udev.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Udev.cs @@ -1,5 +1,4 @@ -#region License -// +// // Udev.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/Linux/DefaultCursor.cs b/src/OpenTK/Platform/Linux/DefaultCursor.cs index 40e58e57..9cd1a18d 100644 --- a/src/OpenTK/Platform/Linux/DefaultCursor.cs +++ b/src/OpenTK/Platform/Linux/DefaultCursor.cs @@ -1,11 +1,10 @@ -#region License -// +// // DefaultCursor.cs // // Author: // Stefanos A. // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; @@ -36,38 +34,38 @@ namespace OpenTK.Platform.Linux public static readonly MouseCursor Default = new MouseCursor(8, 4, 32, 32, new byte[] { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1A, 0x1A, 0x1A, 0x1F, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0xF1, 0xF1, 0xF1, 0xF3, 0x16, 0x16, 0x16, 0x2B, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xEC, 0xEC, 0xF4, 0x11, 0x11, 0x11, 0x37, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xE9, 0xE9, 0xF3, 0x0C, 0x0C, 0x0C, 0x33, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x99, 0x99, 0x99, 0xFF, 0xF7, 0xF7, 0xF7, 0xFF, 0xE4, 0xE4, 0xE4, 0xF0, 0x07, 0x07, 0x07, 0x2D, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0x52, 0x52, 0x52, 0xFF, 0xF9, 0xF9, 0xF9, 0xFF, 0xE0, 0xE0, 0xE0, 0xEC, 0x03, 0x03, 0x03, 0x29, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x5F, 0x5F, 0x5F, 0xFF, 0x13, 0x13, 0x13, 0xFF, 0x5C, 0x5C, 0x5C, 0xFF, 0xFC, 0xFC, 0xFC, 0xFF, 0xD9, 0xD9, 0xD9, 0xE7, 0x01, 0x01, 0x01, 0x26, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x5C, 0x5C, 0x5C, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0x66, 0x66, 0x66, 0xFF, 0xFD, 0xFD, 0xFD, 0xFF, 0xD3, 0xD3, 0xD3, 0xE2, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x59, 0x59, 0x59, 0xFF, 0x0C, 0x0C, 0x0C, 0xFF, 0x15, 0x15, 0x15, 0xFF, 0x1E, 0x1E, 0x1E, 0xFF, 0x72, 0x72, 0x72, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0xCA, 0xCA, 0xCA, 0xDB, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x08, 0x08, 0x08, 0xFF, 0x11, 0x11, 0x11, 0xFF, 0x1A, 0x1A, 0x1A, 0xFF, 0x24, 0x24, 0x24, 0xFF, 0x7C, 0x7C, 0x7C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0xC1, 0xC1, 0xD4, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x04, 0x04, 0x04, 0xFF, 0x0D, 0x0D, 0x0D, 0xFF, 0x16, 0x16, 0x16, 0xFF, 0x20, 0x20, 0x20, 0xFF, 0x29, 0x29, 0x29, 0xFF, 0x88, 0x88, 0x88, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0xB7, 0xB7, 0xCD, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x09, 0x09, 0x09, 0xFF, 0x12, 0x12, 0x12, 0xFF, 0x1C, 0x1C, 0x1C, 0xFF, 0x25, 0x25, 0x25, 0xFF, 0x2F, 0x2F, 0x2F, 0xFF, 0x92, 0x92, 0x92, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xAD, 0xAD, 0xC5, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x05, 0x05, 0x05, 0xFF, 0x0E, 0x0E, 0x0E, 0xFF, 0x18, 0x18, 0x18, 0xFF, 0x21, 0x21, 0x21, 0xFF, 0x2B, 0x2B, 0x2B, 0xFF, 0x34, 0x34, 0x34, 0xFF, 0x9C, 0x9C, 0x9C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0xA1, 0xA1, 0xBC, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x01, 0x01, 0xFF, 0x0A, 0x0A, 0x0A, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x1D, 0x1D, 0x1D, 0xFF, 0x27, 0x27, 0x27, 0xFF, 0x30, 0x30, 0x30, 0xFF, 0x39, 0x39, 0x39, 0xFF, 0xA7, 0xA7, 0xA7, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x96, 0x96, 0x96, 0xB3, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x07, 0x07, 0x07, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0x23, 0x23, 0x23, 0xFF, 0x2C, 0x2C, 0x2C, 0xFF, 0x35, 0x35, 0x35, 0xFF, 0x3F, 0x3F, 0x3F, 0xFF, 0xB0, 0xB0, 0xB0, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x8B, 0x8B, 0x8B, 0xAB, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x03, 0x03, 0x03, 0xFF, 0x0C, 0x0C, 0x0C, 0xFF, 0x15, 0x15, 0x15, 0xFF, 0x1F, 0x1F, 0x1F, 0xFF, 0x28, 0x28, 0x28, 0xFF, 0x31, 0x31, 0x31, 0xFF, 0x3B, 0x3B, 0x3B, 0xFF, 0x45, 0x45, 0x45, 0xFF, 0xB7, 0xB7, 0xB7, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x80, 0x80, 0x80, 0xA2, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x08, 0x08, 0x08, 0xFF, 0x11, 0x11, 0x11, 0xFF, 0x1F, 0x1F, 0x1F, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0x69, 0x69, 0x69, 0xFF, 0x6F, 0x6F, 0x6F, 0xFF, 0x76, 0x76, 0x76, 0xFF, 0x7D, 0x7D, 0x7D, 0xFF, 0xE1, 0xE1, 0xE1, 0xFF, 0xFD, 0xFD, 0xFD, 0xFF, 0x75, 0x75, 0x75, 0x97, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x04, 0x04, 0xFF, 0x0D, 0x0D, 0x0D, 0xFF, 0x17, 0x17, 0x17, 0xFF, 0xCD, 0xCD, 0xCD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x66, 0x66, 0x66, 0x85, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x5B, 0x5B, 0x5B, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x13, 0x13, 0x13, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x69, 0x69, 0xBA, 0x1E, 0x1E, 0x1E, 0x83, 0x1E, 0x1E, 0x1E, 0x78, 0x1E, 0x1E, 0x1E, 0x77, 0x1E, 0x1E, 0x1E, 0x74, 0x1E, 0x1E, 0x1E, 0x6B, 0x15, 0x15, 0x15, 0x4A, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x6D, 0x6D, 0x6D, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x6D, 0x6D, 0x6D, 0xFF, 0x0F, 0x0F, 0x0F, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0xDE, 0xDE, 0xDE, 0xFF, 0xDB, 0xDB, 0xDB, 0xEE, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x75, 0x75, 0x75, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xF7, 0xF7, 0xFC, 0xE6, 0xE6, 0xE6, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x71, 0x71, 0x71, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x36, 0x36, 0x36, 0x75, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x7E, 0x7E, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xAF, 0xAF, 0xD9, 0x36, 0x36, 0x36, 0x8F, 0xFD, 0xFD, 0xFD, 0xFF, 0x67, 0x67, 0x67, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x1E, 0x1E, 0x1E, 0xFF, 0xEA, 0xEA, 0xEA, 0xFF, 0xCD, 0xCD, 0xCD, 0xE2, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xCC, 0xCC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xA7, 0xA7, 0xD5, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x3A, 0xD5, 0xD5, 0xD5, 0xE3, 0xE1, 0xE1, 0xE1, 0xFF, 0x0F, 0x0F, 0x0F, 0xFF, 0x16, 0x16, 0x16, 0xFF, 0x81, 0x81, 0x81, 0xFF, 0xFC, 0xFC, 0xFC, 0xFF, 0x20, 0x20, 0x20, 0x5E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x9F, 0x9F, 0x9F, 0xCF, 0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x12, 0x3D, 0x3D, 0x3D, 0x59, 0xFD, 0xFD, 0xFD, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0x12, 0x12, 0x12, 0xFF, 0x25, 0x25, 0x25, 0xFF, 0xFA, 0xFA, 0xFA, 0xFF, 0x97, 0x97, 0x97, 0xC0, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF, 0x97, 0x97, 0x97, 0xC1, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xD9, 0xD9, 0xD9, 0xE5, 0xDC, 0xDC, 0xDC, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0x34, 0x34, 0x34, 0xFF, 0xFB, 0xFB, 0xFB, 0xFF, 0xA2, 0xA2, 0xA2, 0xCB, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x8E, 0x8E, 0x8E, 0xA1, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x45, 0x45, 0x45, 0x5F, 0xFA, 0xFA, 0xFA, 0xFF, 0xF2, 0xF2, 0xF2, 0xFF, 0xFB, 0xFB, 0xFB, 0xFF, 0xF2, 0xF2, 0xF2, 0xFC, 0x30, 0x30, 0x30, 0x83, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x34, 0x34, 0x34, 0x5D, 0xBB, 0xBB, 0xBB, 0xD5, 0x95, 0x95, 0x95, 0xC4, 0x16, 0x16, 0x16, 0x72, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1A, 0x1A, 0x1A, 0x1F, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0xF1, 0xF1, 0xF1, 0xF3, 0x16, 0x16, 0x16, 0x2B, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xEC, 0xEC, 0xF4, 0x11, 0x11, 0x11, 0x37, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xE9, 0xE9, 0xF3, 0x0C, 0x0C, 0x0C, 0x33, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x99, 0x99, 0x99, 0xFF, 0xF7, 0xF7, 0xF7, 0xFF, 0xE4, 0xE4, 0xE4, 0xF0, 0x07, 0x07, 0x07, 0x2D, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0x52, 0x52, 0x52, 0xFF, 0xF9, 0xF9, 0xF9, 0xFF, 0xE0, 0xE0, 0xE0, 0xEC, 0x03, 0x03, 0x03, 0x29, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x5F, 0x5F, 0x5F, 0xFF, 0x13, 0x13, 0x13, 0xFF, 0x5C, 0x5C, 0x5C, 0xFF, 0xFC, 0xFC, 0xFC, 0xFF, 0xD9, 0xD9, 0xD9, 0xE7, 0x01, 0x01, 0x01, 0x26, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x5C, 0x5C, 0x5C, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0x66, 0x66, 0x66, 0xFF, 0xFD, 0xFD, 0xFD, 0xFF, 0xD3, 0xD3, 0xD3, 0xE2, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x59, 0x59, 0x59, 0xFF, 0x0C, 0x0C, 0x0C, 0xFF, 0x15, 0x15, 0x15, 0xFF, 0x1E, 0x1E, 0x1E, 0xFF, 0x72, 0x72, 0x72, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0xCA, 0xCA, 0xCA, 0xDB, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x08, 0x08, 0x08, 0xFF, 0x11, 0x11, 0x11, 0xFF, 0x1A, 0x1A, 0x1A, 0xFF, 0x24, 0x24, 0x24, 0xFF, 0x7C, 0x7C, 0x7C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0xC1, 0xC1, 0xD4, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x04, 0x04, 0x04, 0xFF, 0x0D, 0x0D, 0x0D, 0xFF, 0x16, 0x16, 0x16, 0xFF, 0x20, 0x20, 0x20, 0xFF, 0x29, 0x29, 0x29, 0xFF, 0x88, 0x88, 0x88, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0xB7, 0xB7, 0xCD, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x09, 0x09, 0x09, 0xFF, 0x12, 0x12, 0x12, 0xFF, 0x1C, 0x1C, 0x1C, 0xFF, 0x25, 0x25, 0x25, 0xFF, 0x2F, 0x2F, 0x2F, 0xFF, 0x92, 0x92, 0x92, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xAD, 0xAD, 0xC5, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x05, 0x05, 0x05, 0xFF, 0x0E, 0x0E, 0x0E, 0xFF, 0x18, 0x18, 0x18, 0xFF, 0x21, 0x21, 0x21, 0xFF, 0x2B, 0x2B, 0x2B, 0xFF, 0x34, 0x34, 0x34, 0xFF, 0x9C, 0x9C, 0x9C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0xA1, 0xA1, 0xBC, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x01, 0x01, 0xFF, 0x0A, 0x0A, 0x0A, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x1D, 0x1D, 0x1D, 0xFF, 0x27, 0x27, 0x27, 0xFF, 0x30, 0x30, 0x30, 0xFF, 0x39, 0x39, 0x39, 0xFF, 0xA7, 0xA7, 0xA7, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x96, 0x96, 0x96, 0xB3, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x07, 0x07, 0x07, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0x23, 0x23, 0x23, 0xFF, 0x2C, 0x2C, 0x2C, 0xFF, 0x35, 0x35, 0x35, 0xFF, 0x3F, 0x3F, 0x3F, 0xFF, 0xB0, 0xB0, 0xB0, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x8B, 0x8B, 0x8B, 0xAB, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x03, 0x03, 0x03, 0xFF, 0x0C, 0x0C, 0x0C, 0xFF, 0x15, 0x15, 0x15, 0xFF, 0x1F, 0x1F, 0x1F, 0xFF, 0x28, 0x28, 0x28, 0xFF, 0x31, 0x31, 0x31, 0xFF, 0x3B, 0x3B, 0x3B, 0xFF, 0x45, 0x45, 0x45, 0xFF, 0xB7, 0xB7, 0xB7, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x80, 0x80, 0x80, 0xA2, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x08, 0x08, 0x08, 0xFF, 0x11, 0x11, 0x11, 0xFF, 0x1F, 0x1F, 0x1F, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0x69, 0x69, 0x69, 0xFF, 0x6F, 0x6F, 0x6F, 0xFF, 0x76, 0x76, 0x76, 0xFF, 0x7D, 0x7D, 0x7D, 0xFF, 0xE1, 0xE1, 0xE1, 0xFF, 0xFD, 0xFD, 0xFD, 0xFF, 0x75, 0x75, 0x75, 0x97, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x04, 0x04, 0xFF, 0x0D, 0x0D, 0x0D, 0xFF, 0x17, 0x17, 0x17, 0xFF, 0xCD, 0xCD, 0xCD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x66, 0x66, 0x66, 0x85, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x5B, 0x5B, 0x5B, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x13, 0x13, 0x13, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x69, 0x69, 0xBA, 0x1E, 0x1E, 0x1E, 0x83, 0x1E, 0x1E, 0x1E, 0x78, 0x1E, 0x1E, 0x1E, 0x77, 0x1E, 0x1E, 0x1E, 0x74, 0x1E, 0x1E, 0x1E, 0x6B, 0x15, 0x15, 0x15, 0x4A, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x6D, 0x6D, 0x6D, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x6D, 0x6D, 0x6D, 0xFF, 0x0F, 0x0F, 0x0F, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0xDE, 0xDE, 0xDE, 0xFF, 0xDB, 0xDB, 0xDB, 0xEE, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x75, 0x75, 0x75, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xF7, 0xF7, 0xFC, 0xE6, 0xE6, 0xE6, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x71, 0x71, 0x71, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x36, 0x36, 0x36, 0x75, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0x58, 0x58, 0x58, 0xFF, 0x7E, 0x7E, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xAF, 0xAF, 0xD9, 0x36, 0x36, 0x36, 0x8F, 0xFD, 0xFD, 0xFD, 0xFF, 0x67, 0x67, 0x67, 0xFF, 0x10, 0x10, 0x10, 0xFF, 0x1E, 0x1E, 0x1E, 0xFF, 0xEA, 0xEA, 0xEA, 0xFF, 0xCD, 0xCD, 0xCD, 0xE2, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xCC, 0xCC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xA7, 0xA7, 0xD5, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x3A, 0xD5, 0xD5, 0xD5, 0xE3, 0xE1, 0xE1, 0xE1, 0xFF, 0x0F, 0x0F, 0x0F, 0xFF, 0x16, 0x16, 0x16, 0xFF, 0x81, 0x81, 0x81, 0xFF, 0xFC, 0xFC, 0xFC, 0xFF, 0x20, 0x20, 0x20, 0x5E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0x9F, 0x9F, 0x9F, 0xCF, 0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x12, 0x3D, 0x3D, 0x3D, 0x59, 0xFD, 0xFD, 0xFD, 0xFF, 0x61, 0x61, 0x61, 0xFF, 0x12, 0x12, 0x12, 0xFF, 0x25, 0x25, 0x25, 0xFF, 0xFA, 0xFA, 0xFA, 0xFF, 0x97, 0x97, 0x97, 0xC0, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF, 0x97, 0x97, 0x97, 0xC1, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xD9, 0xD9, 0xD9, 0xE5, 0xDC, 0xDC, 0xDC, 0xFF, 0x19, 0x19, 0x19, 0xFF, 0x34, 0x34, 0x34, 0xFF, 0xFB, 0xFB, 0xFB, 0xFF, 0xA2, 0xA2, 0xA2, 0xCB, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x8E, 0x8E, 0x8E, 0xA1, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x45, 0x45, 0x45, 0x5F, 0xFA, 0xFA, 0xFA, 0xFF, 0xF2, 0xF2, 0xF2, 0xFF, 0xFB, 0xFB, 0xFB, 0xFF, 0xF2, 0xF2, 0xF2, 0xFC, 0x30, 0x30, 0x30, 0x83, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x34, 0x34, 0x34, 0x5D, 0xBB, 0xBB, 0xBB, 0xD5, 0x95, 0x95, 0x95, 0xC4, 0x16, 0x16, 0x16, 0x72, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }); public static readonly MouseCursor Empty = MouseCursor.Empty; diff --git a/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs b/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs index 0a861d3d..fa2f0b34 100644 --- a/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs +++ b/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs @@ -1,4 +1,3 @@ -#region License // // LinuxDisplayDriver.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -380,8 +378,6 @@ namespace OpenTK.Platform.Linux return null; } - #region IDisplayDeviceDriver - public override bool TryChangeResolution(DisplayDevice device, DisplayResolution resolution) { unsafe @@ -409,8 +405,6 @@ namespace OpenTK.Platform.Linux &connector_id, 1, &mode) == 0; } } - - #endregion } } diff --git a/src/OpenTK/Platform/Linux/LinuxFactory.cs b/src/OpenTK/Platform/Linux/LinuxFactory.cs index 37d108a2..aa082460 100644 --- a/src/OpenTK/Platform/Linux/LinuxFactory.cs +++ b/src/OpenTK/Platform/Linux/LinuxFactory.cs @@ -1,5 +1,4 @@ -#region License -// +// // LinuxFactory.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -56,8 +54,6 @@ namespace OpenTK.Platform.Linux Debug.Print("[KMS] Using Linux/KMS backend."); } - #region Private Members - int gpu_fd { get @@ -127,7 +123,7 @@ namespace OpenTK.Platform.Linux gbm_device = IntPtr.Zero; egl_display = IntPtr.Zero; - + int fd = Libc.open(gpu, OpenFlags.ReadWrite | OpenFlags.CloseOnExec); if (fd < 0) { @@ -161,10 +157,6 @@ namespace OpenTK.Platform.Linux return fd; } - #endregion - - #region Protected Members - protected override void Dispose(bool manual) { if (egl_display != IntPtr.Zero) @@ -188,10 +180,6 @@ namespace OpenTK.Platform.Linux base.Dispose(manual); } - #endregion - - #region IPlatformFactory Members - public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice display_device) { return new LinuxNativeWindow(egl_display, gbm_device, gpu_fd, x, y, width, height, title, mode, options, display_device); @@ -246,8 +234,6 @@ namespace OpenTK.Platform.Linux { return new MappedGamePadDriver(); } - - #endregion } } diff --git a/src/OpenTK/Platform/Linux/LinuxGraphicsContext.cs b/src/OpenTK/Platform/Linux/LinuxGraphicsContext.cs index 779fd36d..ca76ed83 100644 --- a/src/OpenTK/Platform/Linux/LinuxGraphicsContext.cs +++ b/src/OpenTK/Platform/Linux/LinuxGraphicsContext.cs @@ -1,11 +1,10 @@ -#region License // // LinuxGraphicsContext.cs // // Author: // thefiddler // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; diff --git a/src/OpenTK/Platform/Linux/LinuxInput.cs b/src/OpenTK/Platform/Linux/LinuxInput.cs index ce5457c3..99e84033 100644 --- a/src/OpenTK/Platform/Linux/LinuxInput.cs +++ b/src/OpenTK/Platform/Linux/LinuxInput.cs @@ -1,5 +1,4 @@ -#region License -// +// // LinuxKeyboardLibInput.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -197,8 +195,6 @@ namespace OpenTK.Platform.Linux } } - #region Private Members - static CloseRestrictedCallback CloseRestricted = CloseRestrictedHandler; static void CloseRestrictedHandler(int fd, IntPtr data) { @@ -216,7 +212,7 @@ namespace OpenTK.Platform.Linux } static OpenRestrictedCallback OpenRestricted = OpenRestrictedHandler; - static int OpenRestrictedHandler(IntPtr path, int flags, IntPtr data) + static int OpenRestrictedHandler(IntPtr path, int flags, IntPtr data) { int fd = Libc.open(path, (OpenFlags)flags); Debug.Print("[Input] Opening '{0}' with flags {1}. fd:{2}", @@ -572,10 +568,6 @@ namespace OpenTK.Platform.Linux return mouse; } - #endregion - - #region IKeyboardDriver2 implementation - KeyboardState IKeyboardDriver2.GetState() { lock (Sync) @@ -621,10 +613,6 @@ namespace OpenTK.Platform.Linux } } - #endregion - - #region IMouseDriver2 implementation - MouseState IMouseDriver2.GetState() { lock (Sync) @@ -671,10 +659,6 @@ namespace OpenTK.Platform.Linux return state; } - #endregion - - #region IDisposable implementation - public void Dispose() { Dispose(true); @@ -714,8 +698,6 @@ namespace OpenTK.Platform.Linux { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/Linux/LinuxJoystick.cs b/src/OpenTK/Platform/Linux/LinuxJoystick.cs index a32a744e..58c92f53 100644 --- a/src/OpenTK/Platform/Linux/LinuxJoystick.cs +++ b/src/OpenTK/Platform/Linux/LinuxJoystick.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -66,8 +64,6 @@ namespace OpenTK.Platform.Linux sealed class LinuxJoystick : IJoystickDriver2 { - #region Fields - static readonly HatPosition[,] HatPositions = new HatPosition[,] { { HatPosition.UpLeft, HatPosition.Up, HatPosition.UpRight }, @@ -84,10 +80,6 @@ namespace OpenTK.Platform.Linux bool disposed; - #endregion - - #region Constructors - public LinuxJoystick() { string path = @@ -107,10 +99,6 @@ namespace OpenTK.Platform.Linux } } - #endregion - - #region Private Members - void OpenJoysticks(string path) { lock (sync) @@ -165,10 +153,6 @@ namespace OpenTK.Platform.Linux } } - #endregion - - #region Private Members - Guid CreateGuid(EvdevInputId id, string name) { // Note: the first 8bytes of the Guid are byteswapped @@ -463,10 +447,6 @@ namespace OpenTK.Platform.Linux static readonly string JoystickPath = "/dev/input"; static readonly string JoystickPathLegacy = "/dev"; - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -496,10 +476,6 @@ namespace OpenTK.Platform.Linux Dispose(false); } - #endregion - - #region IJoystickDriver2 Members - JoystickState IJoystickDriver2.GetState(int index) { LinuxJoystickDetails js = Sticks.FromIndex(index); @@ -530,7 +506,5 @@ namespace OpenTK.Platform.Linux } return Guid.Empty; } - - #endregion } } diff --git a/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs b/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs index afe66bc1..45407d50 100644 --- a/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs +++ b/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs @@ -1,11 +1,10 @@ -#region License -// +// // LinuxKeyboardTTY.cs // // Author: // thefiddler // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -68,8 +66,6 @@ namespace OpenTK.Platform.Linux input_thread.Start(); } - #region Private Members - bool SetupTTY(int stdin) { // Ensure that we are using a real terminal, @@ -201,10 +197,6 @@ namespace OpenTK.Platform.Linux static readonly Key[] KeyMap = Evdev.KeyMap; - #endregion - - #region IKeyboardDriver2 implementation - public KeyboardState GetState() { lock (this) @@ -232,10 +224,6 @@ namespace OpenTK.Platform.Linux return String.Empty; } - #endregion - - #region IDisposable Implementation - public void Dispose() { Dispose(true); @@ -260,8 +248,6 @@ namespace OpenTK.Platform.Linux { Dispose(false); } - - #endregion } #endif } diff --git a/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs b/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs index 46ff13be..86518b71 100644 --- a/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs +++ b/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs @@ -1,5 +1,4 @@ -#region License -// +// // LinuxNativeWindow.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -120,8 +118,6 @@ namespace OpenTK.Platform.Linux exists = true; } - #region Private Members - static BufferObject CreateCursor(IntPtr gbm, MouseCursor cursor) { if (cursor.Width > 64 || cursor.Height > 64) @@ -330,10 +326,6 @@ namespace OpenTK.Platform.Linux } } - #endregion - - #region INativeWindow Members - public override void ProcessEvents() { // Note: there is no event-based keyboard/mouse input available. @@ -530,8 +522,6 @@ namespace OpenTK.Platform.Linux } } } - - #endregion } } diff --git a/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs b/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs index e1d91e9a..a6e6b6d4 100644 --- a/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs +++ b/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs @@ -1,4 +1,3 @@ -#region License // // LinuxWindowInfo.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; diff --git a/src/OpenTK/Platform/MacOS/Carbon/Cgl.cs b/src/OpenTK/Platform/MacOS/Carbon/Cgl.cs index 0e842667..f09f3ca9 100644 --- a/src/OpenTK/Platform/MacOS/Carbon/Cgl.cs +++ b/src/OpenTK/Platform/MacOS/Carbon/Cgl.cs @@ -1,5 +1,4 @@ -// #region License -// +// // Cgl.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -// #endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs b/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs index 780414e4..16e7e02c 100644 --- a/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs +++ b/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -31,7 +29,7 @@ using System.Text; namespace OpenTK.Platform.MacOS { - // + // // http://web.archive.org/web/20100501161453/http://www.classicteck.com/rbarticles/mackeyboard.php enum MacOSKeyCode @@ -79,11 +77,11 @@ namespace OpenTK.Platform.MacOS Minus = 27, Equals = 24, - BracketLeft = 33, - BracketRight = 30, + BracketLeft = 33, + BracketRight = 30, Backslash = 42, - Semicolon = 41, - Quote = 39, + Semicolon = 41, + Quote = 39, Comma = 43, Period = 47, Slash = 44, @@ -93,13 +91,13 @@ namespace OpenTK.Platform.MacOS Backspace = 51, Return = 52, Esc = 53, - + Command = 55, Shift = 56, CapsLock = 57, OptionAlt = 58, Control = 59, - + KeyPad_Decimal = 65, KeyPad_Multiply = 67, KeyPad_Add = 69, @@ -117,7 +115,7 @@ namespace OpenTK.Platform.MacOS KeyPad_7 = 89, KeyPad_8 = 91, KeyPad_9 = 92, - + F1 = 122, F2 = 120, F3 = 99, @@ -155,8 +153,8 @@ namespace OpenTK.Platform.MacOS None = 0, Shift = 0x0200, CapsLock = 0x0400, - Control = 0x1000, // - Command = 0x0100, // Open-Apple - Windows key + Control = 0x1000, // + Command = 0x0100, // Open-Apple - Windows key Option = 0x0800, // Option key is same position as the alt key on non-mac keyboards. } } diff --git a/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs b/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs index 0dde51b4..dac59c8a 100644 --- a/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs +++ b/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -48,8 +46,6 @@ namespace OpenTK.Platform.MacOS GetInt xOffset; GetInt yOffset; - #region Constructors - /// /// Constructs a new instance with the specified parameters. /// @@ -69,10 +65,6 @@ namespace OpenTK.Platform.MacOS this.yOffset = getY; } - #endregion - - #region Public Members - /// /// Gets the window reference for this instance. /// @@ -123,10 +115,6 @@ namespace OpenTK.Platform.MacOS get { return yOffset; } set { yOffset = value; } } - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -136,17 +124,17 @@ namespace OpenTK.Platform.MacOS { if (disposed) return; - + if (disposing) { - + } - + if (ownHandle) { windowRef = IntPtr.Zero; } - + disposed = true; } @@ -154,7 +142,6 @@ namespace OpenTK.Platform.MacOS { Dispose(false); } - - #endregion + } } diff --git a/src/OpenTK/Platform/MacOS/Cocoa/Class.cs b/src/OpenTK/Platform/MacOS/Cocoa/Class.cs index b7cd602f..312dceee 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/Class.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/Class.cs @@ -1,5 +1,4 @@ -#region License -// +// // Class.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System.Runtime.InteropServices; using System; diff --git a/src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs b/src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs index 0732538a..6d9977f1 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs @@ -1,5 +1,4 @@ -#region License -// +// // Cocoa.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System.Runtime.InteropServices; using System; @@ -216,7 +214,7 @@ namespace OpenTK.Platform.MacOS if (str == null) return IntPtr.Zero; - unsafe + unsafe { fixed (char* ptrFirstChar = str) { @@ -244,7 +242,7 @@ namespace OpenTK.Platform.MacOS IntPtr nsData = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSData"), Selector.Alloc), Selector.Get("initWithBytes:length:"), (IntPtr)pBytes, b.Length); - IntPtr nsImage = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSImage"), Selector.Alloc), + IntPtr nsImage = Cocoa.SendIntPtr(Cocoa.SendIntPtr(Class.Get("NSImage"), Selector.Alloc), Selector.Get("initWithData:"), nsData); Cocoa.SendVoid(nsData, Selector.Release); diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs index 82bde263..64ba32b7 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSApplication.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.ComponentModel; @@ -80,7 +78,7 @@ namespace OpenTK.Platform.MacOS Cocoa.SendIntPtr(appMenu, Selector.Get("addItem:"), quitMenuItem); Cocoa.SendIntPtr(menuItem, Selector.Get("setSubmenu:"), appMenu); - // Tell cocoa we're ready to run the application (usually called by [NSApp run]). + // Tell cocoa we're ready to run the application (usually called by [NSApp run]). // Note: if a main menu exists, then this method has already been called and // calling it again will result in a crash. For this reason, we only call it // when we create our own main menu. @@ -93,7 +91,7 @@ namespace OpenTK.Platform.MacOS IntPtr press_and_hold = Cocoa.SendIntPtr(Class.NSNumber, Selector.Get("numberWithBool:"), false); // Initialize and register the settings dictionary - settings = + settings = Cocoa.SendIntPtr(settings, Selector.Get("initWithObjectsAndKeys:"), //momentum_scrolling, Cocoa.ToNSString("AppleMomentumScrollSupported"), press_and_hold, Cocoa.ToNSString("ApplePressAndHoldEnabled"), diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationActivationPolicy.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationActivationPolicy.cs index a6f49836..f670302e 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationActivationPolicy.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationActivationPolicy.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSApplicationActivationPolicy.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion namespace OpenTK.Platform.MacOS { diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationPresentationOptions.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationPresentationOptions.cs index 46340e0d..e2f88578 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationPresentationOptions.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSApplicationPresentationOptions.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSApplicationPresentationOptions.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion namespace OpenTK.Platform.MacOS { diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSBackingStore.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSBackingStore.cs index 26bd1bee..b56efc45 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSBackingStore.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSBackingStore.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSBackingStore.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion namespace OpenTK.Platform.MacOS { diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSBitmapFormat.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSBitmapFormat.cs index fbae3343..504394a7 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSBitmapFormat.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSBitmapFormat.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSBitmapFormat.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSEventModifierMask.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSEventModifierMask.cs index f4d1925c..4d9cbeb1 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSEventModifierMask.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSEventModifierMask.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSEventModifierMask.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSEventType.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSEventType.cs index 1aa0c7cd..354cc1ff 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSEventType.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSEventType.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSEventType.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion namespace OpenTK.Platform.MacOS { diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs index b6f90f70..9156eb83 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSFloat.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; #if !MINIMAL @@ -189,11 +187,11 @@ namespace OpenTK.Platform.MacOS public static implicit operator RectangleF(NSRect s) { return new RectangleF(s.Location, s.Size); - } + } } // Using IntPtr in NSFloat cause that if imported function - // return struct that consist of them you will get wrong data + // return struct that consist of them you will get wrong data // This types are used for such function. [StructLayout(LayoutKind.Sequential)] struct NSPointF diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLContextParameter.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLContextParameter.cs index 9ba91e2a..c3011904 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLContextParameter.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLContextParameter.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSOpenGLContextParameter.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLPixelFormatAttribute.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLPixelFormatAttribute.cs index 17c37988..bbd0b186 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLPixelFormatAttribute.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLPixelFormatAttribute.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSOpenGLPixelFormatAttribute.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLProfile.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLProfile.cs index 9fd8e787..b8ef9e74 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLProfile.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSOpenGLProfile.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSOpenGLProfile.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion namespace OpenTK.Platform.MacOS { diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSTrackingAreaOptions.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSTrackingAreaOptions.cs index 5caa97f3..fac4a9f5 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSTrackingAreaOptions.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSTrackingAreaOptions.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSTrackingAreaOptions.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSWindowStyle.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSWindowStyle.cs index c2cbdba4..32b5500e 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/NSWindowStyle.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/NSWindowStyle.cs @@ -1,5 +1,4 @@ -#region License -// +// // NSWindowStyle.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Platform/MacOS/Cocoa/Selector.cs b/src/OpenTK/Platform/MacOS/Cocoa/Selector.cs index 908aa090..b7e4a07d 100644 --- a/src/OpenTK/Platform/MacOS/Cocoa/Selector.cs +++ b/src/OpenTK/Platform/MacOS/Cocoa/Selector.cs @@ -1,4 +1,3 @@ -#region License // // Selector.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/MacOS/CocoaContext.cs b/src/OpenTK/Platform/MacOS/CocoaContext.cs index 5ae0c789..663d04ed 100644 --- a/src/OpenTK/Platform/MacOS/CocoaContext.cs +++ b/src/OpenTK/Platform/MacOS/CocoaContext.cs @@ -1,4 +1,3 @@ -#region License // // CocoaContext.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using OpenTK.Platform; @@ -63,9 +61,9 @@ namespace OpenTK { Debug.Print("Context Type: {0}", shareContext); Debug.Print("Window info: {0}", window); - + cocoaWindow = (CocoaWindowInfo)window; - + if (shareContext is CocoaContext) shareContextRef = ((CocoaContext)shareContext).Handle.Handle; @@ -79,17 +77,17 @@ namespace OpenTK { Debug.Print("No context sharing will take place."); } - + CreateContext(mode, cocoaWindow, shareContextRef, majorVersion, minorVersion, true); } - + public CocoaContext(ContextHandle handle, IWindowInfo window, IGraphicsContext shareContext, int majorVersion, int minorVersion) { if (handle == ContextHandle.Zero) throw new ArgumentException("handle"); if (window == null) throw new ArgumentNullException("window"); - + Handle = handle; cocoaWindow = (CocoaWindowInfo)window; } @@ -97,14 +95,14 @@ namespace OpenTK private void AddPixelAttrib(List attributes, NSOpenGLPixelFormatAttribute attribute) { Debug.Print(attribute.ToString()); - + attributes.Add(attribute); } private void AddPixelAttrib(List attributes, NSOpenGLPixelFormatAttribute attribute, int value) { Debug.Print("{0} : {1}", attribute, value); - + attributes.Add(attribute); attributes.Add((NSOpenGLPixelFormatAttribute)value); } @@ -216,7 +214,7 @@ namespace OpenTK // Create pixel format var pixelFormat = Cocoa.SendIntPtr(Class.Get("NSOpenGLPixelFormat"), Selector.Alloc); - unsafe + unsafe { fixed (NSOpenGLPixelFormatAttribute* ptr = attributes.ToArray()) { @@ -272,7 +270,7 @@ namespace OpenTK } public override bool IsCurrent - { + { get { return Handle.Handle == CurrentContext; @@ -302,7 +300,7 @@ namespace OpenTK } public override int SwapInterval - { + { get { return GetContextValue(NSOpenGLContextParameter.SwapInterval); @@ -323,8 +321,6 @@ namespace OpenTK Cocoa.SendVoid(Handle.Handle, selUpdate); } - #region IDisposable Members - protected override void Dispose(bool disposing) { if (IsDisposed || Handle.Handle == IntPtr.Zero) @@ -345,10 +341,6 @@ namespace OpenTK IsDisposed = true; } - #endregion - - #region IGraphicsContextInternal Members - public override IntPtr GetAddress(IntPtr function) { unsafe @@ -393,8 +385,6 @@ namespace OpenTK return address; } } - - #endregion } } diff --git a/src/OpenTK/Platform/MacOS/CocoaNativeWindow.cs b/src/OpenTK/Platform/MacOS/CocoaNativeWindow.cs index 687f5684..6b47249b 100644 --- a/src/OpenTK/Platform/MacOS/CocoaNativeWindow.cs +++ b/src/OpenTK/Platform/MacOS/CocoaNativeWindow.cs @@ -1,4 +1,3 @@ -#region License // // CocoaNativeWindow.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.ComponentModel; @@ -256,7 +254,7 @@ namespace OpenTK.Platform.MacOS windowInfo = new CocoaWindowInfo(windowPtr); // Set up behavior - Cocoa.SendIntPtr(windowPtr, Selector.Get("setDelegate:"), windowPtr); // The window class acts as its own delegate + Cocoa.SendIntPtr(windowPtr, Selector.Get("setDelegate:"), windowPtr); // The window class acts as its own delegate Cocoa.SendVoid(windowPtr, Selector.Get("makeKeyWindow")); SetTitle(title, false); @@ -444,7 +442,7 @@ namespace OpenTK.Platform.MacOS { try { - // Can get stuck in weird states if we maximize, then minimize; + // Can get stuck in weird states if we maximize, then minimize; // restoring to the old state would override the normalBounds. // To avoid this without adding complexity, just restore state here. RestoreWindowState(); // Avoid getting in weird states @@ -531,18 +529,18 @@ namespace OpenTK.Platform.MacOS return false; } - private bool AcceptsFirstResponder(IntPtr self, IntPtr cmd) - { - return true; - } - - private bool CanBecomeKeyWindow(IntPtr self, IntPtr cmd) - { + private bool AcceptsFirstResponder(IntPtr self, IntPtr cmd) + { return true; } - private bool CanBecomeMainWindow(IntPtr self, IntPtr cmd) - { + private bool CanBecomeKeyWindow(IntPtr self, IntPtr cmd) + { + return true; + } + + private bool CanBecomeMainWindow(IntPtr self, IntPtr cmd) + { return true; } @@ -990,8 +988,8 @@ namespace OpenTK.Platform.MacOS public override WindowBorder WindowBorder { - get - { + get + { return windowBorder; } set @@ -1066,11 +1064,11 @@ namespace OpenTK.Platform.MacOS public override Size ClientSize { - get + get { var contentViewBounds = Cocoa.SendRect(windowInfo.ViewHandle, selBounds); var bounds = Cocoa.SendRect(windowInfo.Handle, selConvertRectToBacking, contentViewBounds); - return new Size((int)bounds.Width, (int)bounds.Height); + return new Size((int)bounds.Width, (int)bounds.Height); } set { @@ -1144,7 +1142,7 @@ namespace OpenTK.Platform.MacOS } // Construct the actual NSImage - IntPtr img = + IntPtr img = Cocoa.SendIntPtr( Cocoa.SendIntPtr(NSImage, Selector.Alloc), selInitWithSize, diff --git a/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs b/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs index 3c3f8bb3..75cfb64e 100644 --- a/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs +++ b/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs @@ -1,5 +1,4 @@ -#region License -// +// // CocoaWindowInfo.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -47,8 +45,6 @@ namespace OpenTK.Platform.MacOS bool disposed = false; - #region Constructors - /// /// Constructs a new instance with the specified parameters. /// @@ -71,10 +67,6 @@ namespace OpenTK.Platform.MacOS Cocoa.SendVoid(nsWindowRef, Selector.Retain); } - #endregion - - #region Public Members - /// /// Gets the window reference for this instance. /// @@ -92,10 +84,6 @@ namespace OpenTK.Platform.MacOS return String.Format("MacOS.CocoaWindowInfo: NSWindow {0}, NSView {1}", nsWindowRef, nsViewRef); } - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -124,7 +112,5 @@ namespace OpenTK.Platform.MacOS Dispose(false); } #endif - - #endregion } } \ No newline at end of file diff --git a/src/OpenTK/Platform/MacOS/HIDInput.cs b/src/OpenTK/Platform/MacOS/HIDInput.cs index 046ab42c..62e8c09c 100644 --- a/src/OpenTK/Platform/MacOS/HIDInput.cs +++ b/src/OpenTK/Platform/MacOS/HIDInput.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -55,8 +53,6 @@ namespace OpenTK.Platform.MacOS // Todo: create a driver for older installations. Maybe use CGGetLastMouseDelta for that? class HIDInput : IInputDriver2, IMouseDriver2, IKeyboardDriver2, IJoystickDriver2 { - #region Fields - class MouseData { public IntPtr Id; @@ -142,23 +138,15 @@ namespace OpenTK.Platform.MacOS MaxReported = max; } - #region IComparable implementation - public int CompareTo(JoystickElement other) { return Usage.CompareTo(other.Usage); } - #endregion - - #region IEquatable implementation - public bool Equals(JoystickElement other) { return Cookie.Equals(other.Cookie); } - - #endregion } IOHIDManagerRef hidmanager; @@ -192,10 +180,6 @@ namespace OpenTK.Platform.MacOS bool disposed; - #endregion - - #region Constructors - public HIDInput() { Debug.Print("Using HIDInput."); @@ -228,10 +212,6 @@ namespace OpenTK.Platform.MacOS RegisterMouseMonitor(); } - #endregion - - #region Private Members - void RegisterMouseMonitor() { Debug.Write("Creating mouse event monitor... "); @@ -478,8 +458,6 @@ namespace OpenTK.Platform.MacOS } } - #region Mouse - void AddMouse(CFAllocatorRef sender, CFAllocatorRef device) { Debug.Print("Mouse device {0:x} discovered, sender is {1:x}", device, sender); @@ -542,10 +520,6 @@ namespace OpenTK.Platform.MacOS } } - #endregion - - #region Keyboard - void AddKeyboard(CFAllocatorRef sender, CFAllocatorRef device) { Debug.Print("Keyboard device {0:x} discovered, sender is {1:x}", device, sender); @@ -566,8 +540,8 @@ namespace OpenTK.Platform.MacOS int v_int = NativeMethods.IOHIDValueGetIntegerValue(val).ToInt32(); HIDPage page = NativeMethods.IOHIDElementGetUsagePage(elem); int usage = NativeMethods.IOHIDElementGetUsage(elem); - - // This will supress the debug printing below. Seems like it generates a lot of -1s. + + // This will supress the debug printing below. Seems like it generates a lot of -1s. // Couldn't find any details in USB spec or Apple docs for this behavior. if (usage >= 0) { @@ -587,10 +561,6 @@ namespace OpenTK.Platform.MacOS } } - #endregion - - #region Joystick - Guid CreateJoystickGuid(IntPtr device, string name) { // Create a device guid from the product and vendor id keys @@ -1000,21 +970,11 @@ namespace OpenTK.Platform.MacOS return position; } - #endregion - - #endregion - - #region IInputDriver2 Members - public IMouseDriver2 MouseDriver { get { return this; } } public IKeyboardDriver2 KeyboardDriver { get { return this; } } public IGamePadDriver GamePadDriver { get { return mapped_gamepad; } } public IJoystickDriver2 JoystickDriver { get { return this; } } - #endregion - - #region IMouseDriver2 Members - MouseState IMouseDriver2.GetState() { MouseState master = new MouseState(); @@ -1066,10 +1026,6 @@ namespace OpenTK.Platform.MacOS CG.WarpMouseCursorPosition(p); } - #endregion - - #region IKeyboardDriver2 - KeyboardState IKeyboardDriver2.GetState() { KeyboardState master = new KeyboardState(); @@ -1105,10 +1061,6 @@ namespace OpenTK.Platform.MacOS return String.Empty; } - #endregion - - #region IJoystickDriver2 Members - JoystickState IJoystickDriver2.GetState(int index) { JoystickData joystick = GetJoystick(index); @@ -1139,10 +1091,6 @@ namespace OpenTK.Platform.MacOS return new Guid(); } - #endregion - - #region NativeMethods - class NativeMethods { const string hid = "/System/Library/Frameworks/IOKit.framework/Versions/Current/IOKit"; @@ -1695,10 +1643,6 @@ namespace OpenTK.Platform.MacOS /* 0xE8-0xFFFF Reserved */ }; - #endregion - - #region IDisposable Members - void Dispose(bool manual) { @@ -1775,8 +1719,6 @@ namespace OpenTK.Platform.MacOS { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/MacOS/MacOSException.cs b/src/OpenTK/Platform/MacOS/MacOSException.cs index edc30fdb..d8ad2dc0 100644 --- a/src/OpenTK/Platform/MacOS/MacOSException.cs +++ b/src/OpenTK/Platform/MacOS/MacOSException.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion // Created by Erik Ylvisaker on 3/17/08. @@ -62,7 +60,7 @@ namespace OpenTK.Platform.MacOS internal enum OSStatus { NoError = 0, - + ParameterError = -50, /*error in user parameter list*/ NoHardwareError = -200, /*Sound Manager Error Returns*/ NotEnoughHardwareError = -201, /*Sound Manager Error Returns*/ diff --git a/src/OpenTK/Platform/MacOS/MacOSFactory.cs b/src/OpenTK/Platform/MacOS/MacOSFactory.cs index dde24600..57fffda8 100644 --- a/src/OpenTK/Platform/MacOS/MacOSFactory.cs +++ b/src/OpenTK/Platform/MacOS/MacOSFactory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -51,8 +49,6 @@ namespace OpenTK.Platform.MacOS InputDriver = new HIDInput(); } - #region IPlatformFactory Members - public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) { return new CocoaNativeWindow(x, y, width, height, title, mode, options, device); @@ -100,10 +96,7 @@ namespace OpenTK.Platform.MacOS { return new MappedGamePadDriver(); } - - #endregion - #region IDisposable Members protected override void Dispose(bool manual) { @@ -117,7 +110,5 @@ namespace OpenTK.Platform.MacOS base.Dispose(manual); } } - - #endregion } } diff --git a/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs b/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs index 103bd579..048c3210 100644 --- a/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs +++ b/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion // Created by Erik Ylvisaker on 3/17/08. @@ -169,7 +167,7 @@ namespace OpenTK.Platform.MacOS return Key.Left; case MacOSKeyCode.M: return Key.M; - //Key.MaxKeys + //Key.MaxKeys case MacOSKeyCode.Menu: return Key.Menu; case MacOSKeyCode.Minus: @@ -226,7 +224,7 @@ namespace OpenTK.Platform.MacOS return Key.Semicolon; case MacOSKeyCode.Shift: return Key.ShiftLeft; - //Key.ShiftRight + //Key.ShiftRight case MacOSKeyCode.Slash: return Key.Slash; // Key.Sleep diff --git a/src/OpenTK/Platform/MacOS/NS.cs b/src/OpenTK/Platform/MacOS/NS.cs index 90c5d71e..b78d8944 100644 --- a/src/OpenTK/Platform/MacOS/NS.cs +++ b/src/OpenTK/Platform/MacOS/NS.cs @@ -1,4 +1,3 @@ -#region License // // NS.cs // @@ -26,8 +25,6 @@ // THE SOFTWARE. // -#endregion - using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs b/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs index 419f7a13..c5dacee9 100644 --- a/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs +++ b/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs index 710f5e7f..3f1fa2aa 100644 --- a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs +++ b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/MacOS/Quartz/EventServices.cs b/src/OpenTK/Platform/MacOS/Quartz/EventServices.cs index 3a806cf7..063e1332 100644 --- a/src/OpenTK/Platform/MacOS/Quartz/EventServices.cs +++ b/src/OpenTK/Platform/MacOS/Quartz/EventServices.cs @@ -1,5 +1,4 @@ -#region License -// +// // EventServices.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs b/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs index c4d87cb2..ae742d57 100644 --- a/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs +++ b/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -52,7 +50,7 @@ namespace OpenTK.Platform.MacOS const int maxDisplayCount = 20; IntPtr[] displays = new IntPtr[maxDisplayCount]; int displayCount; - + unsafe { fixed (IntPtr* displayPtr = displays) @@ -60,60 +58,60 @@ namespace OpenTK.Platform.MacOS CG.GetActiveDisplayList(maxDisplayCount, displayPtr, out displayCount); } } - + Debug.Print("CoreGraphics reported {0} display(s).", displayCount); Debug.Indent(); - + for (int i = 0; i < displayCount; i++) { IntPtr currentDisplay = displays[i]; - + // according to docs, first element in the array is always the // main display. bool primary = (i == 0); - + // gets current settings int currentWidth = CG.DisplayPixelsWide(currentDisplay); int currentHeight = CG.DisplayPixelsHigh(currentDisplay); Debug.Print("Display {0} is at {1}x{2}", i, currentWidth, currentHeight); - + IntPtr displayModesPtr = CG.DisplayAvailableModes(currentDisplay); CFArray displayModes = new CFArray(displayModesPtr); Debug.Print("Supports {0} display modes.", displayModes.Count); - + DisplayResolution opentk_dev_current_res = null; List opentk_dev_available_res = new List(); IntPtr currentModePtr = CG.DisplayCurrentMode(currentDisplay); CFDictionary currentMode = new CFDictionary(currentModePtr); - + for (int j = 0; j < displayModes.Count; j++) { CFDictionary dict = new CFDictionary(displayModes[j]); - + int width = (int)dict.GetNumberValue("Width"); int height = (int)dict.GetNumberValue("Height"); int bpp = (int)dict.GetNumberValue("BitsPerPixel"); double freq = dict.GetNumberValue("RefreshRate"); bool current = currentMode.Ref == dict.Ref; - + //if (current) Debug.Write(" * "); //else Debug.Write(" "); - + //Debug.Print("Mode {0} is {1}x{2}x{3} @ {4}.", j, width, height, bpp, freq); - + DisplayResolution thisRes = new DisplayResolution(0, 0, width, height, bpp, (float)freq); opentk_dev_available_res.Add(thisRes); - + if (current) opentk_dev_current_res = thisRes; - + } - + NSRect bounds = CG.DisplayBounds(currentDisplay); Rectangle newRect = new Rectangle((int)bounds.Location.X, (int)bounds.Location.Y, (int)bounds.Size.Width, (int)bounds.Size.Height); - + Debug.Print("Display {0} bounds: {1}", i, newRect); - + DisplayDevice opentk_dev = new DisplayDevice(opentk_dev_current_res, primary, opentk_dev_available_res, newRect, currentDisplay); @@ -122,7 +120,7 @@ namespace OpenTK.Platform.MacOS if (primary) Primary = opentk_dev; } - + Debug.Unindent(); } } @@ -132,8 +130,6 @@ namespace OpenTK.Platform.MacOS return (IntPtr)displayDevice.Id; } - #region IDisplayDeviceDriver Members - Dictionary storedModes = new Dictionary(); List displaysCaptured = new List(); @@ -141,38 +137,38 @@ namespace OpenTK.Platform.MacOS { IntPtr display = HandleTo(device); IntPtr currentModePtr = CG.DisplayCurrentMode(display); - + if (storedModes.ContainsKey(display) == false) { storedModes.Add(display, currentModePtr); } - + IntPtr displayModesPtr = CG.DisplayAvailableModes(display); CFArray displayModes = new CFArray(displayModesPtr); - + for (int j = 0; j < displayModes.Count; j++) { CFDictionary dict = new CFDictionary(displayModes[j]); - + int width = (int)dict.GetNumberValue("Width"); int height = (int)dict.GetNumberValue("Height"); int bpp = (int)dict.GetNumberValue("BitsPerPixel"); double freq = dict.GetNumberValue("RefreshRate"); - + if (width == resolution.Width && height == resolution.Height && bpp == resolution.BitsPerPixel && System.Math.Abs(freq - resolution.RefreshRate) < 1e-6) { // if (displaysCaptured.Contains(display) == false) // { // CG.DisplayCapture(display); // } - + Debug.Print("Changing resolution to {0}x{1}x{2}@{3}.", width, height, bpp, freq); - + CG.DisplaySwitchToMode(display, displayModes[j]); - + return true; } - + } return false; } @@ -180,21 +176,19 @@ namespace OpenTK.Platform.MacOS public sealed override bool TryRestoreResolution(DisplayDevice device) { IntPtr display = HandleTo(device); - + if (storedModes.ContainsKey(display)) { Debug.Print("Restoring resolution."); - + CG.DisplaySwitchToMode(display, storedModes[display]); //CG.DisplayRelease(display); displaysCaptured.Remove(display); - + return true; } - + return false; } - - #endregion } } diff --git a/src/OpenTK/Platform/MappedGamePadDriver.cs b/src/OpenTK/Platform/MappedGamePadDriver.cs index a15676fe..e20ea6c8 100644 --- a/src/OpenTK/Platform/MappedGamePadDriver.cs +++ b/src/OpenTK/Platform/MappedGamePadDriver.cs @@ -1,5 +1,4 @@ -#region License -// +// // MappedGamePadDriver.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -231,8 +229,6 @@ namespace OpenTK.Platform return false; } - #region Private Members - GamePadConfiguration GetConfiguration(Guid guid) { if (!configurations.ContainsKey(guid)) @@ -248,7 +244,5 @@ namespace OpenTK.Platform { return item.Type != ConfigurationType.Unmapped; } - - #endregion } } diff --git a/src/OpenTK/Platform/NativeWindowBase.cs b/src/OpenTK/Platform/NativeWindowBase.cs index 63cd93cb..cd446f0e 100644 --- a/src/OpenTK/Platform/NativeWindowBase.cs +++ b/src/OpenTK/Platform/NativeWindowBase.cs @@ -1,5 +1,4 @@ -#region License -// +// // NativeWindowBase.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.ComponentModel; @@ -65,8 +63,6 @@ namespace OpenTK.Platform PreviousMouseState.SetIsConnected(true); } - #region Protected Members - protected void OnMove(EventArgs e) { Move(this, e); @@ -296,10 +292,6 @@ namespace OpenTK.Platform MouseWheel(this, e); } - #endregion - - #region INativeWindow Members - public event EventHandler Move = delegate { }; public event EventHandler Resize = delegate { }; public event EventHandler Closing = delegate { }; @@ -455,10 +447,6 @@ namespace OpenTK.Platform public abstract MouseCursor Cursor { get; set; } - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -472,8 +460,6 @@ namespace OpenTK.Platform Debug.Print("NativeWindowBase leaked, did you forget to call Dispose()?"); Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/PlatformException.cs b/src/OpenTK/Platform/PlatformException.cs index 37ffe478..abc3b873 100644 --- a/src/OpenTK/Platform/PlatformException.cs +++ b/src/OpenTK/Platform/PlatformException.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; diff --git a/src/OpenTK/Platform/PlatformFactoryBase.cs b/src/OpenTK/Platform/PlatformFactoryBase.cs index 203660ab..d619f668 100644 --- a/src/OpenTK/Platform/PlatformFactoryBase.cs +++ b/src/OpenTK/Platform/PlatformFactoryBase.cs @@ -1,4 +1,3 @@ -#region License // // PlatformFactoryBase.cs // @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -52,8 +50,6 @@ namespace OpenTK.Platform { } - #region IPlatformFactory Members - public abstract INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device); public abstract IDisplayDeviceDriver CreateDisplayDeviceDriver(); @@ -86,10 +82,6 @@ namespace OpenTK.Platform } } - #endregion - - #region IDisposable implementation - public void Dispose() { Dispose(true); @@ -124,8 +116,6 @@ namespace OpenTK.Platform { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2.cs b/src/OpenTK/Platform/SDL2/Sdl2.cs index d4042e1f..6cd8a527 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -24,8 +23,6 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#endregion - using System; using System.Diagnostics; using System.Security; @@ -71,8 +68,6 @@ namespace OpenTK.Platform.SDL2 } } - #region Functions - static string IntPtrToString(IntPtr ptr) { return Marshal.PtrToStringAnsi(ptr); @@ -81,8 +76,6 @@ namespace OpenTK.Platform.SDL2 // strlen++; } - #region Cursor - [SuppressUnmanagedCodeSecurity] [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_CreateColorCursor", ExactSpelling = true)] public static extern Cursor CreateColorCursor(Surface surface, int hot_x, int hot_y); @@ -99,8 +92,6 @@ namespace OpenTK.Platform.SDL2 [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_SetCursor", ExactSpelling = true)] public static extern void SetCursor(Cursor cursor); - #endregion - [SuppressUnmanagedCodeSecurity] [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_AddEventWatch", ExactSpelling = true)] public static extern void AddEventWatch(EventFilter filter, IntPtr userdata); @@ -143,8 +134,6 @@ namespace OpenTK.Platform.SDL2 [DllImport (lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_free", ExactSpelling = true)] public static extern void Free(IntPtr memblock); - #region GameContoller - [SuppressUnmanagedCodeSecurity] [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GameControllerEventState", ExactSpelling = true)] public static extern EventState GameControllerEventState(EventState state); @@ -226,8 +215,6 @@ namespace OpenTK.Platform.SDL2 [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GameControllerOpen", ExactSpelling = true)] public static extern IntPtr GameControllerOpen(int joystick_index); - #endregion - [SuppressUnmanagedCodeSecurity] [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetDisplayBounds", ExactSpelling = true)] public static extern int GetDisplayBounds(int displayIndex, out Rect rect); @@ -428,7 +415,7 @@ namespace OpenTK.Platform.SDL2 [SuppressUnmanagedCodeSecurity] [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_PixelFormatEnumToMasks", ExactSpelling = true)] - public static extern bool PixelFormatEnumToMasks(uint format, out int bpp, + public static extern bool PixelFormatEnumToMasks(uint format, out int bpp, out uint rmask, out uint gmask, out uint bmask, out uint amask); [SuppressUnmanagedCodeSecurity] @@ -499,8 +486,6 @@ namespace OpenTK.Platform.SDL2 [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_WarpMouseInWindow", ExactSpelling = true)] public static extern void WarpMouseInWindow(IntPtr window, int x, int y); - #region SysWM - /// /// Retrieves driver-dependent window information. /// @@ -525,8 +510,6 @@ namespace OpenTK.Platform.SDL2 [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetWindowWMInfo", ExactSpelling = true)] static extern bool GetWindowWMInfoInternal(IntPtr window, ref SysWMInfo info); - #endregion - public partial class GL { [SuppressUnmanagedCodeSecurity] @@ -593,19 +576,11 @@ namespace OpenTK.Platform.SDL2 [DllImport(lib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GL_SwapWindow", ExactSpelling = true)] public static extern void SwapWindow(IntPtr window); } - - #endregion } - #region Delegates - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int EventFilter(IntPtr userdata, IntPtr @event); - #endregion - - #region Enums - enum Button : byte { Left = 1, @@ -1363,10 +1338,6 @@ namespace OpenTK.Platform.SDL2 ALLOW_HIGHDPI = 0x00002000, } - #endregion - - #region Structs - struct ControllerAxisEvent { public EventType Type; @@ -1554,7 +1525,7 @@ namespace OpenTK.Platform.SDL2 { fixed (JoystickGuid* pdata = &this) { - Marshal.Copy(new IntPtr(pdata), data, 0, data.Length); + Marshal.Copy(new IntPtr(pdata), data, 0, data.Length); } } @@ -1769,7 +1740,5 @@ namespace OpenTK.Platform.SDL2 public IntPtr File; public UInt32 WindowID; } - - #endregion } diff --git a/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs b/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs index 4216781c..699b420c 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -75,8 +73,6 @@ namespace OpenTK.Platform.SDL2 } } - #region Private Members - int TranslateFormat(uint format) { int bpp; @@ -90,10 +86,6 @@ namespace OpenTK.Platform.SDL2 return new Rectangle(rect.X, rect.Y, rect.Width, rect.Height); } - #endregion - - #region DisplayDeviceBase Members - public override bool TryChangeResolution(DisplayDevice device, DisplayResolution resolution) { Sdl2Factory.UseFullscreenDesktop = false; @@ -105,8 +97,6 @@ namespace OpenTK.Platform.SDL2 Sdl2Factory.UseFullscreenDesktop = true; return true; } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2Factory.cs b/src/OpenTK/Platform/SDL2/Sdl2Factory.cs index 7d942818..966f58fe 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2Factory.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2Factory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -54,8 +52,6 @@ namespace OpenTK.Platform.SDL2 UseFullscreenDesktop = true; } - #region IPlatformFactory implementation - public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) { return new Sdl2NativeWindow(x, y, width, height, title, options, device); @@ -99,10 +95,6 @@ namespace OpenTK.Platform.SDL2 return GetInputDriver().JoystickDriver; } - #endregion - - #region IDisposable Members - protected override void Dispose(bool manual) { if (!IsDisposed) @@ -120,8 +112,6 @@ namespace OpenTK.Platform.SDL2 } } - #endregion - private Sdl2InputDriver GetInputDriver() { if (inputDriver == null) diff --git a/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs b/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs index 4a78ae4f..6d6652b2 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -92,8 +90,6 @@ namespace OpenTK.Platform.SDL2 Debug.Print(" GraphicsContextFlags: {0}", flags); } - #region Private Members - static GraphicsMode GetGLAttributes(ContextHandle sdlContext, out GraphicsContextFlags context_flags) { context_flags = 0; @@ -308,19 +304,11 @@ namespace OpenTK.Platform.SDL2 } } - #endregion - - #region Public Members - public static ContextHandle GetCurrentContext() { return new ContextHandle(SDL.GL.GetCurrentContext()); } - #endregion - - #region GraphicsContextBase Members - public override void SwapBuffers() { SDL.GL.SwapWindow(Window.Handle); @@ -372,10 +360,6 @@ namespace OpenTK.Platform.SDL2 } } - #endregion - - #region IDisposable Members - protected override void Dispose(bool manual) { if (!IsDisposed) @@ -396,8 +380,6 @@ namespace OpenTK.Platform.SDL2 IsDisposed = true; } } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2GraphicsMode.cs b/src/OpenTK/Platform/SDL2/Sdl2GraphicsMode.cs index 0bb18ffc..9a2faab9 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2GraphicsMode.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2GraphicsMode.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using OpenTK.Graphics; @@ -36,14 +34,10 @@ namespace OpenTK.Platform.SDL2 { } - #region IGraphicsMode implementation - public GraphicsMode SelectGraphicsMode(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo) { return new GraphicsMode(IntPtr.Zero, color, depth, stencil, samples, accum, buffers, stereo); } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs b/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs index 73972acb..9dc97204 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -73,8 +71,6 @@ namespace OpenTK.Platform.SDL2 } } - #region Private Members - unsafe static int FilterInputEvents(IntPtr driver_handle, IntPtr e) { try @@ -152,10 +148,6 @@ namespace OpenTK.Platform.SDL2 return 0; } - #endregion - - #region IInputDriver2 Members - public IMouseDriver2 MouseDriver { get @@ -188,10 +180,6 @@ namespace OpenTK.Platform.SDL2 } } - #endregion - - #region IDisposable Members - void Dispose(bool manual) { if (!disposed) @@ -224,8 +212,6 @@ namespace OpenTK.Platform.SDL2 { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2JoystickDriver.cs b/src/OpenTK/Platform/SDL2/Sdl2JoystickDriver.cs index 606cd1a7..00623d4b 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2JoystickDriver.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2JoystickDriver.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -77,8 +75,6 @@ namespace OpenTK.Platform.SDL2 { } - #region Private Members - JoystickDevice OpenJoystick(int id) { JoystickDevice joystick = null; @@ -219,7 +215,7 @@ namespace OpenTK.Platform.SDL2 { case GameControllerAxis.LeftX: return GamePadAxes.LeftX; - + case GameControllerAxis.LeftY: return GamePadAxes.LeftY; @@ -297,10 +293,6 @@ namespace OpenTK.Platform.SDL2 } #endif - #endregion - - #region Public Members - public void ProcessJoystickEvent(JoyDeviceEvent ev) { int id = ev.Which; @@ -316,7 +308,7 @@ namespace OpenTK.Platform.SDL2 { IntPtr handle = SDL.JoystickOpen(id); if (handle != IntPtr.Zero) - { + { JoystickDevice joystick = OpenJoystick(id); int instance_id = joystick.Details.InstanceId; @@ -544,10 +536,6 @@ namespace OpenTK.Platform.SDL2 } #endif - #endregion - - #region IGamePadDriver Members - #if USE_SDL2_GAMECONTOLLER public GamePadCapabilities GetCapabilities(int index) { @@ -593,10 +581,6 @@ namespace OpenTK.Platform.SDL2 } #endif - #endregion - - #region IJoystickDriver2 Members - JoystickState IJoystickDriver2.GetState(int index) { JoystickState state = new JoystickState(); @@ -656,10 +640,6 @@ namespace OpenTK.Platform.SDL2 return guid; } - #endregion - - #region IDisposable Members - void Dispose(bool manual) { if (!disposed) @@ -695,8 +675,6 @@ namespace OpenTK.Platform.SDL2 { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs b/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs index 96c6a43b..113fa707 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs b/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs index d5b05c1f..9b1eea1d 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -42,8 +40,6 @@ namespace OpenTK.Platform.SDL2 state.IsConnected = true; } - #region Private Members - // Unfortunately, SDL does not report KeyDown events // when a modifier (e.g. shift, alt, etc) is first pressed. // It reports a keydown+keyup event pair when the modifier @@ -68,10 +64,6 @@ namespace OpenTK.Platform.SDL2 //state[Key.] = (mod & Keymod.MODE) != 0; } - #endregion - - #region Internal Members - internal void ProcessKeyboardEvent(KeyboardEvent e) { bool pressed = e.State != 0; @@ -84,10 +76,6 @@ namespace OpenTK.Platform.SDL2 } } - #endregion - - #region IKeyboardDriver2 Members - public KeyboardState GetState() { //UpdateModifiers(); // Fixme @@ -107,8 +95,6 @@ namespace OpenTK.Platform.SDL2 { return "SDL2 Default Keyboard"; } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs b/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs index 0f7f2825..d77081ab 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,8 +42,6 @@ namespace OpenTK.Platform.SDL2 state.IsConnected = true; } - #region Private Members - static internal MouseButton TranslateButton(Button button) { switch (button) @@ -85,10 +81,6 @@ namespace OpenTK.Platform.SDL2 internal static float Scale = 1.0f; - #endregion - - #region Public Members - public void ProcessWheelEvent(MouseWheelEvent wheel) { state.SetScrollRelative(wheel.X, wheel.Y); @@ -106,10 +98,6 @@ namespace OpenTK.Platform.SDL2 SetButtonState(TranslateButton(button.Button), pressed); } - #endregion - - #region IMouseDriver2 Members - public MouseState GetState() { MouseState scaledState = state; @@ -158,8 +146,6 @@ namespace OpenTK.Platform.SDL2 { SDL.WarpMouseInWindow(IntPtr.Zero, (int)x, (int)y); } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs b/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs index a8de18d8..d2c5452a 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -64,7 +62,7 @@ namespace OpenTK.Platform.SDL2 IntPtr sdl_cursor = IntPtr.Zero; // Used in KeyPress event to decode SDL UTF8 text strings - // to .Net UTF16 strings + // to .Net UTF16 strings char[] DecodeTextBuffer = new char[32]; static readonly Dictionary windows = @@ -106,8 +104,6 @@ namespace OpenTK.Platform.SDL2 } } - #region Private Members - static WindowFlags TranslateFlags(GameWindowFlags flags) { WindowFlags windowFlags = WindowFlags.Default; @@ -467,10 +463,6 @@ namespace OpenTK.Platform.SDL2 window_state = WindowState.Normal; } - #endregion - - #region INativeWindow Members - public override MouseCursor Cursor { get @@ -935,10 +927,6 @@ namespace OpenTK.Platform.SDL2 } } - #endregion - - #region IDisposable implementation - protected override void Dispose(bool manual) { if (!disposed) @@ -977,8 +965,6 @@ namespace OpenTK.Platform.SDL2 } } } - - #endregion } } diff --git a/src/OpenTK/Platform/SDL2/Sdl2WindowInfo.cs b/src/OpenTK/Platform/SDL2/Sdl2WindowInfo.cs index c6510233..8124ac01 100644 --- a/src/OpenTK/Platform/SDL2/Sdl2WindowInfo.cs +++ b/src/OpenTK/Platform/SDL2/Sdl2WindowInfo.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -50,14 +48,10 @@ namespace OpenTK.Platform.SDL2 // (e.g. MonoGame) public IntPtr WindowHandle { get { return Handle; } set { Handle = value; } } - #region IDisposable implementation - public void Dispose() { Debug.Print("Disposing {0}", GetType()); } - - #endregion } } diff --git a/src/OpenTK/Platform/Utilities.cs b/src/OpenTK/Platform/Utilities.cs index 7d4e016f..80e5dd2a 100644 --- a/src/OpenTK/Platform/Utilities.cs +++ b/src/OpenTK/Platform/Utilities.cs @@ -1,10 +1,6 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion - -#region --- Using Directives --- using System; using System.Collections.Generic; @@ -14,8 +10,6 @@ using System.Reflection; using System.Diagnostics; using OpenTK.Graphics; -#endregion - namespace OpenTK.Platform { namespace MacOS @@ -33,8 +27,6 @@ namespace OpenTK.Platform /// public static class Utilities { - #region internal static bool ThrowOnX11Error - static bool throw_on_error; internal static bool ThrowOnX11Error { @@ -60,10 +52,6 @@ namespace OpenTK.Platform } } - #endregion - - #region internal static void LoadExtensions(Type type) - delegate Delegate LoadDelegateFunction(string name, Type signature); /// @@ -124,10 +112,6 @@ namespace OpenTK.Platform time.Reset(); } - #endregion - - #region internal static bool TryLoadExtension(Type type, string extension) - /// /// Loads the specified extension for the specified class. This function is intended /// for OpenGL, Wgl, Glx, OpenAL etc. @@ -178,10 +162,6 @@ namespace OpenTK.Platform return @new != null; } - #endregion - - #region CreateGetAddress - internal static GraphicsContext.GetAddressDelegate CreateGetAddress() { #if SDL2 @@ -218,12 +198,6 @@ namespace OpenTK.Platform return IntPtr.Zero; } - #endregion - - #region --- Creating a Graphics Context --- - - #region CreateX11WindowInfo - /// /// Constructs a new IWindowInfo instance for the X11 platform. /// @@ -248,10 +222,6 @@ namespace OpenTK.Platform #endif } - #endregion - - #region CreateWindowsWindowInfo - /// /// Creates an IWindowInfo instance for the windows platform. /// @@ -266,10 +236,6 @@ namespace OpenTK.Platform #endif } - #endregion - - #region CreateMacOSCarbonWindowInfo - /// /// Creates an IWindowInfo instance for the Mac OS X platform. /// @@ -303,10 +269,6 @@ namespace OpenTK.Platform } #endif - #endregion - - #region CreateMacOSWindowInfo - /// /// Creates an IWindowInfo instance for the Mac OS X platform. /// @@ -337,10 +299,6 @@ namespace OpenTK.Platform #endif } - #endregion - - #region CreateDummyWindowInfo - /// /// Creates an IWindowInfo instance for the dummy platform. /// @@ -350,10 +308,6 @@ namespace OpenTK.Platform return new Dummy.DummyWindowInfo(); } - #endregion - - #region CreateSdl2WindowInfo - /// /// Creates an IWindowInfo instance for the windows platform. /// @@ -369,10 +323,6 @@ namespace OpenTK.Platform #endif } - #endregion - - #region - #if !__MOBILE__ /// /// Creates an IWindowInfo instance for Angle rendering, based on @@ -387,12 +337,6 @@ namespace OpenTK.Platform } #endif - #endregion - - #endregion - - #region RelaxGraphicsMode - internal static bool RelaxGraphicsMode(ref GraphicsMode mode) { ColorFormat color = mode.ColorFormat; @@ -496,7 +440,5 @@ namespace OpenTK.Platform // no parameters left to relax, fail return false; } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/API.cs b/src/OpenTK/Platform/Windows/API.cs index c689f887..23d4ba28 100644 --- a/src/OpenTK/Platform/Windows/API.cs +++ b/src/OpenTK/Platform/Windows/API.cs @@ -1,4 +1,3 @@ -#region License // // WinRawJoystick.cs // @@ -26,7 +25,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; #if !MINIMAL @@ -46,8 +44,6 @@ using OpenTK.Platform.Common; namespace OpenTK.Platform.Windows { - #region Type aliases - using HWND = System.IntPtr; using HINSTANCE = System.IntPtr; using HMENU = System.IntPtr; @@ -98,8 +94,6 @@ namespace OpenTK.Platform.Windows using REGSAM = System.UInt32; using System.Diagnostics; - #endregion - /// \internal /// /// For internal use by OpenTK only! @@ -134,8 +128,6 @@ namespace OpenTK.Platform.Windows internal static class Functions { - #region Window functions - [DllImport("shell32.dll")] internal static extern bool DragAcceptFiles( IntPtr handle, @@ -155,8 +147,6 @@ namespace OpenTK.Platform.Windows HDROP hDrop ); - #region SetWindowPos - // WINUSERAPI BOOL WINAPI SetWindowPos(__in HWND hWnd, __in_opt HWND hWndInsertAfter, // __in int X, __in int Y, __in int cx, __in int cy, __in UINT uFlags); @@ -169,10 +159,6 @@ namespace OpenTK.Platform.Windows SetWindowPosFlags flags ); - #endregion - - #region AdjustWindowRect - /// /// Calculates the required size of the window rectangle, based on the desired client-rectangle size. The window rectangle can then be passed to the CreateWindow function to create a window whose client area is the desired size. /// @@ -184,8 +170,8 @@ namespace OpenTK.Platform.Windows /// If the function fails, the return value is zero. To get extended error information, call GetLastError. /// /// - /// A client rectangle is the smallest rectangle that completely encloses a client area. A window rectangle is the smallest rectangle that completely encloses the window, which includes the client area and the nonclient area. - /// The AdjustWindowRect function does not add extra space when a menu bar wraps to two or more rows. + /// A client rectangle is the smallest rectangle that completely encloses a client area. A window rectangle is the smallest rectangle that completely encloses the window, which includes the client area and the nonclient area. + /// The AdjustWindowRect function does not add extra space when a menu bar wraps to two or more rows. /// The AdjustWindowRect function does not take the WS_VSCROLL or WS_HSCROLL styles into account. To account for the scroll bars, call the GetSystemMetrics function with SM_CXVSCROLL or SM_CYHSCROLL. /// Found Winuser.h, user32.dll /// @@ -200,10 +186,6 @@ namespace OpenTK.Platform.Windows [MarshalAs(UnmanagedType.Bool)] bool bMenu, ExtendedWindowStyle dwExStyle); - #endregion - - #region CreateWindowEx - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern IntPtr CreateWindowEx( ExtendedWindowStyle ExStyle, @@ -243,40 +225,22 @@ namespace OpenTK.Platform.Windows IntPtr Instance, IntPtr Param); - #region DestroyWindow - [DllImport("user32.dll", SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool DestroyWindow(IntPtr windowHandle); - #endregion - - #region RegisterClass - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern ushort RegisterClass(ref WindowClass window_class); - #endregion - - #region RegisterClassEx - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern ushort RegisterClassEx(ref ExtendedWindowClass window_class); - #endregion - - #region UnregisterClass - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern short UnregisterClass([MarshalAs(UnmanagedType.LPTStr)] LPCTSTR className, IntPtr instance); [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern short UnregisterClass(IntPtr className, IntPtr instance); - #endregion - - #region GetClassInfoEx - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern BOOL GetClassInfoEx(HINSTANCE hinst, [MarshalAs(UnmanagedType.LPTStr)] LPCTSTR lpszClass, ref ExtendedWindowClass lpwcx); @@ -284,19 +248,11 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern BOOL GetClassInfoEx(HINSTANCE hinst, UIntPtr lpszClass, ref ExtendedWindowClass lpwcx); - #endregion - - #region CallWindowProc - [SuppressUnmanagedCodeSecurity] [DllImport("user32.dll", SetLastError = true)] internal static extern LRESULT CallWindowProc(WNDPROC lpPrevWndFunc, HWND hWnd, WindowMessage Msg, WPARAM wParam, LPARAM lParam); - #endregion - - #region SetWindowLong - // SetWindowLongPtr does not exist on x86 platforms (it's a macro that resolves to SetWindowLong). // We need to detect if we are on x86 or x64 at runtime and call the correct function // (SetWindowLongPtr on x64 or SetWindowLong on x86). Fun! @@ -346,10 +302,6 @@ namespace OpenTK.Platform.Windows static extern LONG_PTR SetWindowLongPtrInternal(HWND hWnd, GetWindowLongOffsets nIndex, [MarshalAs(UnmanagedType.FunctionPtr)]WindowProcedure dwNewLong); - #endregion - - #region GetWindowLong - internal static UIntPtr GetWindowLong(IntPtr handle, GetWindowLongOffsets index) { if (IntPtr.Size == 4) @@ -366,14 +318,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true, EntryPoint = "GetWindowLongPtr")] static extern UIntPtr GetWindowLongPtrInternal(HWND hWnd, GetWindowLongOffsets nIndex); - #endregion - - #endregion - - #region Message handling - - #region PeekMessage - /// /// Low-level WINAPI function that checks the next message in the queue. /// @@ -388,10 +332,6 @@ namespace OpenTK.Platform.Windows [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool PeekMessage(ref MSG msg, IntPtr hWnd, int messageFilterMin, int messageFilterMax, PeekMessageFlags flags); - #endregion - - #region GetMessage - /// /// Low-level WINAPI function that retrieves the next message in the queue. /// @@ -411,14 +351,10 @@ namespace OpenTK.Platform.Windows internal static extern INT GetMessage(ref MSG msg, IntPtr windowHandle, int messageFilterMin, int messageFilterMax); - #endregion - - #region GetMessageTime - /// - /// Retrieves the message time for the last message retrieved by the - /// GetMessage function. The time is a long integer that specifies the - /// elapsed time, in milliseconds, from the time the system was started + /// Retrieves the message time for the last message retrieved by the + /// GetMessage function. The time is a long integer that specifies the + /// elapsed time, in milliseconds, from the time the system was started /// to the time the message was created (that is, placed in the thread's /// message queue). /// @@ -426,17 +362,9 @@ namespace OpenTK.Platform.Windows [DllImport("User32.dll")] internal static extern int GetMessageTime(); - #endregion - - #region SendMessage - [DllImport("user32.dll", CharSet = CharSet.Auto)] internal static extern LRESULT SendMessage(HWND hWnd, WindowMessage Msg, WPARAM wParam, LPARAM lParam); - #endregion - - #region PostMessage - [CLSCompliant(false)] [System.Security.SuppressUnmanagedCodeSecurity] [DllImport("User32.dll", CharSet = CharSet.Auto)] @@ -448,33 +376,17 @@ namespace OpenTK.Platform.Windows LPARAM lParam ); - #endregion - - #region PostQuitMessage - [DllImport("User32.dll", CharSet = CharSet.Auto)] internal static extern void PostQuitMessage(int exitCode); - #endregion - - #region DispatchMessage - [SuppressUnmanagedCodeSecurity] [DllImport("User32.dll"), CLSCompliant(false)] internal static extern LRESULT DispatchMessage(ref MSG msg); - #endregion - - #region TranslateMessage - [SuppressUnmanagedCodeSecurity] [DllImport("User32.dll"), CLSCompliant(false)] internal static extern BOOL TranslateMessage(ref MSG lpMsg); - #endregion - - #region GetQueueStatus - /// /// Indicates the type of messages found in the calling thread's message queue. /// @@ -489,7 +401,7 @@ namespace OpenTK.Platform.Windows /// a subsequent call to the GetMessage or PeekMessage function will return a message. /// GetMessage and PeekMessage perform some internal filtering that may cause the message /// to be processed internally. For this reason, the return value from GetQueueStatus - /// should be considered only a hint as to whether GetMessage or PeekMessage should be called. + /// should be considered only a hint as to whether GetMessage or PeekMessage should be called. /// /// The QS_ALLPOSTMESSAGE and QS_POSTMESSAGE flags differ in when they are cleared. /// QS_POSTMESSAGE is cleared when you call GetMessage or PeekMessage, whether or not you are filtering messages. @@ -502,21 +414,9 @@ namespace OpenTK.Platform.Windows [DllImport("User32.dll", CharSet = CharSet.Auto)] internal static extern DWORD GetQueueStatus([MarshalAs(UnmanagedType.U4)] QueueStatusFlags flags); - #endregion - - #region DefWindowProc - [DllImport("User32.dll", CharSet = CharSet.Auto)] public extern static IntPtr DefWindowProc(HWND hWnd, WindowMessage msg, IntPtr wParam, IntPtr lParam); - #endregion - - #endregion - - #region Timing - - #region TimeBeginPeriod - /// /// Sets the timing resolution of the GetTime (?) method. /// @@ -526,12 +426,8 @@ namespace OpenTK.Platform.Windows [DllImport("winmm.dll")] internal static extern IntPtr TimeBeginPeriod(int period); - #endregion - - #region QueryPerformanceFrequency - /// - /// + /// /// /// /// @@ -540,12 +436,8 @@ namespace OpenTK.Platform.Windows [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool QueryPerformanceFrequency(ref long PerformanceFrequency); - #endregion - - #region QueryPerformanceCounter - /// - /// + /// /// /// /// @@ -554,35 +446,19 @@ namespace OpenTK.Platform.Windows [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool QueryPerformanceCounter(ref long PerformanceCount); - #endregion - - #endregion - - #region Rendering - - #region GetDC - /// - /// + /// /// /// /// [DllImport("user32.dll")] internal static extern IntPtr GetDC(IntPtr hwnd); - #endregion - - #region GetWindowDC - [DllImport("user32.dll")] internal static extern IntPtr GetWindowDC(IntPtr hwnd); - #endregion - - #region ReleaseDC - /// - /// + /// /// /// /// @@ -591,22 +467,14 @@ namespace OpenTK.Platform.Windows [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool ReleaseDC(IntPtr hwnd, IntPtr DC); - #endregion - - #region ChoosePixelFormat - [DllImport("gdi32.dll")] internal static extern int ChoosePixelFormat(IntPtr dc, ref PixelFormatDescriptor pfd); - #endregion - [DllImport("gdi32.dll")] internal static extern int DescribePixelFormat(IntPtr deviceContext, int pixel, int pfdSize, ref PixelFormatDescriptor pixelFormat); - #region SetPixelFormat - /// - /// + /// /// /// /// @@ -616,19 +484,11 @@ namespace OpenTK.Platform.Windows [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool SetPixelFormat(IntPtr dc, int format, ref PixelFormatDescriptor pfd); - #endregion - - #region SwapBuffers - [SuppressUnmanagedCodeSecurity] [DllImport("gdi32.dll", SetLastError=true)] [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool SwapBuffers(IntPtr dc); - #endregion - - #region GetProcAddress - [DllImport("kernel32.dll")] internal static extern IntPtr GetProcAddress(IntPtr handle, string funcname); @@ -636,42 +496,22 @@ namespace OpenTK.Platform.Windows internal static extern IntPtr GetProcAddress(IntPtr handle, IntPtr funcname); - #endregion - - #endregion - - #region DLL handling - - #region SetLastError - [DllImport("kernel32.dll")] internal static extern void SetLastError(DWORD dwErrCode); - #endregion - - #region GetModuleHandle - [DllImport("kernel32.dll")] internal static extern IntPtr GetModuleHandle([MarshalAs(UnmanagedType.LPTStr)]string module_name); - #endregion - - #region LoadLibrary - /// - /// + /// /// /// /// [DllImport("kernel32.dll", SetLastError = true)] internal static extern IntPtr LoadLibrary(string dllName); - #endregion - - #region FreeLibrary - /// - /// + /// /// /// /// @@ -679,28 +519,14 @@ namespace OpenTK.Platform.Windows [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool FreeLibrary(IntPtr handle); - #endregion - - #endregion - - #region GetAsyncKeyState - [System.Security.SuppressUnmanagedCodeSecurity] [DllImport("user32.dll", SetLastError = true)] internal static extern SHORT GetAsyncKeyState(VirtualKeys vKey); - #endregion - - #region GetKeyState - [System.Security.SuppressUnmanagedCodeSecurity] [DllImport("user32.dll", SetLastError = true)] internal static extern SHORT GetKeyState(VirtualKeys vKey); - #endregion - - #region MapVirtualKey - [System.Security.SuppressUnmanagedCodeSecurity] [DllImport("user32.dll", SetLastError = true)] internal static extern UINT MapVirtualKey(UINT uCode, MapVirtualKeyType uMapType); @@ -709,10 +535,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true)] internal static extern UINT MapVirtualKey(VirtualKeys vkey, MapVirtualKeyType uMapType); - #endregion - - #region ShowWindow - /// /// The ShowWindow function sets the specified window's show state. /// @@ -731,10 +553,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true), SuppressUnmanagedCodeSecurity] internal static extern BOOL ShowWindow(HWND hWnd, ShowWindowCommand nCmdShow); - #endregion - - #region SetWindowText - /// /// The SetWindowText function changes the text of the specified window's title bar (if it has one). If the specified window is a control, the text of the control is changed. However, SetWindowText cannot change the text of a control in another application. /// @@ -753,10 +571,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern BOOL SetWindowText(HWND hWnd, [MarshalAs(UnmanagedType.LPTStr)] string lpString); - #endregion - - #region GetWindowText - /// /// The GetWindowText function copies the text of the specified window's title bar (if it has one) into a buffer. If the specified window is a control, the text of the control is copied. However, GetWindowText cannot retrieve the text of a control in another application. /// @@ -775,10 +589,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] internal static extern int GetWindowText(HWND hWnd, [MarshalAs(UnmanagedType.LPTStr), In, Out] StringBuilder lpString, int nMaxCount); - #endregion - - #region ScreenToClient - /// /// Converts the screen coordinates of a specified point on the screen to client-area coordinates. /// @@ -795,10 +605,6 @@ namespace OpenTK.Platform.Windows //internal static extern BOOL ScreenToClient(HWND hWnd, ref POINT point); internal static extern BOOL ScreenToClient(HWND hWnd, ref Point point); - #endregion - - #region ClientToScreen - /// /// Converts the client-area coordinates of a specified point to screen coordinates. /// @@ -812,10 +618,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true), SuppressUnmanagedCodeSecurity] internal static extern BOOL ClientToScreen(HWND hWnd, ref Point point); - #endregion - - #region GetClientRect - /// /// The GetClientRect function retrieves the coordinates of a window's client area. The client coordinates specify the upper-left and lower-right corners of the client area. Because client coordinates are relative to the upper-left corner of a window's client area, the coordinates of the upper-left corner are (0,0). /// @@ -829,10 +631,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true), SuppressUnmanagedCodeSecurity] internal extern static BOOL GetClientRect(HWND windowHandle, out Win32Rectangle clientRectangle); - #endregion - - #region GetWindowRect - /// /// The GetWindowRect function retrieves the dimensions of the bounding rectangle of the specified window. The dimensions are given in screen coordinates that are relative to the upper-left corner of the screen. /// @@ -846,45 +644,21 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true), SuppressUnmanagedCodeSecurity] internal extern static BOOL GetWindowRect(HWND windowHandle, out Win32Rectangle windowRectangle); - #endregion - - #region GetWindowInfo - [DllImport("user32.dll"), SuppressUnmanagedCodeSecurity] internal static extern BOOL GetWindowInfo(HWND hwnd, ref WindowInfo wi); - #endregion - - #region DwmGetWindowAttribute - [DllImport("dwmapi.dll")] unsafe public static extern HRESULT DwmGetWindowAttribute(HWND hwnd, DwmWindowAttribute dwAttribute, void* pvAttribute, DWORD cbAttribute); - #endregion - - #region GetFocus - [DllImport("user32.dll")] public static extern HWND GetFocus(); - #endregion - - #region IsWindowVisible - [DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr intPtr); - #endregion - - #region LoadIcon - [DllImport("user32.dll")] public static extern HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName); - #endregion - - #region LoadCursor - [DllImport("user32.dll")] public static extern HCURSOR LoadCursor(HINSTANCE hInstance, LPCTSTR lpCursorName); @@ -896,68 +670,56 @@ namespace OpenTK.Platform.Windows return LoadCursor(IntPtr.Zero, new IntPtr((int)lpCursorName)); } - #endregion - - #region CreateIconIndirect - /// /// Creates an icon or cursor from an IconInfo structure. /// /// - /// A pointer to an IconInfo structure the function uses to create the + /// A pointer to an IconInfo structure the function uses to create the /// icon or cursor. /// /// /// If the function succeeds, the return value is a handle to the icon /// or cursor that is created. - /// - /// If the function fails, the return value is null. To get extended + /// + /// If the function fails, the return value is null. To get extended /// error information, call Marshal.GetLastWin32Error. /// /// - /// The system copies the bitmaps in the IconInfo structure before - /// creating the icon or cursor. Because the system may temporarily - /// select the bitmaps in a device context, the hbmMask and hbmColor - /// members of the IconInfo structure should not already be selected - /// into a device context. The application must continue to manage the + /// The system copies the bitmaps in the IconInfo structure before + /// creating the icon or cursor. Because the system may temporarily + /// select the bitmaps in a device context, the hbmMask and hbmColor + /// members of the IconInfo structure should not already be selected + /// into a device context. The application must continue to manage the /// original bitmaps and delete them when they are no longer necessary. - /// When you are finished using the icon, destroy it using the + /// When you are finished using the icon, destroy it using the /// DestroyIcon function. /// [DllImport("user32.dll", SetLastError=true)] public static extern HICON CreateIconIndirect(ref IconInfo iconInfo); - #endregion - - #region GetIconInfo - /// /// Retrieves information about the specified icon or cursor. /// /// A handle to the icon or cursor. /// - /// A pointer to an IconInfo structure. The function fills in the + /// A pointer to an IconInfo structure. The function fills in the /// structure's members. /// /// - /// If the function succeeds, the return value is nonzero and the + /// If the function succeeds, the return value is nonzero and the /// function fills in the members of the specified IconInfo structure. - /// - /// If the function fails, the return value is zero. To get extended + /// + /// If the function fails, the return value is zero. To get extended /// error information, call Marshal.GetLastWin32Error. /// /// - /// GetIconInfo creates bitmaps for the hbmMask and hbmColor members + /// GetIconInfo creates bitmaps for the hbmMask and hbmColor members /// of IconInfo. The calling application must manage these bitmaps and /// delete them when they are no longer necessary. /// [DllImport("user32.dll", SetLastError=true)] public static extern BOOL GetIconInfo(HICON hIcon, out IconInfo pIconInfo); - #endregion - - #region DestroyIcon - /// /// Destroys an icon and frees any memory the icon occupied. /// @@ -966,18 +728,18 @@ namespace OpenTK.Platform.Windows /// /// /// If the function succeeds, the return value is nonzero. - /// - /// If the function fails, the return value is zero. To get extended + /// + /// If the function fails, the return value is zero. To get extended /// error information, call Marshal.GetLastWin32Error. /// /// - /// It is only necessary to call DestroyIcon for icons and cursors - /// created with the following functions: CreateIconFromResourceEx - /// (if called without the LR_SHARED flag), CreateIconIndirect, and - /// CopyIcon. Do not use this function to destroy a shared icon. A + /// It is only necessary to call DestroyIcon for icons and cursors + /// created with the following functions: CreateIconFromResourceEx + /// (if called without the LR_SHARED flag), CreateIconIndirect, and + /// CopyIcon. Do not use this function to destroy a shared icon. A /// shared icon is valid as long as the module from which it was loaded /// remains in memory. The following functions obtain a shared icon. - /// + /// /// LoadIcon /// LoadImage (if you use the LR_SHARED flag) /// CopyImage (if you use the LR_COPYRETURNORG flag and the hImage parameter is a shared icon) @@ -987,8 +749,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true)] public static extern BOOL DestroyIcon(HICON hIcon); - #endregion - [DllImport("user32.dll", SetLastError = true)] public static extern BOOL SetForegroundWindow(HWND hWnd); @@ -1006,12 +766,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true)] public static extern BOOL UnregisterDeviceNotification(HDEVNOTIFY Handle); - #endregion - - #region Display settings - - #region ChangeDisplaySettings - /// /// The ChangeDisplaySettings function changes the settings of the default display device to the specified graphics mode. /// @@ -1025,27 +779,15 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true)] internal static extern int ChangeDisplaySettings(DeviceMode device_mode, ChangeDisplaySettingsEnum flags); - #endregion int ChangeDisplaySettings - - #region ChangeDisplaySettingsEx - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] public static extern LONG ChangeDisplaySettingsEx([MarshalAs(UnmanagedType.LPTStr)] LPCTSTR lpszDeviceName, LPDEVMODE lpDevMode, HWND hwnd, ChangeDisplaySettingsEnum dwflags, LPVOID lParam); - #endregion - - #region EnumDisplayDevices - [DllImport("user32.dll", SetLastError = true, CharSet=CharSet.Auto)] [return: MarshalAs(UnmanagedType.Bool)] public static extern BOOL EnumDisplayDevices([MarshalAs(UnmanagedType.LPTStr)] LPCTSTR lpDevice, DWORD iDevNum, [In, Out] WindowsDisplayDevice lpDisplayDevice, DWORD dwFlags); - #endregion - - #region EnumDisplaySettings - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] [return: MarshalAs(UnmanagedType.Bool)] internal static extern BOOL EnumDisplaySettings([MarshalAs(UnmanagedType.LPTStr)] string device_name, @@ -1056,10 +798,6 @@ namespace OpenTK.Platform.Windows internal static extern BOOL EnumDisplaySettings([MarshalAs(UnmanagedType.LPTStr)] string device_name, DisplayModeSettingsEnum graphics_mode, [In, Out] DeviceMode device_mode); - #endregion - - #region EnumDisplaySettingsEx - [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] public static extern BOOL EnumDisplaySettingsEx([MarshalAs(UnmanagedType.LPTStr)] LPCTSTR lpszDeviceName, DisplayModeSettingsEnum iModeNum, [In, Out] DeviceMode lpDevMode, DWORD dwFlags); @@ -1068,31 +806,15 @@ namespace OpenTK.Platform.Windows public static extern BOOL EnumDisplaySettingsEx([MarshalAs(UnmanagedType.LPTStr)] LPCTSTR lpszDeviceName, DWORD iModeNum, [In, Out] DeviceMode lpDevMode, DWORD dwFlags); - #endregion - - #region GetMonitorInfo - [DllImport("user32.dll", SetLastError = true)] public static extern BOOL GetMonitorInfo(IntPtr hMonitor, ref MonitorInfo lpmi); - #endregion - - #region MonitorFromPoint - [DllImport("user32.dll", SetLastError = true)] public static extern HMONITOR MonitorFromPoint(POINT pt, MonitorFrom dwFlags); - #endregion - - #region MonitorFromWindow - [DllImport("user32.dll", SetLastError = true)] public static extern HMONITOR MonitorFromWindow(HWND hwnd, MonitorFrom dwFlags); - #endregion - - #region SetProcessDPIAware - /// /// Sets the current process as dots per inch (dpi) aware. /// Note: SetProcessDPIAware is subject to a possible race condition @@ -1113,19 +835,9 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll")] internal static extern BOOL SetProcessDPIAware(); - #endregion - - #region GetDeviceCaps - [DllImport("gdi32.dll", CharSet = CharSet.Auto, SetLastError = true, ExactSpelling = true)] public static extern int GetDeviceCaps(IntPtr hDC, DeviceCaps nIndex); - #endregion - - #endregion - - #region Input functions - [DllImport("user32.dll", SetLastError=true)] public static extern BOOL TrackMouseEvent(ref TrackMouseEventStructure lpEventTrack); @@ -1158,57 +870,57 @@ namespace OpenTK.Platform.Windows /// /// The size, in bytes, of the MouseMovePoint structure. /// - /// A pointer to a MOUSEMOVEPOINT structure containing valid mouse - /// coordinates (in screen coordinates). It may also contain a time + /// A pointer to a MOUSEMOVEPOINT structure containing valid mouse + /// coordinates (in screen coordinates). It may also contain a time /// stamp. /// /// - /// A pointer to a buffer that will receive the points. It should be at + /// A pointer to a buffer that will receive the points. It should be at /// least cbSize * nBufPoints in size. /// /// The number of points to be retrieved. /// - /// The resolution desired. This parameter can GMMP_USE_DISPLAY_POINTS + /// The resolution desired. This parameter can GMMP_USE_DISPLAY_POINTS /// or GMMP_USE_HIGH_RESOLUTION_POINTS. /// /// [DllImport("user32", ExactSpelling = true, CharSet = CharSet.Auto, SetLastError = true)] unsafe internal static extern int GetMouseMovePointsEx( - uint cbSize, MouseMovePoint* pointsIn, + uint cbSize, MouseMovePoint* pointsIn, MouseMovePoint* pointsBufferOut, int nBufPoints, uint resolution); /// /// Sets the cursor shape. /// /// - /// A handle to the cursor. The cursor must have been created by the - /// CreateCursor function or loaded by the LoadCursor or LoadImage - /// function. If this parameter is IntPtr.Zero, the cursor is removed + /// A handle to the cursor. The cursor must have been created by the + /// CreateCursor function or loaded by the LoadCursor or LoadImage + /// function. If this parameter is IntPtr.Zero, the cursor is removed /// from the screen. /// /// /// The return value is the handle to the previous cursor, if there was one. - /// + /// /// If there was no previous cursor, the return value is null. /// /// - /// The cursor is set only if the new cursor is different from the + /// The cursor is set only if the new cursor is different from the /// previous cursor; otherwise, the function returns immediately. - /// - /// The cursor is a shared resource. A window should set the cursor - /// shape only when the cursor is in its client area or when the window - /// is capturing mouse input. In systems without a mouse, the window - /// should restore the previous cursor before the cursor leaves the + /// + /// The cursor is a shared resource. A window should set the cursor + /// shape only when the cursor is in its client area or when the window + /// is capturing mouse input. In systems without a mouse, the window + /// should restore the previous cursor before the cursor leaves the /// client area or before it relinquishes control to another window. - /// - /// If your application must set the cursor while it is in a window, - /// make sure the class cursor for the specified window's class is set - /// to NULL. If the class cursor is not NULL, the system restores the + /// + /// If your application must set the cursor while it is in a window, + /// make sure the class cursor for the specified window's class is set + /// to NULL. If the class cursor is not NULL, the system restores the /// class cursor each time the mouse is moved. - /// - /// The cursor is not shown on the screen if the internal cursor - /// display count is less than zero. This occurs if the application - /// uses the ShowCursor function to hide the cursor more times than to + /// + /// The cursor is not shown on the screen if the internal cursor + /// display count is less than zero. This occurs if the application + /// uses the ShowCursor function to hide the cursor more times than to /// show the cursor. /// [DllImport("user32.dll")] @@ -1218,16 +930,12 @@ namespace OpenTK.Platform.Windows /// Retrieves a handle to the current cursor. /// /// - /// The return value is the handle to the current cursor. If there is + /// The return value is the handle to the current cursor. If there is /// no cursor, the return value is null. /// [DllImport("user32.dll")] public static extern HCURSOR GetCursor(); - #region Async input - - #region GetCursorPos - /// /// Retrieves the cursor's position, in screen coordinates. /// @@ -1241,14 +949,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true), SuppressUnmanagedCodeSecurity] internal static extern BOOL GetCursorPos(ref POINT point); - #endregion - - #endregion - - #region Raw Input - - #region DefRawInputProc - /// /// calls the default raw input procedure to provide default processing for /// any raw input messages that an application does not process. @@ -1274,10 +974,6 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError = true)] unsafe internal static extern LRESULT DefRawInputProc(IntPtr RawInput, INT Input, UINT SizeHeader); - #endregion - - #region RegisterRawInputDevices - /// /// Registers the devices that supply the raw input data. /// @@ -1310,10 +1006,6 @@ namespace OpenTK.Platform.Windows INT Size ); - #endregion - - #region GetRawInputBuffer - /// /// Does a buffered read of the raw input data. /// @@ -1354,10 +1046,6 @@ namespace OpenTK.Platform.Windows [In] INT SizeHeader ); - #endregion - - #region GetRegisteredRawInputDevices - /// /// Gets the information about the raw input devices for the current application. /// @@ -1373,7 +1061,7 @@ namespace OpenTK.Platform.Windows /// /// /// If successful, the function returns a non-negative number that is - /// the number of RawInputDevice structures written to the buffer. + /// the number of RawInputDevice structures written to the buffer. /// /// /// If the pRawInputDevices buffer is too small or NULL, the function sets @@ -1399,10 +1087,6 @@ namespace OpenTK.Platform.Windows INT cbSize ); - #endregion - - #region GetRawInputDeviceList - /// /// Enumerates the raw input devices attached to the system. /// @@ -1424,7 +1108,7 @@ namespace OpenTK.Platform.Windows /// /// If the function is successful, the return value is the number of devices stored in the buffer /// pointed to by RawInputDeviceList. - /// If RawInputDeviceList is NULL, the return value is zero. + /// If RawInputDeviceList is NULL, the return value is zero. /// If NumDevices is smaller than needed to contain all the RawInputDeviceList structures, /// the return value is (UINT) -1 and the required buffer is returned in NumDevices. /// Calling GetLastError returns ERROR_INSUFFICIENT_BUFFER. @@ -1466,7 +1150,7 @@ namespace OpenTK.Platform.Windows /// /// If the function is successful, the return value is the number of devices stored in the buffer /// pointed to by RawInputDeviceList. - /// If RawInputDeviceList is NULL, the return value is zero. + /// If RawInputDeviceList is NULL, the return value is zero. /// If NumDevices is smaller than needed to contain all the RawInputDeviceList structures, /// the return value is (UINT) -1 and the required buffer is returned in NumDevices. /// Calling GetLastError returns ERROR_INSUFFICIENT_BUFFER. @@ -1487,10 +1171,6 @@ namespace OpenTK.Platform.Windows INT Size ); - #endregion - - #region GetRawInputDeviceInfo - /// /// Gets information about the raw input device. /// @@ -1500,11 +1180,11 @@ namespace OpenTK.Platform.Windows /// It can also be NULL if an application inserts input data, for example, by using SendInput. /// /// - /// Specifies what data will be returned in pData. It can be one of the following values. + /// Specifies what data will be returned in pData. It can be one of the following values. /// RawInputDeviceInfoEnum.PREPARSEDDATA /// Data points to the previously parsed data. /// RawInputDeviceInfoEnum.DEVICENAME - /// Data points to a string that contains the device name. + /// Data points to a string that contains the device name. /// For this Command only, the value in Size is the character count (not the byte count). /// RawInputDeviceInfoEnum.DEVICEINFO /// Data points to an RawInputDeviceInfo structure. @@ -1550,11 +1230,11 @@ namespace OpenTK.Platform.Windows /// It can also be NULL if an application inserts input data, for example, by using SendInput. /// /// - /// Specifies what data will be returned in pData. It can be one of the following values. + /// Specifies what data will be returned in pData. It can be one of the following values. /// RawInputDeviceInfoEnum.PREPARSEDDATA /// Data points to the previously parsed data. /// RawInputDeviceInfoEnum.DEVICENAME - /// Data points to a string that contains the device name. + /// Data points to a string that contains the device name. /// For this Command only, the value in Size is the character count (not the byte count). /// RawInputDeviceInfoEnum.DEVICEINFO /// Data points to an RawInputDeviceInfo structure. @@ -1592,16 +1272,12 @@ namespace OpenTK.Platform.Windows ); - #endregion - - #region GetRawInputData - /// /// Gets the raw input from the specified device. /// /// Handle to the RawInput structure. This comes from the lParam in WM_INPUT. /// - /// Command flag. This parameter can be one of the following values. + /// Command flag. This parameter can be one of the following values. /// RawInputDateEnum.INPUT /// Get the raw data from the RawInput structure. /// RawInputDateEnum.HEADER @@ -1632,7 +1308,7 @@ namespace OpenTK.Platform.Windows /// /// Handle to the RawInput structure. This comes from the lParam in WM_INPUT. /// - /// Command flag. This parameter can be one of the following values. + /// Command flag. This parameter can be one of the following values. /// RawInputDateEnum.INPUT /// Get the raw data from the RawInput structure. /// RawInputDateEnum.HEADER @@ -1714,10 +1390,6 @@ namespace OpenTK.Platform.Windows return size; } - #endregion - - #region IntPtr NextRawInputStructure(IntPtr data) - /* From winuser.h #ifdef _WIN64 #define RAWINPUT_ALIGN(x) (((x) + sizeof(QWORD) - 1) & ~(sizeof(QWORD) - 1)) @@ -1745,31 +1417,12 @@ namespace OpenTK.Platform.Windows } - #endregion - - #endregion - - #endregion - - #region GDI functions - - #region GetStockObject - [DllImport("gdi32.dll", SetLastError = true)] internal static extern IntPtr GetStockObject(int index); - #endregion - - #region DeleteObject - [DllImport("gdi32.dll", SetLastError = true)] internal static extern BOOL DeleteObject([In]IntPtr hObject); - - #endregion - #endregion - - #region Timer Functions [DllImport("user32.dll", SetLastError=true)] public static extern UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc); @@ -1780,17 +1433,9 @@ namespace OpenTK.Platform.Windows [UnmanagedFunctionPointer(CallingConvention.Winapi)] public delegate void TimerProc(HWND hwnd, WindowMessage uMsg, UINT_PTR idEvent, DWORD dwTime); - #endregion - - #region Shell Functions - [DllImport("shell32.dll")] public static extern DWORD_PTR SHGetFileInfo(LPCTSTR pszPath, DWORD dwFileAttributes, ref SHFILEINFO psfi, UINT cbFileInfo, ShGetFileIconFlags uFlags); - #endregion - - #region Registry Functions - [DllImport("Advapi32.dll")] internal static extern int RegOpenKeyEx( HKEY hKey, @@ -1808,12 +1453,8 @@ namespace OpenTK.Platform.Windows out DWORD pdwType, StringBuilder pvData, ref DWORD pcbData); - - #endregion } - #region --- Constants --- - static class Constants { // Found in winuser.h @@ -1921,20 +1562,14 @@ namespace OpenTK.Platform.Windows internal const int GMMP_USE_DISPLAY_POINTS = 1; /// - /// Retrieves high resolution points. Points can range from zero to - /// 65,535 (0xFFFF) in both x and y coordinates. This is the resolution - /// provided by absolute coordinate pointing devices such as drawing + /// Retrieves high resolution points. Points can range from zero to + /// 65,535 (0xFFFF) in both x and y coordinates. This is the resolution + /// provided by absolute coordinate pointing devices such as drawing /// tablets. /// internal const int GMMP_USE_HIGH_RESOLUTION_POINTS = 2; } - #endregion - - #region --- Structures --- - - #region CreateStruct - internal struct CreateStruct { /// @@ -1942,12 +1577,12 @@ namespace OpenTK.Platform.Windows /// /// /// If the window is being created as a result of a call to the CreateWindow - /// or CreateWindowEx function, this member contains the value of the lpParam + /// or CreateWindowEx function, this member contains the value of the lpParam /// parameter specified in the function call. /// /// If the window being created is a multiple-document interface (MDI) client window, /// this member contains a pointer to a CLIENTCREATESTRUCT structure. If the window - /// being created is a MDI child window, this member contains a pointer to an + /// being created is a MDI child window, this member contains a pointer to an /// MDICREATESTRUCT structure. /// /// @@ -2021,30 +1656,18 @@ namespace OpenTK.Platform.Windows internal DWORD dwExStyle; } - #endregion - - #region StyleStruct - struct StyleStruct { public WindowStyle Old; public WindowStyle New; } - #endregion - - #region ExtendedStyleStruct - struct ExtendedStyleStruct { public ExtendedWindowStyle Old; public ExtendedWindowStyle New; } - #endregion - - #region PixelFormatDescriptor - /// \internal /// /// Describes a pixel format. It is used when interfacing with the WINAPI to create a new Context. @@ -2080,10 +1703,8 @@ namespace OpenTK.Platform.Windows internal int VisibleMask; internal int DamageMask; } - - #endregion - - #region internal class LayerPlaneDescriptor + + /// \internal /// @@ -2092,36 +1713,32 @@ namespace OpenTK.Platform.Windows [StructLayout(LayoutKind.Sequential)] internal struct LayerPlaneDescriptor { - internal static readonly WORD Size = (WORD)Marshal.SizeOf(typeof(LayerPlaneDescriptor)); - internal WORD Version; - internal DWORD Flags; - internal BYTE PixelType; - internal BYTE ColorBits; - internal BYTE RedBits; - internal BYTE RedShift; - internal BYTE GreenBits; - internal BYTE GreenShift; - internal BYTE BlueBits; - internal BYTE BlueShift; - internal BYTE AlphaBits; - internal BYTE AlphaShift; - internal BYTE AccumBits; - internal BYTE AccumRedBits; - internal BYTE AccumGreenBits; - internal BYTE AccumBlueBits; - internal BYTE AccumAlphaBits; - internal BYTE DepthBits; - internal BYTE StencilBits; - internal BYTE AuxBuffers; - internal BYTE LayerPlane; - BYTE Reserved; - internal COLORREF crTransparent; + internal static readonly WORD Size = (WORD)Marshal.SizeOf(typeof(LayerPlaneDescriptor)); + internal WORD Version; + internal DWORD Flags; + internal BYTE PixelType; + internal BYTE ColorBits; + internal BYTE RedBits; + internal BYTE RedShift; + internal BYTE GreenBits; + internal BYTE GreenShift; + internal BYTE BlueBits; + internal BYTE BlueShift; + internal BYTE AlphaBits; + internal BYTE AlphaShift; + internal BYTE AccumBits; + internal BYTE AccumRedBits; + internal BYTE AccumGreenBits; + internal BYTE AccumBlueBits; + internal BYTE AccumAlphaBits; + internal BYTE DepthBits; + internal BYTE StencilBits; + internal BYTE AuxBuffers; + internal BYTE LayerPlane; + BYTE Reserved; + internal COLORREF crTransparent; } - #endregion - - #region GlyphMetricsFloat - /// \internal /// /// The GlyphMetricsFloat structure contains information about the placement and orientation of a glyph in a @@ -2154,10 +1771,6 @@ namespace OpenTK.Platform.Windows internal float CellIncY; } - #endregion - - #region PointFloat - /// \internal /// /// The PointFloat structure contains the x and y coordinates of a point. @@ -2175,50 +1788,46 @@ namespace OpenTK.Platform.Windows /// internal float Y; }; - - #endregion - - #region DeviceMode /* - typedef struct _devicemode { - BCHAR dmDeviceName[CCHDEVICENAME]; - WORD dmSpecVersion; - WORD dmDriverVersion; - WORD dmSize; - WORD dmDriverExtra; - DWORD dmFields; + typedef struct _devicemode { + BCHAR dmDeviceName[CCHDEVICENAME]; + WORD dmSpecVersion; + WORD dmDriverVersion; + WORD dmSize; + WORD dmDriverExtra; + DWORD dmFields; union { struct { short dmOrientation; short dmPaperSize; short dmPaperLength; short dmPaperWidth; - short dmScale; - short dmCopies; - short dmDefaultSource; - short dmPrintQuality; + short dmScale; + short dmCopies; + short dmDefaultSource; + short dmPrintQuality; }; POINTL dmPosition; DWORD dmDisplayOrientation; DWORD dmDisplayFixedOutput; }; - short dmColor; - short dmDuplex; - short dmYResolution; - short dmTTOption; - short dmCollate; - BYTE dmFormName[CCHFORMNAME]; - WORD dmLogPixels; - DWORD dmBitsPerPel; - DWORD dmPelsWidth; - DWORD dmPelsHeight; + short dmColor; + short dmDuplex; + short dmYResolution; + short dmTTOption; + short dmCollate; + BYTE dmFormName[CCHFORMNAME]; + WORD dmLogPixels; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; union { - DWORD dmDisplayFlags; + DWORD dmDisplayFlags; DWORD dmNup; } - DWORD dmDisplayFrequency; - #if(WINVER >= 0x0400) + DWORD dmDisplayFrequency; + #if(WINVER >= 0x0400) DWORD dmICMMethod; DWORD dmICMIntent; DWORD dmMediaType; @@ -2229,8 +1838,8 @@ namespace OpenTK.Platform.Windows DWORD dmPanningWidth; DWORD dmPanningHeight; #endif - #endif - } DEVMODE; + #endif + } DEVMODE; */ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] internal class DeviceMode @@ -2284,10 +1893,6 @@ namespace OpenTK.Platform.Windows internal int PanningHeight; } - #endregion DeviceMode class - - #region DisplayDevice - /// \internal /// /// The DISPLAY_DEVICE structure receives information about the display device specified by the iDevNum parameter of the EnumDisplayDevices function. @@ -2310,12 +1915,6 @@ namespace OpenTK.Platform.Windows [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] internal string DeviceKey; } - - #endregion - - #region Window Handling - - #region WindowClass [StructLayout(LayoutKind.Sequential)] internal struct WindowClass { @@ -2337,10 +1936,6 @@ namespace OpenTK.Platform.Windows internal static int SizeInBytes = Marshal.SizeOf(default(WindowClass)); } - #endregion - - #region ExtendedWindowClass - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] struct ExtendedWindowClass { @@ -2362,10 +1957,6 @@ namespace OpenTK.Platform.Windows public static uint SizeInBytes = (uint)Marshal.SizeOf(default(ExtendedWindowClass)); } - #endregion - - #region internal struct MinMaxInfo - /// \internal /// /// Struct pointed to by WM_GETMINMAXINFO lParam @@ -2380,10 +1971,6 @@ namespace OpenTK.Platform.Windows public Size MaxTrackSize; } - #endregion - - #region internal struct WindowPosition - /// \internal /// /// The WindowPosition structure contains information about the size and position of a window. @@ -2424,8 +2011,6 @@ namespace OpenTK.Platform.Windows internal SetWindowPosFlags flags; } - #region internal enum SetWindowPosFlags - [Flags] internal enum SetWindowPosFlags : int { @@ -2470,7 +2055,7 @@ namespace OpenTK.Platform.Windows HIDEWINDOW = 0x0080, /// /// Discards the entire contents of the client area. If this flag is not specified, - /// the valid contents of the client area are saved and copied back into the client area + /// the valid contents of the client area are saved and copied back into the client area /// after the window is sized or repositioned. /// NOCOPYBITS = 0x0100, @@ -2496,16 +2081,6 @@ namespace OpenTK.Platform.Windows ASYNCWINDOWPOS = 0x4000 } - #endregion - - #endregion - - #endregion - - #region Raw Input structures - - #region RawInputDevice - /// \internal /// /// Defines information for the raw input devices. @@ -2529,7 +2104,7 @@ namespace OpenTK.Platform.Windows /// Mode flag that specifies how to interpret the information provided by UsagePage and Usage. /// It can be zero (the default) or one of the following values. /// By default, the operating system sends raw input from devices with the specified top level collection (TLC) - /// to the registered application as long as it has the window focus. + /// to the registered application as long as it has the window focus. /// internal RawInputDeviceFlags Flags; /// @@ -2559,10 +2134,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region RawInputDeviceList - /// \internal /// /// Contains information about a raw input device. @@ -2585,10 +2156,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region RawInput - /// \internal /// /// Contains the raw input from a device. @@ -2623,10 +2190,6 @@ namespace OpenTK.Platform.Windows BlittableValueType.Stride; } - #endregion - - #region RawInputHeader - /// \internal /// /// Contains the header information that is part of the raw input data. @@ -2658,10 +2221,6 @@ namespace OpenTK.Platform.Windows BlittableValueType.Stride; } - #endregion - - #region RawKeyboard - /// \internal /// /// Contains information about the state of the keyboard. @@ -2705,10 +2264,6 @@ namespace OpenTK.Platform.Windows internal LONG ExtraInformation; } - #endregion - - #region RawMouse - /// \internal /// /// Contains information about the state of the mouse. @@ -2717,7 +2272,7 @@ namespace OpenTK.Platform.Windows internal struct RawMouse { /// - /// Mouse state. This member can be any reasonable combination of the following. + /// Mouse state. This member can be any reasonable combination of the following. /// MOUSE_ATTRIBUTES_CHANGED /// Mouse attributes changed; application needs to query the mouse attributes. /// MOUSE_MOVE_RELATIVE @@ -2745,21 +2300,17 @@ namespace OpenTK.Platform.Windows /// Motion in the X direction. This is signed relative motion or absolute motion, depending on the value of usFlags. /// [FieldOffset(12)] public LONG LastX; - + /// /// Motion in the Y direction. This is signed relative motion or absolute motion, depending on the value of usFlags. /// [FieldOffset(16)] public LONG LastY; - + /// /// Device-specific additional information for the event. /// [FieldOffset(20)] public ULONG ExtraInformation; } - - #endregion - - #region RawMouse (second try) #if false [StructLayout(LayoutKind.Sequential)] internal struct RawMouse @@ -2771,7 +2322,7 @@ namespace OpenTK.Platform.Windows unsafe private byte* this[int i] { get { fixed (byte* ptr = &b00) { return ptr + i; } } } /// - /// Mouse state. This member can be any reasonable combination of the following. + /// Mouse state. This member can be any reasonable combination of the following. /// MOUSE_ATTRIBUTES_CHANGED /// Mouse attributes changed; application needs to query the mouse attributes. /// MOUSE_MOVE_RELATIVE @@ -2781,7 +2332,7 @@ namespace OpenTK.Platform.Windows /// MOUSE_VIRTUAL_DESKTOP /// Mouse coordinates are mapped to the virtual desktop (for a multiple monitor system). /// - internal RawMouseFlags Flags { get { unsafe { return *(RawMouseFlags*)this[0]; } } } + internal RawMouseFlags Flags { get { unsafe { return *(RawMouseFlags*)this[0]; } } } /// /// Transition state of the mouse buttons. @@ -2814,9 +2365,6 @@ namespace OpenTK.Platform.Windows internal ULONG ExtraInformation { get { unsafe { return *(ULONG*)this[20]; } } } } #endif - #endregion - - #region RawHID /// \internal /// @@ -2861,10 +2409,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region RawInputDeviceInfo - /// \internal /// /// Defines the raw input data coming from any device. @@ -2875,7 +2419,7 @@ namespace OpenTK.Platform.Windows /// /// Size, in bytes, of the RawInputDeviceInfo structure. /// - internal DWORD Size = Marshal.SizeOf(typeof(RawInputDeviceInfo)); + internal DWORD Size = Marshal.SizeOf(typeof(RawInputDeviceInfo)); /// /// Type of raw input data. /// @@ -2889,14 +2433,10 @@ namespace OpenTK.Platform.Windows [FieldOffset(0)] internal RawInputKeyboardDeviceInfo Keyboard; [FieldOffset(0)] - internal RawInputHIDDeviceInfo HID; + internal RawInputHIDDeviceInfo HID; }; } - #endregion - - #region RawInputHIDDeviceInfo - /// \internal /// /// Defines the raw input data coming from the specified Human Interface Device (HID). @@ -2928,10 +2468,6 @@ namespace OpenTK.Platform.Windows internal SHORT Usage; } - #endregion - - #region RawInputKeyboardDeviceInfo - /// \internal /// /// Defines the raw input data coming from the specified keyboard. @@ -2968,10 +2504,6 @@ namespace OpenTK.Platform.Windows internal DWORD NumberOfKeysTotal; } - #endregion - - #region RawInputMouseDeviceInfo - /// \internal /// /// Defines the raw input data coming from the specified mouse. @@ -3003,16 +2535,6 @@ namespace OpenTK.Platform.Windows internal BOOL HasHorizontalWheel; } - #endregion - - #endregion - - #region GetWindowLongOffsets - - #endregion - - #region Rectangle - /// \internal /// /// Defines the coordinates of the upper-left and lower-right corners of a rectangle. @@ -3074,10 +2596,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region WindowInfo - /// \internal /// /// Contains window information. @@ -3090,15 +2608,15 @@ namespace OpenTK.Platform.Windows /// public DWORD Size; /// - /// Pointer to a RECT structure that specifies the coordinates of the window. + /// Pointer to a RECT structure that specifies the coordinates of the window. /// public RECT Window; /// - /// Pointer to a RECT structure that specifies the coordinates of the client area. + /// Pointer to a RECT structure that specifies the coordinates of the client area. /// public RECT Client; /// - /// The window styles. For a table of window styles, see CreateWindowEx. + /// The window styles. For a table of window styles, see CreateWindowEx. /// public WindowStyle Style; /// @@ -3110,7 +2628,7 @@ namespace OpenTK.Platform.Windows /// public DWORD WindowStatus; /// - /// The width of the window border, in pixels. + /// The width of the window border, in pixels. /// public UINT WindowBordersX; /// @@ -3118,19 +2636,15 @@ namespace OpenTK.Platform.Windows /// public UINT WindowBordersY; /// - /// The window class atom (see RegisterClass). + /// The window class atom (see RegisterClass). /// public ATOM WindowType; /// - /// The Microsoft Windows version of the application that created the window. + /// The Microsoft Windows version of the application that created the window. /// public WORD CreatorVersion; } - #endregion - - #region MonitorInfo - struct MonitorInfo { public DWORD Size; @@ -3141,10 +2655,6 @@ namespace OpenTK.Platform.Windows public static readonly int SizeInBytes = Marshal.SizeOf(default(MonitorInfo)); } - #endregion - - #region NcCalculateSize - [StructLayout(LayoutKind.Sequential, Pack=1)] internal struct NcCalculateSize { @@ -3154,10 +2664,6 @@ namespace OpenTK.Platform.Windows unsafe public WindowPosition* Position; } - #endregion - - #region ShFileInfo - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] struct SHFILEINFO { @@ -3170,10 +2676,6 @@ namespace OpenTK.Platform.Windows public string szTypeName; }; - #endregion - - #region TrackMouseEventStructure - struct TrackMouseEventStructure { public DWORD Size; @@ -3184,10 +2686,6 @@ namespace OpenTK.Platform.Windows public static readonly int SizeInBytes = Marshal.SizeOf(typeof(TrackMouseEventStructure)); } - #endregion - - #region BroadcastHeader - struct BroadcastHeader { public DWORD Size; @@ -3195,10 +2693,6 @@ namespace OpenTK.Platform.Windows DWORD dbch_reserved; } - #endregion - - #region BroadcastDeviceInterface - struct BroadcastDeviceInterface { public DWORD Size; @@ -3208,10 +2702,6 @@ namespace OpenTK.Platform.Windows public char dbcc_name; } - #endregion - - #region Registry - #if ANDROID || IPHONE || MINIMAL internal class RegistryKey @@ -3248,10 +2738,6 @@ namespace OpenTK.Platform.Windows #endif - #endregion - - #region MouseMovePoint - /// /// Contains information about the mouse's location in screen coordinates. /// @@ -3281,10 +2767,6 @@ namespace OpenTK.Platform.Windows public static readonly int SizeInBytes = Marshal.SizeOf(default(MouseMovePoint)); } - #endregion - - #region IconInfo - /// \internal /// /// Contains information about an icon or a cursor. @@ -3293,31 +2775,31 @@ namespace OpenTK.Platform.Windows struct IconInfo { /// - /// Specifies whether this structure defines an icon or a cursor. A + /// Specifies whether this structure defines an icon or a cursor. A /// value of TRUE specifies an icon; FALSE specifies a cursor /// public bool fIcon; /// - /// The x-coordinate of a cursor's hot spot. If this structure defines - /// an icon, the hot spot is always in the center of the icon, and + /// The x-coordinate of a cursor's hot spot. If this structure defines + /// an icon, the hot spot is always in the center of the icon, and /// this member is ignored. /// public Int32 xHotspot; /// - /// The y-coordinate of a cursor's hot spot. If this structure defines - /// an icon, the hot spot is always in the center of the icon, and + /// The y-coordinate of a cursor's hot spot. If this structure defines + /// an icon, the hot spot is always in the center of the icon, and /// this member is ignored. /// public Int32 yHotspot; /// - /// The icon bitmask bitmap. If this structure defines a black and - /// white icon, this bitmask is formatted so that the upper half is - /// the icon AND bitmask and the lower half is the icon XOR bitmask. - /// Under this condition, the height should be an even multiple of - /// two. If this structure defines a color icon, this mask only + /// The icon bitmask bitmap. If this structure defines a black and + /// white icon, this bitmask is formatted so that the upper half is + /// the icon AND bitmask and the lower half is the icon XOR bitmask. + /// Under this condition, the height should be an even multiple of + /// two. If this structure defines a color icon, this mask only /// defines the AND bitmask of the icon. /// public IntPtr hbmMask; @@ -3325,21 +2807,13 @@ namespace OpenTK.Platform.Windows /// /// A handle to the icon color bitmap. This member can be optional if /// this structure defines a black and white icon. The AND bitmask of - /// hbmMask is applied with the SRCAND flag to the destination; - /// subsequently, the color bitmap is applied (using XOR) to the + /// hbmMask is applied with the SRCAND flag to the destination; + /// subsequently, the color bitmap is applied (using XOR) to the /// destination by using the SRCINVERT flag. /// public IntPtr hbmColor; } - #endregion - - #endregion - - #region --- Enums --- - - #region GetWindowLongOffset - /// /// Window field offsets for GetWindowLong() and GetWindowLongPtr(). /// @@ -3354,10 +2828,6 @@ namespace OpenTK.Platform.Windows ID = (-12), } - #endregion - - #region SizeMessage - internal enum SizeMessage { MAXHIDE = 4, @@ -3367,10 +2837,6 @@ namespace OpenTK.Platform.Windows RESTORED = 0 } - #endregion - - #region NcCalcSizeOptions - internal enum NcCalcSizeOptions { ALIGNTOP = 0x10, @@ -3383,30 +2849,18 @@ namespace OpenTK.Platform.Windows VALIDRECTS = 0x400 } - #endregion - - #region DeviceCaps - enum DeviceCaps { LogPixelsX = 88, LogPixelsY = 90 } - #endregion - - #region internal enum DisplayModeSettingsEnum - internal enum DisplayModeSettingsEnum { CurrentSettings = -1, RegistrySettings = -2 } - #endregion - - #region internal enum DisplayDeviceStateFlags - [Flags] internal enum DisplayDeviceStateFlags { @@ -3426,10 +2880,6 @@ namespace OpenTK.Platform.Windows Attached = 0x00000002, } - #endregion - - #region internal enum ChangeDisplaySettingsEnum - [Flags] internal enum ChangeDisplaySettingsEnum { @@ -3439,10 +2889,6 @@ namespace OpenTK.Platform.Windows Fullscreen = 0x00000004, } - #endregion - - #region internal enum WindowStyle : uint - [Flags] internal enum WindowStyle : uint { @@ -3479,10 +2925,6 @@ namespace OpenTK.Platform.Windows ChildWindow = Child } - #endregion - - #region internal enum ExtendedWindowStyle : uint - [Flags] internal enum ExtendedWindowStyle : uint { @@ -3534,10 +2976,6 @@ namespace OpenTK.Platform.Windows // #endif /* _WIN32_WINNT >= 0x0500 */ } - #endregion - - #region GetWindowLongOffsets enum - internal enum GetWindowLongOffsets : int { WNDPROC = (-4), @@ -3548,10 +2986,6 @@ namespace OpenTK.Platform.Windows USERDATA = (-21), ID = (-12), } - - #endregion - - #region PixelFormatDescriptorFlags enum [Flags] internal enum PixelFormatDescriptorFlags : int { @@ -3577,20 +3011,12 @@ namespace OpenTK.Platform.Windows DOUBLEBUFFER_DONTCARE = unchecked((int)0x40000000), STEREO_DONTCARE = unchecked((int)0x80000000) } - #endregion - - #region PixelType - internal enum PixelType : byte { RGBA = 0, INDEXED = 1 } - #endregion - - #region WindowPlacementOptions enum - internal enum WindowPlacementOptions { TOP = 0, @@ -3598,10 +3024,6 @@ namespace OpenTK.Platform.Windows TOPMOST = -1, NOTOPMOST = -2 } - - #endregion - - #region ClassStyle enum [Flags] internal enum ClassStyle { @@ -3624,10 +3046,6 @@ namespace OpenTK.Platform.Windows DropShadow = 0x00020000 // #endif /* _WIN32_WINNT >= 0x0501 */ } - #endregion - - #region RawInputDeviceFlags enum - [Flags] internal enum RawInputDeviceFlags : int { @@ -3638,7 +3056,7 @@ namespace OpenTK.Platform.Windows REMOVE = 0x00000001, /// /// If set, this specifies the top level collections to exclude when reading a complete usage page. - /// This flag only affects a TLC whose usage page is already specified with RawInputDeviceEnum.PAGEONLY. + /// This flag only affects a TLC whose usage page is already specified with RawInputDeviceEnum.PAGEONLY. /// EXCLUDE = 0x00000010, /// @@ -3681,20 +3099,12 @@ namespace OpenTK.Platform.Windows //EXMODEMASK = 0x000000F0 } - #endregion - - #region GetRawInputDataEnum - internal enum GetRawInputDataEnum { INPUT = 0x10000003, HEADER = 0x10000005 } - #endregion - - #region RawInputDeviceInfoEnum - internal enum RawInputDeviceInfoEnum { PREPARSEDDATA = 0x20000005, @@ -3702,10 +3112,6 @@ namespace OpenTK.Platform.Windows DEVICEINFO = 0x2000000b } - #endregion - - #region RawInputMouseState - [Flags] internal enum RawInputMouseState : ushort { @@ -3732,10 +3138,6 @@ namespace OpenTK.Platform.Windows HWHEEL = 0x0800, } - #endregion - - #region RawInputKeyboardDataFlags - internal enum RawInputKeyboardDataFlags : short //: ushort { MAKE = 0, @@ -3746,10 +3148,6 @@ namespace OpenTK.Platform.Windows TERMSRV_SHADOW = 0x10 } - #endregion - - #region RawInputDeviceType - internal enum RawInputDeviceType : int { MOUSE = 0, @@ -3757,10 +3155,6 @@ namespace OpenTK.Platform.Windows HID = 2 } - #endregion - - #region RawMouseFlags - /// /// Mouse indicator flags (found in winuser.h). /// @@ -3785,10 +3179,6 @@ namespace OpenTK.Platform.Windows MOUSE_ATTRIBUTES_CHANGED = 0x04, } - #endregion - - #region VirtualKeys - internal enum VirtualKeys : short { /* @@ -3836,7 +3226,7 @@ namespace OpenTK.Platform.Windows NONCONVERT = 0x1D, ACCEPT = 0x1E, MODECHANGE = 0x1F, - + SPACE = 0x20, PRIOR = 0x21, NEXT = 0x22, @@ -3853,7 +3243,7 @@ namespace OpenTK.Platform.Windows INSERT = 0x2D, DELETE = 0x2E, HELP = 0x2F, - + /* * 0 - 9 are the same as ASCII '0' - '9' (0x30 - 0x39) * 0x40 : unassigned @@ -3863,7 +3253,7 @@ namespace OpenTK.Platform.Windows LWIN = 0x5B, RWIN = 0x5C, APPS = 0x5D, - + /* * 0x5E : reserved */ @@ -3910,7 +3300,7 @@ namespace OpenTK.Platform.Windows F22 = 0x85, F23 = 0x86, F24 = 0x87, - + /* * 0x88 - 0x8F : unassigned */ @@ -3947,7 +3337,7 @@ namespace OpenTK.Platform.Windows RCONTROL = 0xA3, LMENU = 0xA4, RMENU = 0xA5, - + BROWSER_BACK = 0xA6, BROWSER_FORWARD = 0xA7, BROWSER_REFRESH = 0xA8, @@ -3955,7 +3345,7 @@ namespace OpenTK.Platform.Windows BROWSER_SEARCH = 0xAA, BROWSER_FAVORITES = 0xAB, BROWSER_HOME = 0xAC, - + VOLUME_MUTE = 0xAD, VOLUME_DOWN = 0xAE, VOLUME_UP = 0xAF, @@ -3967,7 +3357,7 @@ namespace OpenTK.Platform.Windows LAUNCH_MEDIA_SELECT = 0xB5, LAUNCH_APP1 = 0xB6, LAUNCH_APP2 = 0xB7, - + /* * 0xB8 - 0xB9 : reserved */ @@ -4047,10 +3437,6 @@ namespace OpenTK.Platform.Windows Last } - #endregion - - #region MouseKeys - /// /// Enumerates available mouse keys (suitable for use in WM_MOUSEMOVE messages). /// @@ -4081,10 +3467,6 @@ namespace OpenTK.Platform.Windows XButton2 = 0x0040, } - #endregion - - #region QueueStatusFlags - /// \internal /// /// Queue status flags for GetQueueStatus() and MsgWaitForMultipleObjects() @@ -4157,10 +3539,6 @@ namespace OpenTK.Platform.Windows ALLINPUT = INPUT | POSTMESSAGE | TIMER | PAINT | HOTKEY | SENDMESSAGE } - #endregion - - #region WindowMessage - internal enum WindowMessage : int { NULL = 0x0000, @@ -4278,7 +3656,7 @@ namespace OpenTK.Platform.Windows NCXBUTTONDBLCLK = 0x00ad, INPUT = 0x00FF, - + KEYDOWN = 0x0100, KEYFIRST = 0x0100, KEYUP = 0x0101, @@ -4431,16 +3809,12 @@ namespace OpenTK.Platform.Windows REFLECT = USER + 0x1c00, CLOSE_INTERNAL = USER + 0x1c01, - // NotifyIcon (Systray) Balloon messages + // NotifyIcon (Systray) Balloon messages BALLOONSHOW = USER + 0x0002, BALLOONHIDE = USER + 0x0003, BALLOONTIMEOUT = USER + 0x0004, BALLOONUSERCLICK = USER + 0x0005 - } - - #endregion - - #region PeekMessageFlags + } [Flags] enum PeekMessageFlags : uint @@ -4450,10 +3824,6 @@ namespace OpenTK.Platform.Windows NoYield = 2 } - #endregion - - #region ShowWindowCommand - /// /// ShowWindow() Commands /// @@ -4519,10 +3889,6 @@ namespace OpenTK.Platform.Windows //SHOW_OPENNOACTIVATE= 4, } - #endregion - - #region ShowWindowMessageIdentifiers - /// /// Identifiers for the WM_SHOWWINDOW message /// @@ -4534,10 +3900,6 @@ namespace OpenTK.Platform.Windows OTHERUNZOOM = 4, } - #endregion - - #region GDI charset - /// /// Enumerates the available character sets. /// @@ -4566,10 +3928,6 @@ namespace OpenTK.Platform.Windows Baltic = 186, } - #endregion - - #region MapVirtualKeyType - internal enum MapVirtualKeyType { /// uCode is a virtual-key code and is translated into a scan code. If it is a virtual-key code that does not distinguish between left- and right-hand keys, the left-hand scan code is returned. If there is no translation, the function returns 0. @@ -4583,10 +3941,6 @@ namespace OpenTK.Platform.Windows VirtualKeyToScanCodeExtended = 4, } - #endregion - - #region DwmWindowAttribute - enum DwmWindowAttribute { NCRENDERING_ENABLED = 1, @@ -4604,10 +3958,6 @@ namespace OpenTK.Platform.Windows LAST } - #endregion - - #region ShGetFileIcon - [Flags] enum ShGetFileIconFlags : int { @@ -4649,10 +3999,6 @@ namespace OpenTK.Platform.Windows OverlayIndex = 0x000000040, } - #endregion - - #region MonitorFrom - enum MonitorFrom { Null = 0, @@ -4660,19 +4006,11 @@ namespace OpenTK.Platform.Windows Nearest = 2, } - #endregion - - #region CursorName - enum CursorName : int { Arrow = 32512 } - #endregion - - #region TrackMouseEventFlags - [Flags] enum TrackMouseEventFlags : uint { @@ -4683,10 +4021,6 @@ namespace OpenTK.Platform.Windows CANCEL = 0x80000000, } - #endregion - - #region MouseActivate - enum MouseActivate { ACTIVATE = 1, @@ -4695,10 +4029,6 @@ namespace OpenTK.Platform.Windows NOACTIVATEANDEAT = 4, } - #endregion - - #region DeviceNotification - enum DeviceNotification { WINDOW_HANDLE = 0x00000000, @@ -4706,10 +4036,6 @@ namespace OpenTK.Platform.Windows ALL_INTERFACE_CLASSES = 0x00000004, } - #endregion - - #region DeviceBroadcastType - enum DeviceBroadcastType { OEM = 0, @@ -4719,18 +4045,10 @@ namespace OpenTK.Platform.Windows HANDLE = 6, } - #endregion - - #endregion - - #region --- Callbacks --- - [SuppressUnmanagedCodeSecurity] [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr WindowProcedure(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam); - #region Message - [StructLayout(LayoutKind.Sequential), CLSCompliant(false)] internal struct MSG { @@ -4748,10 +4066,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Point - [StructLayout(LayoutKind.Sequential)] internal struct POINT { @@ -4774,10 +4088,6 @@ namespace OpenTK.Platform.Windows return "Point {" + X.ToString() + ", " + Y.ToString() + ")"; } } - - #endregion - - #endregion } #pragma warning restore 3019 diff --git a/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs b/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs index 11e1b83d..5727a70a 100644 --- a/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs +++ b/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs @@ -1,5 +1,4 @@ -#region License -// +// // HidProtocol.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/Windows/Bindings/Wgl.cs b/src/OpenTK/Platform/Windows/Bindings/Wgl.cs index 2af62cc5..e02116fd 100644 --- a/src/OpenTK/Platform/Windows/Bindings/Wgl.cs +++ b/src/OpenTK/Platform/Windows/Bindings/Wgl.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/Platform/Windows/WglHelper.cs b/src/OpenTK/Platform/Windows/WglHelper.cs index 5096edf8..0ed940da 100644 --- a/src/OpenTK/Platform/Windows/WglHelper.cs +++ b/src/OpenTK/Platform/Windows/WglHelper.cs @@ -1,11 +1,9 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info * * Date: 12/8/2007 * Time: 6:43 �� */ -#endregion using System; using System.Collections.Generic; @@ -31,8 +29,6 @@ namespace OpenTK.Platform.Windows { } - #region Public Members - public static bool SupportsExtension(string name) { return SupportsExtension(Wgl.GetCurrentDC(), name); @@ -96,10 +92,6 @@ namespace OpenTK.Platform.Windows return false; } - #endregion - - #region Protected Members - object SyncRoot { get { return sync; } @@ -115,10 +107,6 @@ namespace OpenTK.Platform.Windows return address; } - #endregion - - #region Private Members - static bool IsValid(IntPtr address) { // See https://www.opengl.org/wiki/Load_OpenGL_Functions @@ -127,10 +115,6 @@ namespace OpenTK.Platform.Windows return is_valid; } - #endregion - - #region Internal Members - internal void LoadEntryPoints() { lock (SyncRoot) @@ -145,7 +129,5 @@ namespace OpenTK.Platform.Windows } } } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinDisplayDevice.cs b/src/OpenTK/Platform/Windows/WinDisplayDevice.cs index ceb7cd42..846b0794 100644 --- a/src/OpenTK/Platform/Windows/WinDisplayDevice.cs +++ b/src/OpenTK/Platform/Windows/WinDisplayDevice.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -38,8 +36,6 @@ namespace OpenTK.Platform.Windows { readonly object display_lock = new object(); - #region Constructors - public WinDisplayDeviceDriver() { RefreshDisplayDevices(); @@ -47,12 +43,6 @@ namespace OpenTK.Platform.Windows HandleDisplaySettingsChanged; } - #endregion - - #region IDisplayDeviceDriver Members - - #region TryChangeResolution - public sealed override bool TryChangeResolution(DisplayDevice device, DisplayResolution resolution) { DeviceMode mode = null; @@ -70,28 +60,16 @@ namespace OpenTK.Platform.Windows | Constants.DM_DISPLAYFREQUENCY; } - return Constants.DISP_CHANGE_SUCCESSFUL == + return Constants.DISP_CHANGE_SUCCESSFUL == Functions.ChangeDisplaySettingsEx((string)device.Id, mode, IntPtr.Zero, ChangeDisplaySettingsEnum.Fullscreen, IntPtr.Zero); } - #endregion - - #region TryRestoreResolution - public sealed override bool TryRestoreResolution(DisplayDevice device) { return TryChangeResolution(device, null); } - #endregion - - #endregion - - #region Private Members - - #region RefreshDisplayDevices - public void RefreshDisplayDevices() { lock (display_lock) @@ -201,23 +179,15 @@ namespace OpenTK.Platform.Windows mode.BitsPerPel = 32; } } - #endregion - - #region HandleDisplaySettingsChanged - void HandleDisplaySettingsChanged(object sender, EventArgs e) { RefreshDisplayDevices(); } - #endregion - ~WinDisplayDeviceDriver() { SystemEvents.DisplaySettingsChanged -= HandleDisplaySettingsChanged; } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinFactory.cs b/src/OpenTK/Platform/Windows/WinFactory.cs index 6f57024e..8010ddc1 100644 --- a/src/OpenTK/Platform/Windows/WinFactory.cs +++ b/src/OpenTK/Platform/Windows/WinFactory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -84,8 +82,6 @@ namespace OpenTK.Platform.Windows Debug.WriteLine(String.Format("Loaded opengl32.dll: {0}", OpenGLHandle)); } - #region IPlatformFactory Members - public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) { return new WinGLNative(x, y, width, height, title, options, device); @@ -134,10 +130,6 @@ namespace OpenTK.Platform.Windows return RawInputDriver.JoystickDriver; } - #endregion - - #region Private Members - WinRawInput RawInputDriver { get @@ -153,10 +145,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region IDisposable Members - protected override void Dispose(bool manual) { if (!IsDisposed) @@ -174,7 +162,5 @@ namespace OpenTK.Platform.Windows base.Dispose(manual); } } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinGLContext.cs b/src/OpenTK/Platform/Windows/WinGLContext.cs index 0e5c044f..6312ea49 100644 --- a/src/OpenTK/Platform/Windows/WinGLContext.cs +++ b/src/OpenTK/Platform/Windows/WinGLContext.cs @@ -1,11 +1,7 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * Contributions from Erik Ylvisaker * See license.txt for license info */ -#endregion - -#region --- Using Directives --- using System; using System.Collections.Generic; @@ -16,8 +12,6 @@ using System.Diagnostics; using OpenTK.Graphics; using OpenTK.Graphics.OpenGL; -#endregion - namespace OpenTK.Platform.Windows { /// \internal @@ -100,8 +94,6 @@ namespace OpenTK.Platform.Windows } } - #region --- Contructors --- - public WinGLContext(GraphicsMode format, WinWindowInfo window, IGraphicsContext sharedContext, int major, int minor, GraphicsContextFlags flags) { @@ -250,12 +242,6 @@ namespace OpenTK.Platform.Windows Handle = handle; } - #endregion - - #region IGraphicsContext Members - - #region SwapBuffers - public override void SwapBuffers() { if (!Functions.SwapBuffers(DeviceContext)) @@ -263,10 +249,6 @@ namespace OpenTK.Platform.Windows "Failed to swap buffers for context {0} current. Error: {1}", this, Marshal.GetLastWin32Error())); } - #endregion - - #region MakeCurrent - public override void MakeCurrent(IWindowInfo window) { lock (LoadLock) @@ -296,19 +278,11 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region IsCurrent - public override bool IsCurrent { get { return Wgl.GetCurrentContext() == Handle.Handle; } } - #endregion - - #region SwapInterval - public override int SwapInterval { get @@ -340,10 +314,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region void LoadAll() - public override void LoadAll() { lock (LoadLock) @@ -359,23 +329,12 @@ namespace OpenTK.Platform.Windows base.LoadAll(); } - - #endregion - - #endregion - - #region IGLContextInternal Members - - #region IWindowInfo IGLContextInternal.Info /* IWindowInfo IGraphicsContextInternal.Info { get { return (IWindowInfo)windowInfo; } } */ - #endregion - - #region GetAddress public override IntPtr GetAddress(IntPtr function_string) { @@ -395,14 +354,6 @@ namespace OpenTK.Platform.Windows return is_valid; } - #endregion - - #endregion - - #region Internal Methods - - #region SetGraphicsModePFD - // Note: there is no relevant ARB function. internal static GraphicsMode SetGraphicsModePFD(WinGraphicsMode mode_selector, GraphicsMode mode, WinWindowInfo window) @@ -436,10 +387,6 @@ namespace OpenTK.Platform.Windows return mode; } - #endregion - - #region internal IntPtr DeviceContext - internal IntPtr DeviceContext { get @@ -448,12 +395,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #endregion - - #region Overrides - /// Returns a System.String describing this OpenGL context. /// A System.String describing this OpenGL context. public override string ToString() @@ -461,10 +402,6 @@ namespace OpenTK.Platform.Windows return (this as IGraphicsContextInternal).Context.ToString(); } - #endregion - - #region IDisposable Members - protected override void Dispose(bool calledManually) { if (!IsDisposed) @@ -477,8 +414,6 @@ namespace OpenTK.Platform.Windows } } - #region private void DestroyContext() - private void DestroyContext() { if (Handle != ContextHandle.Zero) @@ -501,9 +436,5 @@ namespace OpenTK.Platform.Windows Handle = ContextHandle.Zero; } } - - #endregion - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinGLNative.cs b/src/OpenTK/Platform/Windows/WinGLNative.cs index db65cb7c..1d8d3515 100644 --- a/src/OpenTK/Platform/Windows/WinGLNative.cs +++ b/src/OpenTK/Platform/Windows/WinGLNative.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -47,8 +45,6 @@ namespace OpenTK.Platform.Windows /// internal sealed class WinGLNative : NativeWindowBase { - #region Fields - const ExtendedWindowStyle ParentStyleEx = ExtendedWindowStyle.WindowEdge | ExtendedWindowStyle.ApplicationWindow; const ExtendedWindowStyle ChildStyleEx = 0; @@ -74,7 +70,7 @@ namespace OpenTK.Platform.Windows int mouse_last_timestamp = 0; bool invisible_since_creation; // Set by WindowsMessage.CREATE and consumed by Visible = true (calls BringWindowToFront). int suppress_resize; // Used in WindowBorder and WindowState in order to avoid rapid, consecutive resize events. - bool is_in_modal_loop; // set to true whenever we enter the modal resize/move event loop + bool is_in_modal_loop; // set to true whenever we enter the modal resize/move event loop Rectangle bounds = new Rectangle(), @@ -99,10 +95,6 @@ namespace OpenTK.Platform.Windows static readonly object SyncRoot = new object(); - #endregion - - #region Contructors - public WinGLNative(int x, int y, int width, int height, string title, GameWindowFlags options, DisplayDevice device) { lock (SyncRoot) @@ -156,12 +148,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Private Members - - #region Scale - enum ScaleDirection { X, Y } // Scales a value according according @@ -187,7 +173,7 @@ namespace OpenTK.Platform.Windows { return Scale(x, ScaleDirection.X); } - + static int ScaleY(int y) { return Scale(y, ScaleDirection.Y); @@ -220,10 +206,6 @@ namespace OpenTK.Platform.Windows return Unscale(y, ScaleDirection.Y); } - #endregion - - #region Message Handlers - void HandleActivate(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) { // See http://msdn.microsoft.com/en-us/library/ms646274(VS.85).aspx (WM_ACTIVATE notification): @@ -422,11 +404,11 @@ namespace OpenTK.Platform.Windows if (mouse_outside_window && !mouse_was_outside_window) { // Mouse leaving - // If we have mouse capture we ignore WM_MOUSELEAVE events, so + // If we have mouse capture we ignore WM_MOUSELEAVE events, so // have to manually call OnMouseLeave here. // Mouse tracking is disabled automatically by the OS OnMouseLeave(EventArgs.Empty); - } + } else if (!mouse_outside_window && mouse_was_outside_window) { // Mouse entring @@ -449,7 +431,7 @@ namespace OpenTK.Platform.Windows Functions.ClientToScreen(handle, ref screenPoint); int timestamp = Functions.GetMessageTime(); - // & 0xFFFF to handle multiple monitors http://support.microsoft.com/kb/269743 + // & 0xFFFF to handle multiple monitors http://support.microsoft.com/kb/269743 MouseMovePoint movePoint = new MouseMovePoint() { X = screenPoint.X & 0xFFFF, @@ -461,7 +443,7 @@ namespace OpenTK.Platform.Windows const int numPoints = 64; MouseMovePoint* movePoints = stackalloc MouseMovePoint[numPoints]; - // GetMouseMovePointsEx fills in movePoints so that the most + // GetMouseMovePointsEx fills in movePoints so that the most // recent events are at low indices in the array. int points = Functions.GetMouseMovePointsEx( (uint)MouseMovePoint.SizeInBytes, @@ -482,7 +464,7 @@ namespace OpenTK.Platform.Windows } else { - // Exclude the current position. + // Exclude the current position. Point currentScreenPosition = new Point(MouseState.X, MouseState.Y); Functions.ClientToScreen(handle, ref currentScreenPosition); @@ -502,7 +484,7 @@ namespace OpenTK.Platform.Windows while (--i >= 0) { Point position = new Point(movePoints[i].X, movePoints[i].Y); - // Handle multiple monitors http://support.microsoft.com/kb/269743 + // Handle multiple monitors http://support.microsoft.com/kb/269743 if (position.X > 32767) { position.X -= 65536; @@ -702,18 +684,12 @@ namespace OpenTK.Platform.Windows Functions.DragFinish(hDrop); } - #endregion - - #region WindowProcedure - IntPtr WindowProcedure(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) { IntPtr? result = null; switch (message) { - #region Size / Move / Style events - case WindowMessage.ACTIVATE: HandleActivate(handle, message, wParam, lParam); break; @@ -751,10 +727,6 @@ namespace OpenTK.Platform.Windows HandleCaptureChanged(handle, message, wParam, lParam); break; - #endregion - - #region Input events - case WindowMessage.CHAR: HandleChar(handle, message, wParam, lParam); break; @@ -826,10 +798,6 @@ namespace OpenTK.Platform.Windows HandleDropFiles(handle, message, wParam, lParam); break; - #endregion - - #region Creation / Destruction events - case WindowMessage.CREATE: HandleCreate(handle, message, wParam, lParam); break; @@ -841,8 +809,6 @@ namespace OpenTK.Platform.Windows case WindowMessage.DESTROY: HandleDestroy(handle, message, wParam, lParam); break; - - #endregion } if (result.HasValue) @@ -909,10 +875,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region CreateWindow - IntPtr CreateWindow(int x, int y, int width, int height, string title, GameWindowFlags options, DisplayDevice device, IntPtr parentHandle) { // Use win32 to create the native window. @@ -972,10 +934,6 @@ namespace OpenTK.Platform.Windows return handle; } - #endregion - - #region DestroyWindow - /// /// Starts the teardown sequence for the current window. /// @@ -989,8 +947,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - void HideBorder() { suppress_resize++; @@ -1036,12 +992,6 @@ namespace OpenTK.Platform.Windows Marshal.GetLastWin32Error())); } - #endregion - - #region INativeWindow Members - - #region Bounds - public override Rectangle Bounds { get { return bounds; } @@ -1052,10 +1002,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Location - public override Point Location { get { return Bounds.Location; } @@ -1066,10 +1012,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Size - public override Size Size { get { return Bounds.Size; } @@ -1080,10 +1022,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region ClientSize - public override Size ClientSize { get @@ -1099,10 +1037,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Icon - public override Icon Icon { get @@ -1124,19 +1058,11 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Focused - public override bool Focused { get { return focused; } } - #endregion - - #region Title - StringBuilder sb_title = new StringBuilder(256); public override string Title { @@ -1158,10 +1084,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Visible - public override bool Visible { get @@ -1191,16 +1113,8 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Exists - public override bool Exists { get { return exists; } } - #endregion - - #region Cursor - public override MouseCursor Cursor { get @@ -1272,7 +1186,7 @@ namespace OpenTK.Platform.Windows { if (success) { - // GetIconInfo creates bitmaps for the hbmMask and hbmColor members of ICONINFO. + // GetIconInfo creates bitmaps for the hbmMask and hbmColor members of ICONINFO. // The calling application must manage these bitmaps and delete them when they are no longer necessary. Functions.DeleteObject(iconInfo.hbmColor); Functions.DeleteObject(iconInfo.hbmMask); @@ -1282,7 +1196,7 @@ namespace OpenTK.Platform.Windows } } } - + Debug.Assert(oldCursorHandle != IntPtr.Zero); Debug.Assert(oldCursorHandle != cursor_handle); Debug.Assert(oldCursor != cursor); @@ -1296,10 +1210,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region CursorVisible - public override bool CursorVisible { get { return cursor_visible_count >= 0; } // Not used @@ -1327,20 +1237,13 @@ namespace OpenTK.Platform.Windows } } } - - #endregion - #region Close public override void Close() { Functions.PostMessage(window.Handle, WindowMessage.CLOSE, IntPtr.Zero, IntPtr.Zero); } - #endregion - - #region public WindowState WindowState - public override WindowState WindowState { get @@ -1432,10 +1335,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region public WindowBorder WindowBorder - public override WindowBorder WindowBorder { get @@ -1526,10 +1425,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region PointToClient - public override Point PointToClient(Point point) { if (!Functions.ScreenToClient(window.Handle, ref point)) @@ -1540,10 +1435,6 @@ namespace OpenTK.Platform.Windows return point; } - #endregion - - #region PointToScreen - public override Point PointToScreen(Point point) { if (!Functions.ClientToScreen(window.Handle, ref point)) @@ -1554,14 +1445,6 @@ namespace OpenTK.Platform.Windows return point; } - #endregion - - #endregion - - #region INativeGLWindow Members - - #region public void ProcessEvents() - MSG msg; public override void ProcessEvents() { @@ -1573,21 +1456,11 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region public IWindowInfo WindowInfo - public override IWindowInfo WindowInfo { get { return child_window; } } - #endregion - - #endregion - - #region IDisposable Members - protected override void Dispose(bool calledManually) { if (!disposed) @@ -1614,7 +1487,5 @@ namespace OpenTK.Platform.Windows disposed = true; } } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs index 91ffd9ac..ef3a9937 100644 --- a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs +++ b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -49,8 +47,6 @@ namespace OpenTK.Platform.Windows readonly IntPtr Device; - #region Constructors - public WinGraphicsMode(IntPtr device) { if (device == IntPtr.Zero) @@ -59,10 +55,6 @@ namespace OpenTK.Platform.Windows Device = device; } - #endregion - - #region IGraphicsMode Members - public GraphicsMode SelectGraphicsMode(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo) { @@ -83,12 +75,6 @@ namespace OpenTK.Platform.Windows return created_mode; } - #endregion - - #region Private Methods - - #region ChoosePixelFormatARB - // Queries pixel formats through the WGL_ARB_pixel_format extension // This method only returns accelerated formats. If no format offers // hardware acceleration (e.g. we are running in a VM or in a remote desktop @@ -220,10 +206,6 @@ namespace OpenTK.Platform.Windows return created_mode; } - #endregion - - #region ChoosePixelFormatPFD - static bool Compare(int got, int requested, ref int distance) { bool valid = true; @@ -333,10 +315,6 @@ namespace OpenTK.Platform.Windows return DescribePixelFormatPFD(device, ref pfd, best); } - #endregion - - #region DescribePixelFormatPFD - static GraphicsMode DescribePixelFormatPFD(IntPtr device, ref PixelFormatDescriptor pfd, int pixelformat) { @@ -356,10 +334,6 @@ namespace OpenTK.Platform.Windows return created_mode; } - #endregion - - #region DescribePixelFormatARB - GraphicsMode DescribePixelFormatARB(IntPtr device, int pixelformat) { GraphicsMode created_mode = null; @@ -377,10 +351,10 @@ namespace OpenTK.Platform.Windows (int)WGL_ARB_pixel_format.BlueBitsArb, (int)WGL_ARB_pixel_format.AlphaBitsArb, (int)WGL_ARB_pixel_format.ColorBitsArb, - + (int)WGL_ARB_pixel_format.DepthBitsArb, (int)WGL_ARB_pixel_format.StencilBitsArb, - + (int)WGL_ARB_multisample.SampleBuffersArb, (int)WGL_ARB_multisample.SamplesArb, @@ -421,9 +395,5 @@ namespace OpenTK.Platform.Windows } return created_mode; } - - #endregion - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinInputBase.cs b/src/OpenTK/Platform/Windows/WinInputBase.cs index 701abd02..4e44d2d7 100644 --- a/src/OpenTK/Platform/Windows/WinInputBase.cs +++ b/src/OpenTK/Platform/Windows/WinInputBase.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -35,12 +33,10 @@ namespace OpenTK.Platform.Windows { abstract class WinInputBase { - #region Fields - readonly WindowProcedure WndProc; readonly Thread InputThread; - readonly AutoResetEvent InputReady = new AutoResetEvent(false); - + readonly AutoResetEvent InputReady = new AutoResetEvent(false); + IntPtr OldWndProc; INativeWindow native; @@ -49,10 +45,6 @@ namespace OpenTK.Platform.Windows static readonly IntPtr Unhandled = new IntPtr(-1); - #endregion - - #region Constructors - public WinInputBase() { WndProc = WindowProcedure; @@ -65,12 +57,6 @@ namespace OpenTK.Platform.Windows InputReady.WaitOne(); } - #endregion - - #region Private Members - - #region ConstructMessageWindow - INativeWindow ConstructMessageWindow() { Debug.WriteLine("Initializing input driver."); @@ -88,10 +74,6 @@ namespace OpenTK.Platform.Windows } - #endregion - - #region ProcessEvents - void ProcessEvents() { Native = ConstructMessageWindow(); @@ -119,10 +101,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region WndProcHandler - IntPtr WndProcHandler( IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) { @@ -133,43 +111,21 @@ namespace OpenTK.Platform.Windows return ret; } - #endregion - - #endregion - - #region Protected Members - - #region WindowProcedure - protected virtual IntPtr WindowProcedure( IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) { return Unhandled; } - #endregion - - #region CreateDrivers - // Note: this method is called through the input thread. protected abstract void CreateDrivers(); - #endregion - - #endregion - - #region Public Members - public abstract IMouseDriver2 MouseDriver { get; } public abstract IKeyboardDriver2 KeyboardDriver { get; } public abstract IJoystickDriver2 JoystickDriver { get; } - #endregion - - #region IDisposable Members - protected bool Disposed; public void Dispose() @@ -200,7 +156,5 @@ namespace OpenTK.Platform.Windows Debug.Print("[Warning] Resource leaked: {0}.", this); Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinKeyMap.cs b/src/OpenTK/Platform/Windows/WinKeyMap.cs index c0b57e58..dc4a9c99 100644 --- a/src/OpenTK/Platform/Windows/WinKeyMap.cs +++ b/src/OpenTK/Platform/Windows/WinKeyMap.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/Windows/WinRawInput.cs b/src/OpenTK/Platform/Windows/WinRawInput.cs index 4575153e..b5f0ce9b 100644 --- a/src/OpenTK/Platform/Windows/WinRawInput.cs +++ b/src/OpenTK/Platform/Windows/WinRawInput.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -35,8 +33,6 @@ namespace OpenTK.Platform.Windows { sealed class WinRawInput : WinInputBase { - #region Fields - // Input event data. WinRawKeyboard keyboard_driver; @@ -46,20 +42,12 @@ namespace OpenTK.Platform.Windows IntPtr DevNotifyHandle; static readonly Guid DeviceInterfaceHid = new Guid("4D1E55B2-F16F-11CF-88CB-001111000030"); - #endregion - - #region Constructors - public WinRawInput() : base() { Debug.WriteLine("Using WinRawInput."); } - #endregion - - #region Private Members - static IntPtr RegisterForDeviceNotifications(WinWindowInfo parent) { IntPtr dev_notify_handle; @@ -79,12 +67,6 @@ namespace OpenTK.Platform.Windows } - #endregion - - #region Protected Members - - #region WindowProcedure - // Processes the input Windows Message, routing the buffer to the correct Keyboard, Mouse or HID. protected unsafe override IntPtr WindowProcedure( IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) @@ -135,10 +117,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region CreateDrivers - protected override void CreateDrivers() { keyboard_driver = new WinRawKeyboard(Parent.Handle); @@ -147,8 +125,6 @@ namespace OpenTK.Platform.Windows DevNotifyHandle = RegisterForDeviceNotifications(Parent); } - #endregion - protected override void Dispose(bool manual) { if (!Disposed) @@ -158,12 +134,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Public Members - - #region DeviceCount - public static int DeviceCount { get @@ -174,10 +144,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region GetDeviceList - public static RawInputDeviceList[] GetDeviceList() { int count = WinRawInput.DeviceCount; @@ -188,8 +154,6 @@ namespace OpenTK.Platform.Windows return ridl; } - #endregion - public override IKeyboardDriver2 KeyboardDriver { get { return keyboard_driver; } @@ -204,7 +168,5 @@ namespace OpenTK.Platform.Windows { get { return joystick_driver; } } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinRawJoystick.cs b/src/OpenTK/Platform/Windows/WinRawJoystick.cs index e5f4592d..970e98c1 100644 --- a/src/OpenTK/Platform/Windows/WinRawJoystick.cs +++ b/src/OpenTK/Platform/Windows/WinRawJoystick.cs @@ -1,5 +1,4 @@ -#region License -// +// // WinRawJoystick.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -60,8 +58,6 @@ namespace OpenTK.Platform.Windows readonly Dictionary hats = new Dictionary(); - #region Constructors - public Device(IntPtr handle, Guid guid, bool is_xinput, int xinput_index) { Handle = handle; @@ -70,10 +66,6 @@ namespace OpenTK.Platform.Windows XInputIndex = xinput_index; } - #endregion - - #region Public Members - public void ClearButtons() { State.ClearButtons(); @@ -84,7 +76,7 @@ namespace OpenTK.Platform.Windows if (page == HIDPage.GenericDesktop || page == HIDPage.Simulation) // set axis only when HIDPage is known by HidHelper.TranslateJoystickAxis() to avoid axis0 to be overwritten by unknown HIDPage { //Certain joysticks (Speedlink Black Widow, PS3 pad connected via USB) - //return an invalid HID page of 1, so + //return an invalid HID page of 1, so if ((int)usage != 1) { JoystickAxis axis = GetAxis(collection, page, usage); @@ -134,10 +126,6 @@ namespace OpenTK.Platform.Windows return State; } - #endregion - - #region Private Members - static int MakeKey(short collection, HIDPage page, short usage) { byte coll_byte = unchecked((byte)collection); @@ -175,8 +163,6 @@ namespace OpenTK.Platform.Windows } return hats[key]; } - - #endregion } static readonly string TypeName = typeof(WinRawJoystick).Name; @@ -222,8 +208,6 @@ namespace OpenTK.Platform.Windows Debug.Unindent(); } - #region Public Members - public void RefreshDevices() { // Mark all devices as disconnected. We will check which of those @@ -460,10 +444,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region Private Members - static bool GetPreparsedData(IntPtr handle, ref byte[] prepared_data) { // Query the size of the _HIDP_PREPARSED_DATA structure for this event. @@ -783,10 +763,6 @@ namespace OpenTK.Platform.Windows return Devices.FromIndex(index) != null; } - #endregion - - #region IJoystickDriver2 Members - public JoystickState GetState(int index) { lock (UpdateLock) @@ -846,7 +822,5 @@ namespace OpenTK.Platform.Windows return new Guid(); } } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinRawKeyboard.cs b/src/OpenTK/Platform/Windows/WinRawKeyboard.cs index 223f68be..c444a320 100644 --- a/src/OpenTK/Platform/Windows/WinRawKeyboard.cs +++ b/src/OpenTK/Platform/Windows/WinRawKeyboard.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -45,8 +43,6 @@ namespace OpenTK.Platform.Windows readonly IntPtr window; readonly object UpdateLock = new object(); - #region Constructors - public WinRawKeyboard(IntPtr windowHandle) { Debug.WriteLine("Using WinRawKeyboard."); @@ -58,10 +54,6 @@ namespace OpenTK.Platform.Windows Debug.Unindent(); } - #endregion - - #region Public Members - public void RefreshDevices() { lock (UpdateLock) @@ -206,10 +198,6 @@ namespace OpenTK.Platform.Windows return processed; } - #endregion - - #region Private Members - static RegistryKey GetRegistryKey(string name) { if (name.Length < 4) @@ -264,10 +252,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region IKeyboardDriver2 Members - public KeyboardState GetState() { lock (UpdateLock) @@ -302,7 +286,5 @@ namespace OpenTK.Platform.Windows return String.Empty; } } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinRawMouse.cs b/src/OpenTK/Platform/Windows/WinRawMouse.cs index b1e0d447..63694ac3 100644 --- a/src/OpenTK/Platform/Windows/WinRawMouse.cs +++ b/src/OpenTK/Platform/Windows/WinRawMouse.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2010 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -42,13 +40,11 @@ namespace OpenTK.Platform.Windows sealed class WinRawMouse : IMouseDriver2 { readonly List mice = new List(); - readonly List names = new List(); + readonly List names = new List(); readonly Dictionary rawids = new Dictionary(); readonly IntPtr Window; readonly object UpdateLock = new object(); - #region Constructors - public WinRawMouse(IntPtr window) { Debug.WriteLine("Using WinRawMouse."); @@ -63,10 +59,6 @@ namespace OpenTK.Platform.Windows Debug.Unindent(); } - #endregion - - #region Public Members - public void RefreshDevices() { lock (UpdateLock) @@ -254,10 +246,6 @@ namespace OpenTK.Platform.Windows return processed; } - #endregion - - #region Private Members - static string GetDeviceName(RawInputDeviceList dev) { // get name size @@ -316,10 +304,6 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region IMouseDriver2 Members - public MouseState GetState() { lock (UpdateLock) @@ -361,7 +345,5 @@ namespace OpenTK.Platform.Windows state.Y = p.Y; return state; } - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/WinWindowInfo.cs b/src/OpenTK/Platform/Windows/WinWindowInfo.cs index 7449b6f1..2fc20ba2 100644 --- a/src/OpenTK/Platform/Windows/WinWindowInfo.cs +++ b/src/OpenTK/Platform/Windows/WinWindowInfo.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -41,8 +39,6 @@ namespace OpenTK.Platform.Windows WinWindowInfo parent; bool disposed; - #region --- Constructors --- - /// /// Constructs a new instance. /// @@ -61,10 +57,6 @@ namespace OpenTK.Platform.Windows this.parent = parent; } - #endregion - - #region --- Public Methods --- - /// /// Gets or sets the handle of the window. /// @@ -94,8 +86,6 @@ namespace OpenTK.Platform.Windows // (e.g. MonoGame) public IntPtr WindowHandle { get { return Handle; } set { Handle = value; } } - #region public override string ToString() - /// Returns a System.String that represents the current window. /// A System.String that represents the current window. public override string ToString() @@ -111,7 +101,7 @@ namespace OpenTK.Platform.Windows { if (obj == null) return false; if (this.GetType() != obj.GetType()) return false; - WinWindowInfo info = (WinWindowInfo)obj; + WinWindowInfo info = (WinWindowInfo)obj; if (info == null) return false; // TODO: Assumes windows will always have unique handles. @@ -125,14 +115,6 @@ namespace OpenTK.Platform.Windows return handle.GetHashCode(); } - #endregion - - #endregion - - #region --- IDisposable --- - - #region public void Dispose() - /// Releases the unmanaged resources consumed by this instance. public void Dispose() { @@ -140,10 +122,6 @@ namespace OpenTK.Platform.Windows GC.SuppressFinalize(this); } - #endregion - - #region void Dispose(bool manual) - void Dispose(bool manual) { if (!disposed) @@ -162,17 +140,9 @@ namespace OpenTK.Platform.Windows } } - #endregion - - #region ~WinWindowInfo() - ~WinWindowInfo() { this.Dispose(false); } - - #endregion - - #endregion } } diff --git a/src/OpenTK/Platform/Windows/XInputJoystick.cs b/src/OpenTK/Platform/Windows/XInputJoystick.cs index 357bfd28..b0f49dcf 100644 --- a/src/OpenTK/Platform/Windows/XInputJoystick.cs +++ b/src/OpenTK/Platform/Windows/XInputJoystick.cs @@ -1,5 +1,4 @@ -#region License -// +// // XInputJoystick.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -46,8 +44,6 @@ namespace OpenTK.Platform.Windows XInput xinput = new XInput(); - #region IJoystickDriver2 Members - public JoystickState GetState(int index) { XInputState xstate; @@ -157,10 +153,6 @@ namespace OpenTK.Platform.Windows return xinput.SetState((XInputUserIndex)index, ref vibration) == XInputErrorCode.Success; } - #endregion - - #region Private Members - int TranslateAxes(ref XInputGamePad pad) { int count = 0; @@ -378,8 +370,6 @@ namespace OpenTK.Platform.Windows SetState = (XInputSetState)Load("XInputSetState", typeof(XInputSetState)); } - #region Private Members - Delegate Load(ushort ordinal, Type type) { IntPtr pfunc = Functions.GetProcAddress(dll, (IntPtr)ordinal); @@ -396,10 +386,6 @@ namespace OpenTK.Platform.Windows return null; } - #endregion - - #region Internal Members - internal XInputGetCapabilities GetCapabilities; internal XInputGetState GetState; internal XInputSetState SetState; @@ -424,10 +410,6 @@ namespace OpenTK.Platform.Windows ref XInputVibration pVibration ); - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -445,14 +427,8 @@ namespace OpenTK.Platform.Windows } } } - - #endregion } - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -477,7 +453,5 @@ namespace OpenTK.Platform.Windows Dispose(false); } #endif - - #endregion } } diff --git a/src/OpenTK/Platform/X11/API.cs b/src/OpenTK/Platform/X11/API.cs index e7f4fb77..18ec28a7 100644 --- a/src/OpenTK/Platform/X11/API.cs +++ b/src/OpenTK/Platform/X11/API.cs @@ -1,9 +1,7 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * Contributions from Erik Ylvisaker * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -18,8 +16,6 @@ using System.Diagnostics; namespace OpenTK.Platform.X11 { - #region Types - // using XID = System.Int32; using Window = System.IntPtr; using Drawable = System.IntPtr; @@ -50,8 +46,6 @@ namespace OpenTK.Platform.X11 using Status = System.Int32; using SizeID = System.UInt16; - #endregion - /// /// X11 has some defined values they are defined with c's #define in X.h /// @@ -61,19 +55,15 @@ namespace OpenTK.Platform.X11 /// Universal null resource or null atom. From header: #define None 0L /// public static readonly IntPtr None = IntPtr.Zero; - // + // /// /// Special time value. From header: #define CurrentTime 0L /// - public static readonly IntPtr CurrentTime = IntPtr.Zero; // + public static readonly IntPtr CurrentTime = IntPtr.Zero; // } - #region internal static class API - internal static class API { - #region --- Fields --- - private const string _dll_name = "libX11"; private const string _dll_name_vid = "libXxf86vm"; @@ -89,8 +79,6 @@ namespace OpenTK.Platform.X11 internal static object Lock = new object(); - #endregion - static API() { int has_threaded_x = Functions.XInitThreads(); @@ -131,8 +119,6 @@ namespace OpenTK.Platform.X11 //[DllImport(_dll_name, EntryPoint = "XCreateColormap")] //extern public static IntPtr CreateColormap(Display display, Window window, IntPtr visual, int alloc); - #region Window handling - [DllImport(_dll_name, EntryPoint = "XCreateSimpleWindow")] public extern static Window CreateSimpleWindow( Display display, @@ -156,13 +142,9 @@ namespace OpenTK.Platform.X11 [DllImport(_dll_name, EntryPoint = "XMapRaised")] extern public static void MapRaised(Display display, Window window); - #endregion - [DllImport(_dll_name, EntryPoint = "XDefaultVisual")] extern public static IntPtr DefaultVisual(Display display, int screen_number); - #region XFree - /// /// Frees the memory used by an X structure. Only use on unmanaged structures! /// @@ -170,10 +152,6 @@ namespace OpenTK.Platform.X11 [DllImport(_dll_name, EntryPoint = "XFree")] extern public static void Free(IntPtr buffer); - #endregion - - #region Event queue management - [System.Security.SuppressUnmanagedCodeSecurity] [DllImport(_dll_name, EntryPoint = "XEventsQueued")] extern public static int EventsQueued(Display display, int mode); @@ -254,10 +232,6 @@ namespace OpenTK.Platform.X11 [return: MarshalAs(UnmanagedType.Bool)] public static extern bool CheckMaskEvent(Display display, EventMask event_mask, ref XEvent event_return); - #endregion - - #region Pointer and Keyboard functions - [DllImport(_dll_name, EntryPoint = "XGrabPointer")] extern public static ErrorCodes GrabPointer(Display display, IntPtr grab_window, bool owner_events, int event_mask, GrabMode pointer_mode, GrabMode keyboard_mode, @@ -307,10 +281,6 @@ namespace OpenTK.Platform.X11 [DllImport(_dll_name, EntryPoint = "XDisplayKeycodes")] public static extern void DisplayKeycodes(Display display, ref int min_keycodes_return, ref int max_keycodes_return); - #endregion - - #region Xf86VidMode internal structures - [StructLayout(LayoutKind.Sequential)] internal struct XF86VidModeModeLine { @@ -443,10 +413,6 @@ namespace OpenTK.Platform.X11 float green; /* Green Gamma value */ float blue; /* Blue Gamma value */ } - #endregion - - #region libXxf86vm Functions - [DllImport(_dll_name_vid)] extern public static bool XF86VidModeQueryExtension( Display display, @@ -572,18 +538,10 @@ XF86VidModeGetGammaRampSize( int *size); * */ - #endregion - [DllImport(_dll_name, EntryPoint = "XLookupKeysym")] public static extern KeySym LookupKeysym(ref XKeyEvent key_event, int index); } - #endregion - - #region X11 Structures - - #region Xcursor - [StructLayout(LayoutKind.Sequential)] unsafe struct XcursorImage { @@ -621,10 +579,6 @@ XF86VidModeGetGammaRampSize( public int sequence; } - #endregion - - #region public class XVisualInfo - [StructLayout(LayoutKind.Sequential)] public struct XVisualInfo { @@ -646,10 +600,6 @@ XF86VidModeGetGammaRampSize( } } - #endregion - - #region internal struct SizeHints - [StructLayout(LayoutKind.Sequential)] internal struct SizeHints { @@ -671,20 +621,12 @@ XF86VidModeGetGammaRampSize( /* this structure may be extended in the future */ } - #endregion - - #region internal struct XRRScreenSize - internal struct XRRScreenSize { internal int Width, Height; internal int MWidth, MHeight; }; - #endregion - - #region unsafe internal struct Screen - unsafe internal struct Screen { XExtData ext_data; /* hook for extension to hang buffer */ @@ -706,10 +648,6 @@ XF86VidModeGetGammaRampSize( long root_input_mask; /* initial root input mask */ } - #endregion - - #region unsafe internal class XExtData - unsafe internal class XExtData { int number; /* number returned by XRegisterExtension */ @@ -719,10 +657,6 @@ XF86VidModeGetGammaRampSize( XPointer private_data; /* buffer private to this extension. */ }; - #endregion - - #region Motif - [StructLayout(LayoutKind.Sequential)] internal struct MotifWmHints { @@ -780,12 +714,6 @@ XF86VidModeGetGammaRampSize( FullApplicationModal = 3 } - #endregion - - #endregion - - #region X11 Constants and Enums - internal struct Constants { public const int QueuedAlready = 0; @@ -898,8 +826,6 @@ XF86VidModeGetGammaRampSize( //CWStackMode = (1<<6), } - #region XKey - /// /// Defines LATIN-1 and miscellaneous keys. /// @@ -1297,8 +1223,6 @@ XF86VidModeGetGammaRampSize( SunOpen = 0x1005ff73, } - #endregion - #pragma warning disable 1591 public enum XVisualClass : int @@ -1329,8 +1253,6 @@ XF86VidModeGetGammaRampSize( All = 0x1FF, } - #region internal enum MouseMask - internal enum MouseMask { Button1MotionMask = (1 << 8), @@ -1356,17 +1278,11 @@ XF86VidModeGetGammaRampSize( Mod5Mask = (1 << 7), } - #endregion - - #endregion - internal static partial class Functions { internal const string X11Library = "libX11"; internal const string XcursorLibrary = "libXcursor.so.1"; - #region XCreateWindow - /// /// The XCreateWindow function creates an unmapped subwindow for a specified parent window, returns the window ID of the created window, and causes the X server to generate a CreateNotify event. The created window is placed on top in the stacking order with respect to siblings. /// @@ -1412,10 +1328,6 @@ XF86VidModeGetGammaRampSize( } } - #endregion - - #region XChangeWindowAttributes - [DllImport(X11Library)] internal static extern void XChangeWindowAttributes(Display display, Window w, UIntPtr valuemask, ref XSetWindowAttributes attributes); @@ -1424,10 +1336,6 @@ XF86VidModeGetGammaRampSize( XChangeWindowAttributes(display, w, (UIntPtr)valuemask, ref attributes); } - #endregion - - #region Xcursor - [DllImport(XcursorLibrary)] internal static unsafe extern XcursorImage* XcursorImageCreate(int width, int height); @@ -1437,10 +1345,6 @@ XF86VidModeGetGammaRampSize( [DllImport(XcursorLibrary)] internal static unsafe extern Cursor XcursorImageLoadCursor(Display dpy, XcursorImage* image); - #endregion - - #region XQueryKeymap - /* /// /// The XQueryKeymap() function returns a bit vector for the logical state of the keyboard, where each bit set to 1 indicates that the corresponding key is currently pressed down. The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7 with the least-significant bit in the byte representing key 8N. @@ -1461,10 +1365,6 @@ XF86VidModeGetGammaRampSize( [DllImport(X11Library, EntryPoint = "XQueryKeymap")] extern public static void XQueryKeymap(IntPtr display, byte[] keys); - #endregion - - #region XMaskEvent - /// /// The XMaskEvent() function searches the event queue for the events associated with the specified mask. When it finds a match, XMaskEvent() removes that event and copies it into the specified XEvent structure. The other events stored in the queue are not discarded. If the event you requested is not in the queue, XMaskEvent() flushes the output buffer and blocks until one is received. /// @@ -1474,10 +1374,6 @@ XF86VidModeGetGammaRampSize( [DllImport(X11Library, EntryPoint = "XMaskEvent")] extern public static void XMaskEvent(IntPtr display, EventMask event_mask, ref XEvent e); - #endregion - - #region XPutBackEvent - /// /// The XPutBackEvent() function pushes an event back onto the head of the display's event queue by copying the event into the queue. This can be useful if you read an event and then decide that you would rather deal with it later. There is no limit to the number of times in succession that you can call XPutBackEvent(). /// @@ -1486,10 +1382,6 @@ XF86VidModeGetGammaRampSize( [DllImport(X11Library, EntryPoint = "XPutBackEvent")] public static extern void XPutBackEvent(IntPtr display, ref XEvent @event); - #endregion - - #region Xrandr - const string XrandrLibrary = "libXrandr.so.2"; [DllImport(XrandrLibrary)] @@ -1607,19 +1499,9 @@ XF86VidModeGetGammaRampSize( [DllImport(XrandrLibrary)] public static extern Time XRRTimes(Display dpy, int screen, out Time config_timestamp); - #endregion - - #region Display, Screen and Window functions - - #region XScreenCount - [DllImport(X11Library)] public static extern int XScreenCount(Display display); - #endregion - - #region XListDepths - [DllImport(X11Library)] unsafe static extern int *XListDepths(Display display, int screen_number, int* count_return); @@ -1639,10 +1521,6 @@ XF86VidModeGetGammaRampSize( } } - #endregion - - #endregion - public static Pixmap XCreateBitmapFromData(Display display, Window d, byte[,] data) { if (data == null) diff --git a/src/OpenTK/Platform/X11/Bindings/DL.cs b/src/OpenTK/Platform/X11/Bindings/DL.cs index d89b5c3e..61cd95d1 100644 --- a/src/OpenTK/Platform/X11/Bindings/DL.cs +++ b/src/OpenTK/Platform/X11/Bindings/DL.cs @@ -1,5 +1,4 @@ -#region License -// +// // DL.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/X11/Bindings/Glx.cs b/src/OpenTK/Platform/X11/Bindings/Glx.cs index 4bc2e0aa..300293b3 100644 --- a/src/OpenTK/Platform/X11/Bindings/Glx.cs +++ b/src/OpenTK/Platform/X11/Bindings/Glx.cs @@ -1,9 +1,7 @@ -#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * Contributions from Erik Ylvisaker * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -15,8 +13,6 @@ using System.Security; namespace OpenTK.Platform.X11 { - #region Enums - public enum GLXAttribute : int { TRANSPARENT_BLUE_VALUE_EXT = 0x27, @@ -255,8 +251,6 @@ namespace OpenTK.Platform.X11 BAD_ENUM = 7, /* unused? */ } - #endregion - /// \internal /// /// Provides access to GLX functions. @@ -337,8 +331,6 @@ namespace OpenTK.Platform.X11 return false; } - #region GLX functions - [DllImport(Library, EntryPoint = "glXIsDirect")] public static extern bool IsDirect(IntPtr dpy, IntPtr context); @@ -396,8 +388,6 @@ namespace OpenTK.Platform.X11 [DllImport(Library, EntryPoint = "glXGetConfig")] public static extern int GetConfig(IntPtr dpy, ref XVisualInfo vis, GLXAttribute attrib, out int value); - #region glXChooseVisual - [DllImport(Library, EntryPoint = "glXChooseVisual")] public extern static IntPtr ChooseVisual(IntPtr dpy, int screen, IntPtr attriblist); @@ -423,12 +413,8 @@ namespace OpenTK.Platform.X11 [DllImport(Library, EntryPoint = "glXGetVisualFromFBConfig")] public unsafe extern static IntPtr GetVisualFromFBConfig(IntPtr dpy, IntPtr fbconfig); - #endregion - public partial class Arb { - #region CreateContextAttribs - [AutoGenerated(EntryPoint = "glXCreateContextAttribsARB")] unsafe public static IntPtr CreateContextAttribs(IntPtr display, IntPtr fbconfig, IntPtr share_context, bool direct, int* attribs) { @@ -441,10 +427,6 @@ namespace OpenTK.Platform.X11 throw new NotImplementedException(); } - #endregion - - #region GetProcAddress - // The linux OpenGL ABI 3.6 (1999) requires // that glXGetProcAddressARB be available as // a static export. The same is *not* true @@ -456,8 +438,6 @@ namespace OpenTK.Platform.X11 [DllImport(Library, EntryPoint = "glXGetProcAddressARB")] public static extern IntPtr GetProcAddress(IntPtr procName); - - #endregion } public partial class Ext @@ -508,8 +488,6 @@ namespace OpenTK.Platform.X11 [Slot(4)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] internal static extern ErrorCode glXSwapIntervalSGI(int interval); - - #endregion } } diff --git a/src/OpenTK/Platform/X11/Bindings/XI.cs b/src/OpenTK/Platform/X11/Bindings/XI.cs index 6ccfb698..894794f3 100644 --- a/src/OpenTK/Platform/X11/Bindings/XI.cs +++ b/src/OpenTK/Platform/X11/Bindings/XI.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2014 Stefanos Apostolopoulos for the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -82,7 +80,7 @@ namespace OpenTK.Platform.X11 [DllImport(lib, EntryPoint = "XISelectEvents")] static extern int SelectEvents(IntPtr dpy, Window win, [In] XIEventMask[] masks, int num_masks); - + [DllImport(lib, EntryPoint = "XISelectEvents")] static extern int SelectEvents(IntPtr dpy, Window win, [In] ref XIEventMask masks, int num_masks); diff --git a/src/OpenTK/Platform/X11/Bindings/Xkb.cs b/src/OpenTK/Platform/X11/Bindings/Xkb.cs index 74a3d83b..c6127642 100644 --- a/src/OpenTK/Platform/X11/Bindings/Xkb.cs +++ b/src/OpenTK/Platform/X11/Bindings/Xkb.cs @@ -1,11 +1,10 @@ -#region License // // Xkb.cs // // Author: // Stefanos Apostolopoulos // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -65,10 +63,10 @@ namespace OpenTK.Platform.X11 internal extern static IntPtr GetKeyboard(IntPtr display, XkbKeyboardMask which, int device_id); [DllImport(lib, EntryPoint = "XkbGetMap")] - internal extern static IntPtr GetMap(IntPtr display, XkbKeyboardMask which, int device_spec); + internal extern static IntPtr GetMap(IntPtr display, XkbKeyboardMask which, int device_spec); [DllImport(lib, EntryPoint = "XkbGetNames")] - unsafe internal extern static IntPtr GetNames(IntPtr display, XkbNamesMask which, XkbDesc* xkb); + unsafe internal extern static IntPtr GetNames(IntPtr display, XkbNamesMask which, XkbDesc* xkb); [DllImport(lib, EntryPoint = "XkbKeycodeToKeysym")] internal extern static XKey KeycodeToKeysym(IntPtr display, int keycode, int group, int level); @@ -165,8 +163,6 @@ namespace OpenTK.Platform.X11 [StructLayout(LayoutKind.Sequential)] unsafe struct XkbNames { - #region Structs - [StructLayout(LayoutKind.Sequential)] internal struct Groups { @@ -281,8 +277,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - internal Atom keycodes; internal Atom geometry; internal Atom symbols; diff --git a/src/OpenTK/Platform/X11/Functions.cs b/src/OpenTK/Platform/X11/Functions.cs index 3b10cf4d..c6094a47 100644 --- a/src/OpenTK/Platform/X11/Functions.cs +++ b/src/OpenTK/Platform/X11/Functions.cs @@ -1,10 +1,8 @@ -#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; @@ -21,8 +19,6 @@ using System.Runtime.InteropServices; namespace OpenTK.Platform.X11 { - #region Types - // using XID = System.Int32; using Window = System.IntPtr; using Drawable = System.IntPtr; @@ -48,11 +44,7 @@ namespace OpenTK.Platform.X11 using Status = System.Int32; using SizeID = System.UInt16; - #endregion - - #region Structs - - #endregion + internal static partial class Functions { @@ -130,7 +122,7 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XMoveWindow")] public extern static int XMoveWindow(IntPtr display, IntPtr w, int x, int y); - + [DllImport("libX11", EntryPoint = "XResizeWindow")] public extern static int XResizeWindow(IntPtr display, IntPtr window, int width, int height); @@ -399,7 +391,7 @@ namespace OpenTK.Platform.X11 [DllImport("libX11")] public static extern IntPtr XAllocWMHints(); - + [DllImport("libX11", EntryPoint = "XGetIconSizes")] public extern static int XGetIconSizes(IntPtr display, IntPtr window, out IntPtr size_list, out int count); @@ -448,15 +440,15 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XGetVisualInfo")] static extern IntPtr XGetVisualInfoInternal(IntPtr display, IntPtr vinfo_mask, ref XVisualInfo template, out int nitems); - + public static IntPtr XGetVisualInfo(IntPtr display, XVisualInfoMask vinfo_mask, ref XVisualInfo template, out int nitems) { return XGetVisualInfoInternal(display, (IntPtr)(int)vinfo_mask, ref template, out nitems); } - + [DllImport("libX11")] public static extern IntPtr XCreateColormap(Display display, Window window, IntPtr visual, int alloc); - + [DllImport("libX11")] public static extern void XLockDisplay(Display display); @@ -537,7 +529,7 @@ namespace OpenTK.Platform.X11 new IntPtr((int)(EventMask.SubstructureRedirectMask | EventMask.SubstructureNotifyMask)), ref xev); } - + public static void SendNetClientMessage(X11WindowInfo window, IntPtr message_type, IntPtr l0, IntPtr l1, IntPtr l2) { @@ -576,53 +568,53 @@ namespace OpenTK.Platform.X11 (byte)(argb & 0xFF)); } } - public static IntPtr CreatePixmapFromImage(Display display, Bitmap image) - { + public static IntPtr CreatePixmapFromImage(Display display, Bitmap image) + { int width = image.Width; int height = image.Height; BitmapData data = image.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb); - - IntPtr ximage = XCreateImage(display, CopyFromParent, 24, ImageFormat.ZPixmap, - 0, data.Scan0, (uint)width, (uint)height, 32, 0); - IntPtr pixmap = XCreatePixmap(display, XDefaultRootWindow(display), - width, height, 24); + + IntPtr ximage = XCreateImage(display, CopyFromParent, 24, ImageFormat.ZPixmap, + 0, data.Scan0, (uint)width, (uint)height, 32, 0); + IntPtr pixmap = XCreatePixmap(display, XDefaultRootWindow(display), + width, height, 24); IntPtr gc = XCreateGC(display, pixmap, IntPtr.Zero, null); - + XPutImage(display, pixmap, gc, ximage, 0, 0, 0, 0, (uint)width, (uint)height); - + XFreeGC(display, gc); image.UnlockBits(data); - return pixmap; - } - - public static IntPtr CreateMaskFromImage(Display display, Bitmap image) - { - int width = image.Width; - int height = image.Height; - int stride = (width + 7) >> 3; + return pixmap; + } + + public static IntPtr CreateMaskFromImage(Display display, Bitmap image) + { + int width = image.Width; + int height = image.Height; + int stride = (width + 7) >> 3; byte[] mask = new byte[stride * height]; bool msbfirst = (XBitmapBitOrder(display) == 1); // 1 = MSBFirst - - for (int y = 0; y < height; ++y) - { - for (int x = 0; x < width; ++x) - { - byte bit = (byte) (1 << (msbfirst ? (7 - (x & 7)) : (x & 7))); - int offset = y * stride + (x >> 3); - - if (image.GetPixel(x, y).A >= 128) - mask[offset] |= bit; - } - } - - Pixmap pixmap = XCreatePixmapFromBitmapData(display, XDefaultRootWindow(display), - mask, width, height, new IntPtr(1), IntPtr.Zero, 1); - - return pixmap; + + for (int y = 0; y < height; ++y) + { + for (int x = 0; x < width; ++x) + { + byte bit = (byte) (1 << (msbfirst ? (7 - (x & 7)) : (x & 7))); + int offset = y * stride + (x >> 3); + + if (image.GetPixel(x, y).A >= 128) + mask[offset] |= bit; + } + } + + Pixmap pixmap = XCreatePixmapFromBitmapData(display, XDefaultRootWindow(display), + mask, width, height, new IntPtr(1), IntPtr.Zero, 1); + + return pixmap; } } } diff --git a/src/OpenTK/Platform/X11/X11DisplayDevice.cs b/src/OpenTK/Platform/X11/X11DisplayDevice.cs index 3a794f1b..8b23ff1b 100644 --- a/src/OpenTK/Platform/X11/X11DisplayDevice.cs +++ b/src/OpenTK/Platform/X11/X11DisplayDevice.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -51,18 +49,13 @@ namespace OpenTK.Platform.X11 readonly List lastConfigUpdate = new List(); bool xinerama_supported, xrandr_supported, xf86_supported; - - #region Constructors + public X11DisplayDevice() { RefreshDisplayDevices(); } - #endregion - - #region Private Methods - void RefreshDisplayDevices() { using (new XLock(API.DefaultDisplay)) @@ -225,7 +218,7 @@ namespace OpenTK.Platform.X11 // We have added depths.Length copies of each resolution // Adjust the return value of XRRGetScreenInfo to retrieve the correct resolution int index = current_resolution_index * depths.Length; - + // Make sure we are within the bounds of the available_res array if (index >= available_res.Count) { @@ -259,7 +252,7 @@ namespace OpenTK.Platform.X11 { return false; } - + int currentScreen = 0; Debug.Print("Using XF86 v" + major.ToString() + "." + minor.ToString()); @@ -296,17 +289,11 @@ namespace OpenTK.Platform.X11 return true; } - #region static int[] FindAvailableDepths(int screen) - static int[] FindAvailableDepths(int screen) { return Functions.XListDepths(API.DefaultDisplay, screen); } - #endregion - - #region static XRRScreenSize[] FindAvailableResolutions(int screen) - static XRRScreenSize[] FindAvailableResolutions(int screen) { XRRScreenSize[] resolutions = null; @@ -316,10 +303,6 @@ namespace OpenTK.Platform.X11 return resolutions; } - #endregion - - #region static float FindCurrentRefreshRate(int screen) - static float FindCurrentRefreshRate(int screen) { short rate = 0; @@ -329,17 +312,11 @@ namespace OpenTK.Platform.X11 return (float)rate; } - #endregion - - #region private static int FindCurrentDepth(int screen) - static int FindCurrentDepth(int screen) { return (int)Functions.XDefaultDepth(API.DefaultDisplay, screen); } - #endregion - bool ChangeResolutionXRandR(DisplayDevice device, DisplayResolution resolution) { using (new XLock(API.DefaultDisplay)) @@ -390,10 +367,6 @@ namespace OpenTK.Platform.X11 return false; } - #endregion - - #region IDisplayDeviceDriver Members - public sealed override bool TryChangeResolution(DisplayDevice device, DisplayResolution resolution) { // If resolution is null, restore the default resolution (new_resolution_index = 0). @@ -417,10 +390,6 @@ namespace OpenTK.Platform.X11 return TryChangeResolution(device, null); } - #endregion - - #region NativeMethods - static class NativeMethods { const string Xinerama = "libXinerama"; @@ -466,7 +435,5 @@ namespace OpenTK.Platform.X11 public short Width; public short Height; } - - #endregion } } diff --git a/src/OpenTK/Platform/X11/X11Factory.cs b/src/OpenTK/Platform/X11/X11Factory.cs index ce609b73..e98a3c24 100644 --- a/src/OpenTK/Platform/X11/X11Factory.cs +++ b/src/OpenTK/Platform/X11/X11Factory.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -54,18 +52,12 @@ namespace OpenTK.Platform.X11 } } - #region Constructors - public X11Factory() { int result = Functions.XInitThreads(); Debug.Print("Initializing threaded X: {0}.", result != 0 ? "success" : "failed"); } - #endregion - - #region IPlatformFactory Members - public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) { return new X11GLNative(x, y, width, height, title, mode, options, device); @@ -109,8 +101,6 @@ namespace OpenTK.Platform.X11 return InputDriver.JoystickDriver; } - #endregion - protected override void Dispose(bool manual) { base.Dispose(manual); diff --git a/src/OpenTK/Platform/X11/X11GLContext.cs b/src/OpenTK/Platform/X11/X11GLContext.cs index 1b680d2a..9d926bd8 100644 --- a/src/OpenTK/Platform/X11/X11GLContext.cs +++ b/src/OpenTK/Platform/X11/X11GLContext.cs @@ -1,8 +1,6 @@ -#region --- License --- /* Copyright (c) 2007 Stefanos Apostolopoulos * See license.txt for license info */ -#endregion using System; using System.Collections.Generic; @@ -21,8 +19,6 @@ namespace OpenTK.Platform.X11 /// internal sealed class X11GLContext : DesktopGraphicsContext { - #region Fields - // We assume that we cannot move a GL context to a different display connection. // For this reason, we'll "lock" onto the display of the window used in the context // constructor and we'll throw an exception if the user ever tries to make the context @@ -37,10 +33,6 @@ namespace OpenTK.Platform.X11 readonly X11GraphicsMode ModeSelector = new X11GraphicsMode(); string extensions = null; - #endregion - - #region --- Constructors --- - static X11GLContext() { new Glx().LoadEntryPoints(); @@ -100,12 +92,12 @@ namespace OpenTK.Platform.X11 ContextHandle shareHandle = shared != null ? (shared as IGraphicsContextInternal).Context : (ContextHandle)IntPtr.Zero; - + Debug.Write("Creating X11GLContext context: "); Debug.Write(direct ? "direct, " : "indirect, "); Debug.WriteLine(shareHandle.Handle == IntPtr.Zero ? "not shared... " : String.Format("shared with ({0})... ", shareHandle)); - + // Try using the new context creation method. If it fails, fall back to the old one. // For each of these methods, we try two times to create a context: // one with the "direct" flag intact, the other with the flag inversed. @@ -117,12 +109,12 @@ namespace OpenTK.Platform.X11 Handle = CreateContextAttribs(Display, currentWindow.Screen, fbconfig, direct, major, minor, flags, shareHandle); } - + if (Handle == ContextHandle.Zero) { Handle = CreateContextLegacy(Display, visual, direct, shareHandle); } - + if (Handle != ContextHandle.Zero) Debug.Print("Context created (id: {0}).", Handle); else @@ -148,10 +140,6 @@ namespace OpenTK.Platform.X11 Display = currentWindow.Display; } - #endregion - - #region --- Private Methods --- - static ContextHandle CreateContextAttribs( IntPtr display, int screen, IntPtr fbconfig, bool direct, int major, int minor, @@ -273,12 +261,6 @@ namespace OpenTK.Platform.X11 SupportsExtension(display, window, "GLX_ARB_create_context_profile"); } - #endregion - - #region --- IGraphicsContext Members --- - - #region SwapBuffers() - public override void SwapBuffers() { if (Display == IntPtr.Zero || currentWindow.Handle == IntPtr.Zero) @@ -290,10 +272,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region MakeCurrent - public override void MakeCurrent(IWindowInfo window) { if (window == currentWindow && IsCurrent) @@ -347,10 +325,6 @@ namespace OpenTK.Platform.X11 currentWindow = (X11WindowInfo)window; } - #endregion - - #region IsCurrent - public override bool IsCurrent { get @@ -362,10 +336,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region SwapInterval - public override int SwapInterval { get @@ -433,10 +403,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region LoadAll - public override void LoadAll() { // Note: GLX entry points are always available, even @@ -461,14 +427,6 @@ namespace OpenTK.Platform.X11 base.LoadAll(); } - #endregion - - #endregion - - #region --- IGraphicsContextInternal Members --- - - #region GetAddress - public override IntPtr GetAddress(IntPtr function) { using (new XLock(Display)) @@ -477,12 +435,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #endregion - - #region --- IDisposable Members --- - protected override void Dispose(bool manuallyCalled) { if (!IsDisposed) @@ -510,7 +462,5 @@ namespace OpenTK.Platform.X11 } IsDisposed = true; } - - #endregion } } diff --git a/src/OpenTK/Platform/X11/X11GLNative.cs b/src/OpenTK/Platform/X11/X11GLNative.cs index afae0bd4..34db0102 100644 --- a/src/OpenTK/Platform/X11/X11GLNative.cs +++ b/src/OpenTK/Platform/X11/X11GLNative.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -51,8 +49,6 @@ namespace OpenTK.Platform.X11 // TODO: What happens if we can't disable decorations through motif? // TODO: Mouse/keyboard grabbing/wrapping. - #region Fields - const int _min_width = 30, _min_height = 30; readonly X11WindowInfo window = new X11WindowInfo(); @@ -67,9 +63,8 @@ namespace OpenTK.Platform.X11 const string ICCM_WM_ATOM = "_NET_WM_WINDOW_TYPE"; const string ICON_NET_ATOM = "_NET_WM_ICON"; - // The Atom class from Mono might be useful to avoid calling XInternAtom by hand (somewhat error prone). + // The Atom class from Mono might be useful to avoid calling XInternAtom by hand (somewhat error prone). IntPtr _atom_wm_destroy; - IntPtr _atom_net_wm_state; IntPtr _atom_net_wm_state_minimized; IntPtr _atom_net_wm_state_fullscreen; @@ -152,10 +147,6 @@ namespace OpenTK.Platform.X11 readonly int xi2_version; #pragma warning restore 414 - #endregion - - #region Constructors - public X11GLNative(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) : this() @@ -318,7 +309,7 @@ namespace OpenTK.Platform.X11 Debug.Print("Display: {0}, Screen {1}, Root window: {2}", window.Display, window.Screen, window.RootWindow); - + RegisterAtoms(window); } finally @@ -327,10 +318,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region Private Members - private void ReadProperty(IntPtr window, IntPtr property, IntPtr type, ref IntPtr data, ref IntPtr itemsCount) { int format; @@ -339,8 +326,8 @@ namespace OpenTK.Platform.X11 IntPtr bytesLeft; Functions.XGetWindowProperty(this.window.Display, window, property, IntPtr.Zero, - length, false, type, - out actualType, out format, out itemsCount, out bytesLeft, ref data); + length, false, type, + out actualType, out format, out itemsCount, out bytesLeft, ref data); } private string[] parseUriList(string rawString) @@ -358,8 +345,6 @@ namespace OpenTK.Platform.X11 return fileNames; } - #region private void RegisterAtoms() - /// /// Not used yet. /// Registers the necessary atoms for GameWindow. @@ -370,7 +355,7 @@ namespace OpenTK.Platform.X11 { Debug.WriteLine("Registering atoms."); _atom_wm_destroy = Functions.XInternAtom(window.Display, "WM_DELETE_WINDOW", true); - + _atom_net_wm_state = Functions.XInternAtom(window.Display, "_NET_WM_STATE", false); _atom_net_wm_state_minimized = Functions.XInternAtom(window.Display, "_NET_WM_STATE_MINIMIZED", false); _atom_net_wm_state_fullscreen = Functions.XInternAtom(window.Display, "_NET_WM_STATE_FULLSCREEN", false); @@ -378,7 +363,7 @@ namespace OpenTK.Platform.X11 Functions.XInternAtom(window.Display, "_NET_WM_STATE_MAXIMIZED_HORZ", false); _atom_net_wm_state_maximized_vertical = Functions.XInternAtom(window.Display, "_NET_WM_STATE_MAXIMIZED_VERT", false); - + _atom_net_wm_allowed_actions = Functions.XInternAtom(window.Display, "_NET_WM_ALLOWED_ACTIONS", false); _atom_net_wm_action_resize = @@ -421,10 +406,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region SetWindowMinMax - void SetWindowMinMax(int min_width, int min_height, int max_width, int max_height) { SetWindowMinMax((short)min_width, (short)min_height, (short)max_width, (short)max_height); @@ -470,10 +451,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region IsWindowBorderResizable - bool IsWindowBorderResizable { get @@ -491,10 +468,7 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region bool IsWindowBorderHidden - + bool IsWindowBorderHidden { get @@ -509,7 +483,7 @@ namespace OpenTK.Platform.X11 if (_decorations_hidden) return true; } - + // Some WMs remove decorations when the transient_for hint is set. Most new ones do not (but those // should obey the Motif hint). Anyway, if this hint is set, we say the decorations have been remove // although there is a slight chance this is not the case. @@ -517,15 +491,12 @@ namespace OpenTK.Platform.X11 Functions.XGetTransientForHint(window.Display, window.Handle, out transient_for_parent); if (transient_for_parent != IntPtr.Zero) return true; - + return false; } } } - - #endregion - #region void DisableWindowDecorations() void DisableWindowDecorations() { @@ -534,7 +505,7 @@ namespace OpenTK.Platform.X11 Debug.Print("Removed decorations through motif."); _decorations_hidden = true; } - + using (new XLock(window.Display)) { // Functions.XSetTransientForHint(this.window.Display, this.Handle, this.window.RootWindow); @@ -549,9 +520,7 @@ namespace OpenTK.Platform.X11 } } } - - #region bool DisableMotifDecorations() bool DisableMotifDecorations() { @@ -561,7 +530,7 @@ namespace OpenTK.Platform.X11 if (atom != IntPtr.Zero) { //Functions.XGetWindowProperty(window.Display, window.Handle, atom, IntPtr.Zero, IntPtr.Zero, false, - + MotifWmHints hints = new MotifWmHints(); hints.flags = (IntPtr)MotifFlags.Decorations; Functions.XChangeProperty(this.window.Display, this.Handle, atom, atom, 32, PropertyMode.Replace, @@ -572,10 +541,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region bool DisableGnomeDecorations() - bool DisableGnomeDecorations() { using (new XLock(window.Display)) @@ -588,17 +553,11 @@ namespace OpenTK.Platform.X11 ref hints, Marshal.SizeOf(hints) / IntPtr.Size); return true; } - + return false; } } - #endregion - - #endregion - - #region void EnableWindowDecorations() - void EnableWindowDecorations() { if (EnableMotifDecorations()) @@ -621,8 +580,6 @@ namespace OpenTK.Platform.X11 } } - #region bool EnableMotifDecorations() - bool EnableMotifDecorations() { using (new XLock(window.Display)) @@ -636,17 +593,13 @@ namespace OpenTK.Platform.X11 hints.decorations = (IntPtr)MotifDecorations.All; Functions.XChangeProperty(this.window.Display, this.Handle, atom, atom, 32, PropertyMode.Replace, ref hints, Marshal.SizeOf(hints) / IntPtr.Size); - + return true; } return false; } } - #endregion - - #region bool EnableGnomeDecorations() - bool EnableGnomeDecorations() { using (new XLock(window.Display)) @@ -659,55 +612,47 @@ namespace OpenTK.Platform.X11 //xev.ClientMessageEvent.format = 32; //xev.ClientMessageEvent.ptr1 = (IntPtr)WindowLayer.AboveDock; //Functions.XSendEvent(this.window.Display, this.window.RootWindow, false, (IntPtr)EventMask.SubstructureNotifyMask, ref xev); - + IntPtr atom = Functions.XInternAtom(this.window.Display, Constants.XA_WIN_HINTS, true); if (atom != IntPtr.Zero) { Functions.XDeleteProperty(this.window.Display, this.Handle, atom); return true; } - + return false; } } - #endregion - - #endregion - - #region DeleteIconPixmaps - static void DeleteIconPixmaps(IntPtr display, IntPtr window) { using (new XLock(display)) { IntPtr wmHints_ptr = Functions.XGetWMHints(display, window); - + if (wmHints_ptr != IntPtr.Zero) { XWMHints wmHints = (XWMHints)Marshal.PtrToStructure(wmHints_ptr, typeof(XWMHints)); XWMHintsFlags flags = (XWMHintsFlags)wmHints.flags.ToInt32(); - + if ((flags & XWMHintsFlags.IconPixmapHint) != 0) { wmHints.flags = new IntPtr((int)(flags & ~XWMHintsFlags.IconPixmapHint)); Functions.XFreePixmap(display, wmHints.icon_pixmap); } - + if ((flags & XWMHintsFlags.IconMaskHint) != 0) { wmHints.flags = new IntPtr((int)(flags & ~XWMHintsFlags.IconMaskHint)); Functions.XFreePixmap(display, wmHints.icon_mask); } - + Functions.XSetWMHints(display, window, ref wmHints); Functions.XFree(wmHints_ptr); } } } - #endregion - bool RefreshWindowBorders() { bool borders_changed = false; @@ -719,7 +664,7 @@ namespace OpenTK.Platform.X11 border_right != 0 || border_top != 0 || border_bottom != 0; - + border_left = 0; border_right = 0; border_top = 0; @@ -729,14 +674,14 @@ namespace OpenTK.Platform.X11 { IntPtr atom, nitems, bytes_after, prop = IntPtr.Zero; int format; - + using (new XLock(window.Display)) { Functions.XGetWindowProperty(window.Display, window.Handle, _atom_net_frame_extents, IntPtr.Zero, new IntPtr(16), false, (IntPtr)AtomName.XA_CARDINAL, out atom, out format, out nitems, out bytes_after, ref prop); } - + if ((prop != IntPtr.Zero)) { if ((long)nitems == 4) @@ -745,24 +690,24 @@ namespace OpenTK.Platform.X11 int new_border_right = Marshal.ReadIntPtr(prop, IntPtr.Size).ToInt32(); int new_border_top = Marshal.ReadIntPtr(prop, IntPtr.Size * 2).ToInt32(); int new_border_bottom = Marshal.ReadIntPtr(prop, IntPtr.Size * 3).ToInt32(); - + borders_changed = new_border_left != border_left || new_border_right != border_right || new_border_top != border_top || new_border_bottom != border_bottom; - + border_left = new_border_left; border_right = new_border_right; border_top = new_border_top; border_bottom = new_border_bottom; - + //Debug.WriteLine(border_left); //Debug.WriteLine(border_right); //Debug.WriteLine(border_top); //Debug.WriteLine(border_bottom); } - + using (new XLock(window.Display)) { Functions.XFree(prop); @@ -796,7 +741,7 @@ namespace OpenTK.Platform.X11 x = e.ConfigureEvent.x; y = e.ConfigureEvent.y; } - + Point new_location = new Point( x - border_left, y - border_top); @@ -845,12 +790,6 @@ namespace OpenTK.Platform.X11 return cursor; } - #endregion - - #region INativeWindow Members - - #region ProcessEvents - public override void ProcessEvents() { base.ProcessEvents(); @@ -1053,7 +992,7 @@ namespace OpenTK.Platform.X11 status = Functions.XLookupString( ref e.KeyEvent, ascii, ascii.Length, null, IntPtr.Zero); Encoding.Default.GetChars(ascii, 0, status, chars, 0); - + for (int i = 0; i < status; i++) { if (!Char.IsControl(chars[i])) @@ -1220,10 +1159,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region Bounds - public override Rectangle Bounds { get @@ -1268,10 +1203,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region ClientSize - public override Size ClientSize { get @@ -1303,10 +1234,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region Icon - public override Icon Icon { get @@ -1335,10 +1262,10 @@ namespace OpenTK.Platform.X11 int size = bitmap.Width * bitmap.Height + 2; IntPtr[] data = new IntPtr[size]; int index = 0; - + data[index++] = (IntPtr)bitmap.Width; data[index++] = (IntPtr)bitmap.Height; - + for (int y = 0; y < bitmap.Height; y++) for (int x = 0; x < bitmap.Width; x++) data[index++] = (IntPtr)bitmap.GetPixel(x, y).ToArgb(); @@ -1355,19 +1282,19 @@ namespace OpenTK.Platform.X11 using (new XLock(window.Display)) { IntPtr wmHints_ptr = Functions.XGetWMHints(window.Display, window.Handle); - + if (wmHints_ptr == IntPtr.Zero) wmHints_ptr = Functions.XAllocWMHints(); - + XWMHints wmHints = (XWMHints)Marshal.PtrToStructure(wmHints_ptr, typeof(XWMHints)); - + wmHints.flags = new IntPtr(wmHints.flags.ToInt32() | (int)(XWMHintsFlags.IconPixmapHint | XWMHintsFlags.IconMaskHint)); wmHints.icon_pixmap = Functions.CreatePixmapFromImage(window.Display, bitmap); wmHints.icon_mask = Functions.CreateMaskFromImage(window.Display, bitmap); - + Functions.XSetWMHints(window.Display, window.Handle, ref wmHints); Functions.XFree (wmHints_ptr); - + Functions.XSync(window.Display, false); } } @@ -1377,10 +1304,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region Focused - public override bool Focused { get @@ -1389,10 +1312,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region WindowState - public override OpenTK.WindowState WindowState { get @@ -1558,10 +1477,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region WindowBorder - public override OpenTK.WindowBorder WindowBorder { get @@ -1627,10 +1542,6 @@ namespace OpenTK.Platform.X11 ProcessEvents(); } - #endregion - - #region Cursor - public override MouseCursor Cursor { get @@ -1681,10 +1592,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region CursorVisible - public override bool CursorVisible { get { return cursor_visible; } @@ -1730,14 +1637,6 @@ namespace OpenTK.Platform.X11 Functions.XUngrabPointer(window.Display, IntPtr.Zero); } - #endregion - - #endregion - - #region --- INativeGLWindow Members --- - - #region public bool Exists - /// /// Returns true if a render window/context exists. /// @@ -1746,19 +1645,11 @@ namespace OpenTK.Platform.X11 get { return exists; } } - #endregion - - #region public bool IsIdle - public bool IsIdle { get { throw new Exception("The method or operation is not implemented."); } } - #endregion - - #region public IntPtr Handle - /// /// Gets the current window handle. /// @@ -1767,10 +1658,6 @@ namespace OpenTK.Platform.X11 get { return this.window.Handle; } } - #endregion - - #region public string Title - /// /// TODO: Use atoms for this property. /// Gets or sets the GameWindow title. @@ -1803,10 +1690,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region public bool Visible - public override bool Visible { get @@ -1836,21 +1719,13 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region public IWindowInfo WindowInfo - public override IWindowInfo WindowInfo { get { return window; } } - #endregion - public override void Close() { Exit(); } - #region public void Exit() - public void Exit() { Debug.Print("[X11] Sending exit message window {0:X} on display {1:X}", window.Handle, window.Display); @@ -1869,10 +1744,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region public void DestroyWindow() - public void DestroyWindow() { Debug.Print("[X11] Destroying window {0:X} on display {1:X}", window.Handle, window.Display); @@ -1886,10 +1757,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region PointToClient - public override Point PointToClient(Point point) { int ox, oy; @@ -1906,10 +1773,6 @@ namespace OpenTK.Platform.X11 return point; } - #endregion - - #region PointToScreen - public override Point PointToScreen(Point point) { int ox, oy; @@ -1926,12 +1789,6 @@ namespace OpenTK.Platform.X11 return point; } - #endregion - - #endregion - - #region IDisposable Members - protected override void Dispose(bool manuallyCalled) { if (!disposed) @@ -1961,7 +1818,5 @@ namespace OpenTK.Platform.X11 disposed = true; } } - - #endregion } } diff --git a/src/OpenTK/Platform/X11/X11GraphicsMode.cs b/src/OpenTK/Platform/X11/X11GraphicsMode.cs index d82e6162..87fa52a0 100644 --- a/src/OpenTK/Platform/X11/X11GraphicsMode.cs +++ b/src/OpenTK/Platform/X11/X11GraphicsMode.cs @@ -1,10 +1,8 @@ -#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing detailed licensing details. */ -#endregion using System; using System.Collections.Generic; @@ -21,17 +19,12 @@ namespace OpenTK.Platform.X11 // Todo: Add custom visual selection algorithm, instead of ChooseFBConfig/ChooseVisual. // It seems the Choose* methods do not take multisampling into account (at least on some // drivers). - - #region Constructors + public X11GraphicsMode() { } - #endregion - - #region IGraphicsMode Members - public GraphicsMode SelectGraphicsMode(GraphicsMode desired_mode, out IntPtr visual, out IntPtr fbconfig) { GraphicsMode gfx; @@ -47,10 +40,10 @@ namespace OpenTK.Platform.X11 fbconfig = SelectFBConfig(mode); if (fbconfig != IntPtr.Zero) visual = Glx.GetVisualFromFBConfig(display, fbconfig); - + if (visual == IntPtr.Zero) visual = SelectVisual(mode); - + if (visual == IntPtr.Zero) { // Relax parameters and retry @@ -65,10 +58,6 @@ namespace OpenTK.Platform.X11 return gfx; } - #endregion - - #region Private Members - static GraphicsMode CreateGraphicsMode(IntPtr display, ref XVisualInfo info) { // See what we *really* got: @@ -273,7 +262,5 @@ namespace OpenTK.Platform.X11 return Glx.ChooseVisual(display, Functions.XDefaultScreen(display), visualAttributes.ToArray()); } } - - #endregion } } diff --git a/src/OpenTK/Platform/X11/X11Input.cs b/src/OpenTK/Platform/X11/X11Input.cs index 246501c7..4e5814a3 100644 --- a/src/OpenTK/Platform/X11/X11Input.cs +++ b/src/OpenTK/Platform/X11/X11Input.cs @@ -1,11 +1,10 @@ -#region License // // X11Input.cs // // Author: // thefiddler // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -47,8 +45,6 @@ namespace OpenTK.Platform.X11 Debug.WriteLine("[Warning] Copy OpenTK.dll.config to use the XI2 input driver instead."); } - #region IInputDriver2 Members - public IMouseDriver2 MouseDriver { get @@ -81,17 +77,11 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region IDisposable Members - public void Dispose() { joystick.Dispose(); } - #endregion - } } diff --git a/src/OpenTK/Platform/X11/X11KeyMap.cs b/src/OpenTK/Platform/X11/X11KeyMap.cs index b89e4931..6513e26e 100644 --- a/src/OpenTK/Platform/X11/X11KeyMap.cs +++ b/src/OpenTK/Platform/X11/X11KeyMap.cs @@ -1,11 +1,10 @@ -#region License -// +// // X11KeyMap.cs // // Author: // Stefanos Apostolopoulos // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -55,7 +53,7 @@ namespace OpenTK.Platform.X11 internal void RefreshKeycodes(IntPtr display) { // Approach inspired by GLFW: http://www.glfw.org/ - // Huge props to the GLFW team! + // Huge props to the GLFW team! if (xkb_supported) { unsafe diff --git a/src/OpenTK/Platform/X11/X11Keyboard.cs b/src/OpenTK/Platform/X11/X11Keyboard.cs index 288fba05..f75df397 100644 --- a/src/OpenTK/Platform/X11/X11Keyboard.cs +++ b/src/OpenTK/Platform/X11/X11Keyboard.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/X11/X11Mouse.cs b/src/OpenTK/Platform/X11/X11Mouse.cs index 6a137b26..6618f04d 100644 --- a/src/OpenTK/Platform/X11/X11Mouse.cs +++ b/src/OpenTK/Platform/X11/X11Mouse.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; diff --git a/src/OpenTK/Platform/X11/X11WindowInfo.cs b/src/OpenTK/Platform/X11/X11WindowInfo.cs index 2b5b19ab..f2da4149 100644 --- a/src/OpenTK/Platform/X11/X11WindowInfo.cs +++ b/src/OpenTK/Platform/X11/X11WindowInfo.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2009 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -42,17 +40,9 @@ namespace OpenTK.Platform.X11 XVisualInfo visualInfo; EventMask eventMask; - #region --- Constructors --- - - #region X11WindowInfo() - /// Constructs a new X11WindowInfo class. public X11WindowInfo() { } - #endregion - - #region X11WindowInfo(IntPtr handle, X11WindowInfo parent) - /// /// Constructs a new X11WindowInfo class from the specified window handle and parent. /// @@ -71,12 +61,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #endregion - - #region --- Public Methods --- - /// Gets or sets the handle of the window. public IntPtr Handle { get { return handle; } set { handle = value; } } /// Gets or sets the parent of the window. @@ -111,10 +95,6 @@ namespace OpenTK.Platform.X11 public IntPtr FBConfig { get; set; } public Graphics.GraphicsMode GraphicsMode { get; set; } - #endregion - - #region --- IDisposable Members --- - /// /// Disposes of this X11WindowInfo instance. /// @@ -122,12 +102,6 @@ namespace OpenTK.Platform.X11 { } - #endregion - - #region --- Overrides --- - - #region public override string ToString() - /// Returns a System.String that represents the current window. /// A System.String that represents the current window. public override string ToString() @@ -136,8 +110,6 @@ namespace OpenTK.Platform.X11 this.Display, this.Screen, this.Handle, this.Parent != null ? this.Parent.ToString() : "null"); } - #endregion - /// Checks if this and obj reference the same win32 window. /// The object to check against. /// True if this and obj reference the same win32 window; false otherwise. @@ -159,7 +131,5 @@ namespace OpenTK.Platform.X11 { return handle.GetHashCode() ^ display.GetHashCode(); } - - #endregion } } diff --git a/src/OpenTK/Platform/X11/XI2Input.cs b/src/OpenTK/Platform/X11/XI2Input.cs index d91d2c07..1facf222 100644 --- a/src/OpenTK/Platform/X11/XI2Input.cs +++ b/src/OpenTK/Platform/X11/XI2Input.cs @@ -1,11 +1,10 @@ -#region License // // XI2Input.cs // // Author: // thefiddler // -// Copyright (c) 2006-2014 +// Copyright (c) 2006-2014 // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Diagnostics; @@ -44,8 +42,6 @@ namespace OpenTK.Platform.X11 Debug.WriteLine("Using XI2 input driver."); } - #region IInputDriver2 Members - public IMouseDriver2 MouseDriver { get @@ -78,18 +74,12 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region IDisposable Members - public void Dispose() { mouse_keyboard.Dispose(); joystick.Dispose(); } - #endregion - } } diff --git a/src/OpenTK/Platform/X11/XI2MouseKeyboard.cs b/src/OpenTK/Platform/X11/XI2MouseKeyboard.cs index 00e90fc1..24e6ca8d 100644 --- a/src/OpenTK/Platform/X11/XI2MouseKeyboard.cs +++ b/src/OpenTK/Platform/X11/XI2MouseKeyboard.cs @@ -1,4 +1,3 @@ - #region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal - // in the Software without restriction, including without limitation the rights to + // in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // - #endregion using System; using System.Collections.Generic; @@ -167,8 +165,6 @@ namespace OpenTK.Platform.X11 return false; } - #region IKeyboardDriver2 Members - KeyboardState IKeyboardDriver2.GetState() { lock (Sync) @@ -203,13 +199,9 @@ namespace OpenTK.Platform.X11 return keyboards[index].Name; } return String.Empty; - } + } } - #endregion - - #region IMouseDriver2 Members - MouseState IMouseDriver2.GetState() { lock (Sync) @@ -261,10 +253,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region Private Members - void UpdateDevices() { lock (Sync) @@ -308,7 +296,7 @@ namespace OpenTK.Platform.X11 { XIMouse d = new XIMouse(); d.DeviceInfo = *(list + i); - + d.State.SetIsConnected(d.DeviceInfo.enabled); d.Name = Marshal.PtrToStringAnsi(d.DeviceInfo.name); Debug.Print("Device {0} \"{1}\" is {2} and has:", @@ -642,10 +630,6 @@ namespace OpenTK.Platform.X11 } } - #endregion - - #region IDisposable Members - public void Dispose() { Dispose(true); @@ -665,8 +649,6 @@ namespace OpenTK.Platform.X11 { Dispose(false); } - - #endregion } } diff --git a/src/OpenTK/RewrittenAttribute.cs b/src/OpenTK/RewrittenAttribute.cs index d49f1992..8d2cf065 100644 --- a/src/OpenTK/RewrittenAttribute.cs +++ b/src/OpenTK/RewrittenAttribute.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/SlotAttribute.cs b/src/OpenTK/SlotAttribute.cs index 28fde6c3..795ad6dc 100644 --- a/src/OpenTK/SlotAttribute.cs +++ b/src/OpenTK/SlotAttribute.cs @@ -1,4 +1,3 @@ -#region License // // The Open Toolkit Library License // @@ -6,7 +5,7 @@ // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; diff --git a/src/OpenTK/Toolkit.cs b/src/OpenTK/Toolkit.cs index 0699d5b8..6743f4b7 100644 --- a/src/OpenTK/Toolkit.cs +++ b/src/OpenTK/Toolkit.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,8 +42,6 @@ namespace OpenTK volatile static bool initialized; static readonly object InitLock = new object(); - #region Constructors - Toolkit(Factory factory) { if (factory == null) @@ -53,10 +49,6 @@ namespace OpenTK platform_factory = factory; } - #endregion - - #region Public Members - /// /// Initializes OpenTK with default options. /// @@ -144,16 +136,8 @@ namespace OpenTK } } - #endregion - - #region Internal Members - internal static ToolkitOptions Options { get; private set; } - #endregion - - #region IDisposable Members - /// /// Disposes of the resources consumed by this instance. /// @@ -191,7 +175,5 @@ namespace OpenTK // as that will crash on many operating systems. } #endif - - #endregion } } diff --git a/src/OpenTK/ToolkitOptions.cs b/src/OpenTK/ToolkitOptions.cs index 5541a2bb..02bf3521 100644 --- a/src/OpenTK/ToolkitOptions.cs +++ b/src/OpenTK/ToolkitOptions.cs @@ -1,12 +1,11 @@ -#region License -// +// // The Open Toolkit Library License // // Copyright (c) 2006 - 2013 the Open Toolkit library. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights to +// in the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of // the Software, and to permit persons to whom the Software is furnished to do // so, subject to the following conditions: @@ -23,7 +22,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -#endregion using System; using System.Collections.Generic; @@ -44,7 +42,7 @@ namespace OpenTK /// Default = 0, /// - /// Prefer native OpenTK.Platform implementations. + /// Prefer native OpenTK.Platform implementations. /// Platform abstractions such as SDL will not be considered, /// even if available. Use this if you need support for multiple /// mice or keyboards. @@ -54,7 +52,7 @@ namespace OpenTK /// Prefer an X11 OpenTK.Platform implementation, /// even if a different implementation is available. This option /// allows you to use X11 on Windows or Mac OS X when an - /// X11 server is installed. + /// X11 server is installed. /// PreferX11 } diff --git a/src/OpenTK/WindowIcon.cs b/src/OpenTK/WindowIcon.cs index 53d2d1f8..07e4d44d 100644 --- a/src/OpenTK/WindowIcon.cs +++ b/src/OpenTK/WindowIcon.cs @@ -1,5 +1,4 @@ -#region License -// +// // WindowIcon.cs // // Author: @@ -25,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#endregion using System; using System.Runtime.InteropServices; diff --git a/src/OpenTK/WindowState.cs b/src/OpenTK/WindowState.cs index 64a72612..24045808 100644 --- a/src/OpenTK/WindowState.cs +++ b/src/OpenTK/WindowState.cs @@ -1,10 +1,8 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. +/* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. * See license.txt for licensing details. */ -#endregion using System; using System.Collections.Generic;