diff --git a/Source/Bind/Glu/Generator.cs b/Source/Bind/Glu/Generator.cs index ac5f9e1e..1c415b22 100644 --- a/Source/Bind/Glu/Generator.cs +++ b/Source/Bind/Glu/Generator.cs @@ -14,7 +14,7 @@ namespace Bind.Glu { class Generator : Bind.GL2.Generator { - string enumSpecAux = "GL2\\enum.spec"; + string enumSpecAux;// = "GL2\\enum.spec"; #region --- Constructors --- @@ -44,7 +44,7 @@ namespace Bind.Glu } else { - Settings.OutputNamespace = "OpenTK.OpenGL"; + //Settings.OutputNamespace = "OpenTK.Graphics.OpenGL"; } Settings.CompleteEnumName = "AllGlu"; diff --git a/Source/Bind/Main.cs b/Source/Bind/Main.cs index 6d7c849f..2beda870 100644 --- a/Source/Bind/Main.cs +++ b/Source/Bind/Main.cs @@ -180,8 +180,8 @@ namespace Bind Available switches: -in: Input directory (e.g. -in:../specs/) -out: Output directory (e.g. -out:out) --ns: Output namespace (e.g. -ns:OpenTK.OpenGL). - Default: OpenTK.OpenGL +-ns: Output namespace (e.g. -ns:OpenTK.Graphics.OpenGL). + Default: OpenTK.Graphics.OpenGL -namespace: Same as -ns -class: Output class (e.g. -class:GL3). Default: GL/Wgl/Glu/Glx (depends on -mode) @@ -193,7 +193,7 @@ Available switches: Generate all possible parameter permutations. -o:enums_in_class Place enums in a nested class (i.e. GL.Enums) - instead of a namespace (i.e. OpenTK.OpenGL.Enums) + instead of a namespace (i.e. OpenTK.Graphics.OpenGL.Enums) "); } } diff --git a/Source/Bind/Specifications/Glu/enumglu.spec b/Source/Bind/Specifications/Glu/enumglu.spec index 10cb2155..c0f163bf 100644 --- a/Source/Bind/Specifications/Glu/enumglu.spec +++ b/Source/Bind/Specifications/Glu/enumglu.spec @@ -226,7 +226,7 @@ TessContour enum: EXTERIOR = 100123 UNKNOWN = 100124 -TessProperty enum: +TessParameter enum: # TessProperty TESS_WINDING_RULE = 100140 TESS_BOUNDARY_ONLY = 100141 TESS_TOLERANCE = 100142 diff --git a/Source/Bind/Specifications/Glu/glu.spec b/Source/Bind/Specifications/Glu/glu.spec index 09ba1952..3c0d8fa3 100644 --- a/Source/Bind/Specifications/Glu/glu.spec +++ b/Source/Bind/Specifications/Glu/glu.spec @@ -185,7 +185,7 @@ GetNurbsProperty(nurb, property, data) GetTessProperty(tess, which, data) return void param tess TesselatorObj in value - param which TessProperty in value + param which TessParameter in value # TessProperty in value param data Float64Pointer out value LoadSamplingMatrices(nurb, model, perspective, view) @@ -401,7 +401,7 @@ TessNormal(tess, valueX, valueY, valueZ) TessProperty(tess, which, data) return void param tess TesselatorObj in value - param which TessProperty in value + param which TessParameter in value # TessProperty in value param data Float64 in value # Edited for OpenTK diff --git a/Source/Bind/Specifications/Glu/glu.tm b/Source/Bind/Specifications/Glu/glu.tm index 0cf5fe57..28e8c82e 100644 --- a/Source/Bind/Specifications/Glu/glu.tm +++ b/Source/Bind/Specifications/Glu/glu.tm @@ -14,11 +14,13 @@ Float64Pointer Float64Pointer Float32 Float32 Float32Pointer Float32Pointer SizeI GLsizei +Sizei GLsizei UInt8 GLubyte +Uint8 GLubyte # Enum types (find Tao-compatible solution!) TextureTarget TextureTarget PixelFormat PixelFormat PixelType PixelType MapTarget MapTarget -Boolean GLboolean \ No newline at end of file +Boolean GLboolean diff --git a/Source/Bind/Structures/Enum.cs b/Source/Bind/Structures/Enum.cs index a0b393c4..d44c4306 100644 --- a/Source/Bind/Structures/Enum.cs +++ b/Source/Bind/Structures/Enum.cs @@ -28,10 +28,11 @@ namespace Bind.Structures { Initialize(enumFile, enumextFile); - using (System.IO.StreamReader sr = new System.IO.StreamReader(Path.Combine(Settings.InputPath, auxFile))) - { - AuxEnums = Bind.MainClass.Generator.ReadEnums(sr); - } + if (!String.IsNullOrEmpty(auxFile)) + using (System.IO.StreamReader sr = new System.IO.StreamReader(Path.Combine(Settings.InputPath, auxFile))) + { + AuxEnums = Bind.MainClass.Generator.ReadEnums(sr); + } } internal static void Initialize(string enumFile, string enumextFile) @@ -96,6 +97,9 @@ namespace Bind.Structures public static string TranslateName(string name) { + if (Utilities.Keywords.Contains(name)) + return name; + translator.Remove(0, translator.Length); // Trick to avoid allocating a new StringBuilder. // Translate the constant's name to match .Net naming conventions diff --git a/Source/Bind/Structures/Type.cs b/Source/Bind/Structures/Type.cs index ae2531be..2df6c6ab 100644 --- a/Source/Bind/Structures/Type.cs +++ b/Source/Bind/Structures/Type.cs @@ -183,7 +183,7 @@ namespace Bind.Structures #endregion - #region WrapperType property + #region public WrapperTypes WrapperType private WrapperTypes _wrapper_type = WrapperTypes.None; @@ -268,10 +268,12 @@ namespace Bind.Structures Enum @enum; string s; - if (this.CurrentType == "BlendEquationModeEXT") + if (this.CurrentType == "SGIS_texture_filter4") { } + this.CurrentType = Enum.TranslateName(CurrentType); + // Try to find out if it is an enum. If the type exists in the normal GLEnums list, use this. // Otherwise, try to find it in the aux enums list. If it exists in neither, it is not an enum. // Special case for Boolean - it is an enum, but it is dumb to use that instead of the 'bool' type. @@ -289,9 +291,9 @@ namespace Bind.Structures else { if (normal) - CurrentType = Enum.TranslateName(CurrentType).Insert(0, String.Format("{0}.", Settings.EnumsOutput)); + CurrentType = CurrentType.Insert(0, String.Format("{0}.", Settings.EnumsOutput)); else if (aux) - CurrentType = Enum.TranslateName(CurrentType).Insert(0, String.Format("{0}.", Settings.EnumsAuxOutput)); + CurrentType = CurrentType.Insert(0, String.Format("{0}.", Settings.EnumsAuxOutput)); } } else if (Bind.Structures.Type.GLTypes.TryGetValue(CurrentType, out s)) diff --git a/Source/Examples/OpenGL/GluTessellation.cs b/Source/Examples/OpenGL/GluTessellation.cs index 877ba491..be089997 100644 --- a/Source/Examples/OpenGL/GluTessellation.cs +++ b/Source/Examples/OpenGL/GluTessellation.cs @@ -8,8 +8,8 @@ using System; using System.Diagnostics; using OpenTK; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.OpenAL; using OpenTK.OpenAL.Enums; using OpenTK.Audio; diff --git a/Source/Examples/Tests/S01_Call_Performance.cs b/Source/Examples/Tests/S01_Call_Performance.cs index ebfb8145..90d384b1 100644 --- a/Source/Examples/Tests/S01_Call_Performance.cs +++ b/Source/Examples/Tests/S01_Call_Performance.cs @@ -12,8 +12,8 @@ using System.Diagnostics; using System.Windows.Forms; using System.Security; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.Graphics; namespace Examples.Tests @@ -69,9 +69,9 @@ namespace Examples.Tests #endregion - #region OpenTK.OpenGL + #region OpenTK.Graphics.OpenGL - Trace.Write("Timing OpenTK.OpenGL core functions: "); + Trace.Write("Timing OpenTK.Graphics.OpenGL core functions: "); timer.Start(); for (int i = 0; ++i < num_calls; ) { @@ -81,7 +81,7 @@ namespace Examples.Tests Trace.WriteLine(String.Format("{0} ns", timer.Elapsed.TotalMilliseconds * (1000000.0 / (double)num_calls))); timer.Reset(); - Trace.Write("Timing OpenTK.OpenGL core functions (array): "); + Trace.Write("Timing OpenTK.Graphics.OpenGL core functions (array): "); timer.Start(); for (int i = 0; ++i < num_calls; ) { @@ -91,7 +91,7 @@ namespace Examples.Tests Trace.WriteLine(String.Format("{0} ns", timer.Elapsed.TotalMilliseconds * (1000000.0 / (double)num_calls))); timer.Reset(); - Trace.Write("Timing OpenTK.OpenGL core functions (void*): "); + Trace.Write("Timing OpenTK.Graphics.OpenGL core functions (void*): "); timer.Start(); for (int i = 0; ++i < num_calls; ) GL.CallLists(v.Length, ListNameType.Float, v); @@ -99,7 +99,7 @@ namespace Examples.Tests Trace.WriteLine(String.Format("{0} ns", timer.Elapsed.TotalMilliseconds * (1000000.0 / (double)num_calls))); timer.Reset(); - Trace.Write("Timing OpenTK.OpenGL extension functions: "); + Trace.Write("Timing OpenTK.Graphics.OpenGL extension functions: "); timer.Start(); for (int i = 0; ++i < num_calls; ) GL.ActiveTexture(TextureUnit.Texture0); diff --git a/Source/Examples/Tutorial/Fonts.cs b/Source/Examples/Tutorial/Fonts.cs index 62f602c7..dd783393 100644 --- a/Source/Examples/Tutorial/Fonts.cs +++ b/Source/Examples/Tutorial/Fonts.cs @@ -11,10 +11,10 @@ using System.Drawing; using OpenTK; using OpenTK.Fonts; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Input; using System.IO; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.Math; namespace Examples.Tutorial diff --git a/Source/Examples/Tutorial/T01_Simple_Window.cs b/Source/Examples/Tutorial/T01_Simple_Window.cs index 3bcad12e..b78e2913 100644 --- a/Source/Examples/Tutorial/T01_Simple_Window.cs +++ b/Source/Examples/Tutorial/T01_Simple_Window.cs @@ -11,9 +11,9 @@ using System.Drawing; using System.Diagnostics; using OpenTK; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Fonts; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.Input; namespace Examples.Tutorial diff --git a/Source/Examples/Tutorial/T02_Vertex_Arrays.cs b/Source/Examples/Tutorial/T02_Vertex_Arrays.cs index a70a40ef..94e245ca 100644 --- a/Source/Examples/Tutorial/T02_Vertex_Arrays.cs +++ b/Source/Examples/Tutorial/T02_Vertex_Arrays.cs @@ -11,11 +11,11 @@ using System.Drawing; using System.Threading; using OpenTK; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using System.Diagnostics; using OpenTK.Input; using OpenTK.Fonts; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; namespace Examples.Tutorial { diff --git a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs index eb26ad76..9303688e 100644 --- a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs +++ b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs @@ -13,8 +13,8 @@ using System.Threading; using System.Drawing; using OpenTK; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.Platform; #endregion diff --git a/Source/Examples/Tutorial/T04_Vertex_Lighting.cs b/Source/Examples/Tutorial/T04_Vertex_Lighting.cs index 23527d05..0d9c0bb5 100644 --- a/Source/Examples/Tutorial/T04_Vertex_Lighting.cs +++ b/Source/Examples/Tutorial/T04_Vertex_Lighting.cs @@ -10,9 +10,9 @@ using System.Text; using System.Drawing; using OpenTK; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using Examples.Shapes; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; namespace Examples.Tutorial { diff --git a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs index c49343ff..8edbcf46 100644 --- a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs +++ b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs @@ -16,8 +16,8 @@ using System.Windows.Forms; using System.Threading; using OpenTK; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; #endregion --- Using Directives --- diff --git a/Source/Examples/Tutorial/T08_VBO.cs b/Source/Examples/Tutorial/T08_VBO.cs index 647741d3..43e7d9c7 100644 --- a/Source/Examples/Tutorial/T08_VBO.cs +++ b/Source/Examples/Tutorial/T08_VBO.cs @@ -11,10 +11,10 @@ using System.Collections.Generic; using System.Text; using OpenTK; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Platform; using System.Threading; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; using System.Runtime.InteropServices; using OpenTK.Math; diff --git a/Source/Examples/Tutorial/T10_GLSL_Cube.cs b/Source/Examples/Tutorial/T10_GLSL_Cube.cs index 4e0cd67d..0641b9ba 100644 --- a/Source/Examples/Tutorial/T10_GLSL_Cube.cs +++ b/Source/Examples/Tutorial/T10_GLSL_Cube.cs @@ -14,11 +14,11 @@ using System.Text; using System.Windows.Forms; using System.Threading; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK; using System.Diagnostics; using System.IO; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; #endregion --- Using Directives --- diff --git a/Source/Examples/Tutorial/Text.cs b/Source/Examples/Tutorial/Text.cs index 502de8dc..e933cd49 100644 --- a/Source/Examples/Tutorial/Text.cs +++ b/Source/Examples/Tutorial/Text.cs @@ -12,9 +12,9 @@ using System.Drawing; using OpenTK; using OpenTK.Fonts; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Input; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; using System.Diagnostics; namespace Examples.Tutorial diff --git a/Source/Examples/Tutorial/Textures.cs b/Source/Examples/Tutorial/Textures.cs index bb590573..2a029b25 100644 --- a/Source/Examples/Tutorial/Textures.cs +++ b/Source/Examples/Tutorial/Textures.cs @@ -14,12 +14,14 @@ using System.Drawing; using System.Drawing.Imaging; using OpenTK; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Fonts; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; namespace Examples.Tutorial { + using PixelFormat = OpenTK.Graphics.OpenGL.PixelFormat; + /// /// Demonstrates simple OpenGL Texturing. /// @@ -51,7 +53,7 @@ namespace Examples.Tutorial ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, data.Width, data.Height, 0, - OpenTK.OpenGL.Enums.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0); + PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0); bitmap.UnlockBits(data); diff --git a/Source/Examples/WinForms/DerivedGLControl.cs b/Source/Examples/WinForms/DerivedGLControl.cs index 3f5ac3c5..5bcd33e1 100644 --- a/Source/Examples/WinForms/DerivedGLControl.cs +++ b/Source/Examples/WinForms/DerivedGLControl.cs @@ -7,8 +7,8 @@ using System.Text; using System.Windows.Forms; using OpenTK; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; namespace Examples.WinForms { diff --git a/Source/Examples/WinForms/W01_First_Window.cs b/Source/Examples/WinForms/W01_First_Window.cs index 6c9276cd..d2697875 100644 --- a/Source/Examples/WinForms/W01_First_Window.cs +++ b/Source/Examples/WinForms/W01_First_Window.cs @@ -15,8 +15,8 @@ using System.Text; using System.Windows.Forms; using OpenTK; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; #endregion diff --git a/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs b/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs index 17aa8784..1ac5c5a1 100644 --- a/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs +++ b/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs @@ -15,11 +15,11 @@ using System.Text; using System.Windows.Forms; using System.Diagnostics; -using OpenTK.OpenGL; -//using Enums = OpenTK.OpenGL.GL.Enums; +using OpenTK.Graphics.OpenGL; +//using Enums = OpenTK.Graphics.OpenGL.GL.Enums; using OpenTK.Platform; using System.Threading; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL.Enums; #endregion diff --git a/Source/Examples/WinForms/W03_Extensions.cs b/Source/Examples/WinForms/W03_Extensions.cs index 51025780..b1b8d849 100644 --- a/Source/Examples/WinForms/W03_Extensions.cs +++ b/Source/Examples/WinForms/W03_Extensions.cs @@ -15,8 +15,8 @@ using System.Threading; using System.Reflection; using OpenTK; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.Graphics; namespace Examples.WinForms diff --git a/Source/Examples/WinForms/W04_Multiple_GLControls.cs b/Source/Examples/WinForms/W04_Multiple_GLControls.cs index 23ad1ba9..f966149b 100644 --- a/Source/Examples/WinForms/W04_Multiple_GLControls.cs +++ b/Source/Examples/WinForms/W04_Multiple_GLControls.cs @@ -7,7 +7,7 @@ using System.Text; using System.Windows.Forms; using OpenTK; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; namespace Examples.WinForms { diff --git a/Source/OpenTK/Fonts/DisplayListTextHandle.cs b/Source/OpenTK/Fonts/DisplayListTextHandle.cs index 9a36973f..01717a16 100644 --- a/Source/OpenTK/Fonts/DisplayListTextHandle.cs +++ b/Source/OpenTK/Fonts/DisplayListTextHandle.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Text; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; namespace OpenTK.Fonts { diff --git a/Source/OpenTK/Fonts/DisplayListTextPrinter.cs b/Source/OpenTK/Fonts/DisplayListTextPrinter.cs index 17ebbf96..9e8951ff 100644 --- a/Source/OpenTK/Fonts/DisplayListTextPrinter.cs +++ b/Source/OpenTK/Fonts/DisplayListTextPrinter.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; using System.Text; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; namespace OpenTK.Fonts { @@ -23,8 +23,8 @@ namespace OpenTK.Fonts { DisplayListTextHandle handle = new DisplayListTextHandle(GL.GenLists(1)); - GL.NewList(handle.Handle, OpenTK.OpenGL.Enums.ListMode.Compile); - GL.Begin(OpenTK.OpenGL.Enums.BeginMode.Triangles); + GL.NewList(handle.Handle, ListMode.Compile); + GL.Begin(BeginMode.Triangles); for (int i = 0; i < index_count; i++) //foreach (ushort index in indices) diff --git a/Source/OpenTK/Fonts/TextPrinter.cs b/Source/OpenTK/Fonts/TextPrinter.cs index fa729fce..64cc437d 100644 --- a/Source/OpenTK/Fonts/TextPrinter.cs +++ b/Source/OpenTK/Fonts/TextPrinter.cs @@ -12,8 +12,8 @@ using System.Text.RegularExpressions; using System.Runtime.InteropServices; using OpenTK.Math; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; using System.Diagnostics; namespace OpenTK.Fonts diff --git a/Source/OpenTK/Fonts/TextureFont.cs b/Source/OpenTK/Fonts/TextureFont.cs index ef8fc9ad..8b38e69c 100644 --- a/Source/OpenTK/Fonts/TextureFont.cs +++ b/Source/OpenTK/Fonts/TextureFont.cs @@ -14,13 +14,14 @@ using System.Runtime.InteropServices; using System.Diagnostics; using OpenTK.Math; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.Platform; namespace OpenTK.Fonts { using Graphics = System.Drawing.Graphics; + using PixelFormat = OpenTK.Graphics.OpenGL.PixelFormat; public class TextureFont : IFont { @@ -96,7 +97,7 @@ namespace OpenTK.Fonts GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)All.Linear); GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Alpha, texture_width, texture_height, 0, - OpenTK.OpenGL.Enums.PixelFormat.Rgba, PixelType.UnsignedByte, IntPtr.Zero); + PixelFormat.Rgba, PixelType.UnsignedByte, IntPtr.Zero); } #endregion @@ -168,7 +169,7 @@ namespace OpenTK.Fonts //BitmapData bitmap_data = bitmap.LockBits(new Rectangle(0, 0, rect.Width, rect.Height), ImageLockMode.ReadOnly, // System.Drawing.Imaging.PixelFormat.Format32bppArgb); //GL.TexSubImage2D(TextureTarget.Texture2D, 0, rect.Left, rect.Top, rect.Width, rect.Height, - // OpenTK.OpenGL.Enums.PixelFormat.Rgba, PixelType.UnsignedByte, bitmap_data.Scan0); + // OpenTK.Graphics.OpenGL.Enums.PixelFormat.Rgba, PixelType.UnsignedByte, bitmap_data.Scan0); //bitmap.UnlockBits(bitmap_data); BitmapData bitmap_data = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, @@ -190,7 +191,7 @@ namespace OpenTK.Fonts fixed (int* data_ptr = data) GL.TexSubImage2D(TextureTarget.Texture2D, 0, rect.Left, rect.Top, rect.Width, rect.Height, - OpenTK.OpenGL.Enums.PixelFormat.Rgba, PixelType.UnsignedByte, (IntPtr)data_ptr); + PixelFormat.Rgba, PixelType.UnsignedByte, (IntPtr)data_ptr); } bmp.UnlockBits(bitmap_data); @@ -279,12 +280,28 @@ namespace OpenTK.Fonts /// The measured height. public void MeasureString(string str, out float width, out float height) { - System.Drawing.SizeF size = gfx.MeasureString(str, font, 16384, System.Drawing.StringFormat.GenericTypographic); - if (size.Width == 0) - width = font.SizeInPoints * 0.5f; - else - width = size.Width; - height = size.Height; + //System.Drawing.SizeF size = gfx.MeasureString(str, font, 16384, System.Drawing.StringFormat.GenericTypographic); + //height = size.Height; + + //if (size.Width == 0) + // width = font.SizeInPoints * 0.5f; + //else + // width = size.Width; + + width = 0; + height = 0; + int i = 0; + foreach (char c in str) + { + if (c != '\n' && c != '\r') + { + SizeF size = gfx.MeasureString(str.Substring(i, 1), font, 16384, System.Drawing.StringFormat.GenericTypographic); + width += size.Width == 0 ? font.SizeInPoints * 0.5f : size.Width; + if (height < size.Height) + height = size.Height; + } + ++i; + } } #endregion diff --git a/Source/OpenTK/Fonts/VboTextPrinter.cs b/Source/OpenTK/Fonts/VboTextPrinter.cs index e1f7b46a..96ce695f 100644 --- a/Source/OpenTK/Fonts/VboTextPrinter.cs +++ b/Source/OpenTK/Fonts/VboTextPrinter.cs @@ -9,9 +9,8 @@ using System.Collections.Generic; using System.Text; using System.Runtime.InteropServices; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Math; -using OpenTK.OpenGL.Enums; namespace OpenTK.Fonts { diff --git a/Source/OpenTK/GameWindow.cs b/Source/OpenTK/GameWindow.cs index 54fc6658..76d597eb 100644 --- a/Source/OpenTK/GameWindow.cs +++ b/Source/OpenTK/GameWindow.cs @@ -14,8 +14,8 @@ using System.Threading; using OpenTK.Platform; using OpenTK.Input; -using OpenTK.OpenGL; -using OpenTK.OpenGL.Enums; +using OpenTK.Graphics.OpenGL; +using OpenTK.Graphics.OpenGL.Enums; using OpenTK.Graphics; namespace OpenTK @@ -715,7 +715,7 @@ namespace OpenTK /// Gets a value indicating whether the shutdown sequence has been initiated /// for this window, by calling GameWindow.Exit() or hitting the 'close' button. /// If this property is true, it is no longer safe to use any OpenTK.Input or - /// OpenTK.OpenGL functions or properties. + /// OpenTK.Graphics.OpenGL functions or properties. /// public bool IsExiting { diff --git a/Source/OpenTK/Graphics/DisplayDevice.cs b/Source/OpenTK/Graphics/DisplayDevice.cs index 6b90dc30..0ae1cb3c 100644 --- a/Source/OpenTK/Graphics/DisplayDevice.cs +++ b/Source/OpenTK/Graphics/DisplayDevice.cs @@ -341,8 +341,8 @@ namespace OpenTK.Graphics void MoveToStartPositions() { int count = 0; - foreach (Screen s in Screen.AllScreens) - forms[count++].Location = new System.Drawing.Point(s.Bounds.X, s.Bounds.Y); + //foreach (Screen s in Screen.AllScreens) + // forms[count++].Location = new System.Drawing.Point(s.Bounds.X, s.Bounds.Y); } bool FadedOut diff --git a/Source/OpenTK/Graphics/OpenGL/GL/GLHelper.cs b/Source/OpenTK/Graphics/OpenGL/GL/GLHelper.cs index 6ac42c82..3207c8be 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL/GLHelper.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL/GLHelper.cs @@ -20,6 +20,12 @@ using OpenTK.Math; #endregion +// Add a dummy namespace to keep old code compiling. +namespace OpenTK.Graphics.OpenGL.Enums +{ + internal static class Dummy { } +} + namespace OpenTK.Graphics.OpenGL { /// @@ -754,7 +760,7 @@ namespace OpenTK.Graphics.OpenGL /// Helper function that defines the coordinate origin of the Point Sprite. /// /// - /// A OpenTK.OpenGL.GL.PointSpriteCoordOriginParameter token, + /// A OpenTK.Graphics.OpenGL.GL.PointSpriteCoordOriginParameter token, /// denoting the origin of the Point Sprite. /// public static void PointParameter(PointSpriteCoordOriginParameter param) diff --git a/Source/OpenTK/Graphics/OpenGL/Glu/Glu.cs b/Source/OpenTK/Graphics/OpenGL/Glu/Glu.cs index de74b65e..87933ef2 100644 --- a/Source/OpenTK/Graphics/OpenGL/Glu/Glu.cs +++ b/Source/OpenTK/Graphics/OpenGL/Glu/Glu.cs @@ -1,4 +1,4 @@ -namespace OpenTK.OpenGL +namespace OpenTK.Graphics.OpenGL { using System; using System.Runtime.InteropServices; @@ -33,23 +33,23 @@ namespace OpenTK.OpenGL } public static - Int32 Build1DMipmapLevel(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data) + Int32 Build1DMipmapLevel(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data) { unsafe { - return Delegates.gluBuild1DMipmapLevels((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data); + return Delegates.gluBuild1DMipmapLevels((TextureTarget)target, (Int32)internalFormat, (Int32)width, (PixelFormat)format, (PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data); } } public static - Int32 Build1DMipmapLevel(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, [In, Out] object data) + Int32 Build1DMipmapLevel(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, [In, Out] object data) { unsafe { System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - return Delegates.gluBuild1DMipmapLevels((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data_ptr.AddrOfPinnedObject()); + return Delegates.gluBuild1DMipmapLevels((TextureTarget)target, (Int32)internalFormat, (Int32)width, (PixelFormat)format, (PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { @@ -59,23 +59,23 @@ namespace OpenTK.OpenGL } public static - Int32 Build1DMipmap(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data) + Int32 Build1DMipmap(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, IntPtr data) { unsafe { - return Delegates.gluBuild1DMipmaps((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (IntPtr)data); + return Delegates.gluBuild1DMipmaps((TextureTarget)target, (Int32)internalFormat, (Int32)width, (PixelFormat)format, (PixelType)type, (IntPtr)data); } } public static - Int32 Build1DMipmap(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, [In, Out] object data) + Int32 Build1DMipmap(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, [In, Out] object data) { unsafe { System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - return Delegates.gluBuild1DMipmaps((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject()); + return Delegates.gluBuild1DMipmaps((TextureTarget)target, (Int32)internalFormat, (Int32)width, (PixelFormat)format, (PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { @@ -85,23 +85,23 @@ namespace OpenTK.OpenGL } public static - Int32 Build2DMipmapLevel(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data) + Int32 Build2DMipmapLevel(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data) { unsafe { - return Delegates.gluBuild2DMipmapLevels((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data); + return Delegates.gluBuild2DMipmapLevels((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (PixelFormat)format, (PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data); } } public static - Int32 Build2DMipmapLevel(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, [In, Out] object data) + Int32 Build2DMipmapLevel(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, [In, Out] object data) { unsafe { System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - return Delegates.gluBuild2DMipmapLevels((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data_ptr.AddrOfPinnedObject()); + return Delegates.gluBuild2DMipmapLevels((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (PixelFormat)format, (PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { @@ -111,23 +111,23 @@ namespace OpenTK.OpenGL } public static - Int32 Build2DMipmap(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data) + Int32 Build2DMipmap(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, IntPtr data) { unsafe { - return Delegates.gluBuild2DMipmaps((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (IntPtr)data); + return Delegates.gluBuild2DMipmaps((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (PixelFormat)format, (PixelType)type, (IntPtr)data); } } public static - Int32 Build2DMipmap(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, [In, Out] object data) + Int32 Build2DMipmap(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, [In, Out] object data) { unsafe { System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - return Delegates.gluBuild2DMipmaps((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject()); + return Delegates.gluBuild2DMipmaps((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (PixelFormat)format, (PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { @@ -137,23 +137,23 @@ namespace OpenTK.OpenGL } public static - Int32 Build3DMipmapLevel(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data) + Int32 Build3DMipmapLevel(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data) { unsafe { - return Delegates.gluBuild3DMipmapLevels((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data); + return Delegates.gluBuild3DMipmapLevels((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (PixelFormat)format, (PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data); } } public static - Int32 Build3DMipmapLevel(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, [In, Out] object data) + Int32 Build3DMipmapLevel(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, [In, Out] object data) { unsafe { System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - return Delegates.gluBuild3DMipmapLevels((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data_ptr.AddrOfPinnedObject()); + return Delegates.gluBuild3DMipmapLevels((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (PixelFormat)format, (PixelType)type, (Int32)level, (Int32)@base, (Int32)max, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { @@ -163,23 +163,23 @@ namespace OpenTK.OpenGL } public static - Int32 Build3DMipmap(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data) + Int32 Build3DMipmap(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, IntPtr data) { unsafe { - return Delegates.gluBuild3DMipmaps((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (IntPtr)data); + return Delegates.gluBuild3DMipmaps((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (PixelFormat)format, (PixelType)type, (IntPtr)data); } } public static - Int32 Build3DMipmap(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, [In, Out] object data) + Int32 Build3DMipmap(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, [In, Out] object data) { unsafe { System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - return Delegates.gluBuild3DMipmaps((OpenTK.OpenGL.Enums.TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.OpenGL.Enums.PixelFormat)format, (OpenTK.OpenGL.Enums.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject()); + return Delegates.gluBuild3DMipmaps((TextureTarget)target, (Int32)internalFormat, (Int32)width, (Int32)height, (Int32)depth, (PixelFormat)format, (PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { @@ -276,43 +276,43 @@ namespace OpenTK.OpenGL } public static - string ErrorString(OpenTK.OpenGL.Enums.GluErrorCode error) + string ErrorString(OpenTK.Graphics.OpenGL.GluErrorCode error) { unsafe { - return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.gluErrorString((OpenTK.OpenGL.Enums.GluErrorCode)error)); + return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.gluErrorString((OpenTK.Graphics.OpenGL.GluErrorCode)error)); } } public static - string GetString(OpenTK.OpenGL.Enums.GluStringName name) + string GetString(OpenTK.Graphics.OpenGL.GluStringName name) { unsafe { - return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.gluGetString((OpenTK.OpenGL.Enums.GluStringName)name)); + return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.gluGetString((OpenTK.Graphics.OpenGL.GluStringName)name)); } } public static - void GetNurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, [Out] float[] data) + void GetNurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, [Out] float[] data) { unsafe { fixed (float* data_ptr = data) { - Delegates.gluGetNurbsProperty((IntPtr)nurb, (OpenTK.OpenGL.Enums.NurbsProperty)property, (float*)data_ptr); + Delegates.gluGetNurbsProperty((IntPtr)nurb, (OpenTK.Graphics.OpenGL.NurbsProperty)property, (float*)data_ptr); } } } public static - void GetNurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, [Out] out float data) + void GetNurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, [Out] out float data) { unsafe { fixed (float* data_ptr = &data) { - Delegates.gluGetNurbsProperty((IntPtr)nurb, (OpenTK.OpenGL.Enums.NurbsProperty)property, (float*)data_ptr); + Delegates.gluGetNurbsProperty((IntPtr)nurb, (OpenTK.Graphics.OpenGL.NurbsProperty)property, (float*)data_ptr); data = *data_ptr; } } @@ -320,31 +320,31 @@ namespace OpenTK.OpenGL [System.CLSCompliant(false)] public static - unsafe void GetNurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, [Out] float* data) + unsafe void GetNurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, [Out] float* data) { - Delegates.gluGetNurbsProperty((IntPtr)nurb, (OpenTK.OpenGL.Enums.NurbsProperty)property, (float*)data); + Delegates.gluGetNurbsProperty((IntPtr)nurb, (OpenTK.Graphics.OpenGL.NurbsProperty)property, (float*)data); } public static - void GetTessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, [Out] double[] data) + void GetTessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, [Out] double[] data) { unsafe { fixed (double* data_ptr = data) { - Delegates.gluGetTessProperty((IntPtr)tess, (OpenTK.OpenGL.Enums.TessProperty)which, (double*)data_ptr); + Delegates.gluGetTessProperty((IntPtr)tess, (OpenTK.Graphics.OpenGL.TessParameter)which, (double*)data_ptr); } } } public static - void GetTessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, [Out] out double data) + void GetTessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, [Out] out double data) { unsafe { fixed (double* data_ptr = &data) { - Delegates.gluGetTessProperty((IntPtr)tess, (OpenTK.OpenGL.Enums.TessProperty)which, (double*)data_ptr); + Delegates.gluGetTessProperty((IntPtr)tess, (OpenTK.Graphics.OpenGL.TessParameter)which, (double*)data_ptr); data = *data_ptr; } } @@ -352,9 +352,9 @@ namespace OpenTK.OpenGL [System.CLSCompliant(false)] public static - unsafe void GetTessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, [Out] double* data) + unsafe void GetTessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, [Out] double* data) { - Delegates.gluGetTessProperty((IntPtr)tess, (OpenTK.OpenGL.Enums.TessProperty)which, (double*)data); + Delegates.gluGetTessProperty((IntPtr)tess, (OpenTK.Graphics.OpenGL.TessParameter)which, (double*)data); } public static @@ -417,15 +417,15 @@ namespace OpenTK.OpenGL } public static - void NextContour(IntPtr tess, OpenTK.OpenGL.Enums.TessContour type) + void NextContour(IntPtr tess, OpenTK.Graphics.OpenGL.TessContour type) { - Delegates.gluNextContour((IntPtr)tess, (OpenTK.OpenGL.Enums.TessContour)type); + Delegates.gluNextContour((IntPtr)tess, (OpenTK.Graphics.OpenGL.TessContour)type); } public static - void NurbsCallback(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsCallback which, Delegate CallBackFunc) + void NurbsCallback(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsCallback which, Delegate CallBackFunc) { - Delegates.gluNurbsCallback((IntPtr)nurb, (OpenTK.OpenGL.Enums.NurbsCallback)which, (Delegate)CallBackFunc); + Delegates.gluNurbsCallback((IntPtr)nurb, (OpenTK.Graphics.OpenGL.NurbsCallback)which, (Delegate)CallBackFunc); } public static @@ -455,27 +455,27 @@ namespace OpenTK.OpenGL } public static - void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float[] knots, Int32 stride, [Out] float[] control, Int32 order, OpenTK.OpenGL.Enums.MapTarget type) + void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float[] knots, Int32 stride, [Out] float[] control, Int32 order, MapTarget type) { unsafe { fixed (float* knots_ptr = knots) fixed (float* control_ptr = control) { - Delegates.gluNurbsCurve((IntPtr)nurb, (Int32)knotCount, (float*)knots_ptr, (Int32)stride, (float*)control_ptr, (Int32)order, (OpenTK.OpenGL.Enums.MapTarget)type); + Delegates.gluNurbsCurve((IntPtr)nurb, (Int32)knotCount, (float*)knots_ptr, (Int32)stride, (float*)control_ptr, (Int32)order, (MapTarget)type); } } } public static - void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] out float knots, Int32 stride, [Out] out float control, Int32 order, OpenTK.OpenGL.Enums.MapTarget type) + void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] out float knots, Int32 stride, [Out] out float control, Int32 order, MapTarget type) { unsafe { fixed (float* knots_ptr = &knots) fixed (float* control_ptr = &control) { - Delegates.gluNurbsCurve((IntPtr)nurb, (Int32)knotCount, (float*)knots_ptr, (Int32)stride, (float*)control_ptr, (Int32)order, (OpenTK.OpenGL.Enums.MapTarget)type); + Delegates.gluNurbsCurve((IntPtr)nurb, (Int32)knotCount, (float*)knots_ptr, (Int32)stride, (float*)control_ptr, (Int32)order, (MapTarget)type); knots = *knots_ptr; control = *control_ptr; } @@ -484,19 +484,19 @@ namespace OpenTK.OpenGL [System.CLSCompliant(false)] public static - unsafe void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, OpenTK.OpenGL.Enums.MapTarget type) + unsafe void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, MapTarget type) { - Delegates.gluNurbsCurve((IntPtr)nurb, (Int32)knotCount, (float*)knots, (Int32)stride, (float*)control, (Int32)order, (OpenTK.OpenGL.Enums.MapTarget)type); + Delegates.gluNurbsCurve((IntPtr)nurb, (Int32)knotCount, (float*)knots, (Int32)stride, (float*)control, (Int32)order, (MapTarget)type); } public static - void NurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, float value) + void NurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, float value) { - Delegates.gluNurbsProperty((IntPtr)nurb, (OpenTK.OpenGL.Enums.NurbsProperty)property, (float)value); + Delegates.gluNurbsProperty((IntPtr)nurb, (OpenTK.Graphics.OpenGL.NurbsProperty)property, (float)value); } public static - void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float[] sKnots, Int32 tKnotCount, float[] tKnots, Int32 sStride, Int32 tStride, float[] control, Int32 sOrder, Int32 tOrder, OpenTK.OpenGL.Enums.MapTarget type) + void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float[] sKnots, Int32 tKnotCount, float[] tKnots, Int32 sStride, Int32 tStride, float[] control, Int32 sOrder, Int32 tOrder, MapTarget type) { unsafe { @@ -504,13 +504,13 @@ namespace OpenTK.OpenGL fixed (float* tKnots_ptr = tKnots) fixed (float* control_ptr = control) { - Delegates.gluNurbsSurface((IntPtr)nurb, (Int32)sKnotCount, (float*)sKnots_ptr, (Int32)tKnotCount, (float*)tKnots_ptr, (Int32)sStride, (Int32)tStride, (float*)control_ptr, (Int32)sOrder, (Int32)tOrder, (OpenTK.OpenGL.Enums.MapTarget)type); + Delegates.gluNurbsSurface((IntPtr)nurb, (Int32)sKnotCount, (float*)sKnots_ptr, (Int32)tKnotCount, (float*)tKnots_ptr, (Int32)sStride, (Int32)tStride, (float*)control_ptr, (Int32)sOrder, (Int32)tOrder, (MapTarget)type); } } } public static - void NurbsSurface(IntPtr nurb, Int32 sKnotCount, ref float sKnots, Int32 tKnotCount, ref float tKnots, Int32 sStride, Int32 tStride, ref float control, Int32 sOrder, Int32 tOrder, OpenTK.OpenGL.Enums.MapTarget type) + void NurbsSurface(IntPtr nurb, Int32 sKnotCount, ref float sKnots, Int32 tKnotCount, ref float tKnots, Int32 sStride, Int32 tStride, ref float control, Int32 sOrder, Int32 tOrder, MapTarget type) { unsafe { @@ -518,16 +518,16 @@ namespace OpenTK.OpenGL fixed (float* tKnots_ptr = &tKnots) fixed (float* control_ptr = &control) { - Delegates.gluNurbsSurface((IntPtr)nurb, (Int32)sKnotCount, (float*)sKnots_ptr, (Int32)tKnotCount, (float*)tKnots_ptr, (Int32)sStride, (Int32)tStride, (float*)control_ptr, (Int32)sOrder, (Int32)tOrder, (OpenTK.OpenGL.Enums.MapTarget)type); + Delegates.gluNurbsSurface((IntPtr)nurb, (Int32)sKnotCount, (float*)sKnots_ptr, (Int32)tKnotCount, (float*)tKnots_ptr, (Int32)sStride, (Int32)tStride, (float*)control_ptr, (Int32)sOrder, (Int32)tOrder, (MapTarget)type); } } } [System.CLSCompliant(false)] public static - unsafe void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float* sKnots, Int32 tKnotCount, float* tKnots, Int32 sStride, Int32 tStride, float* control, Int32 sOrder, Int32 tOrder, OpenTK.OpenGL.Enums.MapTarget type) + unsafe void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float* sKnots, Int32 tKnotCount, float* tKnots, Int32 sStride, Int32 tStride, float* control, Int32 sOrder, Int32 tOrder, MapTarget type) { - Delegates.gluNurbsSurface((IntPtr)nurb, (Int32)sKnotCount, (float*)sKnots, (Int32)tKnotCount, (float*)tKnots, (Int32)sStride, (Int32)tStride, (float*)control, (Int32)sOrder, (Int32)tOrder, (OpenTK.OpenGL.Enums.MapTarget)type); + Delegates.gluNurbsSurface((IntPtr)nurb, (Int32)sKnotCount, (float*)sKnots, (Int32)tKnotCount, (float*)tKnots, (Int32)sStride, (Int32)tStride, (float*)control, (Int32)sOrder, (Int32)tOrder, (MapTarget)type); } public static @@ -622,58 +622,58 @@ namespace OpenTK.OpenGL } public static - void PwlCurve(IntPtr nurb, Int32 count, float[] data, Int32 stride, OpenTK.OpenGL.Enums.NurbsTrim type) + void PwlCurve(IntPtr nurb, Int32 count, float[] data, Int32 stride, OpenTK.Graphics.OpenGL.NurbsTrim type) { unsafe { fixed (float* data_ptr = data) { - Delegates.gluPwlCurve((IntPtr)nurb, (Int32)count, (float*)data_ptr, (Int32)stride, (OpenTK.OpenGL.Enums.NurbsTrim)type); + Delegates.gluPwlCurve((IntPtr)nurb, (Int32)count, (float*)data_ptr, (Int32)stride, (OpenTK.Graphics.OpenGL.NurbsTrim)type); } } } public static - void PwlCurve(IntPtr nurb, Int32 count, ref float data, Int32 stride, OpenTK.OpenGL.Enums.NurbsTrim type) + void PwlCurve(IntPtr nurb, Int32 count, ref float data, Int32 stride, OpenTK.Graphics.OpenGL.NurbsTrim type) { unsafe { fixed (float* data_ptr = &data) { - Delegates.gluPwlCurve((IntPtr)nurb, (Int32)count, (float*)data_ptr, (Int32)stride, (OpenTK.OpenGL.Enums.NurbsTrim)type); + Delegates.gluPwlCurve((IntPtr)nurb, (Int32)count, (float*)data_ptr, (Int32)stride, (OpenTK.Graphics.OpenGL.NurbsTrim)type); } } } [System.CLSCompliant(false)] public static - unsafe void PwlCurve(IntPtr nurb, Int32 count, float* data, Int32 stride, OpenTK.OpenGL.Enums.NurbsTrim type) + unsafe void PwlCurve(IntPtr nurb, Int32 count, float* data, Int32 stride, OpenTK.Graphics.OpenGL.NurbsTrim type) { - Delegates.gluPwlCurve((IntPtr)nurb, (Int32)count, (float*)data, (Int32)stride, (OpenTK.OpenGL.Enums.NurbsTrim)type); + Delegates.gluPwlCurve((IntPtr)nurb, (Int32)count, (float*)data, (Int32)stride, (OpenTK.Graphics.OpenGL.NurbsTrim)type); } public static - void QuadricCallback(IntPtr quad, OpenTK.OpenGL.Enums.QuadricCallback which, Delegate CallBackFunc) + void QuadricCallback(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricCallback which, Delegate CallBackFunc) { - Delegates.gluQuadricCallback((IntPtr)quad, (OpenTK.OpenGL.Enums.QuadricCallback)which, (Delegate)CallBackFunc); + Delegates.gluQuadricCallback((IntPtr)quad, (OpenTK.Graphics.OpenGL.QuadricCallback)which, (Delegate)CallBackFunc); } public static - void QuadricDrawStyle(IntPtr quad, OpenTK.OpenGL.Enums.QuadricDrawStyle draw) + void QuadricDrawStyle(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricDrawStyle draw) { - Delegates.gluQuadricDrawStyle((IntPtr)quad, (OpenTK.OpenGL.Enums.QuadricDrawStyle)draw); + Delegates.gluQuadricDrawStyle((IntPtr)quad, (OpenTK.Graphics.OpenGL.QuadricDrawStyle)draw); } public static - void QuadricNormal(IntPtr quad, OpenTK.OpenGL.Enums.QuadricNormal normal) + void QuadricNormal(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricNormal normal) { - Delegates.gluQuadricNormals((IntPtr)quad, (OpenTK.OpenGL.Enums.QuadricNormal)normal); + Delegates.gluQuadricNormals((IntPtr)quad, (OpenTK.Graphics.OpenGL.QuadricNormal)normal); } public static - void QuadricOrientation(IntPtr quad, OpenTK.OpenGL.Enums.QuadricOrientation orientation) + void QuadricOrientation(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricOrientation orientation) { - Delegates.gluQuadricOrientation((IntPtr)quad, (OpenTK.OpenGL.Enums.QuadricOrientation)orientation); + Delegates.gluQuadricOrientation((IntPtr)quad, (OpenTK.Graphics.OpenGL.QuadricOrientation)orientation); } public static @@ -683,16 +683,16 @@ namespace OpenTK.OpenGL } public static - Int32 ScaleImage(OpenTK.OpenGL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, OpenTK.OpenGL.Enums.PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, OpenTK.OpenGL.Enums.PixelType typeOut, [Out] IntPtr dataOut) + Int32 ScaleImage(PixelFormat format, Int32 wIn, Int32 hIn, PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, PixelType typeOut, [Out] IntPtr dataOut) { unsafe { - return Delegates.gluScaleImage((OpenTK.OpenGL.Enums.PixelFormat)format, (Int32)wIn, (Int32)hIn, (OpenTK.OpenGL.Enums.PixelType)typeIn, (IntPtr)dataIn, (Int32)wOut, (Int32)hOut, (OpenTK.OpenGL.Enums.PixelType)typeOut, (IntPtr)dataOut); + return Delegates.gluScaleImage((PixelFormat)format, (Int32)wIn, (Int32)hIn, (PixelType)typeIn, (IntPtr)dataIn, (Int32)wOut, (Int32)hOut, (PixelType)typeOut, (IntPtr)dataOut); } } public static - Int32 ScaleImage(OpenTK.OpenGL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, OpenTK.OpenGL.Enums.PixelType typeIn, [In, Out] object dataIn, Int32 wOut, Int32 hOut, OpenTK.OpenGL.Enums.PixelType typeOut, [In, Out] object dataOut) + Int32 ScaleImage(PixelFormat format, Int32 wIn, Int32 hIn, PixelType typeIn, [In, Out] object dataIn, Int32 wOut, Int32 hOut, PixelType typeOut, [In, Out] object dataOut) { unsafe { @@ -700,7 +700,7 @@ namespace OpenTK.OpenGL System.Runtime.InteropServices.GCHandle dataOut_ptr = System.Runtime.InteropServices.GCHandle.Alloc(dataOut, System.Runtime.InteropServices.GCHandleType.Pinned); try { - return Delegates.gluScaleImage((OpenTK.OpenGL.Enums.PixelFormat)format, (Int32)wIn, (Int32)hIn, (OpenTK.OpenGL.Enums.PixelType)typeIn, (IntPtr)dataIn_ptr.AddrOfPinnedObject(), (Int32)wOut, (Int32)hOut, (OpenTK.OpenGL.Enums.PixelType)typeOut, (IntPtr)dataOut_ptr.AddrOfPinnedObject()); + return Delegates.gluScaleImage((PixelFormat)format, (Int32)wIn, (Int32)hIn, (PixelType)typeIn, (IntPtr)dataIn_ptr.AddrOfPinnedObject(), (Int32)wOut, (Int32)hOut, (PixelType)typeOut, (IntPtr)dataOut_ptr.AddrOfPinnedObject()); } finally { @@ -749,9 +749,9 @@ namespace OpenTK.OpenGL } public static - void TessCallback(IntPtr tess, OpenTK.OpenGL.Enums.TessCallback which, Delegate CallBackFunc) + void TessCallback(IntPtr tess, OpenTK.Graphics.OpenGL.TessCallback which, Delegate CallBackFunc) { - Delegates.gluTessCallback((IntPtr)tess, (OpenTK.OpenGL.Enums.TessCallback)which, (Delegate)CallBackFunc); + Delegates.gluTessCallback((IntPtr)tess, (OpenTK.Graphics.OpenGL.TessCallback)which, (Delegate)CallBackFunc); } public static @@ -773,9 +773,9 @@ namespace OpenTK.OpenGL } public static - void TessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, double data) + void TessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, double data) { - Delegates.gluTessProperty((IntPtr)tess, (OpenTK.OpenGL.Enums.TessProperty)which, (double)data); + Delegates.gluTessProperty((IntPtr)tess, (OpenTK.Graphics.OpenGL.TessParameter)which, (double)data); } public static @@ -981,27 +981,27 @@ namespace OpenTK.OpenGL public static partial class Sgi { public static - Int32 TexFilterFunc(OpenTK.OpenGL.Enums.TextureTarget target, OpenTK.OpenGL.Enums.SgisTextureFilter4 filtertype, float[] parms, Int32 n, [Out] float[] weights) + Int32 TexFilterFunc(TextureTarget target, SgisTextureFilter4 filtertype, float[] parms, Int32 n, [Out] float[] weights) { unsafe { fixed (float* parms_ptr = parms) fixed (float* weights_ptr = weights) { - return Delegates.gluTexFilterFuncSGI((OpenTK.OpenGL.Enums.TextureTarget)target, (OpenTK.OpenGL.Enums.SgisTextureFilter4)filtertype, (float*)parms_ptr, (Int32)n, (float*)weights_ptr); + return Delegates.gluTexFilterFuncSGI((TextureTarget)target, (SgisTextureFilter4)filtertype, (float*)parms_ptr, (Int32)n, (float*)weights_ptr); } } } public static - Int32 TexFilterFunc(OpenTK.OpenGL.Enums.TextureTarget target, OpenTK.OpenGL.Enums.SgisTextureFilter4 filtertype, ref float parms, Int32 n, [Out] out float weights) + Int32 TexFilterFunc(TextureTarget target, SgisTextureFilter4 filtertype, ref float parms, Int32 n, [Out] out float weights) { unsafe { fixed (float* parms_ptr = &parms) fixed (float* weights_ptr = &weights) { - Int32 retval = Delegates.gluTexFilterFuncSGI((OpenTK.OpenGL.Enums.TextureTarget)target, (OpenTK.OpenGL.Enums.SgisTextureFilter4)filtertype, (float*)parms_ptr, (Int32)n, (float*)weights_ptr); + Int32 retval = Delegates.gluTexFilterFuncSGI((TextureTarget)target, (SgisTextureFilter4)filtertype, (float*)parms_ptr, (Int32)n, (float*)weights_ptr); weights = *weights_ptr; return retval; } @@ -1010,9 +1010,9 @@ namespace OpenTK.OpenGL [System.CLSCompliant(false)] public static - unsafe Int32 TexFilterFunc(OpenTK.OpenGL.Enums.TextureTarget target, OpenTK.OpenGL.Enums.SgisTextureFilter4 filtertype, float* parms, Int32 n, [Out] float* weights) + unsafe Int32 TexFilterFunc(TextureTarget target, SgisTextureFilter4 filtertype, float* parms, Int32 n, [Out] float* weights) { - return Delegates.gluTexFilterFuncSGI((OpenTK.OpenGL.Enums.TextureTarget)target, (OpenTK.OpenGL.Enums.SgisTextureFilter4)filtertype, (float*)parms, (Int32)n, (float*)weights); + return Delegates.gluTexFilterFuncSGI((TextureTarget)target, (SgisTextureFilter4)filtertype, (float*)parms, (Int32)n, (float*)weights); } } diff --git a/Source/OpenTK/Graphics/OpenGL/Glu/GluCore.cs b/Source/OpenTK/Graphics/OpenGL/Glu/GluCore.cs index bca33d3d..2f27f1e9 100644 --- a/Source/OpenTK/Graphics/OpenGL/Glu/GluCore.cs +++ b/Source/OpenTK/Graphics/OpenGL/Glu/GluCore.cs @@ -1,4 +1,4 @@ -namespace OpenTK.OpenGL +namespace OpenTK.Graphics.OpenGL { using System; using System.Runtime.InteropServices; @@ -25,22 +25,22 @@ namespace OpenTK.OpenGL internal extern static void BeginTrim(IntPtr nurb); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild1DMipmapLevels", ExactSpelling = true)] - internal extern static Int32 Build1DMipmapLevels(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); + internal extern static Int32 Build1DMipmapLevels(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild1DMipmaps", ExactSpelling = true)] - internal extern static Int32 Build1DMipmaps(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data); + internal extern static Int32 Build1DMipmaps(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, IntPtr data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild2DMipmapLevels", ExactSpelling = true)] - internal extern static Int32 Build2DMipmapLevels(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); + internal extern static Int32 Build2DMipmapLevels(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild2DMipmaps", ExactSpelling = true)] - internal extern static Int32 Build2DMipmaps(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data); + internal extern static Int32 Build2DMipmaps(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, IntPtr data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild3DMipmapLevels", ExactSpelling = true)] - internal extern static Int32 Build3DMipmapLevels(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); + internal extern static Int32 Build3DMipmapLevels(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild3DMipmaps", ExactSpelling = true)] - internal extern static Int32 Build3DMipmaps(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data); + internal extern static Int32 Build3DMipmaps(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, IntPtr data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluCheckExtension", ExactSpelling = true)] internal extern static unsafe bool CheckExtension(Byte* extName, Byte* extString); @@ -73,16 +73,16 @@ namespace OpenTK.OpenGL internal extern static void EndTrim(IntPtr nurb); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluErrorString", ExactSpelling = true)] - internal extern static IntPtr ErrorString(OpenTK.OpenGL.Enums.GluErrorCode error); + internal extern static IntPtr ErrorString(OpenTK.Graphics.OpenGL.GluErrorCode error); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluGetString", ExactSpelling = true)] - internal extern static IntPtr GetString(OpenTK.OpenGL.Enums.GluStringName name); + internal extern static IntPtr GetString(OpenTK.Graphics.OpenGL.GluStringName name); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluGetNurbsProperty", ExactSpelling = true)] - internal extern static unsafe void GetNurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, [Out] float* data); + internal extern static unsafe void GetNurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, [Out] float* data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluGetTessProperty", ExactSpelling = true)] - internal extern static unsafe void GetTessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, [Out] double* data); + internal extern static unsafe void GetTessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, [Out] double* data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluLoadSamplingMatrices", ExactSpelling = true)] internal extern static unsafe void LoadSamplingMatrices(IntPtr nurb, float* model, float* perspective, Int32* view); @@ -100,22 +100,22 @@ namespace OpenTK.OpenGL internal extern static IntPtr NewTess(); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNextContour", ExactSpelling = true)] - internal extern static void NextContour(IntPtr tess, OpenTK.OpenGL.Enums.TessContour type); + internal extern static void NextContour(IntPtr tess, OpenTK.Graphics.OpenGL.TessContour type); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNurbsCallback", ExactSpelling = true)] - internal extern static void NurbsCallback(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsCallback which, Delegate CallBackFunc); + internal extern static void NurbsCallback(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsCallback which, Delegate CallBackFunc); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNurbsCallbackData", ExactSpelling = true)] internal extern static void NurbsCallbackData(IntPtr nurb, IntPtr userData); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNurbsCurve", ExactSpelling = true)] - internal extern static unsafe void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, OpenTK.OpenGL.Enums.MapTarget type); + internal extern static unsafe void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, MapTarget type); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNurbsProperty", ExactSpelling = true)] - internal extern static void NurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, float value); + internal extern static void NurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, float value); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNurbsSurface", ExactSpelling = true)] - internal extern static unsafe void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float* sKnots, Int32 tKnotCount, float* tKnots, Int32 sStride, Int32 tStride, float* control, Int32 sOrder, Int32 tOrder, OpenTK.OpenGL.Enums.MapTarget type); + internal extern static unsafe void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float* sKnots, Int32 tKnotCount, float* tKnots, Int32 sStride, Int32 tStride, float* control, Int32 sOrder, Int32 tOrder, MapTarget type); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluOrtho2D", ExactSpelling = true)] internal extern static void Ortho2D(double left, double right, double bottom, double top); @@ -133,25 +133,25 @@ namespace OpenTK.OpenGL internal extern static unsafe Int32 Project(double objX, double objY, double objZ, double* model, double* proj, Int32* view, double* winX, double* winY, double* winZ); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluPwlCurve", ExactSpelling = true)] - internal extern static unsafe void PwlCurve(IntPtr nurb, Int32 count, float* data, Int32 stride, OpenTK.OpenGL.Enums.NurbsTrim type); + internal extern static unsafe void PwlCurve(IntPtr nurb, Int32 count, float* data, Int32 stride, OpenTK.Graphics.OpenGL.NurbsTrim type); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluQuadricCallback", ExactSpelling = true)] - internal extern static void QuadricCallback(IntPtr quad, OpenTK.OpenGL.Enums.QuadricCallback which, Delegate CallBackFunc); + internal extern static void QuadricCallback(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricCallback which, Delegate CallBackFunc); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluQuadricDrawStyle", ExactSpelling = true)] - internal extern static void QuadricDrawStyle(IntPtr quad, OpenTK.OpenGL.Enums.QuadricDrawStyle draw); + internal extern static void QuadricDrawStyle(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricDrawStyle draw); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluQuadricNormals", ExactSpelling = true)] - internal extern static void QuadricNormals(IntPtr quad, OpenTK.OpenGL.Enums.QuadricNormal normal); + internal extern static void QuadricNormals(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricNormal normal); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluQuadricOrientation", ExactSpelling = true)] - internal extern static void QuadricOrientation(IntPtr quad, OpenTK.OpenGL.Enums.QuadricOrientation orientation); + internal extern static void QuadricOrientation(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricOrientation orientation); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluQuadricTexture", ExactSpelling = true)] internal extern static void QuadricTexture(IntPtr quad, bool texture); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluScaleImage", ExactSpelling = true)] - internal extern static Int32 ScaleImage(OpenTK.OpenGL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, OpenTK.OpenGL.Enums.PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, OpenTK.OpenGL.Enums.PixelType typeOut, [Out] IntPtr dataOut); + internal extern static Int32 ScaleImage(PixelFormat format, Int32 wIn, Int32 hIn, PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, PixelType typeOut, [Out] IntPtr dataOut); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluSphere", ExactSpelling = true)] internal extern static void Sphere(IntPtr quad, double radius, Int32 slices, Int32 stacks); @@ -163,7 +163,7 @@ namespace OpenTK.OpenGL internal extern static void TessBeginPolygon(IntPtr tess, IntPtr data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluTessCallback", ExactSpelling = true)] - internal extern static void TessCallback(IntPtr tess, OpenTK.OpenGL.Enums.TessCallback which, Delegate CallBackFunc); + internal extern static void TessCallback(IntPtr tess, OpenTK.Graphics.OpenGL.TessCallback which, Delegate CallBackFunc); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluTessEndContour", ExactSpelling = true)] internal extern static void TessEndContour(IntPtr tess); @@ -175,7 +175,7 @@ namespace OpenTK.OpenGL internal extern static void TessNormal(IntPtr tess, double valueX, double valueY, double valueZ); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluTessProperty", ExactSpelling = true)] - internal extern static void TessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, double data); + internal extern static void TessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, double data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluTessVertex", ExactSpelling = true)] internal extern static unsafe void TessVertex(IntPtr tess, double* location, IntPtr data); diff --git a/Source/OpenTK/Graphics/OpenGL/Glu/GluDelegates.cs b/Source/OpenTK/Graphics/OpenGL/Glu/GluDelegates.cs index a5709bd9..b0db2d8f 100644 --- a/Source/OpenTK/Graphics/OpenGL/Glu/GluDelegates.cs +++ b/Source/OpenTK/Graphics/OpenGL/Glu/GluDelegates.cs @@ -1,4 +1,4 @@ -namespace OpenTK.OpenGL +namespace OpenTK.Graphics.OpenGL { using System; using System.Runtime.InteropServices; @@ -23,22 +23,22 @@ namespace OpenTK.OpenGL internal delegate void BeginTrim(IntPtr nurb); internal static BeginTrim gluBeginTrim; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate Int32 Build1DMipmapLevels(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); + internal delegate Int32 Build1DMipmapLevels(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); internal static Build1DMipmapLevels gluBuild1DMipmapLevels; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate Int32 Build1DMipmaps(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data); + internal delegate Int32 Build1DMipmaps(TextureTarget target, Int32 internalFormat, Int32 width, PixelFormat format, PixelType type, IntPtr data); internal static Build1DMipmaps gluBuild1DMipmaps; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate Int32 Build2DMipmapLevels(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); + internal delegate Int32 Build2DMipmapLevels(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); internal static Build2DMipmapLevels gluBuild2DMipmapLevels; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate Int32 Build2DMipmaps(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data); + internal delegate Int32 Build2DMipmaps(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, PixelFormat format, PixelType type, IntPtr data); internal static Build2DMipmaps gluBuild2DMipmaps; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate Int32 Build3DMipmapLevels(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); + internal delegate Int32 Build3DMipmapLevels(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data); internal static Build3DMipmapLevels gluBuild3DMipmapLevels; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate Int32 Build3DMipmaps(OpenTK.OpenGL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr data); + internal delegate Int32 Build3DMipmaps(TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, PixelFormat format, PixelType type, IntPtr data); internal static Build3DMipmaps gluBuild3DMipmaps; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate bool CheckExtension(Byte* extName, Byte* extString); @@ -71,16 +71,16 @@ namespace OpenTK.OpenGL internal delegate void EndTrim(IntPtr nurb); internal static EndTrim gluEndTrim; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate IntPtr ErrorString(OpenTK.OpenGL.Enums.GluErrorCode error); + internal delegate IntPtr ErrorString(OpenTK.Graphics.OpenGL.GluErrorCode error); internal static ErrorString gluErrorString; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate IntPtr GetString(OpenTK.OpenGL.Enums.GluStringName name); + internal delegate IntPtr GetString(OpenTK.Graphics.OpenGL.GluStringName name); internal static GetString gluGetString; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetNurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, [Out] float* data); + internal unsafe delegate void GetNurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, [Out] float* data); internal unsafe static GetNurbsProperty gluGetNurbsProperty; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetTessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, [Out] double* data); + internal unsafe delegate void GetTessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, [Out] double* data); internal unsafe static GetTessProperty gluGetTessProperty; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void LoadSamplingMatrices(IntPtr nurb, float* model, float* perspective, Int32* view); @@ -98,10 +98,10 @@ namespace OpenTK.OpenGL internal delegate IntPtr NewTess(); internal static NewTess gluNewTess; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void NextContour(IntPtr tess, OpenTK.OpenGL.Enums.TessContour type); + internal delegate void NextContour(IntPtr tess, OpenTK.Graphics.OpenGL.TessContour type); internal static NextContour gluNextContour; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void NurbsCallback(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsCallback which, Delegate CallBackFunc); + internal delegate void NurbsCallback(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsCallback which, Delegate CallBackFunc); internal static NurbsCallback gluNurbsCallback; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void NurbsCallbackData(IntPtr nurb, IntPtr userData); @@ -110,13 +110,13 @@ namespace OpenTK.OpenGL internal delegate void NurbsCallbackDataEXT(IntPtr nurb, IntPtr userData); internal static NurbsCallbackDataEXT gluNurbsCallbackDataEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, OpenTK.OpenGL.Enums.MapTarget type); + internal unsafe delegate void NurbsCurve(IntPtr nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, MapTarget type); internal unsafe static NurbsCurve gluNurbsCurve; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void NurbsProperty(IntPtr nurb, OpenTK.OpenGL.Enums.NurbsProperty property, float value); + internal delegate void NurbsProperty(IntPtr nurb, OpenTK.Graphics.OpenGL.NurbsProperty property, float value); internal static NurbsProperty gluNurbsProperty; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float* sKnots, Int32 tKnotCount, float* tKnots, Int32 sStride, Int32 tStride, float* control, Int32 sOrder, Int32 tOrder, OpenTK.OpenGL.Enums.MapTarget type); + internal unsafe delegate void NurbsSurface(IntPtr nurb, Int32 sKnotCount, float* sKnots, Int32 tKnotCount, float* tKnots, Int32 sStride, Int32 tStride, float* control, Int32 sOrder, Int32 tOrder, MapTarget type); internal unsafe static NurbsSurface gluNurbsSurface; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void Ortho2D(double left, double right, double bottom, double top); @@ -134,25 +134,25 @@ namespace OpenTK.OpenGL internal unsafe delegate Int32 Project(double objX, double objY, double objZ, double* model, double* proj, Int32* view, double* winX, double* winY, double* winZ); internal unsafe static Project gluProject; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void PwlCurve(IntPtr nurb, Int32 count, float* data, Int32 stride, OpenTK.OpenGL.Enums.NurbsTrim type); + internal unsafe delegate void PwlCurve(IntPtr nurb, Int32 count, float* data, Int32 stride, OpenTK.Graphics.OpenGL.NurbsTrim type); internal unsafe static PwlCurve gluPwlCurve; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void QuadricCallback(IntPtr quad, OpenTK.OpenGL.Enums.QuadricCallback which, Delegate CallBackFunc); + internal delegate void QuadricCallback(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricCallback which, Delegate CallBackFunc); internal static QuadricCallback gluQuadricCallback; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void QuadricDrawStyle(IntPtr quad, OpenTK.OpenGL.Enums.QuadricDrawStyle draw); + internal delegate void QuadricDrawStyle(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricDrawStyle draw); internal static QuadricDrawStyle gluQuadricDrawStyle; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void QuadricNormals(IntPtr quad, OpenTK.OpenGL.Enums.QuadricNormal normal); + internal delegate void QuadricNormals(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricNormal normal); internal static QuadricNormals gluQuadricNormals; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void QuadricOrientation(IntPtr quad, OpenTK.OpenGL.Enums.QuadricOrientation orientation); + internal delegate void QuadricOrientation(IntPtr quad, OpenTK.Graphics.OpenGL.QuadricOrientation orientation); internal static QuadricOrientation gluQuadricOrientation; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void QuadricTexture(IntPtr quad, bool texture); internal static QuadricTexture gluQuadricTexture; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate Int32 ScaleImage(OpenTK.OpenGL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, OpenTK.OpenGL.Enums.PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, OpenTK.OpenGL.Enums.PixelType typeOut, [Out] IntPtr dataOut); + internal delegate Int32 ScaleImage(PixelFormat format, Int32 wIn, Int32 hIn, PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, PixelType typeOut, [Out] IntPtr dataOut); internal static ScaleImage gluScaleImage; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void Sphere(IntPtr quad, double radius, Int32 slices, Int32 stacks); @@ -164,7 +164,7 @@ namespace OpenTK.OpenGL internal delegate void TessBeginPolygon(IntPtr tess, IntPtr data); internal static TessBeginPolygon gluTessBeginPolygon; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TessCallback(IntPtr tess, OpenTK.OpenGL.Enums.TessCallback which, Delegate CallBackFunc); + internal delegate void TessCallback(IntPtr tess, OpenTK.Graphics.OpenGL.TessCallback which, Delegate CallBackFunc); internal static TessCallback gluTessCallback; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TessEndContour(IntPtr tess); @@ -176,13 +176,13 @@ namespace OpenTK.OpenGL internal delegate void TessNormal(IntPtr tess, double valueX, double valueY, double valueZ); internal static TessNormal gluTessNormal; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TessProperty(IntPtr tess, OpenTK.OpenGL.Enums.TessProperty which, double data); + internal delegate void TessProperty(IntPtr tess, OpenTK.Graphics.OpenGL.TessParameter which, double data); internal static TessProperty gluTessProperty; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void TessVertex(IntPtr tess, double* location, IntPtr data); internal unsafe static TessVertex gluTessVertex; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate Int32 TexFilterFuncSGI(OpenTK.OpenGL.Enums.TextureTarget target, OpenTK.OpenGL.Enums.SgisTextureFilter4 filtertype, float* parms, Int32 n, [Out] float* weights); + internal unsafe delegate Int32 TexFilterFuncSGI(TextureTarget target, SgisTextureFilter4 filtertype, float* parms, Int32 n, [Out] float* weights); internal unsafe static TexFilterFuncSGI gluTexFilterFuncSGI; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate Int32 UnProject(double winX, double winY, double winZ, double* model, double* proj, Int32* view, double* objX, double* objY, double* objZ); diff --git a/Source/OpenTK/Graphics/OpenGL/Glu/GluEnums.cs b/Source/OpenTK/Graphics/OpenGL/Glu/GluEnums.cs index 327217d9..be04876d 100644 --- a/Source/OpenTK/Graphics/OpenGL/Glu/GluEnums.cs +++ b/Source/OpenTK/Graphics/OpenGL/Glu/GluEnums.cs @@ -1,393 +1,390 @@ -namespace OpenTK.OpenGL +namespace OpenTK.Graphics.OpenGL { - namespace Enums + #pragma warning disable 1591 + + public enum GluVersion { - #pragma warning disable 3019 - #pragma warning disable 1591 - public enum GluVersion - { - Version11 = ((int)1), - Version13 = ((int)1), - Version12 = ((int)1), - } - - public enum GluStringName - { - Version = ((int)100800), - Extensions = ((int)100801), - } - - public enum GluErrorCode - { - OutOfMemory = ((int)100902), - InvalidEnum = ((int)100900), - InvalidValue = ((int)100901), - InvalidOperation = ((int)100904), - } - - public enum Filter4TypeSGIS - { - MitchellNetravaliSgi = ((int)100301), - LagrangianSgi = ((int)100300), - } - - public enum NurbsDisplay - { - OutlinePolygon = ((int)100240), - OutlinePatch = ((int)100241), - Fill = ((int)QuadricDrawStyle.Fill), - } - - public enum NurbsCallback - { - NurbsColorData = ((int)100173), - NurbsVertexData = ((int)100171), - NurbsNormal = ((int)100166), - NurbsError = ((int)100103), - NurbsTextureCoordExt = ((int)100168), - Error = ((int)100103), - NurbsEndDataExt = ((int)100175), - NurbsEnd = ((int)100169), - NurbsTextureCoord = ((int)100168), - NurbsEndExt = ((int)100169), - NurbsNormalDataExt = ((int)100172), - NurbsColor = ((int)100167), - NurbsColorExt = ((int)100167), - NurbsVertexExt = ((int)100165), - NurbsBeginExt = ((int)100164), - NurbsTextureCoordData = ((int)100174), - NurbsBeginData = ((int)100170), - NurbsColorDataExt = ((int)100173), - NurbsBeginDataExt = ((int)100170), - NurbsVertex = ((int)100165), - NurbsTextureCoordDataExt = ((int)100174), - NurbsNormalExt = ((int)100166), - NurbsVertexDataExt = ((int)100171), - NurbsBegin = ((int)100164), - NurbsEndData = ((int)100175), - NurbsNormalData = ((int)100172), - } - - public enum NurbsError - { - NurbsError37 = ((int)100287), - NurbsError16 = ((int)100266), - NurbsError26 = ((int)100276), - NurbsError36 = ((int)100286), - NurbsError19 = ((int)100269), - NurbsError29 = ((int)100279), - NurbsError8 = ((int)100258), - NurbsError12 = ((int)100262), - NurbsError9 = ((int)100259), - NurbsError1 = ((int)100251), - NurbsError18 = ((int)100268), - NurbsError28 = ((int)100278), - NurbsError4 = ((int)100254), - NurbsError5 = ((int)100255), - NurbsError6 = ((int)100256), - NurbsError7 = ((int)100257), - NurbsError3 = ((int)100253), - NurbsError22 = ((int)100272), - NurbsError32 = ((int)100282), - NurbsError2 = ((int)100252), - NurbsError11 = ((int)100261), - NurbsError21 = ((int)100271), - NurbsError31 = ((int)100281), - NurbsError10 = ((int)100260), - NurbsError20 = ((int)100270), - NurbsError30 = ((int)100280), - NurbsError15 = ((int)100265), - NurbsError25 = ((int)100275), - NurbsError35 = ((int)100285), - NurbsError14 = ((int)100264), - NurbsError24 = ((int)100274), - NurbsError34 = ((int)100284), - NurbsError13 = ((int)100263), - NurbsError23 = ((int)100273), - NurbsError33 = ((int)100283), - NurbsError17 = ((int)100267), - NurbsError27 = ((int)100277), - } - - public enum NurbsProperty - { - DisplayMode = ((int)100204), - ParametricTolerance = ((int)100202), - NurbsRenderer = ((int)100162), - NurbsTessellator = ((int)100161), - NurbsTessellatorExt = ((int)100161), - NurbsModeExt = ((int)100160), - UStep = ((int)100206), - SamplingMethod = ((int)100205), - AutoLoadMatrix = ((int)100200), - VStep = ((int)100207), - Culling = ((int)100201), - NurbsRendererExt = ((int)100162), - NurbsMode = ((int)100160), - SamplingTolerance = ((int)100203), - } - - public enum NurbsSampling - { - ObjectParametricError = ((int)100208), - ObjectPathLength = ((int)100209), - PathLength = ((int)100215), - DomainDistance = ((int)100217), - ObjectPathLengthExt = ((int)100209), - ObjectParametricErrorExt = ((int)100208), - ParametricError = ((int)100216), - } - - public enum NurbsTrim - { - Map1Trim3 = ((int)100211), - Map1Trim2 = ((int)100210), - } - - public enum QuadricDrawStyle - { - Line = ((int)100011), - Silhouette = ((int)100013), - Point = ((int)100010), - Fill = ((int)100012), - } - - public enum QuadricCallback - { - Error = ((int)NurbsCallback.Error), - } - - public enum QuadricNormal - { - None = ((int)100002), - Flat = ((int)100001), - Smooth = ((int)100000), - } - - public enum QuadricOrientation - { - Outside = ((int)100020), - Inside = ((int)100021), - } - - public enum TessCallback - { - TessEdgeFlagData = ((int)100110), - Begin = ((int)100100), - TessError = ((int)100103), - EdgeFlag = ((int)100104), - End = ((int)100102), - TessCombine = ((int)100105), - Error = ((int)100103), - TessEndData = ((int)100108), - TessBeginData = ((int)100106), - TessErrorData = ((int)100109), - Vertex = ((int)100101), - TessVertexData = ((int)100107), - TessVertex = ((int)100101), - TessEdgeFlag = ((int)100104), - TessEnd = ((int)100102), - TessBegin = ((int)100100), - TessCombineData = ((int)100111), - } - - public enum TessContour - { - Exterior = ((int)100123), - Ccw = ((int)100121), - Interior = ((int)100122), - Unknown = ((int)100124), - Cw = ((int)100120), - } - - public enum TessProperty - { - TessWindingRule = ((int)100140), - TessBoundaryOnly = ((int)100141), - TessTolerance = ((int)100142), - } - - public enum TessError - { - TessMissingBeginPolygon = ((int)100151), - TessMissingEndPolygon = ((int)100153), - TessError1 = ((int)100151), - TessMissingBeginContour = ((int)100152), - TessCoordTooLarge = ((int)100155), - TessError7 = ((int)100157), - TessError2 = ((int)100152), - TessError4 = ((int)100154), - TessNeedCombineCallback = ((int)100156), - TessError3 = ((int)100153), - TessError6 = ((int)100156), - TessError5 = ((int)100155), - TessError8 = ((int)100158), - TessMissingEndContour = ((int)100154), - } - - public enum TessWinding - { - TessWindingNonzero = ((int)100131), - TessWindingOdd = ((int)100130), - TessWindingPositive = ((int)100132), - TessWindingAbsGeqTwo = ((int)100134), - TessWindingNegative = ((int)100133), - } - - public enum AllGlu - { - None = ((int)100002), - TessWindingRule = ((int)100140), - TessWindingPositive = ((int)100132), - ObjectPathLength = ((int)100209), - NurbsTextureCoordExt = ((int)100168), - Vertex = ((int)100101), - TessCombine = ((int)100105), - AutoLoadMatrix = ((int)100200), - TessBoundaryOnly = ((int)100141), - NurbsEndExt = ((int)100169), - NurbsError17 = ((int)100267), - NurbsError27 = ((int)100277), - NurbsError37 = ((int)100287), - Interior = ((int)100122), - TessWindingOdd = ((int)100130), - InvalidValue = ((int)100901), - ParametricError = ((int)100216), - TessError8 = ((int)100158), - NurbsError14 = ((int)100264), - NurbsError24 = ((int)100274), - NurbsError34 = ((int)100284), - NurbsTextureCoordDataExt = ((int)100174), - TessMissingBeginContour = ((int)100152), - Silhouette = ((int)100013), - TessError7 = ((int)100157), - NurbsNormalDataExt = ((int)100172), - NurbsError21 = ((int)100271), - NurbsError31 = ((int)100281), - PathLength = ((int)100215), - OutlinePolygon = ((int)100240), - TessVertex = ((int)100101), - TessWindingAbsGeqTwo = ((int)100134), - Extensions = ((int)100801), - TessEdgeFlagData = ((int)100110), - EdgeFlag = ((int)100104), - TessError1 = ((int)100151), - Line = ((int)100011), - NurbsBeginExt = ((int)100164), - Point = ((int)100010), - Begin = ((int)100100), - Inside = ((int)100021), - Flat = ((int)100001), - TessBegin = ((int)100100), - NurbsNormal = ((int)100166), - NurbsColorData = ((int)100173), - NurbsBeginDataExt = ((int)100170), - NurbsRenderer = ((int)100162), - NurbsBeginData = ((int)100170), - Outside = ((int)100020), - DisplayMode = ((int)100204), - NurbsError15 = ((int)100265), - NurbsError25 = ((int)100275), - NurbsError35 = ((int)100285), - NurbsVertexExt = ((int)100165), - TessError5 = ((int)100155), - Unknown = ((int)100124), - NurbsEndDataExt = ((int)100175), - NurbsError12 = ((int)100262), - NurbsError22 = ((int)100272), - NurbsError32 = ((int)100282), - ObjectParametricErrorExt = ((int)100208), - NurbsRendererExt = ((int)100162), - TessError3 = ((int)100153), - Fill = ((int)100012), - TessError = ((int)100103), - ObjectPathLengthExt = ((int)100209), - TessWindingNegative = ((int)100133), - NurbsTessellator = ((int)100161), - NurbsColor = ((int)100167), - NurbsModeExt = ((int)100160), - SamplingTolerance = ((int)100203), - NurbsColorDataExt = ((int)100173), - Exterior = ((int)100123), - Ccw = ((int)100121), - Cw = ((int)100120), - NurbsNormalExt = ((int)100166), - NurbsError18 = ((int)100268), - NurbsError28 = ((int)100278), - LagrangianSgi = ((int)100300), - TessEnd = ((int)100102), - NurbsTessellatorExt = ((int)100161), - NurbsEnd = ((int)100169), - TessWindingNonzero = ((int)100131), - OutOfMemory = ((int)100902), - TessBeginData = ((int)100106), - Error = ((int)100103), - ObjectParametricError = ((int)100208), - NurbsBegin = ((int)100164), - TessCombineData = ((int)100111), - TessMissingEndPolygon = ((int)100153), - NurbsTextureCoord = ((int)100168), - Smooth = ((int)100000), - TessMissingBeginPolygon = ((int)100151), - NurbsEndData = ((int)100175), - NurbsVertexData = ((int)100171), - TessEndData = ((int)100108), - NurbsError11 = ((int)100261), - NurbsVertex = ((int)100165), - NurbsError30 = ((int)100280), - Version11 = ((int)1), - TessError6 = ((int)100156), - Version13 = ((int)1), - Version12 = ((int)1), - TessErrorData = ((int)100109), - NurbsError36 = ((int)100286), - End = ((int)100102), - SamplingMethod = ((int)100205), - TessNeedCombineCallback = ((int)100156), - UStep = ((int)100206), - DomainDistance = ((int)100217), - TessEdgeFlag = ((int)100104), - NurbsColorExt = ((int)100167), - NurbsError19 = ((int)100269), - NurbsError29 = ((int)100279), - InvalidOperation = ((int)100904), - TessCoordTooLarge = ((int)100155), - TessVertexData = ((int)100107), - NurbsMode = ((int)100160), - ParametricTolerance = ((int)100202), - NurbsError2 = ((int)100252), - VStep = ((int)100207), - TessMissingEndContour = ((int)100154), - Map1Trim2 = ((int)100210), - Map1Trim3 = ((int)100211), - Culling = ((int)100201), - NurbsError16 = ((int)100266), - NurbsError26 = ((int)100276), - NurbsVertexDataExt = ((int)100171), - NurbsNormalData = ((int)100172), - TessError2 = ((int)100152), - NurbsError13 = ((int)100263), - NurbsError23 = ((int)100273), - NurbsError33 = ((int)100283), - NurbsError8 = ((int)100258), - NurbsError9 = ((int)100259), - TessError4 = ((int)100154), - NurbsError10 = ((int)100260), - NurbsError20 = ((int)100270), - OutlinePatch = ((int)100241), - NurbsError = ((int)100103), - NurbsTextureCoordData = ((int)100174), - NurbsError1 = ((int)100251), - InvalidEnum = ((int)100900), - NurbsError3 = ((int)100253), - NurbsError4 = ((int)100254), - NurbsError5 = ((int)100255), - NurbsError6 = ((int)100256), - NurbsError7 = ((int)100257), - MitchellNetravaliSgi = ((int)100301), - Version = ((int)100800), - TessTolerance = ((int)100142), - } - + Version11 = ((int)1), + Version13 = ((int)1), + Version12 = ((int)1), } + + public enum GluStringName + { + Version = ((int)100800), + Extensions = ((int)100801), + } + + public enum GluErrorCode + { + OutOfMemory = ((int)100902), + InvalidEnum = ((int)100900), + InvalidValue = ((int)100901), + InvalidOperation = ((int)100904), + } + + public enum Filter4TypeSGIS + { + MitchellNetravaliSgi = ((int)100301), + LagrangianSgi = ((int)100300), + } + + public enum NurbsDisplay + { + OutlinePolygon = ((int)100240), + OutlinePatch = ((int)100241), + Fill = ((int)QuadricDrawStyle.Fill), + } + + public enum NurbsCallback + { + NurbsColorData = ((int)100173), + NurbsVertexData = ((int)100171), + NurbsNormal = ((int)100166), + NurbsError = ((int)100103), + NurbsTextureCoordExt = ((int)100168), + Error = ((int)100103), + NurbsEndDataExt = ((int)100175), + NurbsEnd = ((int)100169), + NurbsTextureCoord = ((int)100168), + NurbsEndExt = ((int)100169), + NurbsNormalDataExt = ((int)100172), + NurbsColor = ((int)100167), + NurbsColorExt = ((int)100167), + NurbsVertexExt = ((int)100165), + NurbsBeginExt = ((int)100164), + NurbsTextureCoordData = ((int)100174), + NurbsBeginData = ((int)100170), + NurbsColorDataExt = ((int)100173), + NurbsBeginDataExt = ((int)100170), + NurbsVertex = ((int)100165), + NurbsTextureCoordDataExt = ((int)100174), + NurbsNormalExt = ((int)100166), + NurbsVertexDataExt = ((int)100171), + NurbsBegin = ((int)100164), + NurbsEndData = ((int)100175), + NurbsNormalData = ((int)100172), + } + + public enum NurbsError + { + NurbsError37 = ((int)100287), + NurbsError16 = ((int)100266), + NurbsError26 = ((int)100276), + NurbsError36 = ((int)100286), + NurbsError19 = ((int)100269), + NurbsError29 = ((int)100279), + NurbsError8 = ((int)100258), + NurbsError12 = ((int)100262), + NurbsError9 = ((int)100259), + NurbsError1 = ((int)100251), + NurbsError18 = ((int)100268), + NurbsError28 = ((int)100278), + NurbsError4 = ((int)100254), + NurbsError5 = ((int)100255), + NurbsError6 = ((int)100256), + NurbsError7 = ((int)100257), + NurbsError3 = ((int)100253), + NurbsError22 = ((int)100272), + NurbsError32 = ((int)100282), + NurbsError2 = ((int)100252), + NurbsError11 = ((int)100261), + NurbsError21 = ((int)100271), + NurbsError31 = ((int)100281), + NurbsError10 = ((int)100260), + NurbsError20 = ((int)100270), + NurbsError30 = ((int)100280), + NurbsError15 = ((int)100265), + NurbsError25 = ((int)100275), + NurbsError35 = ((int)100285), + NurbsError14 = ((int)100264), + NurbsError24 = ((int)100274), + NurbsError34 = ((int)100284), + NurbsError13 = ((int)100263), + NurbsError23 = ((int)100273), + NurbsError33 = ((int)100283), + NurbsError17 = ((int)100267), + NurbsError27 = ((int)100277), + } + + public enum NurbsProperty + { + DisplayMode = ((int)100204), + ParametricTolerance = ((int)100202), + NurbsRenderer = ((int)100162), + NurbsTessellator = ((int)100161), + NurbsTessellatorExt = ((int)100161), + NurbsModeExt = ((int)100160), + UStep = ((int)100206), + SamplingMethod = ((int)100205), + AutoLoadMatrix = ((int)100200), + VStep = ((int)100207), + Culling = ((int)100201), + NurbsRendererExt = ((int)100162), + NurbsMode = ((int)100160), + SamplingTolerance = ((int)100203), + } + + public enum NurbsSampling + { + ObjectParametricError = ((int)100208), + ObjectPathLength = ((int)100209), + PathLength = ((int)100215), + DomainDistance = ((int)100217), + ObjectPathLengthExt = ((int)100209), + ObjectParametricErrorExt = ((int)100208), + ParametricError = ((int)100216), + } + + public enum NurbsTrim + { + Map1Trim3 = ((int)100211), + Map1Trim2 = ((int)100210), + } + + public enum QuadricDrawStyle + { + Line = ((int)100011), + Silhouette = ((int)100013), + Point = ((int)100010), + Fill = ((int)100012), + } + + public enum QuadricCallback + { + Error = ((int)NurbsCallback.Error), + } + + public enum QuadricNormal + { + None = ((int)100002), + Flat = ((int)100001), + Smooth = ((int)100000), + } + + public enum QuadricOrientation + { + Outside = ((int)100020), + Inside = ((int)100021), + } + + public enum TessCallback + { + TessEdgeFlagData = ((int)100110), + Begin = ((int)100100), + TessError = ((int)100103), + EdgeFlag = ((int)100104), + End = ((int)100102), + TessCombine = ((int)100105), + Error = ((int)100103), + TessEndData = ((int)100108), + TessBeginData = ((int)100106), + TessErrorData = ((int)100109), + Vertex = ((int)100101), + TessVertexData = ((int)100107), + TessVertex = ((int)100101), + TessEdgeFlag = ((int)100104), + TessEnd = ((int)100102), + TessBegin = ((int)100100), + TessCombineData = ((int)100111), + } + + public enum TessContour + { + Exterior = ((int)100123), + Ccw = ((int)100121), + Interior = ((int)100122), + Unknown = ((int)100124), + Cw = ((int)100120), + } + + public enum TessParameter + { + TessWindingRule = ((int)100140), + TessBoundaryOnly = ((int)100141), + TessTolerance = ((int)100142), + } + + public enum TessError + { + TessMissingBeginPolygon = ((int)100151), + TessMissingEndPolygon = ((int)100153), + TessError1 = ((int)100151), + TessMissingBeginContour = ((int)100152), + TessCoordTooLarge = ((int)100155), + TessError7 = ((int)100157), + TessError2 = ((int)100152), + TessError4 = ((int)100154), + TessNeedCombineCallback = ((int)100156), + TessError3 = ((int)100153), + TessError6 = ((int)100156), + TessError5 = ((int)100155), + TessError8 = ((int)100158), + TessMissingEndContour = ((int)100154), + } + + public enum TessWinding + { + TessWindingNonzero = ((int)100131), + TessWindingOdd = ((int)100130), + TessWindingPositive = ((int)100132), + TessWindingAbsGeqTwo = ((int)100134), + TessWindingNegative = ((int)100133), + } + + public enum AllGlu + { + None = ((int)100002), + TessWindingRule = ((int)100140), + TessWindingPositive = ((int)100132), + ObjectPathLength = ((int)100209), + NurbsTextureCoordExt = ((int)100168), + Vertex = ((int)100101), + TessCombine = ((int)100105), + AutoLoadMatrix = ((int)100200), + TessBoundaryOnly = ((int)100141), + NurbsEndExt = ((int)100169), + NurbsError17 = ((int)100267), + NurbsError27 = ((int)100277), + NurbsError37 = ((int)100287), + Interior = ((int)100122), + TessWindingOdd = ((int)100130), + InvalidValue = ((int)100901), + ParametricError = ((int)100216), + TessError8 = ((int)100158), + NurbsError14 = ((int)100264), + NurbsError24 = ((int)100274), + NurbsError34 = ((int)100284), + NurbsTextureCoordDataExt = ((int)100174), + TessMissingBeginContour = ((int)100152), + Silhouette = ((int)100013), + TessError7 = ((int)100157), + NurbsNormalDataExt = ((int)100172), + NurbsError21 = ((int)100271), + NurbsError31 = ((int)100281), + PathLength = ((int)100215), + OutlinePolygon = ((int)100240), + TessVertex = ((int)100101), + TessWindingAbsGeqTwo = ((int)100134), + Extensions = ((int)100801), + TessEdgeFlagData = ((int)100110), + EdgeFlag = ((int)100104), + TessError1 = ((int)100151), + Line = ((int)100011), + NurbsBeginExt = ((int)100164), + Point = ((int)100010), + Begin = ((int)100100), + Inside = ((int)100021), + Flat = ((int)100001), + TessBegin = ((int)100100), + NurbsNormal = ((int)100166), + NurbsColorData = ((int)100173), + NurbsBeginDataExt = ((int)100170), + NurbsRenderer = ((int)100162), + NurbsBeginData = ((int)100170), + Outside = ((int)100020), + DisplayMode = ((int)100204), + NurbsError15 = ((int)100265), + NurbsError25 = ((int)100275), + NurbsError35 = ((int)100285), + NurbsVertexExt = ((int)100165), + TessError5 = ((int)100155), + Unknown = ((int)100124), + NurbsEndDataExt = ((int)100175), + NurbsError12 = ((int)100262), + NurbsError22 = ((int)100272), + NurbsError32 = ((int)100282), + ObjectParametricErrorExt = ((int)100208), + NurbsRendererExt = ((int)100162), + TessError3 = ((int)100153), + Fill = ((int)100012), + TessError = ((int)100103), + ObjectPathLengthExt = ((int)100209), + TessWindingNegative = ((int)100133), + NurbsTessellator = ((int)100161), + NurbsColor = ((int)100167), + NurbsModeExt = ((int)100160), + SamplingTolerance = ((int)100203), + NurbsColorDataExt = ((int)100173), + Exterior = ((int)100123), + Ccw = ((int)100121), + Cw = ((int)100120), + NurbsNormalExt = ((int)100166), + NurbsError18 = ((int)100268), + NurbsError28 = ((int)100278), + LagrangianSgi = ((int)100300), + TessEnd = ((int)100102), + NurbsTessellatorExt = ((int)100161), + NurbsEnd = ((int)100169), + TessWindingNonzero = ((int)100131), + OutOfMemory = ((int)100902), + TessBeginData = ((int)100106), + Error = ((int)100103), + ObjectParametricError = ((int)100208), + NurbsBegin = ((int)100164), + TessCombineData = ((int)100111), + TessMissingEndPolygon = ((int)100153), + NurbsTextureCoord = ((int)100168), + Smooth = ((int)100000), + TessMissingBeginPolygon = ((int)100151), + NurbsEndData = ((int)100175), + NurbsVertexData = ((int)100171), + TessEndData = ((int)100108), + NurbsError11 = ((int)100261), + NurbsVertex = ((int)100165), + NurbsError30 = ((int)100280), + Version11 = ((int)1), + TessError6 = ((int)100156), + Version13 = ((int)1), + Version12 = ((int)1), + TessErrorData = ((int)100109), + NurbsError36 = ((int)100286), + End = ((int)100102), + SamplingMethod = ((int)100205), + TessNeedCombineCallback = ((int)100156), + UStep = ((int)100206), + DomainDistance = ((int)100217), + TessEdgeFlag = ((int)100104), + NurbsColorExt = ((int)100167), + NurbsError19 = ((int)100269), + NurbsError29 = ((int)100279), + InvalidOperation = ((int)100904), + TessCoordTooLarge = ((int)100155), + TessVertexData = ((int)100107), + NurbsMode = ((int)100160), + ParametricTolerance = ((int)100202), + NurbsError2 = ((int)100252), + VStep = ((int)100207), + TessMissingEndContour = ((int)100154), + Map1Trim2 = ((int)100210), + Map1Trim3 = ((int)100211), + Culling = ((int)100201), + NurbsError16 = ((int)100266), + NurbsError26 = ((int)100276), + NurbsVertexDataExt = ((int)100171), + NurbsNormalData = ((int)100172), + TessError2 = ((int)100152), + NurbsError13 = ((int)100263), + NurbsError23 = ((int)100273), + NurbsError33 = ((int)100283), + NurbsError8 = ((int)100258), + NurbsError9 = ((int)100259), + TessError4 = ((int)100154), + NurbsError10 = ((int)100260), + NurbsError20 = ((int)100270), + OutlinePatch = ((int)100241), + NurbsError = ((int)100103), + NurbsTextureCoordData = ((int)100174), + NurbsError1 = ((int)100251), + InvalidEnum = ((int)100900), + NurbsError3 = ((int)100253), + NurbsError4 = ((int)100254), + NurbsError5 = ((int)100255), + NurbsError6 = ((int)100256), + NurbsError7 = ((int)100257), + MitchellNetravaliSgi = ((int)100301), + Version = ((int)100800), + TessTolerance = ((int)100142), + } + } diff --git a/Source/OpenTK/Graphics/OpenGL/Glu/GluHelper.cs b/Source/OpenTK/Graphics/OpenGL/Glu/GluHelper.cs index 2fa33374..9f96a40d 100644 --- a/Source/OpenTK/Graphics/OpenGL/Glu/GluHelper.cs +++ b/Source/OpenTK/Graphics/OpenGL/Glu/GluHelper.cs @@ -10,13 +10,12 @@ using System.Collections.Generic; using System.Text; using System.Reflection; using System.Runtime.InteropServices; +using System.Reflection.Emit; using OpenTK.Platform; using OpenTK.Math; -using OpenTK.OpenGL.Enums; -using System.Reflection.Emit; -namespace OpenTK.OpenGL +namespace OpenTK.Graphics.OpenGL { public static partial class Glu { @@ -32,8 +31,8 @@ namespace OpenTK.OpenGL static Glu() { - //assembly = Assembly.GetExecutingAssembly();//Assembly.Load("OpenTK.OpenGL"); - //glClass = assembly.GetType("OpenTK.OpenGL.Glu"); + //assembly = Assembly.GetExecutingAssembly();//Assembly.Load("OpenTK.Graphics.OpenGL"); + //glClass = assembly.GetType("OpenTK.Graphics.OpenGL.Glu"); //delegatesClass = glClass.GetNestedType("Delegates", BindingFlags.Static | BindingFlags.NonPublic); //importsClass = glClass.GetNestedType("Imports", BindingFlags.Static | BindingFlags.NonPublic); } @@ -269,7 +268,7 @@ namespace OpenTK.OpenGL public static void TessWindingRuleProperty(IntPtr tess, TessWinding property) { - Glu.TessProperty(tess, OpenTK.OpenGL.Enums.TessProperty.TessWindingRule, (double)property); + Glu.TessProperty(tess, TessParameter.TessWindingRule, (double)property); } #endregion diff --git a/Source/OpenTK/Platform/Windows/WinGLContext.cs b/Source/OpenTK/Platform/Windows/WinGLContext.cs index 17881e1d..3f2a1c2e 100644 --- a/Source/OpenTK/Platform/Windows/WinGLContext.cs +++ b/Source/OpenTK/Platform/Windows/WinGLContext.cs @@ -13,7 +13,7 @@ using System.Text; using System.Runtime.InteropServices; using System.Diagnostics; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Graphics; #endregion diff --git a/Source/OpenTK/Platform/Windows/WinGLNative.cs b/Source/OpenTK/Platform/Windows/WinGLNative.cs index 098fbc00..706ca9bf 100644 --- a/Source/OpenTK/Platform/Windows/WinGLNative.cs +++ b/Source/OpenTK/Platform/Windows/WinGLNative.cs @@ -12,7 +12,7 @@ using System.Text; using System.Runtime.InteropServices; using System.Windows.Forms; using System.Diagnostics; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Input; using OpenTK.Graphics; diff --git a/Source/OpenTK/Platform/X11/X11GLContext.cs b/Source/OpenTK/Platform/X11/X11GLContext.cs index 7e9cc702..ef2272f4 100644 --- a/Source/OpenTK/Platform/X11/X11GLContext.cs +++ b/Source/OpenTK/Platform/X11/X11GLContext.cs @@ -10,7 +10,7 @@ using System.Text; using System.Runtime.InteropServices; using System.Diagnostics; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Graphics; namespace OpenTK.Platform.X11 diff --git a/Source/OpenTK/Platform/X11/X11GLNative.cs b/Source/OpenTK/Platform/X11/X11GLNative.cs index dbe4944c..b748ac2f 100644 --- a/Source/OpenTK/Platform/X11/X11GLNative.cs +++ b/Source/OpenTK/Platform/X11/X11GLNative.cs @@ -10,12 +10,12 @@ using System.Text; using System.Runtime.InteropServices; using System.Diagnostics; using System.Reflection; -using OpenTK.OpenGL; +using OpenTK.Graphics.OpenGL; using OpenTK.Input; using OpenTK.Platform.Windows; using OpenTK.Graphics; -//using OpenTK.OpenGL; +//using OpenTK.Graphics.OpenGL; namespace OpenTK.Platform.X11 {